From 837ca176d1874273f3de615c75b506e1b1787a1b Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 13 Oct 2021 09:28:36 +0000
Subject: Add popup-style and popup-border-style options, from Alexis
 Hildebrandt in GitHub issue 2927.

---
 mode-tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mode-tree.c')

diff --git a/mode-tree.c b/mode-tree.c
index c92f7cff..2d2d8d5c 100644
--- a/mode-tree.c
+++ b/mode-tree.c
@@ -747,7 +747,7 @@ mode_tree_draw(struct mode_tree_data *mtd)
 		mti = mti->parent;
 
 	screen_write_cursormove(&ctx, 0, h, 0);
-	screen_write_box(&ctx, w, sy - h);
+	screen_write_box(&ctx, w, sy - h, NULL);
 
 	if (mtd->sort_list != NULL) {
 		xasprintf(&text, " %s (sort: %s%s)", mti->name,
-- 
cgit 


From add20637f256c0118d3c687d5d1446612d14389a Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 14 Oct 2021 13:19:01 +0000
Subject: Add popup-border-lines option to set popup line style, from Alexis
 Hildebrandt, GitHub issue 2930.

---
 mode-tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mode-tree.c')

diff --git a/mode-tree.c b/mode-tree.c
index 2d2d8d5c..2e029691 100644
--- a/mode-tree.c
+++ b/mode-tree.c
@@ -747,7 +747,7 @@ mode_tree_draw(struct mode_tree_data *mtd)
 		mti = mti->parent;
 
 	screen_write_cursormove(&ctx, 0, h, 0);
-	screen_write_box(&ctx, w, sy - h, NULL);
+	screen_write_box(&ctx, w, sy - h, BOX_LINES_DEFAULT, NULL);
 
 	if (mtd->sort_list != NULL) {
 		xasprintf(&text, " %s (sort: %s%s)", mti->name,
-- 
cgit 


From 8a9bfd0cddd783436e842495fc3039aa56571ed1 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 20 Oct 2021 09:50:40 +0000
Subject: Add -T to set a popup title, from Alexis Hildebrandt in GitHub issue
 2941.

---
 mode-tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mode-tree.c')

diff --git a/mode-tree.c b/mode-tree.c
index 2e029691..d4e93208 100644
--- a/mode-tree.c
+++ b/mode-tree.c
@@ -747,7 +747,7 @@ mode_tree_draw(struct mode_tree_data *mtd)
 		mti = mti->parent;
 
 	screen_write_cursormove(&ctx, 0, h, 0);
-	screen_write_box(&ctx, w, sy - h, BOX_LINES_DEFAULT, NULL);
+	screen_write_box(&ctx, w, sy - h, BOX_LINES_DEFAULT, NULL, NULL);
 
 	if (mtd->sort_list != NULL) {
 		xasprintf(&text, " %s (sort: %s%s)", mti->name,
-- 
cgit 


From 5745bd27fdfd0e806fb3f734966f66f302c76c48 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 26 Oct 2021 12:22:23 +0000
Subject: Do not allow inline styles to replace mode-style for the selected
 item, from Alexis Hildebrandt in GitHub issue 2946.

---
 mode-tree.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mode-tree.c')

diff --git a/mode-tree.c b/mode-tree.c
index d4e93208..85027caf 100644
--- a/mode-tree.c
+++ b/mode-tree.c
@@ -716,14 +716,14 @@ mode_tree_draw(struct mode_tree_data *mtd)
 			screen_write_nputs(&ctx, w, &gc0, "%s", text);
 			if (mti->text != NULL) {
 				format_draw(&ctx, &gc0, w - width, mti->text,
-				    NULL);
+				    NULL, 0);
 			}
 		} else {
 			screen_write_clearendofline(&ctx, gc.bg);
 			screen_write_nputs(&ctx, w, &gc, "%s", text);
 			if (mti->text != NULL) {
 				format_draw(&ctx, &gc, w - width, mti->text,
-				    NULL);
+				    NULL, 0);
 			}
 		}
 		free(text);
-- 
cgit 


From b55f0ac6b94449b3372f0d1737fcf967f4fa13a2 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 15 Nov 2021 10:58:13 +0000
Subject: Leave the hardware cursor at the position of the selected line in
 choose modes and current editing position and at the command prompt. It is
 invisible but this is helpful for people using screen readers. GitHub issue
 2970.

---
 mode-tree.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'mode-tree.c')

diff --git a/mode-tree.c b/mode-tree.c
index 85027caf..21a73ef2 100644
--- a/mode-tree.c
+++ b/mode-tree.c
@@ -736,10 +736,8 @@ mode_tree_draw(struct mode_tree_data *mtd)
 	}
 
 	sy = screen_size_y(s);
-	if (!mtd->preview || sy <= 4 || h <= 4 || sy - h <= 4 || w <= 4) {
-		screen_write_stop(&ctx);
-		return;
-	}
+	if (!mtd->preview || sy <= 4 || h <= 4 || sy - h <= 4 || w <= 4)
+		goto done;
 
 	line = &mtd->line_list[mtd->current];
 	mti = line->item;
@@ -783,6 +781,8 @@ mode_tree_draw(struct mode_tree_data *mtd)
 		mtd->drawcb(mtd->modedata, mti->itemdata, &ctx, box_x, box_y);
 	}
 
+done:
+	screen_write_cursormove(&ctx, 0, mtd->current - mtd->offset, 0);
 	screen_write_stop(&ctx);
 }
 
-- 
cgit 


From ecac73f66445311c58a28afc7d3f92c964eaae67 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 6 Dec 2021 10:10:52 +0000
Subject: Fix g/G keys to be in line with copy mode.

---
 mode-tree.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mode-tree.c')

diff --git a/mode-tree.c b/mode-tree.c
index 21a73ef2..1eb496fe 100644
--- a/mode-tree.c
+++ b/mode-tree.c
@@ -1055,7 +1055,6 @@ mode_tree_key(struct mode_tree_data *mtd, struct client *c, key_code *key,
 	case '\016': /* C-n */
 		mode_tree_down(mtd, 1);
 		break;
-	case 'g':
 	case KEYC_PPAGE:
 	case '\002': /* C-b */
 		for (i = 0; i < mtd->height; i++) {
@@ -1064,7 +1063,6 @@ mode_tree_key(struct mode_tree_data *mtd, struct client *c, key_code *key,
 			mode_tree_up(mtd, 1);
 		}
 		break;
-	case 'G':
 	case KEYC_NPAGE:
 	case '\006': /* C-f */
 		for (i = 0; i < mtd->height; i++) {
@@ -1073,10 +1071,12 @@ mode_tree_key(struct mode_tree_data *mtd, struct client *c, key_code *key,
 			mode_tree_down(mtd, 1);
 		}
 		break;
+	case 'g':
 	case KEYC_HOME:
 		mtd->current = 0;
 		mtd->offset = 0;
 		break;
+	case 'G':
 	case KEYC_END:
 		mtd->current = mtd->line_size - 1;
 		if (mtd->current > mtd->height - 1)
-- 
cgit 


From 97900d0442252aa4b76f89745718038f39717ecd Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 1 Feb 2022 18:12:20 +0000
Subject: A menu must be shown on a client, so always give the client when
 adding the items. Also fix mode menus.

---
 mode-tree.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'mode-tree.c')

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)
-- 
cgit