Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

css: Add some methods for getting selector state

Browse Source 
This adds the following private methods:
_gtk_css_selector_get_primary_state_flags
_gtk_css_selector_get_primary_classes
_gtk_css_selector_has_primary_class

They get state and classes for the primary selector (i.e. the rightmost
simple selector). This will be used for some css optimizations.
This commit is contained in:
Alexander Larsson
2012-11-23 15:49:10 +01:00
parent b70d8c477d
commit c55a492ad3
2 changed files with 63 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
gtk/gtkcssselector.c
View File

@@ -38,6 +38,7 @@ struct _GtkCssSelectorClass {
guint increase_id_specificity :1;
guint increase_class_specificity :1;
guint increase_element_specificity :1;
guint is_simple :1;
};
struct _GtkCssSelector
@@ -112,7 +113,7 @@ static const GtkCssSelectorClass GTK_CSS_SELECTOR_DESCENDANT = {
gtk_css_selector_descendant_print,
gtk_css_selector_descendant_match,
gtk_css_selector_descendant_get_change,
FALSE, FALSE, FALSE
FALSE, FALSE, FALSE, FALSE
};
/* CHILD */
@@ -147,7 +148,7 @@ static const GtkCssSelectorClass GTK_CSS_SELECTOR_CHILD = {
gtk_css_selector_child_print,
gtk_css_selector_child_match,
gtk_css_selector_child_get_change,
FALSE, FALSE, FALSE
FALSE, FALSE, FALSE, FALSE
};
/* SIBLING */
@@ -187,7 +188,7 @@ static const GtkCssSelectorClass GTK_CSS_SELECTOR_SIBLING = {
gtk_css_selector_sibling_print,
gtk_css_selector_sibling_match,
gtk_css_selector_sibling_get_change,
FALSE, FALSE, FALSE
FALSE, FALSE, FALSE, FALSE
};
/* ADJACENT */
@@ -222,7 +223,7 @@ static const GtkCssSelectorClass GTK_CSS_SELECTOR_ADJACENT = {
gtk_css_selector_adjacent_print,
gtk_css_selector_adjacent_match,
gtk_css_selector_adjacent_get_change,
FALSE, FALSE, FALSE
FALSE, FALSE, FALSE, FALSE
};
/* ANY */
@@ -262,7 +263,7 @@ static const GtkCssSelectorClass GTK_CSS_SELECTOR_ANY = {
gtk_css_selector_any_print,
gtk_css_selector_any_match,
gtk_css_selector_any_get_change,
FALSE, FALSE, FALSE
FALSE, FALSE, FALSE, TRUE
};
/* NAME */
@@ -295,7 +296,7 @@ static const GtkCssSelectorClass GTK_CSS_SELECTOR_NAME = {
gtk_css_selector_name_print,
gtk_css_selector_name_match,
gtk_css_selector_name_get_change,
FALSE, FALSE, TRUE
FALSE, FALSE, TRUE, TRUE
};
/* REGION */
@@ -341,7 +342,7 @@ static const GtkCssSelectorClass GTK_CSS_SELECTOR_REGION = {
gtk_css_selector_region_print,
gtk_css_selector_region_match,
gtk_css_selector_region_get_change,
FALSE, FALSE, TRUE
FALSE, FALSE, TRUE, TRUE
};
/* CLASS */
@@ -375,7 +376,7 @@ static const GtkCssSelectorClass GTK_CSS_SELECTOR_CLASS = {
gtk_css_selector_class_print,
gtk_css_selector_class_match,
gtk_css_selector_class_get_change,
FALSE, TRUE, FALSE
FALSE, TRUE, FALSE, TRUE
};
/* ID */
@@ -409,7 +410,7 @@ static const GtkCssSelectorClass GTK_CSS_SELECTOR_ID = {
gtk_css_selector_id_print,
gtk_css_selector_id_match,
gtk_css_selector_id_get_change,
TRUE, FALSE, FALSE
TRUE, FALSE, FALSE, TRUE
};
/* PSEUDOCLASS FOR STATE */
@@ -464,7 +465,7 @@ static const GtkCssSelectorClass GTK_CSS_SELECTOR_PSEUDOCLASS_STATE = {
gtk_css_selector_pseudoclass_state_print,
gtk_css_selector_pseudoclass_state_match,
gtk_css_selector_pseudoclass_state_get_change,
FALSE, TRUE, FALSE
FALSE, TRUE, FALSE, TRUE
};
/* PSEUDOCLASS FOR POSITION */
@@ -705,7 +706,7 @@ static const GtkCssSelectorClass GTK_CSS_SELECTOR_PSEUDOCLASS_POSITION = {
gtk_css_selector_pseudoclass_position_print,
gtk_css_selector_pseudoclass_position_match,
gtk_css_selector_pseudoclass_position_get_change,
FALSE, TRUE, FALSE
FALSE, TRUE, FALSE, TRUE
};
/* API */
@@ -1176,3 +1177,49 @@ _gtk_css_selector_get_state_flags (const GtkCssSelector *selector)
return state;
}
GtkStateFlags
_gtk_css_selector_get_primary_state_flags (const GtkCssSelector *selector)
{
GtkStateFlags state = 0;
g_return_val_if_fail (selector != NULL, 0);
for (; selector && selector->class->is_simple; selector = gtk_css_selector_previous (selector))
{
if (selector->class == &GTK_CSS_SELECTOR_PSEUDOCLASS_STATE)
state |= GPOINTER_TO_UINT (selector->data);
}
return state;
}
GQuark *
_gtk_css_selector_get_primary_classes (const GtkCssSelector *selector)
{
GArray *array = g_array_new (TRUE, FALSE, sizeof (GQuark));
g_return_val_if_fail (selector != NULL, 0);
for (; selector && selector->class->is_simple; selector = gtk_css_selector_previous (selector))
{
if (selector->class == &GTK_CSS_SELECTOR_CLASS)
g_array_append_val (array, selector->data);
}
return (GQuark *)g_array_free (array, FALSE);
}
gboolean
_gtk_css_selector_has_primary_class (const GtkCssSelector *selector, GQuark class)
{
g_return_val_if_fail (selector != NULL, 0);
for (; selector && selector->class->is_simple; selector = gtk_css_selector_previous (selector))
{
if (selector->class == &GTK_CSS_SELECTOR_CLASS)
if (GPOINTER_TO_UINT (selector->data) == class)
return TRUE;
}
return FALSE;
}

5
gtk/gtkcssselectorprivate.h
View File

@@ -40,6 +40,11 @@ gboolean _gtk_css_selector_matches (const GtkCssSelector *sel
int _gtk_css_selector_compare (const GtkCssSelector *a,
const GtkCssSelector *b);
GtkStateFlags _gtk_css_selector_get_primary_state_flags (const GtkCssSelector *selector);
GQuark * _gtk_css_selector_get_primary_classes (const GtkCssSelector *selector);
gboolean _gtk_css_selector_has_primary_class (const GtkCssSelector *selector,
GQuark class);
G_END_DECLS
#endif /* __GTK_CSS_SELECTOR_PRIVATE_H__ */