circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 14:27:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2019-05-12 21:02:27 +01:00
parent 42da951edf c3c3927c2b
commit 699d9d2fac
6 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server-client.c
View File

@ -424,17 +424,21 @@ server_client_check_mouse(struct client *c, struct key_event *event)
key_code key;
struct timeval tv;
struct style_range *sr;
enum { NOTYPE, MOVE, DOWN, UP, DRAG, WHEEL, DOUBLE, TRIPLE } type;
enum { NOTYPE,
MOVE,
DOWN,
UP,
DRAG,
WHEEL,
DOUBLE,
TRIPLE } type = NOTYPE;
enum { NOWHERE,
PANE,
STATUS,
STATUS_LEFT,
STATUS_RIGHT,
STATUS_DEFAULT,
BORDER } where;
type = NOTYPE;
where = NOWHERE;
BORDER } where = NOWHERE;
log_debug("%s mouse %02x at %u,%u (last %u,%u) (%d)", c->name, m->b,
m->x, m->y, m->lx, m->ly, c->tty.mouse_drag_flag);
@ -1001,7 +1005,6 @@ server_client_key_callback(struct cmdq_item *item, void *data)
struct mouse_event *m = &event->m;
struct session *s = c->session;
struct winlink *wl;
struct window *w;
struct window_pane *wp;
struct window_mode_entry *wme;
struct timeval tv;
@ -1015,7 +1018,6 @@ server_client_key_callback(struct cmdq_item *item, void *data)
if (s == NULL || (c->flags & (CLIENT_DEAD|CLIENT_SUSPENDED)) != 0)
goto out;
wl = s->curw;
w = wl->window;
/* Update the activity timer. */
if (gettimeofday(&c->activity_time, NULL) != 0)