diff options
| author | nicm <nicm> | 2017-01-11 22:36:07 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2017-01-11 22:36:07 +0000 |
| commit | 3bb14001b9a9a5665c7dcac542dc49841e1b3c58 (patch) | |
| tree | b84fd2e64b8d75fa4890221e9fb1b028913df6d4 | |
| parent | bf6a5c056d4be87d68d0e3e409dbf8f116bc9317 (diff) | |
| download | rtmux-3bb14001b9a9a5665c7dcac542dc49841e1b3c58.tar.gz rtmux-3bb14001b9a9a5665c7dcac542dc49841e1b3c58.tar.bz2 rtmux-3bb14001b9a9a5665c7dcac542dc49841e1b3c58.zip | |
Add some missing special keys to key_string_lookup_key, fix a mouse
check in server_client_handle_key, and tweak a comment.
| -rw-r--r-- | key-string.c | 6 | ||||
| -rw-r--r-- | server-client.c | 2 | ||||
| -rw-r--r-- | tty.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/key-string.c b/key-string.c index b2fe845f..85841dd2 100644 --- a/key-string.c +++ b/key-string.c @@ -247,8 +247,14 @@ key_string_lookup_key(key_code key) /* Handle special keys. */ if (key == KEYC_UNKNOWN) return ("Unknown"); + if (key == KEYC_FOCUS_IN) + return ("FocusIn"); + if (key == KEYC_FOCUS_OUT) + return ("FocusOut"); if (key == KEYC_MOUSE) return ("Mouse"); + if (key == KEYC_DRAGGING) + return ("Dragging"); /* * Special case: display C-@ as C-Space. Could do this below in diff --git a/server-client.c b/server-client.c index b45265b7..6092a234 100644 --- a/server-client.c +++ b/server-client.c @@ -758,7 +758,7 @@ server_client_handle_key(struct client *c, key_code key) wp = w->active; /* Forward mouse keys if disabled. */ - if (key == KEYC_MOUSE && !options_get_number(s->options, "mouse")) + if (KEYC_IS_MOUSE(key) && !options_get_number(s->options, "mouse")) goto forward; /* Treat everything as a regular key when pasting is detected. */ @@ -565,9 +565,7 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s) if (mode & ALL_MOUSE_MODES) { /* * Enable the SGR (1006) extension unconditionally, as - * this is safe from misinterpretation. Do it in this - * order, because in some terminals it's the last one - * that takes effect and SGR is the preferred one. + * it is safe from misinterpretation. */ tty_puts(tty, "\033[?1006h"); if (mode & MODE_MOUSE_BUTTON) |