filechooserbutton: When the combo box changes, set the *file*, not the current folder

[~andy/gtk] / gtk / gtkcssmatcher.c

diff --git a/gtk/gtkcssmatcher.c b/gtk/gtkcssmatcher.c
index 5a25bfd8a46abd236c9fdceece09958f34ae4af4..ccdf5479cf853575e5e1fd3615a05c09f9a8b0e9 100644 (file)
--- a/gtk/gtkcssmatcher.c
+++ b/gtk/gtkcssmatcher.c
@@ -62,13 +62,11 @@ gtk_css_matcher_widget_path_get_state (const GtkCssMatcher *matcher)
 }
 
 static gboolean
-gtk_css_matcher_widget_path_has_name (const GtkCssMatcher *matcher,
-                                      const char          *name)
+gtk_css_matcher_widget_path_has_type (const GtkCssMatcher *matcher,
+                                      GType                type)
 {
   const GtkWidgetPath *siblings;
-  GType type;
-  
-  type = g_type_from_name (name);
+
   siblings = gtk_widget_path_iter_get_siblings (matcher->path.path, matcher->path.index);
   if (siblings && matcher->path.sibling_index != gtk_widget_path_iter_get_sibling_index (matcher->path.path, matcher->path.index))
     return g_type_is_a (gtk_widget_path_iter_get_object_type (siblings, matcher->path.sibling_index), type);
@@ -78,15 +76,15 @@ gtk_css_matcher_widget_path_has_name (const GtkCssMatcher *matcher,
 
 static gboolean
 gtk_css_matcher_widget_path_has_class (const GtkCssMatcher *matcher,
-                                       const char          *class_name)
+                                       GQuark               class_name)
 {
   const GtkWidgetPath *siblings;
   
   siblings = gtk_widget_path_iter_get_siblings (matcher->path.path, matcher->path.index);
   if (siblings && matcher->path.sibling_index != gtk_widget_path_iter_get_sibling_index (matcher->path.path, matcher->path.index))
-    return gtk_widget_path_iter_has_class (siblings, matcher->path.sibling_index, class_name);
+    return gtk_widget_path_iter_has_qclass (siblings, matcher->path.sibling_index, class_name);
   else
-    return gtk_widget_path_iter_has_class (matcher->path.path, matcher->path.index, class_name);
+    return gtk_widget_path_iter_has_qclass (matcher->path.path, matcher->path.index, class_name);
 }
 
 static gboolean
@@ -179,24 +177,30 @@ static const GtkCssMatcherClass GTK_CSS_MATCHER_WIDGET_PATH = {
   gtk_css_matcher_widget_path_get_parent,
   gtk_css_matcher_widget_path_get_previous,
   gtk_css_matcher_widget_path_get_state,
-  gtk_css_matcher_widget_path_has_name,
+  gtk_css_matcher_widget_path_has_type,
   gtk_css_matcher_widget_path_has_class,
   gtk_css_matcher_widget_path_has_id,
   gtk_css_matcher_widget_path_has_regions,
   gtk_css_matcher_widget_path_has_region,
   gtk_css_matcher_widget_path_has_position,
+  FALSE
 };
 
-void
+gboolean
 _gtk_css_matcher_init (GtkCssMatcher       *matcher,
                        const GtkWidgetPath *path,
                        GtkStateFlags        state)
 {
+  if (gtk_widget_path_length (path) == 0)
+    return FALSE;
+
   matcher->path.klass = &GTK_CSS_MATCHER_WIDGET_PATH;
   matcher->path.path = path;
   matcher->path.state_flags = state;
   matcher->path.index = gtk_widget_path_length (path) - 1;
   matcher->path.sibling_index = gtk_widget_path_iter_get_sibling_index (path, matcher->path.index);
+
+  return TRUE;
 }
 
 /* GTK_CSS_MATCHER_WIDGET_ANY */
@@ -230,15 +234,15 @@ gtk_css_matcher_any_get_state (const GtkCssMatcher *matcher)
 }
 
 static gboolean
-gtk_css_matcher_any_has_name (const GtkCssMatcher *matcher,
-                              const char          *name)
+gtk_css_matcher_any_has_type (const GtkCssMatcher *matcher,
+                              GType                type)
 {
   return TRUE;
 }
 
 static gboolean
 gtk_css_matcher_any_has_class (const GtkCssMatcher *matcher,
-                               const char          *class_name)
+                               GQuark               class_name)
 {
   return TRUE;
 }
@@ -277,12 +281,13 @@ static const GtkCssMatcherClass GTK_CSS_MATCHER_ANY = {
   gtk_css_matcher_any_get_parent,
   gtk_css_matcher_any_get_previous,
   gtk_css_matcher_any_get_state,
-  gtk_css_matcher_any_has_name,
+  gtk_css_matcher_any_has_type,
   gtk_css_matcher_any_has_class,
   gtk_css_matcher_any_has_id,
   gtk_css_matcher_any_has_regions,
   gtk_css_matcher_any_has_region,
   gtk_css_matcher_any_has_position,
+  TRUE
 };
 
 void
@@ -291,3 +296,129 @@ _gtk_css_matcher_any_init (GtkCssMatcher *matcher)
   matcher->klass = &GTK_CSS_MATCHER_ANY;
 }
 
+/* GTK_CSS_MATCHER_WIDGET_SUPERSET */
+
+static gboolean
+gtk_css_matcher_superset_get_parent (GtkCssMatcher       *matcher,
+                                     const GtkCssMatcher *child)
+{
+  _gtk_css_matcher_any_init (matcher);
+
+  return TRUE;
+}
+
+static gboolean
+gtk_css_matcher_superset_get_previous (GtkCssMatcher       *matcher,
+                                       const GtkCssMatcher *next)
+{
+  _gtk_css_matcher_any_init (matcher);
+
+  return TRUE;
+}
+
+static GtkStateFlags
+gtk_css_matcher_superset_get_state (const GtkCssMatcher *matcher)
+{
+  /* XXX: This gets tricky when we implement :not() */
+
+  if (matcher->superset.relevant & GTK_CSS_CHANGE_STATE)
+    return _gtk_css_matcher_get_state (matcher->superset.subset);
+  else
+    return GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED
+      | GTK_STATE_FLAG_INSENSITIVE | GTK_STATE_FLAG_INCONSISTENT
+      | GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_BACKDROP;
+}
+
+static gboolean
+gtk_css_matcher_superset_has_type (const GtkCssMatcher *matcher,
+                                   GType                type)
+{
+  if (matcher->superset.relevant & GTK_CSS_CHANGE_NAME)
+    return _gtk_css_matcher_has_type (matcher->superset.subset, type);
+  else
+    return TRUE;
+}
+
+static gboolean
+gtk_css_matcher_superset_has_class (const GtkCssMatcher *matcher,
+                                    GQuark               class_name)
+{
+  if (matcher->superset.relevant & GTK_CSS_CHANGE_CLASS)
+    return _gtk_css_matcher_has_class (matcher->superset.subset, class_name);
+  else
+    return TRUE;
+}
+
+static gboolean
+gtk_css_matcher_superset_has_id (const GtkCssMatcher *matcher,
+                                 const char          *id)
+{
+  if (matcher->superset.relevant & GTK_CSS_CHANGE_NAME)
+    return _gtk_css_matcher_has_id (matcher->superset.subset, id);
+  else
+    return TRUE;
+}
+
+static gboolean
+gtk_css_matcher_superset_has_regions (const GtkCssMatcher *matcher)
+{
+  if (matcher->superset.relevant & GTK_CSS_CHANGE_NAME)
+    return _gtk_css_matcher_has_regions (matcher->superset.subset);
+  else
+    return TRUE;
+}
+
+static gboolean
+gtk_css_matcher_superset_has_region (const GtkCssMatcher *matcher,
+                                     const char          *region,
+                                     GtkRegionFlags       flags)
+{
+  if (matcher->superset.relevant & GTK_CSS_CHANGE_NAME)
+    {
+      if (matcher->superset.relevant & GTK_CSS_CHANGE_POSITION)
+        return _gtk_css_matcher_has_region (matcher->superset.subset, region, flags);
+      else
+        return _gtk_css_matcher_has_region (matcher->superset.subset, region, 0);
+    }
+  else
+    return TRUE;
+}
+
+static gboolean
+gtk_css_matcher_superset_has_position (const GtkCssMatcher *matcher,
+                                       gboolean             forward,
+                                       int                  a,
+                                       int                  b)
+{
+  if (matcher->superset.relevant & GTK_CSS_CHANGE_POSITION)
+    return _gtk_css_matcher_has_position (matcher->superset.subset, forward, a, b);
+  else
+    return TRUE;
+}
+
+static const GtkCssMatcherClass GTK_CSS_MATCHER_SUPERSET = {
+  gtk_css_matcher_superset_get_parent,
+  gtk_css_matcher_superset_get_previous,
+  gtk_css_matcher_superset_get_state,
+  gtk_css_matcher_superset_has_type,
+  gtk_css_matcher_superset_has_class,
+  gtk_css_matcher_superset_has_id,
+  gtk_css_matcher_superset_has_regions,
+  gtk_css_matcher_superset_has_region,
+  gtk_css_matcher_superset_has_position,
+  FALSE
+};
+
+void
+_gtk_css_matcher_superset_init (GtkCssMatcher       *matcher,
+                                const GtkCssMatcher *subset,
+                                GtkCssChange         relevant)
+{
+  g_return_if_fail (subset != NULL);
+  g_return_if_fail ((relevant & ~(GTK_CSS_CHANGE_CLASS | GTK_CSS_CHANGE_NAME | GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_STATE)) == 0);
+
+  matcher->superset.klass = &GTK_CSS_MATCHER_SUPERSET;
+  matcher->superset.subset = subset;
+  matcher->superset.relevant = relevant;
+}
+