fixed clicking the "(Unnamed)" buffer in 0EB popupsHEADmaster-fmsbw-cimaster

* 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.

3 files changed, 37 insertions, 24 deletions

diff --git a/src/interface-gtk/gtk-info-popup.c b/src/interface-gtk/gtk-info-popup.c
index aaa0a65..3ddd10a 100644
--- a/src/interface-gtk/gtk-info-popup.c
+++ b/src/interface-gtk/gtk-info-popup.c
@@ -37,6 +37,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;
@@ -249,6 +250,10 @@ teco_gtk_info_popup_new(void)
 GIcon *
 teco_gtk_info_popup_get_icon_for_path(const gchar *path, const gchar *fallback_name)
 {
+	if (!path || !*path)
+		/* "(Unnamed)" file */
+		return g_icon_new_for_string(fallback_name, NULL);
+
 	GIcon *icon = NULL;
 
 	g_autoptr(GFile) file = g_file_new_for_path(path);
@@ -299,7 +304,7 @@ teco_gtk_info_popup_add(TecoGtkInfoPopup *self, teco_popup_entry_type_t type,
 
 static void
 teco_gtk_info_popup_idle_add(TecoGtkInfoPopup *self, teco_popup_entry_type_t type,
-                             const gchar *name, gssize len, gboolean highlight)
+                             const gchar *name, gsize len, gboolean highlight)
 {
 	g_return_if_fail(self != NULL);
 	g_return_if_fail(TECO_IS_GTK_INFO_POPUP(self));
@@ -318,12 +323,8 @@ teco_gtk_info_popup_idle_add(TecoGtkInfoPopup *self, teco_popup_entry_type_t typ
 		const gchar *fallback = type == TECO_POPUP_FILE ? "text-x-generic"
 		                                                : "folder";
 
-		/*
-		 * `name` is not guaranteed to be null-terminated.
-		 */
-		g_autofree gchar *path = len < 0 ? g_strdup(name) : g_strndup(name, len);
-
-		g_autoptr(GIcon) icon = teco_gtk_info_popup_get_icon_for_path(path, fallback);
+		/* name comes from a teco_string_t and is guaranteed to be null-terminated */
+		g_autoptr(GIcon) icon = teco_gtk_info_popup_get_icon_for_path(name, fallback);
 		if (icon) {
 			gint width, height;
 			gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
diff --git a/src/interface-gtk/gtk-label.c b/src/interface-gtk/gtk-label.c
index e4b2823..e148652 100644
--- a/src/interface-gtk/gtk-label.c
+++ b/src/interface-gtk/gtk-label.c
@@ -32,7 +32,9 @@
 
 #include "gtk-label.h"
 
-#define GDK_TO_PANGO_COLOR(X) ((guint16)((X) * G_MAXUINT16))
+#define TECO_UNNAMED_FILE	"(Unnamed)"
+
+#define GDK_TO_PANGO_COLOR(X)	((guint16)((X) * G_MAXUINT16))
 
 struct _TecoGtkLabel {
 	GtkLabel parent_instance;
@@ -40,6 +42,7 @@ struct _TecoGtkLabel {
 	PangoColor fg, bg;
 	guint16 fg_alpha, bg_alpha;
 
+	/** text backing the label or empty string for "(Unnamed)" buffer */
 	teco_string_t string;
 };
 
@@ -251,19 +254,22 @@ teco_gtk_label_set_text(TecoGtkLabel *self, const gchar *str, gssize len)
 	teco_string_clear(&self->string);
 	teco_string_init(&self->string, str, len < 0 ? strlen(str) : len);
 
+	teco_string_t string = self->string;
+	if (!string.len) {
+		string.data = TECO_UNNAMED_FILE;
+		string.len = strlen(string.data);
+	}
+
 	g_autofree gchar *plaintext = NULL;
+	PangoAttrList *attribs = NULL;
 
-	if (self->string.len > 0) {
-		PangoAttrList *attribs = NULL;
+	teco_gtk_label_parse_string(string.data, string.len,
+	                            &self->fg, self->fg_alpha,
+	                            &self->bg, self->bg_alpha,
+	                            &attribs, &plaintext);
 
-		teco_gtk_label_parse_string(self->string.data, self->string.len,
-		                            &self->fg, self->fg_alpha,
-		                            &self->bg, self->bg_alpha,
-		                            &attribs, &plaintext);
-
-		gtk_label_set_attributes(GTK_LABEL(self), attribs);
-		pango_attr_list_unref(attribs);
-	}
+	gtk_label_set_attributes(GTK_LABEL(self), attribs);
+	pango_attr_list_unref(attribs);
 
 	gtk_label_set_text(GTK_LABEL(self), plaintext);
 }
diff --git a/src/interface-gtk/interface.c b/src/interface-gtk/interface.c
index d7fc4c4..2b292a3 100644
--- a/src/interface-gtk/interface.c
+++ b/src/interface-gtk/interface.c
@@ -78,7 +78,7 @@ static gboolean teco_interface_window_delete_cb(GtkWidget *widget, GdkEventAny *
 static gboolean teco_interface_sigterm_handler(gpointer user_data) G_GNUC_UNUSED;
 static gchar teco_interface_get_ansi_key(GdkEventKey *event);
 
-#define UNNAMED_FILE		"(Unnamed)"
+#define TECO_UNNAMED_FILE	"(Unnamed)"
 
 #define USER_CSS_FILE		".teco_css"
 
@@ -102,6 +102,7 @@ static struct {
 		TECO_INFO_TYPE_BUFFER_DIRTY,
 		TECO_INFO_TYPE_QREG
 	} info_type;
+	/* current document's name or empty string for "(Unnamed)" buffer */
 	teco_string_t info_current;
 
 	gboolean no_csd;
@@ -501,8 +502,13 @@ teco_interface_refresh_info(void)
 	gtk_style_context_remove_class(style, "dirty");
 
 	g_auto(teco_string_t) info_current_temp;
-	teco_string_init(&info_current_temp,
-	                 teco_interface.info_current.data, teco_interface.info_current.len);
+
+	if (!teco_interface.info_current.len)
+		teco_string_init(&info_current_temp, TECO_UNNAMED_FILE, strlen(TECO_UNNAMED_FILE));
+	else
+		teco_string_init(&info_current_temp,
+		                 teco_interface.info_current.data, teco_interface.info_current.len);
+
 	if (teco_interface.info_type == TECO_INFO_TYPE_BUFFER_DIRTY)
 		teco_string_append_c(&info_current_temp, '*');
 	teco_gtk_label_set_text(TECO_GTK_LABEL(teco_interface.info_name_widget),
@@ -570,10 +576,9 @@ teco_interface_info_update_qreg(const teco_qreg_t *reg)
 void
 teco_interface_info_update_buffer(const teco_buffer_t *buffer)
 {
-	const gchar *filename = buffer->filename ? : UNNAMED_FILE;
-
 	teco_string_clear(&teco_interface.info_current);
-	teco_string_init(&teco_interface.info_current, filename, strlen(filename));
+	teco_string_init(&teco_interface.info_current, buffer->filename,
+	                 buffer->filename ? strlen(buffer->filename) : 0);
 	teco_interface.info_type = buffer->state > TECO_BUFFER_CLEAN
 					 ? TECO_INFO_TYPE_BUFFER_DIRTY : TECO_INFO_TYPE_BUFFER;
 }
@@ -1472,6 +1477,7 @@ static void
 teco_interface_popup_clicked_cb(GtkWidget *popup, gchar *str, gulong len, gpointer user_data)
 {
 	g_assert(len >= teco_interface.popup_prefix_len);
+	/* str is an empty string for the "(Unnamed)" buffer */
 	const teco_string_t insert = {str+teco_interface.popup_prefix_len, len-teco_interface.popup_prefix_len};
 	teco_machine_t *machine = &teco_cmdline.machine.parent;