Import upstream version 0.4.91

1 files changed, 95 insertions, 5 deletions

diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c
index 3652ceb..1d2f958 100644
--- a/libdbusmenu-gtk/genericmenuitem.c
+++ b/libdbusmenu-gtk/genericmenuitem.c
@@ -30,6 +30,8 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include "config.h"
 #endif
 
+#include <gdk/gdk.h>
+
 #include "genericmenuitem.h"
 
 /*
@@ -40,6 +42,7 @@ License version 3 and version 2.1 along with this program.  If not, see
 struct _GenericmenuitemPrivate {
 	GenericmenuitemCheckType   check_type;
 	GenericmenuitemState       state;
+	GenericmenuitemDisposition disposition;
 };
 
 /* Private macro */
@@ -102,6 +105,7 @@ genericmenuitem_init (Genericmenuitem *self)
 
 	self->priv->check_type = GENERICMENUITEM_CHECK_TYPE_NONE;
 	self->priv->state = GENERICMENUITEM_STATE_UNCHECKED;
+	self->priv->disposition = GENERICMENUITEM_DISPOSITION_NORMAL;
 
 	return;
 }
@@ -172,11 +176,51 @@ get_hpadding (GtkWidget * widget)
 	return padding;
 }
 
+/* Get the value to put in the span for the disposition */
+static gchar *
+get_text_color (GenericmenuitemDisposition disposition, GtkStyleContext * context)
+{
+	struct {const gchar * color_name; const gchar * default_color;} values[] = {
+		/* NORMAL */ { NULL, NULL},
+		/* INFO   */ { "informational-color", "blue"},
+		/* WARN   */ { "warning-color", "orange"},
+		/* ALERT  */ { "error-color", "red"}
+	};
+
+	GdkRGBA color;
+
+	if (gtk_style_context_lookup_color(context, values[disposition].color_name, &color)) {
+		return g_strdup_printf("rgb(%d, %d, %d)", (gint)(color.red * 255), (gint)(color.green * 255), (gint)(color.blue * 255));
+	}
+
+	return g_strdup(values[disposition].default_color);
+}
+
 /* Set the label on the item */
 static void
-set_label (GtkMenuItem * menu_item, const gchar * label)
+set_label (GtkMenuItem * menu_item, const gchar * in_label)
 {
-	if (label == NULL) return;
+	if (in_label == NULL) return;
+
+	/* Build a label that might include the colors of the disposition
+	   so that it gets rendered in the menuitem. */
+	gchar * local_label = NULL;
+	switch (GENERICMENUITEM(menu_item)->priv->disposition) {
+	case GENERICMENUITEM_DISPOSITION_NORMAL:
+		local_label = g_strdup(in_label);
+		break;
+	case GENERICMENUITEM_DISPOSITION_INFORMATIONAL:
+	case GENERICMENUITEM_DISPOSITION_WARNING:
+	case GENERICMENUITEM_DISPOSITION_ALERT: {
+		gchar * color = get_text_color(GENERICMENUITEM(menu_item)->priv->disposition, gtk_widget_get_style_context(GTK_WIDGET(menu_item)));
+		local_label = g_markup_printf_escaped("<span fgcolor=\"%s\">%s</span>", color, in_label);
+		g_free(color);
+		break;
+	}
+	default:
+		g_warn_if_reached();
+		break;
+	}
 
 	GtkWidget * child = gtk_bin_get_child(GTK_BIN(menu_item));
 	GtkLabel * labelw = NULL;
@@ -211,10 +255,12 @@ set_label (GtkMenuItem * menu_item, const gchar * label)
 	   update the one that we already have. */
 	if (labelw == NULL) {
 		/* Build it */
-		labelw = GTK_LABEL(gtk_accel_label_new(label));
+		labelw = GTK_LABEL(gtk_accel_label_new(local_label));
 		gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE);
+		gtk_label_set_use_markup(GTK_LABEL(labelw), TRUE);
 		gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5);
 		gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item));
+		gtk_label_set_markup_with_mnemonic(labelw, local_label);
 		gtk_widget_show(GTK_WIDGET(labelw));
 
 		/* Check to see if it needs to be in the bin for this
@@ -226,13 +272,13 @@ set_label (GtkMenuItem * menu_item, const gchar * label)
 		}
 	} else {
 		/* Oh, just an update.  No biggie. */
-		if (!g_strcmp0(label, gtk_label_get_label(labelw))) {
+		if (!g_strcmp0(local_label, gtk_label_get_label(labelw))) {
 			/* The only reason to suppress the update is if we had
 			   a label and the value was the same as the one we're
 			   getting in. */
 			suppress_update = TRUE;
 		} else {
-			gtk_label_set_label(labelw, label);
+			gtk_label_set_markup_with_mnemonic(labelw, local_label);
 		}
 	}
 
@@ -241,6 +287,12 @@ set_label (GtkMenuItem * menu_item, const gchar * label)
 		g_object_notify(G_OBJECT(menu_item), "label");
 	}
 
+	/* Clean up this */
+	if (local_label != NULL) {
+		g_free(local_label);
+		local_label = NULL;
+	}
+
 	return;
 }
 
@@ -466,3 +518,41 @@ genericmenuitem_get_image (Genericmenuitem * menu_item)
 
 	return imagew;
 }
+
+/**
+ * genericmenuitem_set_disposition:
+ * @item: A #Genericmenuitem
+ * @disposition: The disposition of the item
+ * 
+ * Sets the disposition of the menuitem.
+ */
+void
+genericmenuitem_set_disposition (Genericmenuitem * item, GenericmenuitemDisposition disposition)
+{
+	g_return_if_fail(IS_GENERICMENUITEM(item));
+
+	if (item->priv->disposition == disposition)
+		return;
+
+	item->priv->disposition = disposition;
+	
+	set_label(GTK_MENU_ITEM(item), get_label(GTK_MENU_ITEM(item)));
+
+	return;
+}
+
+/**
+ * genericmenuitem_get_disposition:
+ * @item: A #Genericmenuitem
+ * 
+ * Gets the disposition of the menuitem.
+ *
+ * Return value: The disposition of the menuitem.
+ */
+GenericmenuitemDisposition
+genericmenuitem_get_disposition (Genericmenuitem * item)
+{
+	g_return_val_if_fail(IS_GENERICMENUITEM(item), GENERICMENUITEM_DISPOSITION_NORMAL);
+
+	return item->priv->disposition;
+}