isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-16 21:34:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Clutter event structures to use the ModifierType enum

Browse Source
This commit is contained in:
Emmanuele Bassi 2007-06-11 09:02:40 +00:00
parent 32f04a6dc8
commit c22543be1f
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
clutter/clutter-event.h
View File

@ -114,7 +114,7 @@ struct _ClutterKeyEvent
{ {
ClutterEventType type; ClutterEventType type;
guint32 time; guint32 time;
guint modifier_state; ClutterModifierType modifier_state;
guint keyval; guint keyval;
guint16 hardware_keycode; guint16 hardware_keycode;
}; };
@ -125,7 +125,7 @@ struct _ClutterButtonEvent
guint32 time; guint32 time;
gint x; gint x;
gint y; gint y;
guint32 modifier_state; ClutterModifierType modifier_state;
guint32 button; guint32 button;
gdouble *axes; /* Future use */ gdouble *axes; /* Future use */
ClutterInputDevice *device; /* Future use */ ClutterInputDevice *device; /* Future use */
@ -137,7 +137,7 @@ struct _ClutterMotionEvent
guint32 time; guint32 time;
gint x; gint x;
gint y; gint y;
guint32 modifier_state; ClutterModifierType modifier_state;
gdouble *axes; /* Future use */ gdouble *axes; /* Future use */
ClutterInputDevice *device; /* Future use */ ClutterInputDevice *device; /* Future use */
}; };
@ -149,7 +149,7 @@ struct _ClutterScrollEvent
gint x; gint x;
gint y; gint y;
ClutterScrollDirection direction; ClutterScrollDirection direction;
guint32 modifier_state; ClutterModifierType modifier_state;
gdouble *axes; /* future use */ gdouble *axes; /* future use */
ClutterInputDevice *device; /* future use */ ClutterInputDevice *device; /* future use */
}; };
@ -175,19 +175,19 @@ union _ClutterEvent
GType clutter_event_get_type (void) G_GNUC_CONST; GType clutter_event_get_type (void) G_GNUC_CONST;
gboolean clutter_events_pending (void); gboolean clutter_events_pending (void);
ClutterEvent * clutter_event_get (void); ClutterEvent * clutter_event_get (void);
ClutterEvent * clutter_event_peek (void); ClutterEvent * clutter_event_peek (void);
void clutter_event_put (ClutterEvent *event); void clutter_event_put (ClutterEvent *event);
ClutterEvent * clutter_event_new (ClutterEventType type); ClutterEvent * clutter_event_new (ClutterEventType type);
ClutterEvent * clutter_event_copy (ClutterEvent *event); ClutterEvent * clutter_event_copy (ClutterEvent *event);
void clutter_event_free (ClutterEvent *event); void clutter_event_free (ClutterEvent *event);
ClutterEventType clutter_event_type (ClutterEvent *event); ClutterEventType clutter_event_type (ClutterEvent *event);
guint32 clutter_event_get_time (ClutterEvent *event); guint32 clutter_event_get_time (ClutterEvent *event);
guint clutter_event_get_state (ClutterEvent *event); ClutterModifierType clutter_event_get_state (ClutterEvent *event);
void clutter_event_get_coords (ClutterEvent *event, void clutter_event_get_coords (ClutterEvent *event,
gint *x, gint *x,
gint *y); gint *y);
guint clutter_key_event_symbol (ClutterKeyEvent *keyev); guint clutter_key_event_symbol (ClutterKeyEvent *keyev);
guint16 clutter_key_event_code (ClutterKeyEvent *keyev); guint16 clutter_key_event_code (ClutterKeyEvent *keyev);

2
clutter/glx/clutter-event-glx.c
View File

@ -242,7 +242,7 @@ translate_key_event (ClutterBackend *backend,
event->key.type = (xevent->xany.type == KeyPress) ? CLUTTER_KEY_PRESS event->key.type = (xevent->xany.type == KeyPress) ? CLUTTER_KEY_PRESS
: CLUTTER_KEY_RELEASE; : CLUTTER_KEY_RELEASE;
event->key.time = xevent->xkey.time; event->key.time = xevent->xkey.time;
event->key.modifier_state = xevent->xkey.state; /* FIXME: handle modifiers */ event->key.modifier_state = (ClutterModifierType) xevent->xkey.state;
event->key.hardware_keycode = xevent->xkey.keycode; event->key.hardware_keycode = xevent->xkey.keycode;
event->key.keyval = XKeycodeToKeysym (xevent->xkey.display, event->key.keyval = XKeycodeToKeysym (xevent->xkey.display,
xevent->xkey.keycode, xevent->xkey.keycode,