diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-10-11 10:01:19 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-10-11 10:01:19 +0100 |
| commit | 4efd41f3af9844700f2e959b3aaa1d58caca6146 (patch) | |
| tree | 4cd9c9ae00f6c4854be2dcb85af514734906b308 | |
| parent | 60074a6bc6284e841d9ddcf8bfd99b362baf4e4f (diff) | |
| parent | 99351c9cae3c01c68c57aebf127551ec6afe7db2 (diff) | |
| download | rtmux-4efd41f3af9844700f2e959b3aaa1d58caca6146.tar.gz rtmux-4efd41f3af9844700f2e959b3aaa1d58caca6146.tar.bz2 rtmux-4efd41f3af9844700f2e959b3aaa1d58caca6146.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | mode-tree.c | 2 | ||||
| -rw-r--r-- | window-tree.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mode-tree.c b/mode-tree.c index ad783bb4..7b378795 100644 --- a/mode-tree.c +++ b/mode-tree.c @@ -774,11 +774,13 @@ mode_tree_key(struct mode_tree_data *mtd, struct client *c, key_code *key, case KEYC_UP: case 'k': case KEYC_WHEELUP_PANE: + case '\020': /* C-p */ mode_tree_up(mtd, 1); break; case KEYC_DOWN: case 'j': case KEYC_WHEELDOWN_PANE: + case '\016': /* C-n */ mode_tree_down(mtd, 1); break; case KEYC_PPAGE: diff --git a/window-tree.c b/window-tree.c index a3ab6356..86ddebf0 100644 --- a/window-tree.c +++ b/window-tree.c @@ -434,7 +434,10 @@ window_tree_build(void *modedata, u_int sort_type, uint64_t *tag, *tag = (uint64_t)data->fs.wl; break; case WINDOW_TREE_PANE: - *tag = (uint64_t)data->fs.wp; + if (window_count_panes(data->fs.wl->window) == 1) + *tag = (uint64_t)data->fs.wl; + else + *tag = (uint64_t)data->fs.wp; break; } } |