diff options
| author | Thomas Adam <thomas@xteddy.org> | 2022-02-01 20:01:13 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2022-02-01 20:01:13 +0000 |
| commit | a5cf7a9b39b2f9737c2a9c4915274ab66b1824b9 (patch) | |
| tree | 487a1841c4781886f743862d4a77b71385414dda /mode-tree.c | |
| parent | a4f336a91a4bc340111dd72abd894d75093566d7 (diff) | |
| parent | 97900d0442252aa4b76f89745718038f39717ecd (diff) | |
| download | rtmux-a5cf7a9b39b2f9737c2a9c4915274ab66b1824b9.tar.gz rtmux-a5cf7a9b39b2f9737c2a9c4915274ab66b1824b9.tar.bz2 rtmux-a5cf7a9b39b2f9737c2a9c4915274ab66b1824b9.zip | |
Merge branch 'obsd-master' into master
Diffstat (limited to 'mode-tree.c')
| -rw-r--r-- | mode-tree.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/mode-tree.c b/mode-tree.c index 1eb496fe..c007e27f 100644 --- a/mode-tree.c +++ b/mode-tree.c @@ -104,7 +104,6 @@ struct mode_tree_menu { struct mode_tree_data *data; struct client *c; u_int line; - void *itemdata; }; static void mode_tree_free_items(struct mode_tree_list *); @@ -909,18 +908,14 @@ static void mode_tree_menu_callback(__unused struct menu *menu, __unused u_int idx, key_code key, void *data) { - struct mode_tree_menu *mtm = data; - struct mode_tree_data *mtd = mtm->data; - struct mode_tree_item *mti; + struct mode_tree_menu *mtm = data; + struct mode_tree_data *mtd = mtm->data; if (mtd->dead || key == KEYC_NONE) goto out; if (mtm->line >= mtd->line_size) goto out; - mti = mtd->line_list[mtm->line].item; - if (mti->itemdata != mtm->itemdata) - goto out; mtd->current = mtm->line; mtd->menucb(mtd->modedata, mtm->c, key); @@ -954,14 +949,13 @@ mode_tree_display_menu(struct mode_tree_data *mtd, struct client *c, u_int x, title = xstrdup(""); } menu = menu_create(title); - menu_add_items(menu, items, NULL, NULL, NULL); + menu_add_items(menu, items, NULL, c, NULL); free(title); mtm = xmalloc(sizeof *mtm); mtm->data = mtd; mtm->c = c; mtm->line = line; - mtm->itemdata = mti->itemdata; mtd->references++; if (x >= (menu->width + 4) / 2) |