Ticket #122: notify-standard-theme-love.diff

src/themes/standard/theme.c

@@ -1 +1 @@
-#include "config.h"
-
+#include <string.h>
-#include <gtk/gtk.h>
+#include <gconf/gconf-client.h>
-#include <libsexy/sexy-url-label.h>
-
-typedef void (*ActionInvokedCb)(GtkWindow *nw, const char *key);
@@ -21 +23 @@
-    GtkWidget *last_sep;
-    GtkWidget *stripe_spacer;
-    GtkWidget *pie_countdown;
+    GtkWidget *close_button;
-
-    gboolean has_arrow;
-    gboolean enable_transparency;
+    gboolean show_close_button;
+    gboolean draw_gradients;
-
-    int point_x;
-    int point_y;
@@ -35 +40 @@
-    int drawn_arrow_end_x;
-    int drawn_arrow_end_y;
-
+    int theme_width;
-    int width;
-    int height;
-
@@ -49 +55 @@
-
-    UrlClickedCb url_clicked;
-
+    guint gconf_notify_id;
+
+    double background_opacity;
+
+    GdkColor background_color;
+    GdkColor urgency_low_color;
+    GdkColor urgency_normal_color;
+    GdkColor urgency_critical_color;
-} WindowData;
-
-enum
@@ -58 +72 @@
-    URGENCY_CRITICAL
-};
-
-//#define ENABLE_GRADIENT_LOOK
-
-#ifdef ENABLE_GRADIENT_LOOK
-# define STRIPE_WIDTH  45
-#else
-# define STRIPE_WIDTH  30
-#endif
-
+#define STRIPE_WIDTH  30
-#define WIDTH         400
-#define IMAGE_SIZE    32
-#define IMAGE_PADDING 10
@@ -77 +85 @@
-#define DEFAULT_ARROW_OFFSET  (SPACER_LEFT + 2)
-#define DEFAULT_ARROW_HEIGHT  14
-#define DEFAULT_ARROW_WIDTH   28
-#define BACKGROUND_OPACITY    0.92
-#define BOTTOM_GRADIENT_HEIGHT 30
-
+#define DEFAULT_BACKGROUND_OPACITY     0.92
+#define DEFAULT_COLOR_BACKGROUND       "bg[normal]"
+#define DEFAULT_URGENCY_COLOR_CRITICAL "#a40000"
+#define DEFAULT_URGENCY_COLOR_NORMAL   "bg[selected]"
+#define DEFAULT_URGENCY_COLOR_LOW      "dark[normal]"
+
+#define BASE_GCONF_KEY "/apps/notification-daemon/themes/standard"
+
-#if GTK_CHECK_VERSION(2, 8, 0)
-# define USE_CAIRO
-#endif
@@ -88 +103 @@
-# define USE_COMPOSITE
-#endif
-
+static const gchar *gtk_state_strings [] = {
+    "normal", "active", "prelight", "selected", "insensitive", NULL
+};
+
+static gboolean
+parse_theme_color(GtkStyle *style, GdkColor *color, const gchar *str)
+{
+    GtkStateType state = -1;
+    gchar *head, *p;
+    gchar *style_str, *state_str;
+    gint i;
+
+    head = g_strdup(str);
+    p = strchr(head, '[');
+    
+    if (p == NULL || p - head <= 0) {
+        g_free(head);
+        return FALSE;
+    }
+
+    head[p - head] = '\0';
+    style_str = head;
+    state_str = p + 1;
+    state_str[strlen(state_str) - 1] = '\0';
+
+    for (i = 0; gtk_state_strings[i] != NULL; i++) {
+        if (g_ascii_strcasecmp(gtk_state_strings[i], state_str) == 0) {
+            state = (GtkStateType)i;
+            break;
+        }
+    }
+
+    if (state == -1) {
+        g_free(head);
+        return FALSE;
+    }
+
+    if (g_ascii_strcasecmp(style_str, "fg") == 0) {
+        *color = style->fg[state];
+    } else if (g_ascii_strcasecmp(style_str, "bg") == 0) {
+        *color = style->bg[state];
+    } else if (g_ascii_strcasecmp(style_str, "light") == 0) {
+        *color = style->light[state];
+    } else if (g_ascii_strcasecmp(style_str, "dark") == 0) {
+        *color = style->dark[state];
+    } else if (g_ascii_strcasecmp(style_str, "mid") == 0) {
+        *color = style->mid[state];
+    } else if (g_ascii_strcasecmp(style_str, "text") == 0) {
+        *color = style->text[state];
+    } else if (g_ascii_strcasecmp(style_str, "base") == 0) {
+        *color = style->base[state];
+    } else if (g_ascii_strcasecmp(style_str, "text_aa") == 0) {
+        *color = style->text_aa[state];
+    } else {
+        g_free(head);
+        return FALSE;
+    }
+
+    g_free(head);
+    return TRUE;
+}
+
+static gboolean
+parse_color(GtkStyle *style, GdkColor *color, const gchar *attempt, 
+    const gchar *fallback)
+{
+    if (style != NULL && parse_theme_color(style, color, attempt)) {
+        return TRUE;
+    } else if (gdk_color_parse(attempt, color)) {
+        return TRUE;
+    }
+
+    return gdk_color_parse(fallback, color);
+}
+
+static void
+load_theme_settings(WindowData *windata)
+{
+    GConfClient *client;
+    GConfValue *value;
+    GtkStyle *style = NULL;
+
+    const gchar *color_low = DEFAULT_URGENCY_COLOR_LOW;
+    const gchar *color_normal = DEFAULT_URGENCY_COLOR_NORMAL;
+    const gchar *color_critical = DEFAULT_URGENCY_COLOR_CRITICAL;
+    const gchar *color_background = DEFAULT_COLOR_BACKGROUND;
+
+    client = gconf_client_get_default();
+
+    value = gconf_client_get(client, BASE_GCONF_KEY 
+        "/background_opacity", NULL);
+    
+    windata->background_opacity = value == NULL 
+        ? DEFAULT_BACKGROUND_OPACITY
+        : gconf_value_get_float(value);
+
+    value = gconf_client_get(client, BASE_GCONF_KEY "/color_low", NULL);
+    if (value != NULL) {
+        color_low = gconf_value_get_string(value);
+    }
+
+    value = gconf_client_get(client, BASE_GCONF_KEY "/color_normal", NULL);
+    if (value != NULL) {
+        color_normal = gconf_value_get_string(value);
+    }
+    
+    value = gconf_client_get(client, BASE_GCONF_KEY "/color_critical", NULL);
+    if (value != NULL) {
+        color_critical = gconf_value_get_string(value);
+    }
+
+    value = gconf_client_get(client, BASE_GCONF_KEY "/color_background", NULL);
+    if (value != NULL) {
+        color_background = gconf_value_get_string(value);
+    }
+
+    if (windata->win != NULL) {
+        gtk_widget_ensure_style(windata->win);
+        style = gtk_widget_get_style(windata->win);
+    }
+    
+    parse_color(style, &windata->urgency_low_color,
+        color_low, DEFAULT_URGENCY_COLOR_LOW);
+
+    parse_color(style, &windata->urgency_normal_color, 
+        color_normal, DEFAULT_URGENCY_COLOR_NORMAL);
+
+    parse_color(style, &windata->urgency_critical_color, 
+        color_critical, DEFAULT_URGENCY_COLOR_CRITICAL);
+
+    parse_color(style, &windata->background_color, 
+        color_background, DEFAULT_COLOR_BACKGROUND);
+
+    value = gconf_client_get(client, BASE_GCONF_KEY "/draw_gradients", NULL);
+    if (value != NULL) {
+        windata->draw_gradients = gconf_value_get_bool(value);
+    }
+
+    value = gconf_client_get(client, BASE_GCONF_KEY "/show_close_button", NULL);
+    if (value != NULL) {
+        windata->show_close_button = gconf_value_get_bool(value);
+    }
+
+    value = gconf_client_get(client, BASE_GCONF_KEY "/width", NULL);
+    if (value != NULL) {
+        windata->theme_width = gconf_value_get_int(value);
+    }
+}
+
+static void
+set_urgency_color(WindowData *windata, GdkColor *color)
+{
+    switch (windata->urgency) 
+    {
+        case URGENCY_LOW:
+            *color = windata->urgency_low_color;
+            break;
+        case URGENCY_CRITICAL:
+            *color = windata->urgency_critical_color;
+            break;
+        case URGENCY_NORMAL:
+        default:
+            *color = windata->urgency_normal_color;
+            break;
+    }
+}
+
+static void
+gconf_notify_cb(GConfClient *client, guint connection_id, GConfEntry *entry,
+    gpointer userdata)
+{
+    WindowData *windata = (WindowData *)userdata;
+
+    load_theme_settings(windata);
+
+    if (windata->win != NULL) {
+        gtk_widget_queue_draw(windata->win);
+    }
+}
+
+static void 
+setup_gconf(WindowData *windata)
+{
+    GConfClient *client;
+    GError *error = NULL;
+
+    client = gconf_client_get_default();
+
+    if (gconf_client_dir_exists(client, BASE_GCONF_KEY, &error)) {
+        gconf_client_add_dir(client, BASE_GCONF_KEY, 
+            GCONF_CLIENT_PRELOAD_ONELEVEL, &error);
+    }
+    
+    if (error != NULL) {
+        g_warning(error->message);
+        g_error_free(error);
+        return;
+    }
+
+    windata->gconf_notify_id = gconf_client_notify_add(client, 
+        BASE_GCONF_KEY, gconf_notify_cb, windata, NULL, &error);
+    
+    if (error != NULL) {
+        g_warning(error->message);
+        g_error_free(error);
+    }
+}
-
-#ifdef USE_CAIRO
-static void
-fill_background(GtkWidget *widget, WindowData *windata, cairo_t *cr)
-{
-
-
-
+
-    cairo_pattern_t *gradient;
-    int gradient_y = widget->allocation.height - BOTTOM_GRADIENT_HEIGHT;
-#endif
-
-    if (windata->enable_transparency)
-    {
@@ -106 +325 @@
-                              background_color->red   / 65535.0,
-                              background_color->green / 65535.0,
-                              background_color->blue  / 65535.0,
-BACKGROUND_OPACITY
+windata->background_opacity
-    }
-    else
-    {
@@ -118 +337 @@
-                    widget->allocation.height);
-    cairo_fill(cr);
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+
-}
-#else /* !USE_CAIRO */
-static void
-fill_background(GtkWidget *widget, WindowData *windata)
-{
-tkStyle *style = gtk_widget_get_style(windata->win)
+dkGC *gc
-
+    gc = gdk_gc_new(GDK_DRAWABLE(widget->window));
+    gdk_gc_set_rgb_fg_color(gc, &windata->background_color);
+    
-    gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
-style->base_gc[GTK_STATE_NORMAL]
+gc
-                       0, 0,
-                       widget->allocation.width,
-                       widget->allocation.height);
+
+    g_object_unref(G_OBJECT(gc));
-}
-#endif
-
@@ -149 +373 @@
-static void
-draw_stripe(GtkWidget *widget, WindowData *windata, cairo_t *cr)
-{
-    GtkStyle *style = gtk_widget_get_style(widget);
-    GdkColor color;
-    int stripe_x = windata->main_hbox->allocation.x + 1;
-    int stripe_y = windata->main_hbox->allocation.y + 1;
-    int stripe_height = windata->main_hbox->allocation.height - 2;
-#ifdef ENABLE_GRADIENT_LOOK
-    cairo_pattern_t *gradient;
-    double r, g, b;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    cairo_rectangle(cr, stripe_x, stripe_y, STRIPE_WIDTH, stripe_height);
-
-#ifdef ENABLE_GRADIENT_LOOK
-    r = color.red   / 65535.0;
-    g = color.green / 65535.0;
-    b = color.blue  / 65535.0;
-
-    gradient = cairo_pattern_create_linear(stripe_x, 0, STRIPE_WIDTH, 0);
-    cairo_pattern_add_color_stop_rgba(gradient, 0, r, g, b, 1);
-    cairo_pattern_add_color_stop_rgba(gradient, 1, r, g, b, 0);
-    cairo_set_source(cr, gradient);
-    cairo_fill(cr);
-    cairo_pattern_destroy(gradient);
-#else
-    gdk_cairo_set_source_color(cr, &color);
-    cairo_fill(cr);
-#endif
-}
-#else /* !USE_CAIRO */
-static void
-draw_stripe(GtkWidget *widget, WindowData *windata)
-{
-    GtkStyle *style = gtk_widget_get_style(widget);
-    gboolean custom_gc = FALSE;
-    GdkColor color;
-    GdkGC *gc;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    gdk_draw_rectangle(widget->window, gc, TRUE,
-                       windata->main_hbox->allocation.x + 1,
-                       windata->main_hbox->allocation.y + 1,
-                       STRIPE_WIDTH,
-                       windata->main_hbox->allocation.height - 2);
-
-
-
+
-}
-#endif
-
@@ -467 +657 @@
-static void
-draw_border(GtkWidget *widget, WindowData *windata, cairo_t *cr)
-{
-
+
+
+
+
+
+
+
+
+
+
+
-    cairo_set_line_width(cr, 1.0);
-
-    if (windata->has_arrow)
@@ -477 +677 @@
-        create_border_with_arrow(windata->win, windata);
-
-        cairo_move_to(cr,
-0.5
- + 0.5
+1.0
+
-
-        for (i = 1; i < windata->num_border_points; i++)
-        {
-            cairo_line_to(cr,
-0.5
- + 0.5
+1.0
+
-        }
-
-        cairo_close_path(cr);
@@ -495 +695 @@
-    }
-    else
-    {
-0.5, 0.5
-0.5, windata->height - 0.5
+1.0, 0.0
+1.0, windata->height - 1.0
-    }
-
-    cairo_stroke(cr);
@@ -511 +711 @@
-        GdkColor color;
-
-        windata->gc = gdk_gc_new(widget->window);
-gdk_color_parse("black"
+set_urgency_color(windata
-        gdk_gc_set_rgb_fg_color(windata->gc, &color);
-    }
-
@@ -533 +733 @@
-                           0, 0, windata->width - 1, windata->height - 1);
-    }
-
+    g_object_unref(G_OBJECT(windata->gc));
+    windata->gc = NULL;
-}
-#endif
-
@@ -587 +789 @@
-    if (windata->window_region != NULL)
-        gdk_region_destroy(windata->window_region);
-
+    gconf_client_notify_remove(gconf_client_get_default(), 
+        windata->gconf_notify_id);
+
-    g_free(windata);
-}
-
@@ -676 +881 @@
-    windata->urgency = URGENCY_NORMAL;
-    windata->url_clicked = url_clicked;
-
+    windata->draw_gradients = TRUE;
+    windata->show_close_button = TRUE;
+    windata->theme_width = WIDTH;
+
+    setup_gconf(windata);
+
-    win = gtk_window_new(GTK_WINDOW_POPUP);
-    windata->win = win;
-
@@ -691 +902 @@
-    }
-#endif
-
+    load_theme_settings(windata);
+
-    gtk_window_set_title(GTK_WINDOW(win), "Notification");
-    gtk_widget_add_events(win, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
-    gtk_widget_realize(win);
-WIDTH
+windata->theme_width
-
-    g_object_set_data_full(G_OBJECT(win), "windata", windata,
-                           (GDestroyNotify)destroy_windata);
@@ -763 +976 @@
-
-    /* Add the close button */
-    close_button = gtk_button_new();
-
+
+
+
+
-    gtk_box_pack_start(GTK_BOX(hbox), close_button, FALSE, FALSE, 0);
-    gtk_button_set_relief(GTK_BUTTON(close_button), GTK_RELIEF_NONE);
-    gtk_container_set_border_width(GTK_CONTAINER(close_button), 0);
-    gtk_widget_set_size_request(close_button, 20, 20);
-    g_signal_connect_swapped(G_OBJECT(close_button), "clicked",
-                             G_CALLBACK(gtk_widget_destroy), win);
-

data/Makefile.am

@@ -2 +2 @@
-service_DATA = org.freedesktop.Notifications.service
-
-schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
-
+
-schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@

/dev/null

@@ +1 @@
+<gconfschemafile>
+ <schemalist>
+
+  <schema>
+   <key>/schemas/apps/notification-daemon/themes/standard/background_opacity</key>
+   <applyto>/apps/notification-daemon/themes/standard/background_opacity</applyto>
+   <owner>notification-daemon</owner>
+   <type>float</type>
+   <default>0.92</default>
+   <locale name="C">
+    <short>Opacity of the popup window</short>
+    <long>Background opacity of the popup window. Can be 0-100, where 0 is completely transparent and 100 is completely opaque. Works only if notification-daemon was built with Cairo  on GTK+ 2.10 or better and a compositing manager is running.</long>
+   </locale>
+  </schema>
+
+  <schema>
+   <key>/schemas/apps/notification-daemon/themes/standard/color_background</key>
+   <applyto>/apps/notification-daemon/themes/standard/color_background</applyto>
+   <owner>notification-daemon</owner>
+   <type>string</type>
+   <default>bg[normal]</default>
+   <locale name="C">
+    <short>Background color of popup window</short>
+    <long>The color can be in short or long hexadecimal form (#ff9900 or #f90), a symbolic string (purple, blue, red), or a GTK+ style color, such as bg[normal], fg[selected], base[active], mid[prelight], etc.</long>
+   </locale>
+  </schema>
+
+  <schema>
+   <key>/schemas/apps/notification-daemon/themes/standard/color_critical</key>
+   <applyto>/apps/notification-daemon/themes/standard/color_critical</applyto>
+   <owner>notification-daemon</owner>
+   <type>string</type>
+   <default>#a40000</default>
+   <locale name="C">
+    <short>Border and stripe color for critical urgency notification popup windows</short>
+    <long>The color can be in short or long hexadecimal form (#ff9900 or #f90), a symbolic string (purple, blue, red), or a GTK+ style color, such as bg[normal], fg[selected], base[active], mid[prelight], etc.</long>
+   </locale>
+  </schema>
+
+  <schema>
+   <key>/schemas/apps/notification-daemon/themes/standard/color_low</key>
+   <applyto>/apps/notification-daemon/themes/standard/color_low</applyto>
+   <owner>notification-daemon</owner>
+   <type>string</type>
+   <default>dark[normal]</default>
+   <locale name="C">
+    <short>Border and stripe color for low urgency notification popup windows</short>
+    <long>The color can be in short or long hexadecimal form (#ff9900 or #f90), a symbolic string (purple, blue, red), or a GTK+ style color, such as bg[normal], fg[selected], base[active], mid[prelight], etc.</long>
+   </locale>
+  </schema>
+  
+  <schema>
+   <key>/schemas/apps/notification-daemon/themes/standard/color_normal</key>
+   <applyto>/apps/notification-daemon/themes/standard/color_normal</applyto>
+   <owner>notification-daemon</owner>
+   <type>string</type>
+   <default>bg[selected]</default>
+   <locale name="C">
+    <short>Border and stripe color for normal urgency notification popup windows</short>
+    <long>The color can be in short or long hexadecimal form (#ff9900 or #f90), a symbolic string (purple, blue, red), or a GTK+ style color, such as bg[normal], fg[selected], base[active], mid[prelight], etc.</long>
+   </locale>
+  </schema>
+  
+  <schema>
+   <key>/schemas/apps/notification-daemon/themes/standard/draw_gradients</key>
+   <applyto>/apps/notification-daemon/themes/standard/draw_gradients</applyto>
+   <owner>notification-daemon</owner>
+   <type>bool</type>
+   <default>true</default>
+   <locale name="C">
+    <short>Draw the stripe and background using subtle gradients</short>
+    <long>The left colored urgency stripe and the bottom of the notification popup window will be drawn in a very subtle gradient form. Works only if the notification-daemon was built with Cairo on GTK+ 2.8 or better.</long>
+   </locale>
+  </schema>
+  
+  <schema>
+   <key>/schemas/apps/notification-daemon/themes/standard/show_close_button</key>
+   <applyto>/apps/notification-daemon/themes/standard/show_close_button</applyto>
+   <owner>notification-daemon</owner>
+   <type>bool</type>
+   <default>true</default>
+   <locale name="C">
+    <short>Show a close button</short>
+    <long>Show a close button in the top right of the notification popup windows as a visual cue that the notifications can be dismissed before timing out. Clicking any area of the popup will however dismiss it.</long>
+   </locale>
+  </schema>
+
+  <schema>
+   <key>/schemas/apps/notification-daemon/themes/standard/width</key>
+   <applyto>/apps/notification-daemon/themes/standard/width</applyto>
+   <owner>notification-daemon</owner>
+   <type>int</type>
+   <default>400</default>
+   <locale name="C">
+    <short>Fixed width of the notification popup windows</short>
+    <long>Width in pixels, which is recommended to be be no smaller than about 350.</long>
+   </locale>
+  </schema>
+
+ </schemalist>
+</gconfschemafile>