callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cssselector: Use simple macro for position pseudoclass

Browse Source 
This is possible now that the region-specific code is gone.
This commit is contained in:
Benjamin Otte
2014-12-08 05:39:01 +01:00
parent 28e80aa40b
commit 88f28aee4f
1 changed files with 12 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
gtk/gtkcssselector.c
View File

@ -1307,7 +1307,7 @@ DEFINE_SIMPLE_SELECTOR(pseudoclass_state, PSEUDOCLASS_STATE, print_pseudoclass_s
/* PSEUDOCLASS FOR POSITION */ /* PSEUDOCLASS FOR POSITION */
static void static void
gtk_css_selector_pseudoclass_position_print (const GtkCssSelector *selector, print_pseudoclass_position (const GtkCssSelector *selector,
GString *string) GString *string)
{ {
switch (selector->position.type) switch (selector->position.type)
@ -1383,7 +1383,7 @@ gtk_css_selector_pseudoclass_position_print (const GtkCssSelector *selector,
} }
static gboolean static gboolean
get_position_match (const GtkCssSelector *selector, match_pseudoclass_position (const GtkCssSelector *selector,
const GtkCssMatcher *matcher) const GtkCssMatcher *matcher)
{ {
switch (selector->position.type) switch (selector->position.type)
@ -1411,65 +1411,14 @@ get_position_match (const GtkCssSelector *selector,
return TRUE; return TRUE;
} }
static gboolean
gtk_css_selector_pseudoclass_position_match (const GtkCssSelector *selector,
const GtkCssMatcher *matcher)
{
if (!get_position_match (selector, matcher))
return FALSE;
return gtk_css_selector_match (gtk_css_selector_previous (selector), matcher);
}
static void
gtk_css_selector_pseudoclass_position_tree_match (const GtkCssSelectorTree *tree,
const GtkCssMatcher *matcher,
GHashTable *res)
{
if (!get_position_match (&tree->selector, matcher))
return;
gtk_css_selector_tree_found_match (tree, res);
gtk_css_selector_tree_match_previous (tree, matcher, res);
}
static GtkCssChange
gtk_css_selector_pseudoclass_position_tree_get_change (const GtkCssSelectorTree *tree,
const GtkCssMatcher *matcher)
{
GtkCssChange change, previous_change;
if (!get_position_match (&tree->selector, matcher))
return 0;
change = 0;
if (tree->matches_offset != GTK_CSS_SELECTOR_TREE_EMPTY_OFFSET)
change |= GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_GOT_MATCH;
previous_change = gtk_css_selector_tree_get_previous_change (tree, matcher);
if (previous_change != 0)
change |= previous_change | GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_GOT_MATCH;
return change;
}
static GtkCssChange
gtk_css_selector_pseudoclass_position_get_change (const GtkCssSelector *selector, GtkCssChange previous_change)
{
return previous_change | GTK_CSS_CHANGE_POSITION;
}
static guint static guint
gtk_css_selector_pseudoclass_position_hash_one (const GtkCssSelector *a) hash_pseudoclass_position (const GtkCssSelector *a)
{ {
return (((a->position.type << POSITION_NUMBER_BITS) | a->position.a) << POSITION_NUMBER_BITS) | a->position.b; return (((a->position.type << POSITION_NUMBER_BITS) | a->position.a) << POSITION_NUMBER_BITS) | a->position.b;
} }
static int static int
gtk_css_selector_pseudoclass_position_compare_one (const GtkCssSelector *a, comp_pseudoclass_position (const GtkCssSelector *a,
const GtkCssSelector *b) const GtkCssSelector *b)
{ {
int diff; int diff;
@ -1485,18 +1434,11 @@ gtk_css_selector_pseudoclass_position_compare_one (const GtkCssSelector *a,
return a->position.b - b->position.b; return a->position.b - b->position.b;
} }
static const GtkCssSelectorClass GTK_CSS_SELECTOR_PSEUDOCLASS_POSITION = { #define GTK_CSS_CHANGE_PSEUDOCLASS_POSITION GTK_CSS_CHANGE_POSITION
"pseudoclass-position", DEFINE_SIMPLE_SELECTOR(pseudoclass_position, PSEUDOCLASS_POSITION, print_pseudoclass_position,
gtk_css_selector_pseudoclass_position_print, match_pseudoclass_position, hash_pseudoclass_position, comp_pseudoclass_position,
gtk_css_selector_pseudoclass_position_match, FALSE, TRUE, FALSE)
gtk_css_selector_pseudoclass_position_tree_match, #undef GTK_CSS_CHANGE_PSEUDOCLASS_POSITION
gtk_css_selector_pseudoclass_position_get_change,
gtk_css_selector_pseudoclass_position_tree_get_change,
gtk_css_selector_pseudoclass_position_hash_one,
gtk_css_selector_pseudoclass_position_compare_one,
FALSE, TRUE, FALSE, TRUE, TRUE
};
/* API */ /* API */
static guint static guint