matcher: Use a vtable
Now we can do lots of fancy matchers, yay!
This commit is contained in:
parent
a94b85d375
commit
b368c5f10a
@ -21,24 +21,14 @@
|
|||||||
|
|
||||||
#include "gtkwidgetpath.h"
|
#include "gtkwidgetpath.h"
|
||||||
|
|
||||||
void
|
static gboolean
|
||||||
_gtk_css_matcher_init (GtkCssMatcher *matcher,
|
gtk_css_matcher_widget_path_get_parent (GtkCssMatcher *matcher,
|
||||||
const GtkWidgetPath *path,
|
|
||||||
GtkStateFlags state)
|
|
||||||
{
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
gboolean
|
|
||||||
_gtk_css_matcher_get_parent (GtkCssMatcher *matcher,
|
|
||||||
const GtkCssMatcher *child)
|
const GtkCssMatcher *child)
|
||||||
{
|
{
|
||||||
if (child->index == 0)
|
if (child->index == 0)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
matcher->klass = child->klass;
|
||||||
matcher->path = child->path;
|
matcher->path = child->path;
|
||||||
matcher->state_flags = 0;
|
matcher->state_flags = 0;
|
||||||
matcher->index = child->index - 1;
|
matcher->index = child->index - 1;
|
||||||
@ -47,13 +37,14 @@ _gtk_css_matcher_get_parent (GtkCssMatcher *matcher,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
static gboolean
|
||||||
_gtk_css_matcher_get_previous (GtkCssMatcher *matcher,
|
gtk_css_matcher_widget_path_get_previous (GtkCssMatcher *matcher,
|
||||||
const GtkCssMatcher *next)
|
const GtkCssMatcher *next)
|
||||||
{
|
{
|
||||||
if (next->sibling_index == 0)
|
if (next->sibling_index == 0)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
matcher->klass = next->klass;
|
||||||
matcher->path = next->path;
|
matcher->path = next->path;
|
||||||
matcher->state_flags = 0;
|
matcher->state_flags = 0;
|
||||||
matcher->index = next->index;
|
matcher->index = next->index;
|
||||||
@ -62,14 +53,14 @@ _gtk_css_matcher_get_previous (GtkCssMatcher *matcher,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
GtkStateFlags
|
static GtkStateFlags
|
||||||
_gtk_css_matcher_get_state (const GtkCssMatcher *matcher)
|
gtk_css_matcher_widget_path_get_state (const GtkCssMatcher *matcher)
|
||||||
{
|
{
|
||||||
return matcher->state_flags;
|
return matcher->state_flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
static gboolean
|
||||||
_gtk_css_matcher_has_name (const GtkCssMatcher *matcher,
|
gtk_css_matcher_widget_path_has_name (const GtkCssMatcher *matcher,
|
||||||
const char *name)
|
const char *name)
|
||||||
{
|
{
|
||||||
const GtkWidgetPath *siblings;
|
const GtkWidgetPath *siblings;
|
||||||
@ -83,8 +74,8 @@ _gtk_css_matcher_has_name (const GtkCssMatcher *matcher,
|
|||||||
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, matcher->index), type);
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
static gboolean
|
||||||
_gtk_css_matcher_has_class (const GtkCssMatcher *matcher,
|
gtk_css_matcher_widget_path_has_class (const GtkCssMatcher *matcher,
|
||||||
const char *class_name)
|
const char *class_name)
|
||||||
{
|
{
|
||||||
const GtkWidgetPath *siblings;
|
const GtkWidgetPath *siblings;
|
||||||
@ -96,8 +87,8 @@ _gtk_css_matcher_has_class (const GtkCssMatcher *matcher,
|
|||||||
return gtk_widget_path_iter_has_class (matcher->path, matcher->index, class_name);
|
return gtk_widget_path_iter_has_class (matcher->path, matcher->index, class_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
static gboolean
|
||||||
_gtk_css_matcher_has_id (const GtkCssMatcher *matcher,
|
gtk_css_matcher_widget_path_has_id (const GtkCssMatcher *matcher,
|
||||||
const char *id)
|
const char *id)
|
||||||
{
|
{
|
||||||
const GtkWidgetPath *siblings;
|
const GtkWidgetPath *siblings;
|
||||||
@ -109,8 +100,8 @@ _gtk_css_matcher_has_id (const GtkCssMatcher *matcher,
|
|||||||
return gtk_widget_path_iter_has_name (matcher->path, matcher->index, id);
|
return gtk_widget_path_iter_has_name (matcher->path, matcher->index, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
static gboolean
|
||||||
_gtk_css_matcher_has_regions (const GtkCssMatcher *matcher)
|
gtk_css_matcher_widget_path_has_regions (const GtkCssMatcher *matcher)
|
||||||
{
|
{
|
||||||
const GtkWidgetPath *siblings;
|
const GtkWidgetPath *siblings;
|
||||||
GSList *regions;
|
GSList *regions;
|
||||||
@ -127,8 +118,8 @@ _gtk_css_matcher_has_regions (const GtkCssMatcher *matcher)
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
static gboolean
|
||||||
_gtk_css_matcher_has_region (const GtkCssMatcher *matcher,
|
gtk_css_matcher_widget_path_has_region (const GtkCssMatcher *matcher,
|
||||||
const char *region,
|
const char *region,
|
||||||
GtkRegionFlags flags)
|
GtkRegionFlags flags)
|
||||||
{
|
{
|
||||||
@ -153,14 +144,14 @@ _gtk_css_matcher_has_region (const GtkCssMatcher *matcher,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
guint
|
static guint
|
||||||
_gtk_css_matcher_get_sibling_index (const GtkCssMatcher *matcher)
|
gtk_css_matcher_widget_path_get_sibling_index (const GtkCssMatcher *matcher)
|
||||||
{
|
{
|
||||||
return matcher->sibling_index;
|
return matcher->sibling_index;
|
||||||
}
|
}
|
||||||
|
|
||||||
guint
|
static guint
|
||||||
_gtk_css_matcher_get_n_siblings (const GtkCssMatcher *matcher)
|
gtk_css_matcher_widget_path_get_n_siblings (const GtkCssMatcher *matcher)
|
||||||
{
|
{
|
||||||
const GtkWidgetPath *siblings;
|
const GtkWidgetPath *siblings;
|
||||||
|
|
||||||
@ -171,3 +162,28 @@ _gtk_css_matcher_get_n_siblings (const GtkCssMatcher *matcher)
|
|||||||
return gtk_widget_path_length (siblings);
|
return gtk_widget_path_length (siblings);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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_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
|
||||||
|
};
|
||||||
|
|
||||||
|
void
|
||||||
|
_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);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ -24,8 +24,31 @@
|
|||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
typedef struct _GtkCssMatcher GtkCssMatcher;
|
typedef struct _GtkCssMatcher GtkCssMatcher;
|
||||||
|
typedef struct _GtkCssMatcherClass GtkCssMatcherClass;
|
||||||
|
|
||||||
|
struct _GtkCssMatcherClass {
|
||||||
|
gboolean (* get_parent) (GtkCssMatcher *matcher,
|
||||||
|
const GtkCssMatcher *child);
|
||||||
|
gboolean (* get_previous) (GtkCssMatcher *matcher,
|
||||||
|
const GtkCssMatcher *next);
|
||||||
|
|
||||||
|
GtkStateFlags (* get_state) (const GtkCssMatcher *matcher);
|
||||||
|
gboolean (* has_name) (const GtkCssMatcher *matcher,
|
||||||
|
const char *name);
|
||||||
|
gboolean (* has_class) (const GtkCssMatcher *matcher,
|
||||||
|
const char *class_name);
|
||||||
|
gboolean (* has_id) (const GtkCssMatcher *matcher,
|
||||||
|
const char *id);
|
||||||
|
gboolean (* has_regions) (const GtkCssMatcher *matcher);
|
||||||
|
gboolean (* has_region) (const GtkCssMatcher *matcher,
|
||||||
|
const char *region,
|
||||||
|
GtkRegionFlags flags);
|
||||||
|
guint (* get_sibling_index) (const GtkCssMatcher *matcher);
|
||||||
|
guint (* get_n_siblings) (const GtkCssMatcher *matcher);
|
||||||
|
};
|
||||||
|
|
||||||
struct _GtkCssMatcher {
|
struct _GtkCssMatcher {
|
||||||
|
const GtkCssMatcherClass *klass;
|
||||||
const GtkWidgetPath *path;
|
const GtkWidgetPath *path;
|
||||||
GtkStateFlags state_flags;
|
GtkStateFlags state_flags;
|
||||||
guint index;
|
guint index;
|
||||||
@ -35,25 +58,75 @@ struct _GtkCssMatcher {
|
|||||||
void _gtk_css_matcher_init (GtkCssMatcher *matcher,
|
void _gtk_css_matcher_init (GtkCssMatcher *matcher,
|
||||||
const GtkWidgetPath *path,
|
const GtkWidgetPath *path,
|
||||||
GtkStateFlags state);
|
GtkStateFlags state);
|
||||||
gboolean _gtk_css_matcher_get_parent (GtkCssMatcher *matcher,
|
|
||||||
const GtkCssMatcher *child);
|
|
||||||
gboolean _gtk_css_matcher_get_previous (GtkCssMatcher *matcher,
|
|
||||||
const GtkCssMatcher *next);
|
|
||||||
|
|
||||||
GtkStateFlags _gtk_css_matcher_get_state (const GtkCssMatcher *matcher);
|
static inline gboolean
|
||||||
gboolean _gtk_css_matcher_has_name (const GtkCssMatcher *matcher,
|
_gtk_css_matcher_get_parent (GtkCssMatcher *matcher,
|
||||||
const char *name);
|
const GtkCssMatcher *child)
|
||||||
gboolean _gtk_css_matcher_has_class (const GtkCssMatcher *matcher,
|
{
|
||||||
const char *class_name);
|
return child->klass->get_parent (matcher, child);
|
||||||
gboolean _gtk_css_matcher_has_id (const GtkCssMatcher *matcher,
|
}
|
||||||
const char *id);
|
|
||||||
gboolean _gtk_css_matcher_has_regions (const GtkCssMatcher *matcher);
|
static inline gboolean
|
||||||
gboolean _gtk_css_matcher_has_region (const GtkCssMatcher *matcher,
|
_gtk_css_matcher_get_previous (GtkCssMatcher *matcher,
|
||||||
|
const GtkCssMatcher *next)
|
||||||
|
{
|
||||||
|
return next->klass->get_previous (matcher, next);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline GtkStateFlags
|
||||||
|
_gtk_css_matcher_get_state (const GtkCssMatcher *matcher)
|
||||||
|
{
|
||||||
|
return matcher->klass->get_state (matcher);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline gboolean
|
||||||
|
_gtk_css_matcher_has_name (const GtkCssMatcher *matcher,
|
||||||
|
const char *name)
|
||||||
|
{
|
||||||
|
return matcher->klass->has_name (matcher, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline gboolean
|
||||||
|
_gtk_css_matcher_has_class (const GtkCssMatcher *matcher,
|
||||||
|
const char *class_name)
|
||||||
|
{
|
||||||
|
return matcher->klass->has_class (matcher, class_name);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline gboolean
|
||||||
|
_gtk_css_matcher_has_id (const GtkCssMatcher *matcher,
|
||||||
|
const char *id)
|
||||||
|
{
|
||||||
|
return matcher->klass->has_id (matcher, id);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static inline gboolean
|
||||||
|
_gtk_css_matcher_has_regions (const GtkCssMatcher *matcher)
|
||||||
|
{
|
||||||
|
return matcher->klass->has_regions (matcher);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline gboolean
|
||||||
|
_gtk_css_matcher_has_region (const GtkCssMatcher *matcher,
|
||||||
const char *region,
|
const char *region,
|
||||||
GtkRegionFlags flags);
|
GtkRegionFlags flags)
|
||||||
guint _gtk_css_matcher_get_sibling_index
|
{
|
||||||
(const GtkCssMatcher *matcher);
|
return matcher->klass->has_region (matcher, region, flags);
|
||||||
guint _gtk_css_matcher_get_n_siblings (const GtkCssMatcher *matcher);
|
}
|
||||||
|
|
||||||
|
static inline guint
|
||||||
|
_gtk_css_matcher_get_sibling_index (const GtkCssMatcher *matcher)
|
||||||
|
{
|
||||||
|
return matcher->klass->get_sibling_index (matcher);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline guint
|
||||||
|
_gtk_css_matcher_get_n_siblings (const GtkCssMatcher *matcher)
|
||||||
|
{
|
||||||
|
return matcher->klass->get_n_siblings (matcher);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user