Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-04-09 16:01:45 +01:00
16 changed files with 45 additions and 50 deletions

View File

@ -604,10 +604,9 @@ have_event:
wp = window_get_active_at(s->curw->window, px, py);
if (wp != NULL)
where = PANE;
else
return (KEYC_UNKNOWN);
}
if (where == NOWHERE)
return (KEYC_UNKNOWN);
if (where == PANE)
log_debug("mouse %u,%u on pane %%%u", x, y, wp->id);
else if (where == BORDER)
@ -1541,7 +1540,7 @@ server_client_reset_state(struct client *c)
struct window_pane *wp = w->active, *loop;
struct screen *s;
struct options *oo = c->session->options;
int mode, cursor = 0;
int mode, cursor;
u_int cx = 0, cy = 0, ox, oy, sx, sy;
if (c->flags & (CLIENT_CONTROL|CLIENT_SUSPENDED))