X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcssmatcher.c;h=ccdf5479cf853575e5e1fd3615a05c09f9a8b0e9;hb=45ad8a06ad511ad95a74172172b9fe459bc666ad;hp=e796cfcee219f2ec0db3314c1fb9029dbe0cce7c;hpb=b368c5f10aecc3c6fb9f0a09e9eaace3fd1c95dc;p=~andy%2Fgtk diff --git a/gtk/gtkcssmatcher.c b/gtk/gtkcssmatcher.c index e796cfcee..ccdf5479c 100644 --- a/gtk/gtkcssmatcher.c +++ b/gtk/gtkcssmatcher.c @@ -21,18 +21,20 @@ #include "gtkwidgetpath.h" +/* GTK_CSS_MATCHER_WIDGET_PATH */ + static gboolean gtk_css_matcher_widget_path_get_parent (GtkCssMatcher *matcher, const GtkCssMatcher *child) { - if (child->index == 0) + if (child->path.index == 0) return FALSE; - matcher->klass = child->klass; - matcher->path = child->path; - matcher->state_flags = 0; - matcher->index = child->index - 1; - matcher->sibling_index = gtk_widget_path_iter_get_sibling_index (matcher->path, matcher->index); + matcher->path.klass = child->path.klass; + matcher->path.path = child->path.path; + matcher->path.state_flags = 0; + matcher->path.index = child->path.index - 1; + matcher->path.sibling_index = gtk_widget_path_iter_get_sibling_index (matcher->path.path, matcher->path.index); return TRUE; } @@ -41,14 +43,14 @@ static gboolean gtk_css_matcher_widget_path_get_previous (GtkCssMatcher *matcher, const GtkCssMatcher *next) { - if (next->sibling_index == 0) + if (next->path.sibling_index == 0) return FALSE; - matcher->klass = next->klass; - matcher->path = next->path; - matcher->state_flags = 0; - matcher->index = next->index; - matcher->sibling_index = next->sibling_index - 1; + matcher->path.klass = next->path.klass; + matcher->path.path = next->path.path; + matcher->path.state_flags = 0; + matcher->path.index = next->path.index; + matcher->path.sibling_index = next->path.sibling_index - 1; return TRUE; } @@ -56,35 +58,33 @@ gtk_css_matcher_widget_path_get_previous (GtkCssMatcher *matcher, static GtkStateFlags gtk_css_matcher_widget_path_get_state (const GtkCssMatcher *matcher) { - return matcher->state_flags; + return matcher->path.state_flags; } 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, matcher->index); - if (siblings && matcher->sibling_index != gtk_widget_path_iter_get_sibling_index (matcher->path, matcher->index)) - return g_type_is_a (gtk_widget_path_iter_get_object_type (siblings, matcher->sibling_index), type); + + 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); else - return g_type_is_a (gtk_widget_path_iter_get_object_type (matcher->path, matcher->index), type); + return g_type_is_a (gtk_widget_path_iter_get_object_type (matcher->path.path, matcher->path.index), type); } 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, matcher->index); - if (siblings && matcher->sibling_index != gtk_widget_path_iter_get_sibling_index (matcher->path, matcher->index)) - return gtk_widget_path_iter_has_class (siblings, matcher->sibling_index, class_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 gtk_widget_path_iter_has_qclass (siblings, matcher->path.sibling_index, class_name); else - return gtk_widget_path_iter_has_class (matcher->path, matcher->index, class_name); + return gtk_widget_path_iter_has_qclass (matcher->path.path, matcher->path.index, class_name); } static gboolean @@ -93,11 +93,11 @@ gtk_css_matcher_widget_path_has_id (const GtkCssMatcher *matcher, { const GtkWidgetPath *siblings; - siblings = gtk_widget_path_iter_get_siblings (matcher->path, matcher->index); - if (siblings && matcher->sibling_index != gtk_widget_path_iter_get_sibling_index (matcher->path, matcher->index)) - return gtk_widget_path_iter_has_name (siblings, matcher->sibling_index, id); + 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_name (siblings, matcher->path.sibling_index, id); else - return gtk_widget_path_iter_has_name (matcher->path, matcher->index, id); + return gtk_widget_path_iter_has_name (matcher->path.path, matcher->path.index, id); } static gboolean @@ -107,11 +107,11 @@ gtk_css_matcher_widget_path_has_regions (const GtkCssMatcher *matcher) GSList *regions; gboolean result; - siblings = gtk_widget_path_iter_get_siblings (matcher->path, matcher->index); - if (siblings && matcher->sibling_index != gtk_widget_path_iter_get_sibling_index (matcher->path, matcher->index)) - regions = gtk_widget_path_iter_list_regions (siblings, matcher->sibling_index); + 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)) + regions = gtk_widget_path_iter_list_regions (siblings, matcher->path.sibling_index); else - regions = gtk_widget_path_iter_list_regions (matcher->path, matcher->index); + regions = gtk_widget_path_iter_list_regions (matcher->path.path, matcher->path.index); result = regions != NULL; g_slist_free (regions); @@ -126,15 +126,15 @@ gtk_css_matcher_widget_path_has_region (const GtkCssMatcher *matcher, const GtkWidgetPath *siblings; GtkRegionFlags region_flags; - siblings = gtk_widget_path_iter_get_siblings (matcher->path, matcher->index); - if (siblings && matcher->sibling_index != gtk_widget_path_iter_get_sibling_index (matcher->path, matcher->index)) + 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)) { - if (!gtk_widget_path_iter_has_region (siblings, matcher->sibling_index, region, ®ion_flags)) + if (!gtk_widget_path_iter_has_region (siblings, matcher->path.sibling_index, region, ®ion_flags)) return FALSE; } else { - if (!gtk_widget_path_iter_has_region (matcher->path, matcher->index, region, ®ion_flags)) + if (!gtk_widget_path_iter_has_region (matcher->path.path, matcher->path.index, region, ®ion_flags)) return FALSE; } @@ -144,46 +144,281 @@ gtk_css_matcher_widget_path_has_region (const GtkCssMatcher *matcher, return TRUE; } -static guint -gtk_css_matcher_widget_path_get_sibling_index (const GtkCssMatcher *matcher) -{ - return matcher->sibling_index; -} - -static guint -gtk_css_matcher_widget_path_get_n_siblings (const GtkCssMatcher *matcher) +static gboolean +gtk_css_matcher_widget_path_has_position (const GtkCssMatcher *matcher, + gboolean forward, + int a, + int b) { const GtkWidgetPath *siblings; + int x; - siblings = gtk_widget_path_iter_get_siblings (matcher->path, matcher->index); + siblings = gtk_widget_path_iter_get_siblings (matcher->path.path, matcher->path.index); if (!siblings) - return 0; + return FALSE; - return gtk_widget_path_length (siblings); + if (forward) + x = matcher->path.sibling_index + 1; + else + x = gtk_widget_path_length (siblings) - matcher->path.sibling_index; + + x -= b; + + if (a == 0) + return x == 0; + + if (x % a) + return FALSE; + + return x / a > 0; } 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_get_sibling_index, - gtk_css_matcher_widget_path_get_n_siblings + gtk_css_matcher_widget_path_has_position, + FALSE }; -void +gboolean _gtk_css_matcher_init (GtkCssMatcher *matcher, const GtkWidgetPath *path, GtkStateFlags state) { - matcher->klass = >K_CSS_MATCHER_WIDGET_PATH; - matcher->path = path; - matcher->state_flags = state; - matcher->index = gtk_widget_path_length (path) - 1; - matcher->sibling_index = gtk_widget_path_iter_get_sibling_index (path, matcher->index); + if (gtk_widget_path_length (path) == 0) + return FALSE; + + matcher->path.klass = >K_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 */ + +static gboolean +gtk_css_matcher_any_get_parent (GtkCssMatcher *matcher, + const GtkCssMatcher *child) +{ + _gtk_css_matcher_any_init (matcher); + + return TRUE; +} + +static gboolean +gtk_css_matcher_any_get_previous (GtkCssMatcher *matcher, + const GtkCssMatcher *next) +{ + _gtk_css_matcher_any_init (matcher); + + return TRUE; +} + +static GtkStateFlags +gtk_css_matcher_any_get_state (const GtkCssMatcher *matcher) +{ + /* XXX: This gets tricky when we implement :not() */ + + 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_any_has_type (const GtkCssMatcher *matcher, + GType type) +{ + return TRUE; +} + +static gboolean +gtk_css_matcher_any_has_class (const GtkCssMatcher *matcher, + GQuark class_name) +{ + return TRUE; +} + +static gboolean +gtk_css_matcher_any_has_id (const GtkCssMatcher *matcher, + const char *id) +{ + return TRUE; +} + +static gboolean +gtk_css_matcher_any_has_regions (const GtkCssMatcher *matcher) +{ + return TRUE; +} + +static gboolean +gtk_css_matcher_any_has_region (const GtkCssMatcher *matcher, + const char *region, + GtkRegionFlags flags) +{ + return TRUE; +} + +static gboolean +gtk_css_matcher_any_has_position (const GtkCssMatcher *matcher, + gboolean forward, + int a, + int b) +{ + return TRUE; +} + +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_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 +_gtk_css_matcher_any_init (GtkCssMatcher *matcher) +{ + matcher->klass = >K_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 = >K_CSS_MATCHER_SUPERSET; + matcher->superset.subset = subset; + matcher->superset.relevant = relevant; }