The branch, master has been updated
via b58bca9a72009101da373a3b7463fd866ecac58c (commit)
via 27dcf470dc4aa5901ac7f01b3a9f971e02f2229e (commit)
via caa8290510244990b26106e027aa253237ada629 (commit)
via 7f9b225cc269211b86a4c4d2168146c217d63118 (commit)
via cbee283c26968304b473e2191d2bb5f52208b58d (commit)
via 9fcda95a6f55f017536cdf24366754a2304c1059 (commit)
via 7ada64d5f8a0df39229c41b992c0ee8ac9f0a1d7 (commit)
via 20f0d917beb0f774af2628ed7efe2a33cf59f42a (commit)
via 69c86379e39476013205fce627951dd733d647b3 (commit)
via 738e789dbd7712ab94073036cf4e903abc68447f (commit)
via 66afcf5be092ed0ab86d1d4059426823e72c63d5 (commit)
via 7f636587098593c6c0efd3feaecb970aa7170116 (commit)
via 5e4d9a3197a229ecb30d51f5b7e6756ef31dc1d2 (commit)
via 982354765bc6f0bfb225d7c1f96e5b73f9880533 (commit)
from e312db140868754358d40ec17595327a8fbbf180 (commit)
- Log -----------------------------------------------------------------
commit b58bca9a72009101da373a3b7463fd866ecac58c
Merge: e312db1 27dcf47
Author: Thomas Adam <[email protected]>
Commit: Thomas Adam <[email protected]>
Merge branch 'obsd-master'
Conflicts:
tmux.c
clock.c | 15 +++++++++++----
cmd-copy-mode.c | 8 +++++---
cmd-queue.c | 2 +-
cmd-source-file.c | 1 +
cmd-swap-pane.c | 8 ++++++--
colour.c | 26 --------------------------
job.c | 2 +-
options-table.c | 2 +-
screen-write.c | 4 ++++
server-client.c | 14 +-------------
tmux.1 | 16 +++++++---------
tmux.c | 19 ++++++++++---------
tmux.h | 6 ++----
tty-term.c | 4 +---
tty.c | 36 ++++++------------------------------
utf8.c | 1 -
16 files changed, 57 insertions(+), 107 deletions(-)
commit 27dcf470dc4aa5901ac7f01b3a9f971e02f2229e
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Remove some Korean characters from the zero-width list that apparently
shouldn't be there, from Jeong Mok Cho.
---
utf8.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/utf8.c b/utf8.c
index b276d87..1c81392 100644
--- a/utf8.c
+++ b/utf8.c
@@ -171,7 +171,6 @@ struct utf8_width_entry utf8_width_table[] = {
{ 0x30000, 0x3fffd, 2, NULL, NULL },
{ 0x00711, 0x00711, 0, NULL, NULL },
{ 0x0fe00, 0x0fe0f, 0, NULL, NULL },
- { 0x01160, 0x011ff, 0, NULL, NULL },
{ 0x0180b, 0x0180d, 0, NULL, NULL },
{ 0x10a3f, 0x10a3f, 0, NULL, NULL },
{ 0x00981, 0x00981, 0, NULL, NULL },
commit caa8290510244990b26106e027aa253237ada629
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Copy the client into the new cmdq in source-file so commands that work
on it (such as new-session) can work. Fixes issue reported by oss-adv at
users dot sf dot net.
---
cmd-source-file.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/cmd-source-file.c b/cmd-source-file.c
index 1bd2bb0..f50efbe 100644
--- a/cmd-source-file.c
+++ b/cmd-source-file.c
@@ -49,6 +49,7 @@ cmd_source_file_exec(struct cmd *self, struct cmd_q *cmdq)
char *cause;
cmdq1 = cmdq_new(NULL);
+ cmdq1->client = cmdq->client;
cmdq1->emptyfn = cmd_source_file_done;
cmdq1->data = cmdq;
commit 7f9b225cc269211b86a4c4d2168146c217d63118
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Call setlocale(LC_TIME) at startup.
---
clock.c | 15 +++++++++++----
tmux.c | 3 +++
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/clock.c b/clock.c
index 00d818b..283a4a1 100644
--- a/clock.c
+++ b/clock.c
@@ -103,13 +103,20 @@ clock_draw(struct screen_write_ctx *ctx, int colour, int
style)
struct grid_cell gc;
char tim[64], *ptr;
time_t t;
+ struct tm *tm;
u_int i, j, x, y, idx;
t = time(NULL);
- if (style == 0)
- strftime(tim, sizeof tim, "%l:%M %p", localtime(&t));
- else
- strftime(tim, sizeof tim, "%H:%M", localtime(&t));
+ tm = localtime(&t);
+ if (style == 0) {
+ strftime(tim, sizeof tim, "%l:%M ", localtime(&t));
+ if (tm->tm_hour >= 12)
+ strlcat(tim, "PM", sizeof tim);
+ else
+ strlcat(tim, "AM", sizeof tim);
+ } else
+ strftime(tim, sizeof tim, "%H:%M", tm);
+
screen_write_clearscreen(ctx);
diff --git a/tmux.c b/tmux.c
index 1f4057d..e9b28d7 100644
--- a/tmux.c
+++ b/tmux.c
@@ -22,6 +22,7 @@
#include <errno.h>
#include <event.h>
#include <fcntl.h>
+#include <locale.h>
#include <paths.h>
#include <pwd.h>
#include <stdlib.h>
@@ -243,6 +244,8 @@ main(int argc, char **argv)
malloc_options = (char *) "AFGJPX";
#endif
+ setlocale(LC_TIME, "");
+
quiet = flags = 0;
label = path = NULL;
login_shell = (**argv == '-');
commit cbee283c26968304b473e2191d2bb5f52208b58d
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Send an SGR0 after turning on modifyOtherKeys to fix Terminal.app which
treats \033[>4;1m and \033[4;1m (bold+underline). Reported & tested by
otto@.
---
tty.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tty.c b/tty.c
index bffddac..74988eb 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");
+ tty_puts(tty, "\033[c\033[>4;1m\033[?1004h\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");
+ tty_raw(tty, "\033[>4m\033[?1004l\033[m");
tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP));
commit 9fcda95a6f55f017536cdf24366754a2304c1059
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Set EV_WRITE for jobs or run/if-shell jobs can hang. From Chris Johnsen.
---
job.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/job.c b/job.c
index b76b334..291e000 100644
--- a/job.c
+++ b/job.c
@@ -109,7 +109,7 @@ job_run(const char *cmd, struct session *s,
job->event = bufferevent_new(job->fd, NULL, job_write_callback,
job_callback, job);
- bufferevent_enable(job->event, EV_READ);
+ bufferevent_enable(job->event, EV_READ|EV_WRITE);
log_debug("run job %p: %s, pid %ld", job, job->cmd, (long) job->pid);
return (job);
commit 7ada64d5f8a0df39229c41b992c0ee8ac9f0a1d7
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Fix bug where end guard in control mode was not printed after session
destroyed, from George Nachman.
---
cmd-queue.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cmd-queue.c b/cmd-queue.c
index b1c0a4e..a64d332 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -158,7 +158,7 @@ cmdq_guard(struct cmd_q *cmdq, const char *guard)
{
struct client *c = cmdq->client;
- if (c == NULL || c->session == NULL)
+ if (c == NULL)
return 0;
if (!(c->flags & CLIENT_CONTROL))
return 0;
commit 20f0d917beb0f774af2628ed7efe2a33cf59f42a
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Missed -o from set-window-option, from Ben Boeckel.
---
tmux.1 | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/tmux.1 b/tmux.1
index 9b1488f..b38b43b 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2645,7 +2645,7 @@ The default is
.Ql \ -_@ .
.El
.It Xo Ic set-window-option
-.Op Fl agqu
+.Op Fl agoqu
.Op Fl t Ar target-window
.Ar option Ar value
.Xc
@@ -2654,6 +2654,7 @@ Set a window option.
The
.Fl a ,
.Fl g ,
+.Fl o ,
.Fl q
and
.Fl u
commit 69c86379e39476013205fce627951dd733d647b3
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Remove some code not needed on OpenBSD.
---
server-client.c | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/server-client.c b/server-client.c
index ac4ecf2..6cacefa 100644
--- a/server-client.c
+++ b/server-client.c
@@ -534,18 +534,8 @@ server_client_check_resize(struct window_pane *wp)
ws.ws_col = wp->sx;
ws.ws_row = wp->sy;
- if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1) {
-#ifdef __sun
- /*
- * Some versions of Solaris apparently can return an error when
- * resizing; don't know why this happens, can't reproduce on
- * other platforms and ignoring it doesn't seem to cause any
- * issues.
- */
- if (errno != EINVAL)
-#endif
+ if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
fatal("ioctl failed");
- }
wp->flags &= ~PANE_RESIZE;
}
commit 738e789dbd7712ab94073036cf4e903abc68447f
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
If -s to swap-pane is not given, use the current pane.
---
cmd-swap-pane.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index e7ea624..e6b46d6 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -75,8 +75,12 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
src_wp = TAILQ_PREV(dst_wp, window_panes, entry);
if (src_wp == NULL)
src_wp = TAILQ_LAST(&dst_w->panes,
window_panes);
- } else
- return (CMD_RETURN_NORMAL);
+ } else {
+ src_wl = cmd_find_pane(cmdq, NULL, NULL, &src_wp);
+ if (src_wl == NULL)
+ return (CMD_RETURN_ERROR);
+ src_w = src_wl->window;
+ }
} else {
src_wl = cmd_find_pane(cmdq, args_get(args, 's'), NULL,
&src_wp);
if (src_wl == NULL)
commit 66afcf5be092ed0ab86d1d4059426823e72c63d5
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Make copy-mode -u still scroll up if already in copy mode, handy for
people who bind it with -n.
---
cmd-copy-mode.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c
index 59b5a9e..883a937 100644
--- a/cmd-copy-mode.c
+++ b/cmd-copy-mode.c
@@ -54,9 +54,11 @@ cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq)
if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
return (CMD_RETURN_ERROR);
- if (window_pane_set_mode(wp, &window_copy_mode) != 0)
- return (CMD_RETURN_NORMAL);
- window_copy_init_from_pane(wp);
+ if (wp->mode != &window_copy_mode) {
+ if (window_pane_set_mode(wp, &window_copy_mode) != 0)
+ return (CMD_RETURN_NORMAL);
+ window_copy_init_from_pane(wp);
+ }
if (wp->mode == &window_copy_mode && args_has(self->args, 'u'))
window_copy_pageup(wp);
commit 7f636587098593c6c0efd3feaecb970aa7170116
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Add TMUX_TMPDIR variable to put the socket directory outside
TMPDIR. From Ben Boeckel.
---
tmux.1 | 13 +++++--------
tmux.c | 15 ++++++---------
2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/tmux.1 b/tmux.1
index 0dc68bf..9b1488f 100644
--- a/tmux.1
+++ b/tmux.1
@@ -98,10 +98,6 @@ The options are as follows:
Force
.Nm
to assume the terminal supports 256 colours.
-.It Fl 8
-Like
-.Fl 2 ,
-but indicates that the terminal supports 88 colours.
.It Fl C
Start in control mode.
Given twice
@@ -145,11 +141,12 @@ session created, and continues to process the rest of the
configuration file.
.It Fl L Ar socket-name
.Nm
stores the server socket in a directory under
-.Pa /tmp
-(or
+.Ev TMUX_TMPDIR ,
.Ev TMPDIR
-if set);
-the default socket is named
+if it is unset, or
+.Pa /tmp
+if both are unset.
+The default socket is named
.Em default .
This option allows a different socket name to be specified, allowing several
independent
diff --git a/tmux.c b/tmux.c
index 368562f..1f4057d 100644
--- a/tmux.c
+++ b/tmux.c
@@ -164,10 +164,12 @@ makesocketpath(const char *label)
u_int uid;
uid = getuid();
- if ((s = getenv("TMPDIR")) == NULL || *s == '\0')
- xsnprintf(base, sizeof base, "%s/tmux-%u", _PATH_TMP, uid);
- else
+ if ((s = getenv("TMUX_TMPDIR")) != NULL && *s != '\0')
+ xsnprintf(base, sizeof base, "%s/", s);
+ else if ((s = getenv("TMPDIR")) != NULL && *s != '\0')
xsnprintf(base, sizeof base, "%s/tmux-%u", s, uid);
+ else
+ xsnprintf(base, sizeof base, "%s/tmux-%u", _PATH_TMP, uid);
if (mkdir(base, S_IRWXU) != 0 && errno != EEXIST)
return (NULL);
@@ -244,15 +246,10 @@ main(int argc, char **argv)
quiet = flags = 0;
label = path = NULL;
login_shell = (**argv == '-');
- while ((opt = getopt(argc, argv, "28c:Cdf:lL:qS:uUv")) != -1) {
+ while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:uUv")) != -1) {
switch (opt) {
case '2':
flags |= IDENTIFY_256COLOURS;
- flags &= ~IDENTIFY_88COLOURS;
- break;
- case '8':
- flags |= IDENTIFY_88COLOURS;
- flags &= ~IDENTIFY_256COLOURS;
break;
case 'c':
free(shell_cmd);
commit 5e4d9a3197a229ecb30d51f5b7e6756ef31dc1d2
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Move the cursor back into the last column on CUU/CUD to match xterm
behaviour. From George Nachman.
---
screen-write.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/screen-write.c b/screen-write.c
index 348065c..c0935c9 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -488,6 +488,8 @@ screen_write_cursorup(struct screen_write_ctx *ctx, u_int
ny)
if (ny > s->cy - s->rupper)
ny = s->cy - s->rupper;
}
+ if (s->cx == screen_size_x(s))
+ s->cx--;
if (ny == 0)
return;
@@ -512,6 +514,8 @@ screen_write_cursordown(struct screen_write_ctx *ctx, u_int
ny)
if (ny > s->rlower - s->cy)
ny = s->rlower - s->cy;
}
+ if (s->cx == screen_size_x(s))
+ s->cx--;
if (ny == 0)
return;
commit 982354765bc6f0bfb225d7c1f96e5b73f9880533
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Remove tmux's (already minimal) 88 colour support. Such terminals are
few and unnecessary.
---
colour.c | 26 --------------------------
options-table.c | 2 +-
server-client.c | 2 --
tmux.h | 6 ++----
tty-term.c | 4 +---
tty.c | 32 ++++----------------------------
6 files changed, 8 insertions(+), 64 deletions(-)
diff --git a/colour.c b/colour.c
index ff49268..9e90596 100644
--- a/colour.c
+++ b/colour.c
@@ -287,29 +287,3 @@ colour_256to16(u_char c)
return (table[c]);
}
-
-/* Convert 256 colour palette to 88. */
-u_char
-colour_256to88(u_char c)
-{
- static const u_char table[256] = {
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 17, 18, 18, 19, 20, 21, 21, 22, 22, 23, 20, 21, 21, 22,
- 22, 23, 24, 25, 25, 26, 26, 27, 24, 25, 25, 26, 26, 27, 28, 29,
- 29, 30, 30, 31, 32, 33, 33, 34, 34, 35, 36, 37, 37, 38, 38, 39,
- 36, 37, 37, 38, 38, 39, 40, 41, 41, 42, 42, 43, 40, 41, 41, 42,
- 42, 43, 44, 45, 45, 46, 46, 47, 32, 33, 33, 34, 34, 35, 36, 37,
- 37, 38, 38, 39, 36, 37, 37, 38, 38, 39, 40, 41, 41, 42, 42, 43,
- 40, 41, 41, 42, 42, 43, 44, 45, 45, 46, 46, 47, 48, 49, 49, 50,
- 50, 51, 52, 53, 53, 54, 54, 55, 52, 53, 53, 54, 54, 55, 56, 57,
- 57, 58, 58, 59, 56, 57, 57, 58, 58, 59, 60, 61, 61, 62, 62, 63,
- 48, 49, 49, 50, 50, 51, 52, 53, 53, 54, 54, 55, 52, 53, 53, 54,
- 54, 55, 56, 57, 57, 58, 58, 59, 56, 57, 57, 58, 58, 59, 60, 61,
- 61, 62, 62, 63, 64, 65, 65, 66, 66, 67, 68, 69, 69, 70, 70, 71,
- 68, 69, 69, 70, 70, 71, 72, 73, 73, 74, 74, 75, 72, 73, 73, 74,
- 74, 75, 76, 77, 77, 78, 78, 79, 0, 0, 80, 80, 80, 81, 81, 81,
- 82, 82, 82, 83, 83, 83, 84, 84, 84, 85, 85, 85, 86, 86, 86, 87
- };
-
- return (table[c]);
-}
diff --git a/options-table.c b/options-table.c
index ae71188..c4ada1f 100644
--- a/options-table.c
+++ b/options-table.c
@@ -414,7 +414,7 @@ const struct options_table_entry session_options_table[] = {
{ .name = "terminal-overrides",
.type = OPTIONS_TABLE_STRING,
- .default_str = "*88col*:colors=88,*256col*:colors=256"
+ .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"
diff --git a/server-client.c b/server-client.c
index f61912b..ac4ecf2 100644
--- a/server-client.c
+++ b/server-client.c
@@ -981,8 +981,6 @@ server_client_msg_identify(
c->tty.flags |= TTY_UTF8;
if (data->flags & IDENTIFY_256COLOURS)
c->tty.term_flags |= TERM_256COLOURS;
- else if (data->flags & IDENTIFY_88COLOURS)
- c->tty.term_flags |= TERM_88COLOURS;
tty_resize(&c->tty);
diff --git a/tmux.h b/tmux.h
index 10da2be..053b574 100644
--- a/tmux.h
+++ b/tmux.h
@@ -481,7 +481,7 @@ struct msg_identify_data {
#define IDENTIFY_UTF8 0x1
#define IDENTIFY_256COLOURS 0x2
-#define IDENTIFY_88COLOURS 0x4
+/* 0x4 unused */
#define IDENTIFY_CONTROL 0x8
#define IDENTIFY_TERMIOS 0x10
int flags;
@@ -1141,8 +1141,7 @@ struct tty_term {
struct tty_code codes[NTTYCODE];
#define TERM_256COLOURS 0x1
-#define TERM_88COLOURS 0x2
-#define TERM_EARLYWRAP 0x4
+#define TERM_EARLYWRAP 0x2
int flags;
LIST_ENTRY(tty_term) entry;
@@ -1986,7 +1985,6 @@ void colour_set_bg(struct grid_cell *, int);
const char *colour_tostring(int);
int colour_fromstring(const char *);
u_char colour_256to16(u_char);
-u_char colour_256to88(u_char);
/* attributes.c */
const char *attributes_tostring(u_char);
diff --git a/tty-term.c b/tty-term.c
index c827a44..254569f 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -404,11 +404,9 @@ tty_term_find(char *name, int fd, const char *overrides,
char **cause)
goto error;
}
- /* Figure out if we have 256 or 88 colours. */
+ /* Figure out if we have 256. */
if (tty_term_number(term, TTYC_COLORS) == 256)
term->flags |= TERM_256COLOURS;
- if (tty_term_number(term, TTYC_COLORS) == 88)
- term->flags |= TERM_88COLOURS;
/*
* Terminals without xenl (eat newline glitch) wrap at at $COLUMNS - 1
diff --git a/tty.c b/tty.c
index 75a2f65..bffddac 100644
--- a/tty.c
+++ b/tty.c
@@ -35,7 +35,6 @@ void tty_read_callback(struct bufferevent *, void *);
void tty_error_callback(struct bufferevent *, short, void *);
int tty_try_256(struct tty *, u_char, const char *);
-int tty_try_88(struct tty *, u_char, const char *);
void tty_colours(struct tty *, const struct grid_cell *);
void tty_check_fg(struct tty *, struct grid_cell *);
@@ -1446,9 +1445,7 @@ tty_check_fg(struct tty *tty, struct grid_cell *gc)
/* Is this a 256-colour colour? */
if (gc->flags & GRID_FLAG_FG256) {
/* And not a 256 colour mode? */
- if (!(tty->term->flags & TERM_88COLOURS) &&
- !(tty->term_flags & TERM_88COLOURS) &&
- !(tty->term->flags & TERM_256COLOURS) &&
+ if (!(tty->term->flags & TERM_256COLOURS) &&
!(tty->term_flags & TERM_256COLOURS)) {
gc->fg = colour_256to16(gc->fg);
if (gc->fg & 8) {
@@ -1481,9 +1478,7 @@ tty_check_bg(struct tty *tty, struct grid_cell *gc)
* palette. Bold background doesn't exist portably, so just
* discard the bold bit if set.
*/
- if (!(tty->term->flags & TERM_88COLOURS) &&
- !(tty->term_flags & TERM_88COLOURS) &&
- !(tty->term->flags & TERM_256COLOURS) &&
+ if (!(tty->term->flags & TERM_256COLOURS) &&
!(tty->term_flags & TERM_256COLOURS)) {
gc->bg = colour_256to16(gc->bg);
if (gc->bg & 8)
@@ -1511,11 +1506,9 @@ tty_colours_fg(struct tty *tty, const struct grid_cell
*gc)
/* Is this a 256-colour colour? */
if (gc->flags & GRID_FLAG_FG256) {
- /* Try as 256 colours or translating to 88. */
+ /* Try as 256 colours. */
if (tty_try_256(tty, fg, "38") == 0)
goto save_fg;
- if (tty_try_88(tty, fg, "38") == 0)
- goto save_fg;
/* Else already handled by tty_check_fg. */
return;
}
@@ -1546,11 +1539,9 @@ tty_colours_bg(struct tty *tty, const struct grid_cell
*gc)
/* Is this a 256-colour colour? */
if (gc->flags & GRID_FLAG_BG256) {
- /* Try as 256 colours or translating to 88. */
+ /* Try as 256 colours. */
if (tty_try_256(tty, bg, "48") == 0)
goto save_bg;
- if (tty_try_88(tty, bg, "48") == 0)
- goto save_bg;
/* Else already handled by tty_check_bg. */
return;
}
@@ -1591,21 +1582,6 @@ tty_try_256(struct tty *tty, u_char colour, const char
*type)
return (0);
}
-int
-tty_try_88(struct tty *tty, u_char colour, const char *type)
-{
- char s[32];
-
- if (!(tty->term->flags & TERM_88COLOURS) &&
- !(tty->term_flags & TERM_88COLOURS))
- return (-1);
- colour = colour_256to88(colour);
-
- xsnprintf(s, sizeof s, "\033[%s;5;%hhum", type, colour);
- tty_puts(tty, s);
- return (0);
-}
-
void
tty_bell(struct tty *tty)
{
-----------------------------------------------------------------------
Summary of changes:
clock.c | 15 +++++++++++----
cmd-copy-mode.c | 8 +++++---
cmd-queue.c | 2 +-
cmd-source-file.c | 1 +
cmd-swap-pane.c | 8 ++++++--
colour.c | 26 --------------------------
job.c | 2 +-
options-table.c | 2 +-
screen-write.c | 4 ++++
server-client.c | 14 +-------------
tmux.1 | 16 +++++++---------
tmux.c | 19 ++++++++++---------
tmux.h | 6 ++----
tty-term.c | 4 +---
tty.c | 36 ++++++------------------------------
utf8.c | 1 -
16 files changed, 57 insertions(+), 107 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
