return gtk_css_selector_tree_at_offset (tree, tree->sibling_offset);
}
+static void
+gtk_css_selector_tree_match_previous (const GtkCssSelectorTree *tree,
+ const GtkCssMatcher *matcher,
+ GHashTable *res)
+{
+ const GtkCssSelectorTree *prev;
+
+ for (prev = gtk_css_selector_tree_get_previous (tree);
+ prev != NULL;
+ prev = gtk_css_selector_tree_get_sibling (prev))
+ gtk_css_selector_tree_match (prev, matcher, res);
+}
+
static GtkCssChange
gtk_css_selector_tree_get_previous_change (const GtkCssSelectorTree *tree,
const GtkCssMatcher *matcher)
GHashTable *res)
{
GtkCssMatcher ancestor;
- const GtkCssSelectorTree *prev;
while (_gtk_css_matcher_get_parent (&ancestor, matcher))
{
matcher = &ancestor;
- for (prev = gtk_css_selector_tree_get_previous (tree);
- prev != NULL;
- prev = gtk_css_selector_tree_get_sibling (prev))
- gtk_css_selector_tree_match (prev, matcher, res);
+ gtk_css_selector_tree_match_previous (tree, matcher, res);
/* any matchers are dangerous here, as we may loop forever, but
we can terminate now as all possible matches have already been added */
GHashTable *res)
{
GtkCssMatcher parent;
- const GtkCssSelectorTree *prev;
if (!_gtk_css_matcher_get_parent (&parent, matcher))
return;
- for (prev = gtk_css_selector_tree_get_previous (tree);
- prev != NULL;
- prev = gtk_css_selector_tree_get_sibling (prev))
- gtk_css_selector_tree_match (prev, &parent, res);
+ gtk_css_selector_tree_match_previous (tree, &parent, res);
}
GHashTable *res)
{
GtkCssMatcher previous;
- const GtkCssSelectorTree *prev;
while (_gtk_css_matcher_get_previous (&previous, matcher))
{
matcher = &previous;
- for (prev = gtk_css_selector_tree_get_previous (tree);
- prev != NULL;
- prev = gtk_css_selector_tree_get_sibling (prev))
- gtk_css_selector_tree_match (prev, matcher, res);
+ gtk_css_selector_tree_match_previous (tree, matcher, res);
/* any matchers are dangerous here, as we may loop forever, but
we can terminate now as all possible matches have already been added */
GHashTable *res)
{
GtkCssMatcher previous;
- const GtkCssSelectorTree *prev;
if (!_gtk_css_matcher_get_previous (&previous, matcher))
return;
matcher = &previous;
- for (prev = gtk_css_selector_tree_get_previous (tree);
- prev != NULL;
- prev = gtk_css_selector_tree_get_sibling (prev))
- gtk_css_selector_tree_match (prev, matcher, res);
+ gtk_css_selector_tree_match_previous (tree, matcher, res);
}
static GtkCssChange
const GtkCssMatcher *matcher,
GHashTable *res)
{
- const GtkCssSelectorTree *prev, *prev2;
+ const GtkCssSelectorTree *prev;
gtk_css_selector_tree_found_match (tree, res);
{
if (prev->selector.class == >K_CSS_SELECTOR_DESCENDANT &&
_gtk_css_matcher_has_regions (matcher))
- {
- for (prev2 = gtk_css_selector_tree_get_previous (prev);
- prev2 != NULL;
- prev2 = gtk_css_selector_tree_get_sibling (prev2))
- gtk_css_selector_tree_match (prev2, matcher, res);
- }
+ gtk_css_selector_tree_match_previous (prev, matcher, res);
gtk_css_selector_tree_match (prev, matcher, res);
}
/* NAME */
+typedef struct {
+ GType type;
+ const char *name;
+} TypeReference;
+
+static GHashTable *type_refs_ht = NULL;
+static guint type_refs_last_serial = 0;
+
+static TypeReference *
+get_type_reference (const char *name)
+{
+ TypeReference *ref;
+
+
+ if (type_refs_ht == NULL)
+ type_refs_ht = g_hash_table_new (g_str_hash, g_str_equal);
+
+ ref = g_hash_table_lookup (type_refs_ht, name);
+
+ if (ref != NULL)
+ return ref;
+
+ ref = g_slice_new (TypeReference);
+ ref->name = g_intern_string (name);
+ ref->type = g_type_from_name (ref->name);
+
+ g_hash_table_insert (type_refs_ht,
+ (gpointer)ref->name, ref);
+
+ return ref;
+}
+
+static void
+update_type_references (void)
+{
+ GHashTableIter iter;
+ guint serial;
+ gpointer value;
+
+ serial = g_type_get_type_registration_serial ();
+
+ if (serial == type_refs_last_serial)
+ return;
+
+ type_refs_last_serial = serial;
+
+ if (type_refs_ht == NULL)
+ return;
+
+ g_hash_table_iter_init (&iter, type_refs_ht);
+ while (g_hash_table_iter_next (&iter,
+ NULL, &value))
+ {
+ TypeReference *ref = value;
+ if (ref->type == G_TYPE_INVALID)
+ ref->type = g_type_from_name (ref->name);
+ }
+}
+
static void
gtk_css_selector_name_print (const GtkCssSelector *selector,
GString *string)
{
- g_string_append (string, selector->data);
+ g_string_append (string, ((TypeReference *)selector->data)->name);
}
static gboolean
gtk_css_selector_name_match (const GtkCssSelector *selector,
const GtkCssMatcher *matcher)
{
- if (!_gtk_css_matcher_has_name (matcher, selector->data))
+ if (!_gtk_css_matcher_has_type (matcher, ((TypeReference *)selector->data)->type))
return FALSE;
return gtk_css_selector_match (gtk_css_selector_previous (selector), matcher);
const GtkCssMatcher *matcher,
GHashTable *res)
{
- const GtkCssSelectorTree *prev;
-
- if (!_gtk_css_matcher_has_name (matcher, tree->selector.data))
+ if (!_gtk_css_matcher_has_type (matcher, ((TypeReference *)tree->selector.data)->type))
return;
gtk_css_selector_tree_found_match (tree, res);
- for (prev = gtk_css_selector_tree_get_previous (tree);
- prev != NULL;
- prev = gtk_css_selector_tree_get_sibling (prev))
- gtk_css_selector_tree_match (prev, matcher, res);
+ gtk_css_selector_tree_match_previous (tree, matcher, res);
}
static GtkCssChange
{
GtkCssChange change, previous_change;
- if (!_gtk_css_matcher_has_name (matcher, tree->selector.data))
+ if (!_gtk_css_matcher_has_type (matcher, ((TypeReference *)tree->selector.data)->type))
return 0;
change = 0;
gtk_css_selector_name_compare_one (const GtkCssSelector *a,
const GtkCssSelector *b)
{
- return strcmp (a->data, b->data);
+ return strcmp (((TypeReference *)a->data)->name,
+ ((TypeReference *)b->data)->name);
}
static const GtkCssSelectorClass GTK_CSS_SELECTOR_NAME = {
const GtkCssMatcher *matcher,
GHashTable *res)
{
- const GtkCssSelectorTree *prev, *prev2;
+ const GtkCssSelectorTree *prev;
if (!_gtk_css_matcher_has_region (matcher, tree->selector.data, 0))
return;
prev = gtk_css_selector_tree_get_sibling (prev))
{
if (prev->selector.class == >K_CSS_SELECTOR_DESCENDANT)
- {
- for (prev2 = gtk_css_selector_tree_get_previous (prev);
- prev2 != NULL;
- prev2 = gtk_css_selector_tree_get_sibling (prev2))
- gtk_css_selector_tree_match (prev2, matcher, res);
- }
+ gtk_css_selector_tree_match_previous (prev, matcher, res);
gtk_css_selector_tree_match (prev, matcher, res);
}
const GtkCssMatcher *matcher,
GHashTable *res)
{
- const GtkCssSelectorTree *prev;
-
if (!_gtk_css_matcher_has_class (matcher, GPOINTER_TO_UINT (tree->selector.data)))
return;
gtk_css_selector_tree_found_match (tree, res);
- for (prev = gtk_css_selector_tree_get_previous (tree);
- prev != NULL;
- prev = gtk_css_selector_tree_get_sibling (prev))
- gtk_css_selector_tree_match (prev, matcher, res);
+ gtk_css_selector_tree_match_previous (tree, matcher, res);
}
static GtkCssChange
const GtkCssMatcher *matcher,
GHashTable *res)
{
- const GtkCssSelectorTree *prev;
-
if (!_gtk_css_matcher_has_id (matcher, tree->selector.data))
return;
gtk_css_selector_tree_found_match (tree, res);
- for (prev = gtk_css_selector_tree_get_previous (tree);
- prev != NULL;
- prev = gtk_css_selector_tree_get_sibling (prev))
- gtk_css_selector_tree_match (prev, matcher, res);
+ gtk_css_selector_tree_match_previous (tree, matcher, res);
}
static GtkCssChange
"insensitive",
"inconsistent",
"focus",
- "backdrop"
+ "backdrop",
+ "dir(ltr)",
+ "dir(rtl)"
};
guint i, state;
GHashTable *res)
{
GtkStateFlags state = GPOINTER_TO_UINT (tree->selector.data);
- const GtkCssSelectorTree *prev;
if ((_gtk_css_matcher_get_state (matcher) & state) != state)
return;
gtk_css_selector_tree_found_match (tree, res);
- for (prev = gtk_css_selector_tree_get_previous (tree);
- prev != NULL;
- prev = gtk_css_selector_tree_get_sibling (prev))
- gtk_css_selector_tree_match (prev, matcher, res);
+ gtk_css_selector_tree_match_previous (tree, matcher, res);
}
static GtkCssChange
{ "inconsistent", GTK_STATE_FLAG_INCONSISTENT, },
{ "focused", GTK_STATE_FLAG_FOCUSED, },
{ "focus", GTK_STATE_FLAG_FOCUSED, },
- { "backdrop", GTK_STATE_FLAG_BACKDROP, }
+ { "backdrop", GTK_STATE_FLAG_BACKDROP, },
+ { "dir(ltr)", GTK_STATE_FLAG_DIR_LTR, },
+ { "dir(rtl)", GTK_STATE_FLAG_DIR_RTL, }
};
guint i;
name = _gtk_css_parser_try_ident (parser, FALSE);
if (name)
{
- selector = gtk_css_selector_new (_gtk_style_context_check_region_name (name)
- ? >K_CSS_SELECTOR_REGION
- : >K_CSS_SELECTOR_NAME,
- selector,
- g_intern_string (name));
+ if (_gtk_style_context_check_region_name (name))
+ selector = gtk_css_selector_new (>K_CSS_SELECTOR_REGION,
+ selector,
+ g_intern_string (name));
+ else
+ selector = gtk_css_selector_new (>K_CSS_SELECTOR_NAME,
+ selector,
+ get_type_reference (name));
g_free (name);
}
else if (_gtk_css_parser_try (parser, "*", FALSE))
{
GtkCssChange change = 0;
+ update_type_references ();
+
while (tree)
{
change = tree->selector.class->get_change (&tree->selector, change);
g_return_val_if_fail (selector != NULL, FALSE);
g_return_val_if_fail (matcher != NULL, FALSE);
+ update_type_references ();
+
return gtk_css_selector_match (selector, matcher);
}
GHashTableIter iter;
gpointer key;
+ update_type_references ();
+
res = g_hash_table_new (g_direct_hash, g_direct_equal);
for (; tree != NULL;
projects / ~andy / gtk / blobdiff