The branch, master has been updated
via 06b5805479943fc95cafd01d33252954529ba636 (commit)
via d6debc21c777dc0e993fd7928bbba51075685491 (commit)
via ddb52a2b157c1970081a2fb30f1413d57ec35b1e (commit)
via 13441e8cb8b0ce68db3204a44bbdc004bee42a0f (commit)
from a97d5b8e60b25e2d38603d472f1b0b70e4ef5fa4 (commit)
- Log -----------------------------------------------------------------
commit 06b5805479943fc95cafd01d33252954529ba636
Merge: a97d5b8 d6debc2
Author: Thomas Adam <[email protected]>
Commit: Thomas Adam <[email protected]>
Merge branch 'obsd-master'
options-table.c | 4 ++--
tmux.1 | 4 ++--
tmux.h | 6 +++---
tty-term.c | 6 +++---
tty.c | 22 +++++++++++-----------
5 files changed, 21 insertions(+), 21 deletions(-)
commit d6debc21c777dc0e993fd7928bbba51075685491
Author: Stuart Henderson <[email protected]>
Commit: Stuart Henderson <[email protected]>
revert r1.156 "Add support for focus notifications when tmux pane changes"
beck@ found annoying beeps if a machine was shutdown while tmux is running
and you then focus in/out of an xterm; kettenis tracked it down to 1.156.
---
tty.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tty.c b/tty.c
index 652d2b7..cf6e965 100644
--- a/tty.c
+++ b/tty.c
@@ -220,7 +220,7 @@ tty_start_tty(struct tty *tty)
tty_puts(tty, "\033[?1000l\033[?1006l\033[?1005l");
if (tty_term_has(tty->term, TTYC_XT))
- tty_puts(tty, "\033[c\033[>4;1m\033[?1004h\033[m");
+ tty_puts(tty, "\033[c\033[>4;1m\033[m");
tty->cx = UINT_MAX;
tty->cy = UINT_MAX;
@@ -283,7 +283,7 @@ tty_stop_tty(struct tty *tty)
tty_raw(tty, "\033[?1000l\033[?1006l\033[?1005l");
if (tty_term_has(tty->term, TTYC_XT))
- tty_raw(tty, "\033[>4m\033[?1004l\033[m");
+ tty_raw(tty, "\033[>4m\033[m");
tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP));
commit ddb52a2b157c1970081a2fb30f1413d57ec35b1e
Author: Jason McIntyre <[email protected]>
Commit: Jason McIntyre <[email protected]>
escape "Ss", becuase groff thinks it has found a macro;
---
tmux.1 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tmux.1 b/tmux.1
index eb5ea47..e59b9a6 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3581,7 +3581,7 @@ to change the cursor colour from inside
.Bd -literal -offset indent
$ printf '\e033]12;red\e033\e\e'
.Ed
-.It Em Ss , Se
+.It Em \&Ss , Se
Change the cursor style.
If set, a sequence such as this may be used
to change the cursor to an underline:
commit 13441e8cb8b0ce68db3204a44bbdc004bee42a0f
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
The actual terminfo entries we ended up with for cursor changes are Cs,
Ce, Ss and Se (not Cc, Ce, Cs, Csr). So use and document these instead
of the ones we were using earlier.
---
options-table.c | 4 ++--
tmux.1 | 4 ++--
tmux.h | 6 +++---
tty-term.c | 6 +++---
tty.c | 18 +++++++++---------
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/options-table.c b/options-table.c
index c4ada1f..c73842f 100644
--- a/options-table.c
+++ b/options-table.c
@@ -416,8 +416,8 @@ const struct options_table_entry session_options_table[] = {
.type = OPTIONS_TABLE_STRING,
.default_str = "*256col*:colors=256"
",xterm*:XT:Ms=\\E]52;%p1%s;%p2%s\\007"
- ":Cc=\\E]12;%p1%s\\007:Cr=\\E]112\\007"
- ":Cs=\\E[%p1%d q:Csr=\\E[2 q,screen*:XT"
+ ":Cs=\\E]12;%p1%s\\007:Cr=\\E]112\\007"
+ ":Ss=\\E[%p1%d q:Se=\\E[2 q,screen*:XT"
},
{ .name = "update-environment",
diff --git a/tmux.1 b/tmux.1
index 40b0ef7..eb5ea47 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3571,7 +3571,7 @@ This command only works from outside
understands some extensions to
.Xr terminfo 5 :
.Bl -tag -width Ds
-.It Em Cc , Cr
+.It Em Cs , Cr
Set the cursor colour.
The first takes a single string argument and is used to set the colour;
the second takes no arguments and restores the default cursor colour.
@@ -3581,7 +3581,7 @@ to change the cursor colour from inside
.Bd -literal -offset indent
$ printf '\e033]12;red\e033\e\e'
.Ed
-.It Em Cs , Csr
+.It Em Ss , Se
Change the cursor style.
If set, a sequence such as this may be used
to change the cursor to an underline:
diff --git a/tmux.h b/tmux.h
index 7c577b4..b1624b6 100644
--- a/tmux.h
+++ b/tmux.h
@@ -253,15 +253,13 @@ enum tty_code_code {
TTYC_BEL, /* bell, bl */
TTYC_BLINK, /* enter_blink_mode, mb */
TTYC_BOLD, /* enter_bold_mode, md */
- TTYC_CC, /* set colour cursor, Cc */
TTYC_CIVIS, /* cursor_invisible, vi */
TTYC_CLEAR, /* clear_screen, cl */
TTYC_CNORM, /* cursor_normal, ve */
TTYC_COLORS, /* max_colors, Co */
TTYC_CR, /* restore cursor colour, Cr */
- TTYC_CS1, /* set cursor style, Cs */
+ TTYC_CS, /* set cursor colour, Cs */
TTYC_CSR, /* change_scroll_region, cs */
- TTYC_CSR1, /* reset cursor style, Csr */
TTYC_CUB, /* parm_left_cursor, LE */
TTYC_CUB1, /* cursor_left, le */
TTYC_CUD, /* parm_down_cursor, DO */
@@ -391,6 +389,7 @@ enum tty_code_code {
TTYC_RMACS, /* exit_alt_charset_mode */
TTYC_RMCUP, /* exit_ca_mode, te */
TTYC_RMKX, /* keypad_local, ke */
+ TTYC_SE, /* reset cursor style, Se */
TTYC_SETAB, /* set_a_background, AB */
TTYC_SETAF, /* set_a_foreground, AF */
TTYC_SGR0, /* exit_attribute_mode, me */
@@ -400,6 +399,7 @@ enum tty_code_code {
TTYC_SMKX, /* keypad_xmit, ks */
TTYC_SMSO, /* enter_standout_mode, so */
TTYC_SMUL, /* enter_underline_mode, us */
+ TTYC_SS, /* set cursor style, Ss */
TTYC_TSL, /* to_status_line, tsl */
TTYC_VPA, /* row_address, cv */
TTYC_XENL, /* eat_newline_glitch, xn */
diff --git a/tty-term.c b/tty-term.c
index 254569f..8644a84 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -38,15 +38,13 @@ const struct tty_term_code_entry tty_term_codes[NTTYCODE] =
{
{ TTYC_BEL, TTYCODE_STRING, "bel" },
{ TTYC_BLINK, TTYCODE_STRING, "blink" },
{ TTYC_BOLD, TTYCODE_STRING, "bold" },
- { TTYC_CC, TTYCODE_STRING, "Cc" },
{ TTYC_CIVIS, TTYCODE_STRING, "civis" },
{ TTYC_CLEAR, TTYCODE_STRING, "clear" },
{ TTYC_CNORM, TTYCODE_STRING, "cnorm" },
{ TTYC_COLORS, TTYCODE_NUMBER, "colors" },
{ TTYC_CR, TTYCODE_STRING, "Cr" },
- { TTYC_CS1, TTYCODE_STRING, "Cs" },
+ { TTYC_CS, TTYCODE_STRING, "Cs" },
{ TTYC_CSR, TTYCODE_STRING, "csr" },
- { TTYC_CSR1, TTYCODE_STRING, "Csr" },
{ TTYC_CUB, TTYCODE_STRING, "cub" },
{ TTYC_CUB1, TTYCODE_STRING, "cub1" },
{ TTYC_CUD, TTYCODE_STRING, "cud" },
@@ -176,6 +174,7 @@ const struct tty_term_code_entry tty_term_codes[NTTYCODE] =
{
{ TTYC_RMACS, TTYCODE_STRING, "rmacs" },
{ TTYC_RMCUP, TTYCODE_STRING, "rmcup" },
{ TTYC_RMKX, TTYCODE_STRING, "rmkx" },
+ { TTYC_SE, TTYCODE_STRING, "Se" },
{ TTYC_SETAB, TTYCODE_STRING, "setab" },
{ TTYC_SETAF, TTYCODE_STRING, "setaf" },
{ TTYC_SGR0, TTYCODE_STRING, "sgr0" },
@@ -185,6 +184,7 @@ const struct tty_term_code_entry tty_term_codes[NTTYCODE] =
{
{ TTYC_SMKX, TTYCODE_STRING, "smkx" },
{ TTYC_SMSO, TTYCODE_STRING, "smso" },
{ TTYC_SMUL, TTYCODE_STRING, "smul" },
+ { TTYC_SS, TTYCODE_STRING, "Ss" },
{ TTYC_TSL, TTYCODE_STRING, "tsl" },
{ TTYC_VPA, TTYCODE_STRING, "vpa" },
{ TTYC_XENL, TTYCODE_FLAG, "xenl" },
diff --git a/tty.c b/tty.c
index 74988eb..652d2b7 100644
--- a/tty.c
+++ b/tty.c
@@ -270,11 +270,11 @@ tty_stop_tty(struct tty *tty)
tty_raw(tty, tty_term_string(tty->term, TTYC_SGR0));
tty_raw(tty, tty_term_string(tty->term, TTYC_RMKX));
tty_raw(tty, tty_term_string(tty->term, TTYC_CLEAR));
- if (tty_term_has(tty->term, TTYC_CS1) && tty->cstyle != 0) {
- if (tty_term_has(tty->term, TTYC_CSR1))
- tty_raw(tty, tty_term_string(tty->term, TTYC_CSR1));
+ if (tty_term_has(tty->term, TTYC_SS) && tty->cstyle != 0) {
+ if (tty_term_has(tty->term, TTYC_SE))
+ tty_raw(tty, tty_term_string(tty->term, TTYC_SE));
else
- tty_raw(tty, tty_term_string1(tty->term, TTYC_CS1, 0));
+ tty_raw(tty, tty_term_string1(tty->term, TTYC_SS, 0));
}
tty_raw(tty, tty_term_string(tty->term, TTYC_CR));
@@ -455,7 +455,7 @@ tty_force_cursor_colour(struct tty *tty, const char
*ccolour)
if (*ccolour == '\0')
tty_putcode(tty, TTYC_CR);
else
- tty_putcode_ptr1(tty, TTYC_CC, ccolour);
+ tty_putcode_ptr1(tty, TTYC_CS, ccolour);
free(tty->ccolour);
tty->ccolour = xstrdup(ccolour);
}
@@ -479,12 +479,12 @@ tty_update_mode(struct tty *tty, int mode, struct screen
*s)
tty_putcode(tty, TTYC_CIVIS);
}
if (tty->cstyle != s->cstyle) {
- if (tty_term_has(tty->term, TTYC_CS1)) {
+ if (tty_term_has(tty->term, TTYC_SS)) {
if (s->cstyle == 0 &&
- tty_term_has(tty->term, TTYC_CSR1))
- tty_putcode(tty, TTYC_CSR1);
+ tty_term_has(tty->term, TTYC_SE))
+ tty_putcode(tty, TTYC_SE);
else
- tty_putcode1(tty, TTYC_CS1, s->cstyle);
+ tty_putcode1(tty, TTYC_SS, s->cstyle);
}
tty->cstyle = s->cstyle;
}
-----------------------------------------------------------------------
Summary of changes:
options-table.c | 4 ++--
tmux.1 | 4 ++--
tmux.h | 6 +++---
tty-term.c | 6 +++---
tty.c | 22 +++++++++++-----------
5 files changed, 21 insertions(+), 21 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
