Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-03-25 15:57:47 +00:00
2 changed files with 41 additions and 24 deletions

View File

@@ -504,14 +504,13 @@ have_event:
m->statusat = status_at_line(c);
if (m->statusat != -1 &&
y >= (u_int)m->statusat &&
y < m->statusat + status_line_size(c))
y < m->statusat + status_line_size(c)) {
sr = status_get_range(c, x, y - m->statusat);
else
sr = NULL;
if (sr != NULL) {
if (sr == NULL)
return (KEYC_UNKNOWN);
switch (sr->type) {
case STYLE_RANGE_NONE:
break;
return (KEYC_UNKNOWN);
case STYLE_RANGE_LEFT:
where = STATUS_LEFT;
break;
@@ -520,10 +519,11 @@ have_event:
break;
case STYLE_RANGE_WINDOW:
wl = winlink_find_by_index(&s->windows, sr->argument);
if (wl != NULL) {
m->w = wl->window->id;
where = STATUS;
}
if (wl == NULL)
return (KEYC_UNKNOWN);
m->w = wl->window->id;
where = STATUS;
break;
}
}