Skip to content

Commit 8bf1b19

Browse files
committed
Add GType for SugarEvent,SugarSwipe controllers
1 parent bd9616e commit 8bf1b19

File tree

4 files changed

+62
-0
lines changed

4 files changed

+62
-0
lines changed

src/sugar3/event-controller/sugar-event-controller.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include "sugar-event-controller.h"
2323
#include "sugar-enum-types.h"
24+
#include <glib-object.h>
2425

2526
typedef struct _SugarControllerItem SugarControllerItem;
2627
typedef struct _SugarControllerWidgetData SugarControllerWidgetData;
@@ -52,6 +53,24 @@ struct _SugarControllerWidgetData
5253
SugarEventController *current_exclusive;
5354
};
5455

56+
GType sugar_event_controller_state_get_type(void) {
57+
static GType etype = 0;
58+
static const GEnumValue values[] = {
59+
{SUGAR_EVENT_CONTROLLER_STATE_NONE, "SUGAR_EVENT_CONTROLLER_STATE_NONE", "none"},
60+
{SUGAR_EVENT_CONTROLLER_STATE_COLLECTING, "SUGAR_EVENT_CONTROLLER_STATE_COLLECTING", "collecting"},
61+
{SUGAR_EVENT_CONTROLLER_STATE_RECOGNIZED, "SUGAR_EVENT_CONTROLLER_STATE_RECOGNIZED", "recognized"},
62+
{SUGAR_EVENT_CONTROLLER_STATE_NOT_RECOGNIZED, "SUGAR_EVENT_CONTROLLER_STATE_NOT_RECOGNIZED", "not-recognized"},
63+
{0, NULL, NULL}
64+
};
65+
66+
if (etype == 0) {
67+
etype = g_enum_register_static("SugarEventControllerState", values);
68+
}
69+
70+
return etype;
71+
}
72+
73+
5574
G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (SugarEventController,
5675
sugar_event_controller,
5776
G_TYPE_OBJECT)

src/sugar3/event-controller/sugar-event-controller.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ G_BEGIN_DECLS
3636
#define SUGAR_IS_EVENT_CONTROLLER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SUGAR_TYPE_EVENT_CONTROLLER))
3737
#define SUGAR_IS_EVENT_CONTROLLER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SUGAR_TYPE_EVENT_CONTROLLER))
3838
#define SUGAR_EVENT_CONTROLLER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), SUGAR_TYPE_EVENT_CONTROLLER, SugarEventControllerClass))
39+
#define SUGAR_TYPE_EVENT_CONTROLLER_STATE (sugar_event_controller_state_get_type())
3940

4041
typedef struct _SugarEventController SugarEventController;
4142
typedef struct _SugarEventControllerClass SugarEventControllerClass;
@@ -82,6 +83,7 @@ struct _SugarEventControllerPrivate
8283
};
8384

8485
GType sugar_event_controller_get_type (void) G_GNUC_CONST;
86+
GType sugar_event_controller_state_get_type(void) G_GNUC_CONST;
8587
gboolean sugar_event_controller_handle_event (SugarEventController *controller,
8688
GdkEvent *event);
8789
gboolean sugar_event_controller_attach (SugarEventController *controller,

src/sugar3/event-controller/sugar-swipe-controller.c

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
#include "sugar-swipe-controller.h"
2323
#include "sugar-enum-types.h"
24+
#include <glib-object.h>
25+
2426

2527
#define CHECK_TIME 100
2628
#define SWIPE_PX_THRESHOLD 80
@@ -46,6 +48,40 @@ struct _SugarEventData
4648

4749
static guint signals[LAST_SIGNAL] = { 0 };
4850

51+
GType sugar_swipe_direction_get_type(void) {
52+
static GType etype = 0;
53+
static const GEnumValue values[] = {
54+
{SUGAR_SWIPE_DIRECTION_LEFT, "SUGAR_SWIPE_DIRECTION_LEFT", "left"},
55+
{SUGAR_SWIPE_DIRECTION_RIGHT, "SUGAR_SWIPE_DIRECTION_RIGHT", "right"},
56+
{SUGAR_SWIPE_DIRECTION_UP, "SUGAR_SWIPE_DIRECTION_UP", "up"},
57+
{SUGAR_SWIPE_DIRECTION_DOWN, "SUGAR_SWIPE_DIRECTION_DOWN", "down"},
58+
{0, NULL, NULL}
59+
};
60+
61+
if (etype == 0) {
62+
etype = g_enum_register_static("SugarSwipeDirection", values);
63+
}
64+
65+
return etype;
66+
}
67+
68+
GType sugar_swipe_direction_flags_get_type(void) {
69+
static GType etype = 0;
70+
static const GFlagsValue values[] = {
71+
{SUGAR_SWIPE_DIRECTION_FLAG_LEFT, "SUGAR_SWIPE_DIRECTION_FLAG_LEFT", "left"},
72+
{SUGAR_SWIPE_DIRECTION_FLAG_RIGHT, "SUGAR_SWIPE_DIRECTION_FLAG_RIGHT", "right"},
73+
{SUGAR_SWIPE_DIRECTION_FLAG_UP, "SUGAR_SWIPE_DIRECTION_FLAG_UP", "up"},
74+
{SUGAR_SWIPE_DIRECTION_FLAG_DOWN, "SUGAR_SWIPE_DIRECTION_FLAG_DOWN", "down"},
75+
{0, NULL, NULL}
76+
};
77+
78+
if (etype == 0) {
79+
etype = g_flags_register_static("SugarSwipeDirectionFlags", values);
80+
}
81+
82+
return etype;
83+
}
84+
4985
G_DEFINE_TYPE_WITH_PRIVATE (SugarSwipeController,
5086
sugar_swipe_controller,
5187
SUGAR_TYPE_EVENT_CONTROLLER)

src/sugar3/event-controller/sugar-swipe-controller.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ G_BEGIN_DECLS
3737
#define SUGAR_IS_SWIPE_CONTROLLER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SUGAR_TYPE_SWIPE_CONTROLLER))
3838
#define SUGAR_IS_SWIPE_CONTROLLER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SUGAR_TYPE_SWIPE_CONTROLLER))
3939
#define SUGAR_SWIPE_CONTROLLER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), SUGAR_TYPE_SWIPE_CONTROLLER, SugarSwipeControllerClass))
40+
#define SUGAR_TYPE_SWIPE_DIRECTION (sugar_swipe_direction_get_type())
41+
#define SUGAR_TYPE_SWIPE_DIRECTION_FLAGS (sugar_swipe_direction_flags_get_type())
42+
4043

4144
typedef struct _SugarSwipeController SugarSwipeController;
4245
typedef struct _SugarSwipeControllerClass SugarSwipeControllerClass;
@@ -81,6 +84,8 @@ struct _SugarSwipeControllerPrivate
8184
};
8285

8386
GType sugar_swipe_controller_get_type (void) G_GNUC_CONST;
87+
GType sugar_swipe_direction_get_type(void) G_GNUC_CONST;
88+
GType sugar_swipe_direction_flags_get_type(void) G_GNUC_CONST;
8489
SugarEventController * sugar_swipe_controller_new (SugarSwipeDirectionFlags directions);
8590

8691
G_END_DECLS

0 commit comments

Comments
 (0)