mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-18 17:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sixel

Browse Source
This commit is contained in:
Nicholas Marriott
2020-02-20 20:37:32 +00:00
parent a282439fcb 4694afbed4
commit 90dc05191c
18 changed files with 238 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server-client.c
View File

@@ -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;
}
@@ -1704,7 +1706,6 @@ static void
server_client_dispatch(struct imsg *imsg, void *arg)
{
struct client *c = arg;
const char *data;
ssize_t datalen;
struct session *s;
@@ -1716,7 +1717,6 @@ server_client_dispatch(struct imsg *imsg, void *arg)
return;
}
data = imsg->data;
datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
switch (imsg->hdr.type) {