aboutsummaryrefslogtreecommitdiff
path: root/mode-tree.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-10-25 14:01:26 +0100
committerThomas Adam <thomas@xteddy.org>2017-10-25 14:01:26 +0100
commit6b83ca0077ca607ca594c68ad12df61cae2d8259 (patch)
tree7a41ead08511c34cb554e76105c3ef86b1d1cbdf /mode-tree.c
parentd6edd06749b6ad772db47ffb668ca057d6d641ee (diff)
parent78ae4ee82c4596de09b6e6f379e83d638ff2752d (diff)
downloadrtmux-6b83ca0077ca607ca594c68ad12df61cae2d8259.tar.gz
rtmux-6b83ca0077ca607ca594c68ad12df61cae2d8259.tar.bz2
rtmux-6b83ca0077ca607ca594c68ad12df61cae2d8259.zip
Merge branch 'obsd-master'
Diffstat (limited to 'mode-tree.c')
-rw-r--r--mode-tree.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/mode-tree.c b/mode-tree.c
index 349cda49..98f29e82 100644
--- a/mode-tree.c
+++ b/mode-tree.c
@@ -266,7 +266,7 @@ mode_tree_count_tagged(struct mode_tree_data *mtd)
void
mode_tree_each_tagged(struct mode_tree_data *mtd, void (*cb)(void *, void *,
- key_code), key_code key, int current)
+ struct client *, key_code), struct client *c, key_code key, int current)
{
struct mode_tree_item *mti;
u_int i;
@@ -277,12 +277,12 @@ mode_tree_each_tagged(struct mode_tree_data *mtd, void (*cb)(void *, void *,
mti = mtd->line_list[i].item;
if (mti->tagged) {
fired = 1;
- cb(mtd->modedata, mti->itemdata, key);
+ cb(mtd->modedata, mti->itemdata, c, key);
}
}
if (!fired && current) {
mti = mtd->line_list[mtd->current].item;
- cb(mtd->modedata, mti->itemdata, key);
+ cb(mtd->modedata, mti->itemdata, c, key);
}
}
@@ -848,6 +848,7 @@ mode_tree_key(struct mode_tree_data *mtd, struct client *c, key_code *key,
mode_tree_build(mtd);
break;
case KEYC_LEFT:
+ case 'h':
case '-':
if (line->flat || !current->expanded)
current = current->parent;
@@ -860,6 +861,7 @@ mode_tree_key(struct mode_tree_data *mtd, struct client *c, key_code *key,
}
break;
case KEYC_RIGHT:
+ case 'l':
case '+':
if (line->flat || current->expanded)
mode_tree_down(mtd, 0);