fixed clicking the "(Unnamed)" buffer in 0EB popups

* When constructing the list of popup items, the unnamed buffer is stored as the empty string
  instead of a prerendered "(Unnamed)".
  Using the empty string simplifies autocompletions, which will actually have to insert nothing
  at all (in addition to terminating the string).
* Since unnamed buffers are now special in the popup list, we can render them with special
  icons as well.
  Currently, only on Curses we use a file symbol with a question mark.
  There doesn't appear to be a fitting standard Freedesktop icon to use on GTK and there
  isn't even any fitting standard emblem to lay over the default file icon.

1 files changed, 15 insertions, 5 deletions

diff --git a/src/interface-curses/curses-info-popup.c b/src/interface-curses/curses-info-popup.c
index c51a99b..8da6fbb 100644
--- a/src/interface-curses/curses-info-popup.c
+++ b/src/interface-curses/curses-info-popup.c
@@ -19,6 +19,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include <glib.h>
 
 #include <curses.h>
@@ -38,6 +40,7 @@ typedef struct {
 	teco_stailq_entry_t entry;
 
 	teco_popup_entry_type_t type;
+	/** entry name or empty string for the "(Unnamed)" buffer */
 	teco_string_t name;
 	gboolean highlight;
 } teco_popup_entry_t;
@@ -122,25 +125,32 @@ teco_curses_info_popup_init_pad(teco_curses_info_popup_t *ctx, attr_t attr)
 		if (entry->highlight)
 			wattron(ctx->pad, A_BOLD);
 
+		teco_string_t name = entry->name;
+		if (!name.len) {
+			name.data = TECO_UNNAMED_FILE;
+			name.len = strlen(name.data);
+		}
+
 		switch (entry->type) {
 		case TECO_POPUP_FILE:
-			g_assert(!teco_string_contains(&entry->name, '\0'));
+			g_assert(!teco_string_contains(&name, '\0'));
 			if (teco_ed & TECO_ED_ICONS) {
+				/* "(Unnamed)" buffer is looked up as "" */
 				teco_curses_add_wc(ctx->pad, teco_curses_icons_lookup_file(entry->name.data));
 				waddch(ctx->pad, ' ');
 			}
-			teco_curses_format_filename(ctx->pad, entry->name.data, -1);
+			teco_curses_format_filename(ctx->pad, name.data, -1);
 			break;
 		case TECO_POPUP_DIRECTORY:
-			g_assert(!teco_string_contains(&entry->name, '\0'));
+			g_assert(!teco_string_contains(&name, '\0'));
 			if (teco_ed & TECO_ED_ICONS) {
 				teco_curses_add_wc(ctx->pad, teco_curses_icons_lookup_dir(entry->name.data));
 				waddch(ctx->pad, ' ');
 			}
-			teco_curses_format_filename(ctx->pad, entry->name.data, -1);
+			teco_curses_format_filename(ctx->pad, name.data, -1);
 			break;
 		default:
-			teco_curses_format_str(ctx->pad, entry->name.data, entry->name.len, -1);
+			teco_curses_format_str(ctx->pad, name.data, name.len, -1);
 			break;
 		}