st-theme-context.c: Hook up texture cache's texture-file-changed

signal and invalidate any theme nodes using the passed file.

If the underlying file contents changed, this forces a reload of
the background/border image.

Author: mtwebster

src/st/st-theme-context.c

@@ -21,10 +21,12 @@
 
 #include <config.h>
 
+#include "st-border-image.h"
 #include "st-settings.h"
 #include "st-texture-cache.h"
 #include "st-theme.h"
 #include "st-theme-context.h"
+#include "st-theme-node-private.h"
 
 struct _StThemeContext {
   GObject parent;
@@ -68,6 +70,9 @@ static void on_font_name_changed (StSettings     *settings,
                                   StThemeContext *context);
 static void on_icon_theme_changed (StTextureCache *cache,
                                    StThemeContext *context);
+static void on_texture_file_changed (StTextureCache *cache,
+                                     GFile          *file,
+                                     StThemeContext *context);
 
 static void st_theme_context_changed (StThemeContext *context);
 
@@ -91,6 +96,9 @@ st_theme_context_finalize (GObject *object)
   g_signal_handlers_disconnect_by_func (st_texture_cache_get_default (),
                                        (gpointer) on_icon_theme_changed,
                                        context);
+  g_signal_handlers_disconnect_by_func (st_texture_cache_get_default (),
+                                       (gpointer) on_texture_file_changed,
+                                       context);
 
   g_signal_handlers_disconnect_by_func (clutter_get_default_backend (),
                                         (gpointer) st_theme_context_changed,
@@ -152,6 +160,10 @@ st_theme_context_init (StThemeContext *context)
                     "icon-theme-changed",
                     G_CALLBACK (on_icon_theme_changed),
                     context);
+  g_signal_connect (st_texture_cache_get_default (),
+                    "texture-file-changed",
+                    G_CALLBACK (on_texture_file_changed),
+                    context);
 
   g_signal_connect_swapped (clutter_get_default_backend (),
                             "resolution-changed",
@@ -292,6 +304,50 @@ on_icon_theme_changed (StTextureCache *cache,
   g_idle_add ((GSourceFunc) changed_idle, context);
 }
 
+static void
+on_texture_file_changed (StTextureCache *cache,
+                         GFile          *file,
+                         StThemeContext *context)
+{
+  GHashTableIter iter;
+  StThemeNode *node;
+  char *changed_path;
+
+  changed_path = g_file_get_path (file);
+  if (changed_path == NULL)
+    return;
+
+  g_hash_table_iter_init (&iter, context->nodes);
+  while (g_hash_table_iter_next (&iter, (gpointer *) &node, NULL))
+    {
+      const char *node_file;
+      StBorderImage *border_image;
+
+      node_file = st_theme_node_get_background_image (node);
+      if (node_file != NULL && strcmp (node_file, changed_path) == 0)
+        {
+          _st_theme_node_free_drawing_state (node);
+          node->alloc_width = 0;
+          node->alloc_height = 0;
+          continue;
+        }
+
+      border_image = st_theme_node_get_border_image (node);
+      if (border_image != NULL)
+        {
+          node_file = st_border_image_get_filename (border_image);
+          if (node_file != NULL && strcmp (node_file, changed_path) == 0)
+            {
+              _st_theme_node_free_drawing_state (node);
+              node->alloc_width = 0;
+              node->alloc_height = 0;
+            }
+        }
+    }
+
+  g_free (changed_path);
+}
+
 /**
  * st_theme_context_get_for_stage:
  * @stage: a #ClutterStage