The branch, master has been updated
via 1bc910a963ab3c39a03ed3e6b4795c6b5d5b6d18 (commit)
via 260419f48efccd1ca80cd00168ef2471e765e8b6 (commit)
from 63f451965cf26bf6baadc374bd0dcadc8ca66308 (commit)
- Log -----------------------------------------------------------------
commit 1bc910a963ab3c39a03ed3e6b4795c6b5d5b6d18
Merge: 63f4519 260419f
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>
Merge branch 'obsd-master'
Sync from OpenBSD.
cmd-server-info.c | 4 ++--
tmux.h | 4 ++--
tty-keys.c | 30 ++++++++++++------------------
tty.c | 11 ++++-------
4 files changed, 20 insertions(+), 29 deletions(-)
commit 260419f48efccd1ca80cd00168ef2471e765e8b6
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Nicholas Marriott <n...@openbsd.org>
Put helper function back, will be needed in a bit.
---
cmd-server-info.c | 4 ++--
tmux.h | 4 ++--
tty-keys.c | 30 ++++++++++++------------------
tty.c | 11 ++++-------
4 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/cmd-server-info.c b/cmd-server-info.c
index ffd7efc..0d09626 100644
--- a/cmd-server-info.c
+++ b/cmd-server-info.c
@@ -89,10 +89,10 @@ cmd_server_info_exec(unused struct cmd *self, struct
cmd_ctx *ctx)
continue;
ctx->print(ctx,"%2d: %s (%d, %d): %s [%ux%u %s bs=%hho "
- "xterm=%u] [flags=0x%x/0x%x, references=%u]", i,
+ "class=%u] [flags=0x%x/0x%x, references=%u]", i,
c->tty.path, c->ibuf.fd, c->tty.fd, c->session->name,
c->tty.sx, c->tty.sy, c->tty.termname,
- c->tty.tio.c_cc[VERASE], c->tty.xterm_version,
+ c->tty.tio.c_cc[VERASE], c->tty.class,
c->flags, c->tty.flags, c->references);
}
ctx->print(ctx, "%s", "");
diff --git a/tmux.h b/tmux.h
index 2a36c2d..98677f7 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1193,7 +1193,7 @@ struct tty {
struct client *client;
char *path;
- u_int xterm_version;
+ u_int class;
u_int sx;
u_int sy;
@@ -1637,8 +1637,8 @@ void tty_pututf8(struct tty *, const struct
grid_utf8 *);
void tty_init(struct tty *, struct client *, int, char *);
int tty_resize(struct tty *);
int tty_set_size(struct tty *, u_int, u_int);
+void tty_set_class(struct tty *, u_int);
void tty_start_tty(struct tty *);
-void tty_set_version(struct tty *, u_int);
void tty_stop_tty(struct tty *);
void tty_set_title(struct tty *, const char *);
void tty_update_mode(struct tty *, int, struct screen *);
diff --git a/tty-keys.c b/tty-keys.c
index 6d18d79..341f7fb 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -724,18 +724,17 @@ tty_keys_mouse(struct tty *tty, const char *buf, size_t
len, size_t *size)
int
tty_keys_device(struct tty *tty, const char *buf, size_t len, size_t *size)
{
- u_int i, a, b;
+ u_int i, class;
char tmp[64], *endptr;
/*
* Primary device attributes are \033[?a;b and secondary are
- * \033[>a;b;c. We only request attributes on xterm, so we only care
- * about the middle values which is the xterm version.
+ * \033[>a;b;c.
*/
*size = 0;
- /* First three bytes are always \033[>. */
+ /* First three bytes are always \033[?. */
if (buf[0] != '\033')
return (-1);
if (len == 1)
@@ -760,22 +759,17 @@ tty_keys_device(struct tty *tty, const char *buf, size_t
len, size_t *size)
tmp[i] = '\0';
*size = 4 + i;
- /* Only secondary is of interest. */
- if (buf[2] != '>')
+ /* Only primary is of interest. */
+ if (buf[2] != '?')
return (0);
- /* Convert version numbers. */
- a = strtoul(tmp, &endptr, 10);
- if (*endptr == ';') {
- b = strtoul(endptr + 1, &endptr, 10);
- if (*endptr != '\0' && *endptr != ';')
- b = 0;
- } else
- a = b = 0;
-
- log_debug("received xterm version %u", b);
- if (b < 500)
- tty_set_version(tty, b);
+ /* Convert service class. */
+ class = strtoul(tmp, &endptr, 10);
+ if (*endptr != ';')
+ class = 0;
+
+ log_debug("received service class %u", class);
+ tty_set_class(tty, class);
return (0);
}
diff --git a/tty.c b/tty.c
index b221031..6bc7139 100644
--- a/tty.c
+++ b/tty.c
@@ -224,7 +224,7 @@ tty_start_tty(struct tty *tty)
tty_puts(tty, "\033[?1000l");
if (tty_term_has(tty->term, TTYC_XT))
- tty_puts(tty, "\033[>c");
+ tty_puts(tty, "\033[c");
tty->cx = UINT_MAX;
tty->cy = UINT_MAX;
@@ -240,11 +240,11 @@ tty_start_tty(struct tty *tty)
}
void
-tty_set_version(struct tty *tty, u_int version)
+tty_set_class(struct tty *tty, u_int class)
{
- if (tty->xterm_version != 0)
+ if (tty->class != 0)
return;
- tty->xterm_version = version;
+ tty->class = class;
}
void
@@ -289,9 +289,6 @@ tty_stop_tty(struct tty *tty)
tty_raw(tty, "\033[?1000l");
tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP));
-
- if (tty->xterm_version > 270)
- tty_raw(tty, "\033[61;1\"p");
}
void
-----------------------------------------------------------------------
Summary of changes:
cmd-server-info.c | 4 ++--
tmux.h | 4 ++--
tty-keys.c | 30 ++++++++++++------------------
tty.c | 11 ++++-------
4 files changed, 20 insertions(+), 29 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
