circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/1819/head
Thomas Adam 2019-06-26 21:02:26 +01:00
parent f797ac9ff6 3a6d90adad
commit c4a9299956
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-display-panes.c
View File

@ -204,7 +204,7 @@ cmd_display_panes_key(struct client *c, struct key_event *event)
struct cmd_parse_result *pr;
if (event->key < '0' || event->key > '9')
return (1);
return (-1);
wp = window_pane_at_index(w, event->key - '0');
if (wp == NULL)

4
layout.c
View File

@ -272,7 +272,7 @@ layout_fix_panes(struct window *w)
wp->xoff = lc->xoff;
wp->yoff = lc->yoff;
if (shift && status == 1)
if (shift && status == PANE_STATUS_TOP)
wp->yoff += 1;
window_pane_resize(wp, lc->sx, lc->sy - shift);
@ -1021,7 +1021,7 @@ layout_spread_cell(struct window *w, struct layout_cell *parent)
number = 0;
TAILQ_FOREACH (lc, &parent->cells, entry)
number++;
number++;
if (number <= 1)
return (0);
status = options_get_number(w->options, "pane-border-status");

8
server-client.c
View File

@ -1218,9 +1218,13 @@ server_client_handle_key(struct client *c, struct key_event *event)
* blocked so they need to be processed immediately rather than queued.
*/
if ((~c->flags & CLIENT_READONLY) && c->overlay_key != NULL) {
if (c->overlay_key(c, event) != 0)
switch (c->overlay_key(c, event)) {
case 0:
return (0);
case 1:
server_client_clear_overlay(c);
return (0);
return (0);
}
}
/*

2
window.c
View File

@ -1369,7 +1369,7 @@ window_pane_find_down(struct window_pane *wp)
if (edge >= w->sy - 1)
edge = 0;
} else {
if (edge >= wp->sy)
if (edge >= w->sy)
edge = 0;
}