diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-02-19 16:01:27 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-02-19 16:01:27 +0000 |
| commit | ba542e42b7a62ee4b205550d5da7fdfcd77fefa7 (patch) | |
| tree | eaa0dd4bc15201cbfd38952931898844fe9dce9c /server-client.c | |
| parent | 22e9cf04cafeb18c88ef1232d63dff5b5173abac (diff) | |
| parent | b20753f2a302d07829549dfbd249bd210374fec4 (diff) | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/server-client.c b/server-client.c index 513a760e..fe72317a 100644 --- a/server-client.c +++ b/server-client.c @@ -660,8 +660,7 @@ have_event: break; } c->tty.mouse_drag_flag = 0; - - return (key); + goto out; } /* Convert to a key binding. */ @@ -956,6 +955,7 @@ have_event: if (key == KEYC_UNKNOWN) return (KEYC_UNKNOWN); +out: /* Apply modifiers if any. */ if (b & MOUSE_MASK_META) key |= KEYC_ESCAPE; @@ -964,6 +964,8 @@ have_event: if (b & MOUSE_MASK_SHIFT) key |= KEYC_SHIFT; + if (log_get_level() != 0) + log_debug("mouse key is %s", key_string_lookup_key (key)); return (key); } @@ -1057,7 +1059,7 @@ server_client_key_callback(struct cmdq_item *item, void *data) * Mouse drag is in progress, so fire the callback (now that * the mouse event is valid). */ - if (key == KEYC_DRAGGING) { + if ((key & KEYC_MASK_KEY) == KEYC_DRAGGING) { c->tty.mouse_drag_update(c, m); goto out; } |