From 6323010e2e5f1103a7e89248b28a0b75a8b7fd71 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sun, 5 Jul 2015 22:45:34 +0200
Subject: [PATCH 158/193] csstypes: expand GtkCssChange enum
Instead of GTK_CSS_CHANGE_POSITION we now have 4 values:
GTK_CSS_CHANGE_FIRST_CHILD, GTK_CSS_CHANGE_LAST_CHILD,
GTK_CSS_CHANGE_NTH_CHILD and GTK_CSS_CHANGE_NTH_LAST_CHILD
Nobody is using them directly yet.
---
gtk/gtkcsstypes.c | 15 ++++++++--
gtk/gtkcsstypesprivate.h | 75 ++++++++++++++++++++++++++++++++----------------
2 files changed, 63 insertions(+), 27 deletions(-)
diff --git a/gtk/gtkcsstypes.c b/gtk/gtkcsstypes.c
index 6ab3bc5..440f60a 100644
--- a/gtk/gtkcsstypes.c
+++ b/gtk/gtkcsstypes.c
@@ -54,7 +54,10 @@ _gtk_css_change_for_sibling (GtkCssChange match)
static const GtkCssChangeTranslation table[] = {
{ GTK_CSS_CHANGE_CLASS, GTK_CSS_CHANGE_SIBLING_CLASS },
{ GTK_CSS_CHANGE_NAME, GTK_CSS_CHANGE_SIBLING_NAME },
- { GTK_CSS_CHANGE_POSITION, GTK_CSS_CHANGE_SIBLING_POSITION },
+ { GTK_CSS_CHANGE_FIRST_CHILD, GTK_CSS_CHANGE_SIBLING_FIRST_CHILD },
+ { GTK_CSS_CHANGE_LAST_CHILD, GTK_CSS_CHANGE_SIBLING_LAST_CHILD },
+ { GTK_CSS_CHANGE_NTH_CHILD, GTK_CSS_CHANGE_SIBLING_NTH_CHILD },
+ { GTK_CSS_CHANGE_NTH_LAST_CHILD, GTK_CSS_CHANGE_SIBLING_NTH_LAST_CHILD },
{ GTK_CSS_CHANGE_STATE, GTK_CSS_CHANGE_SIBLING_STATE },
{ GTK_CSS_CHANGE_SOURCE, 0 },
{ GTK_CSS_CHANGE_PARENT_STYLE, 0 }
@@ -69,11 +72,17 @@ _gtk_css_change_for_child (GtkCssChange match)
static const GtkCssChangeTranslation table[] = {
{ GTK_CSS_CHANGE_CLASS, GTK_CSS_CHANGE_PARENT_CLASS },
{ GTK_CSS_CHANGE_NAME, GTK_CSS_CHANGE_PARENT_NAME },
- { GTK_CSS_CHANGE_POSITION, GTK_CSS_CHANGE_PARENT_POSITION },
+ { GTK_CSS_CHANGE_FIRST_CHILD, GTK_CSS_CHANGE_PARENT_FIRST_CHILD },
+ { GTK_CSS_CHANGE_LAST_CHILD, GTK_CSS_CHANGE_PARENT_LAST_CHILD },
+ { GTK_CSS_CHANGE_NTH_CHILD, GTK_CSS_CHANGE_PARENT_NTH_CHILD },
+ { GTK_CSS_CHANGE_NTH_LAST_CHILD, GTK_CSS_CHANGE_PARENT_NTH_LAST_CHILD },
{ GTK_CSS_CHANGE_STATE, GTK_CSS_CHANGE_PARENT_STATE },
{ GTK_CSS_CHANGE_SIBLING_CLASS, GTK_CSS_CHANGE_PARENT_SIBLING_CLASS },
{ GTK_CSS_CHANGE_SIBLING_NAME, GTK_CSS_CHANGE_PARENT_SIBLING_NAME },
- { GTK_CSS_CHANGE_SIBLING_POSITION, GTK_CSS_CHANGE_PARENT_SIBLING_POSITION },
+ { GTK_CSS_CHANGE_SIBLING_FIRST_CHILD, GTK_CSS_CHANGE_PARENT_SIBLING_FIRST_CHILD },
+ { GTK_CSS_CHANGE_SIBLING_LAST_CHILD, GTK_CSS_CHANGE_PARENT_SIBLING_LAST_CHILD },
+ { GTK_CSS_CHANGE_SIBLING_NTH_CHILD, GTK_CSS_CHANGE_PARENT_SIBLING_NTH_CHILD },
+ { GTK_CSS_CHANGE_SIBLING_NTH_LAST_CHILD, GTK_CSS_CHANGE_PARENT_SIBLING_NTH_LAST_CHILD },
{ GTK_CSS_CHANGE_SIBLING_STATE, GTK_CSS_CHANGE_PARENT_SIBLING_STATE },
{ GTK_CSS_CHANGE_SOURCE, 0 },
{ GTK_CSS_CHANGE_PARENT_STYLE, 0 }
diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h
index 2f80491..5466269 100644
--- a/gtk/gtkcsstypesprivate.h
+++ b/gtk/gtkcsstypesprivate.h
@@ -30,34 +30,61 @@ typedef struct _GtkCssStyle GtkCssStyle;
typedef struct _GtkStyleProviderPrivate GtkStyleProviderPrivate; /* dummy typedef */
typedef enum { /*< skip >*/
- GTK_CSS_CHANGE_CLASS = (1 << 0),
- GTK_CSS_CHANGE_NAME = (1 << 1),
- GTK_CSS_CHANGE_ID = GTK_CSS_CHANGE_NAME,
- GTK_CSS_CHANGE_REGION = GTK_CSS_CHANGE_NAME,
- GTK_CSS_CHANGE_POSITION = (1 << 2),
- GTK_CSS_CHANGE_STATE = (1 << 3),
- GTK_CSS_CHANGE_SIBLING_CLASS = (1 << 4),
- GTK_CSS_CHANGE_SIBLING_NAME = (1 << 5),
- GTK_CSS_CHANGE_SIBLING_POSITION = (1 << 6),
- GTK_CSS_CHANGE_SIBLING_STATE = (1 << 7),
- GTK_CSS_CHANGE_PARENT_CLASS = (1 << 8),
- GTK_CSS_CHANGE_PARENT_NAME = (1 << 9),
- GTK_CSS_CHANGE_PARENT_REGION = GTK_CSS_CHANGE_PARENT_NAME,
- GTK_CSS_CHANGE_PARENT_POSITION = (1 << 10),
- GTK_CSS_CHANGE_PARENT_STATE = (1 << 11),
- GTK_CSS_CHANGE_PARENT_SIBLING_CLASS = (1 << 12),
- GTK_CSS_CHANGE_PARENT_SIBLING_NAME = (1 << 13),
- GTK_CSS_CHANGE_PARENT_SIBLING_POSITION = (1 << 14),
- GTK_CSS_CHANGE_PARENT_SIBLING_STATE = (1 << 15),
+ GTK_CSS_CHANGE_CLASS = (1 << 0),
+ GTK_CSS_CHANGE_NAME = (1 << 1),
+ GTK_CSS_CHANGE_ID = GTK_CSS_CHANGE_NAME,
+ GTK_CSS_CHANGE_REGION = GTK_CSS_CHANGE_NAME,
+ GTK_CSS_CHANGE_FIRST_CHILD = (1 << 2),
+ GTK_CSS_CHANGE_LAST_CHILD = (1 << 3),
+ GTK_CSS_CHANGE_NTH_CHILD = (1 << 4),
+ GTK_CSS_CHANGE_NTH_LAST_CHILD = (1 << 5),
+ GTK_CSS_CHANGE_STATE = (1 << 6),
+ GTK_CSS_CHANGE_SIBLING_CLASS = (1 << 7),
+ GTK_CSS_CHANGE_SIBLING_NAME = (1 << 8),
+ GTK_CSS_CHANGE_SIBLING_FIRST_CHILD = (1 << 9),
+ GTK_CSS_CHANGE_SIBLING_LAST_CHILD = (1 << 10),
+ GTK_CSS_CHANGE_SIBLING_NTH_CHILD = (1 << 11),
+ GTK_CSS_CHANGE_SIBLING_NTH_LAST_CHILD = (1 << 12),
+ GTK_CSS_CHANGE_SIBLING_STATE = (1 << 13),
+ GTK_CSS_CHANGE_PARENT_CLASS = (1 << 14),
+ GTK_CSS_CHANGE_PARENT_NAME = (1 << 15),
+ GTK_CSS_CHANGE_PARENT_REGION = GTK_CSS_CHANGE_PARENT_NAME,
+ GTK_CSS_CHANGE_PARENT_POSITION = (1 << 16),
+ GTK_CSS_CHANGE_PARENT_FIRST_CHILD = (1 << 17),
+ GTK_CSS_CHANGE_PARENT_LAST_CHILD = (1 << 18),
+ GTK_CSS_CHANGE_PARENT_NTH_CHILD = (1 << 19),
+ GTK_CSS_CHANGE_PARENT_NTH_LAST_CHILD = (1 << 20),
+ GTK_CSS_CHANGE_PARENT_STATE = (1 << 21),
+ GTK_CSS_CHANGE_PARENT_SIBLING_CLASS = (1 << 22),
+ GTK_CSS_CHANGE_PARENT_SIBLING_NAME = (1 << 23),
+ GTK_CSS_CHANGE_PARENT_SIBLING_FIRST_CHILD = (1 << 24),
+ GTK_CSS_CHANGE_PARENT_SIBLING_LAST_CHILD = (1 << 25),
+ GTK_CSS_CHANGE_PARENT_SIBLING_NTH_CHILD = (1 << 26),
+ GTK_CSS_CHANGE_PARENT_SIBLING_NTH_LAST_CHILD = (1 << 27),
+ GTK_CSS_CHANGE_PARENT_SIBLING_POSITION = (1 << 28),
+ GTK_CSS_CHANGE_PARENT_SIBLING_STATE = (1 << 29),
/* add more */
- GTK_CSS_CHANGE_SOURCE = (1 << 16),
- GTK_CSS_CHANGE_PARENT_STYLE = (1 << 17),
- GTK_CSS_CHANGE_TIMESTAMP = (1 << 18),
- GTK_CSS_CHANGE_ANIMATIONS = (1 << 19),
+ GTK_CSS_CHANGE_SOURCE = (1 << 30),
+ GTK_CSS_CHANGE_PARENT_STYLE = (1 << 31),
+ GTK_CSS_CHANGE_TIMESTAMP = (1LL << 32),
+ GTK_CSS_CHANGE_ANIMATIONS = (1LL << 33),
- GTK_CSS_CHANGE_RESERVED_BIT = (1 << 31) /* Used internally in gtkcssselector.c */
+ GTK_CSS_CHANGE_RESERVED_BIT = (1LL << 62) /* Used internally in gtkcssselector.c */
} GtkCssChange;
+/* if this complains we need to use defines instead of an enum */
+G_STATIC_ASSERT(sizeof (GtkCssChange) >= 8);
+
+#define GTK_CSS_CHANGE_POSITION (GTK_CSS_CHANGE_FIRST_CHILD | GTK_CSS_CHANGE_LAST_CHILD | \
+ GTK_CSS_CHANGE_NTH_CHILD | GTK_CSS_CHANGE_NTH_LAST_CHILD)
+#define GTK_CSS_CHANGE_SIBLING_POSITION (GTK_CSS_CHANGE_SIBLING_FIRST_CHILD | GTK_CSS_CHANGE_SIBLING_LAST_CHILD | \
+ GTK_CSS_CHANGE_SIBLING_NTH_CHILD | GTK_CSS_CHANGE_SIBLING_NTH_LAST_CHILD)
+#define GTK_CSS_CHANGE_PARENT_POSITION (GTK_CSS_CHANGE_PARENT_FIRST_CHILD | GTK_CSS_CHANGE_PARENT_LAST_CHILD | \
+ GTK_CSS_CHANGE_PARENT_NTH_CHILD | GTK_CSS_CHANGE_PARENT_NTH_LAST_CHILD)
+#define GTK_CSS_CHANGE_PARENT_SIBLING_POSITION (GTK_CSS_CHANGE_PARENT_SIBLING_FIRST_CHILD | GTK_CSS_CHANGE_PARENT_SIBLING_LAST_CHILD | \
+ GTK_CSS_CHANGE_PARENT_SIBLING_NTH_CHILD | GTK_CSS_CHANGE_PARENT_SIBLING_NTH_LAST_CHILD)
+
+
#define GTK_CSS_CHANGE_ANY ((1 << 19) - 1)
#define GTK_CSS_CHANGE_ANY_SELF (GTK_CSS_CHANGE_CLASS | GTK_CSS_CHANGE_NAME | GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_STATE)
#define GTK_CSS_CHANGE_ANY_SIBLING (GTK_CSS_CHANGE_SIBLING_CLASS | GTK_CSS_CHANGE_SIBLING_NAME | \
--
2.4.5