diff options
author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-07-12 12:11:41 (GMT) |
---|---|---|
committer | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-07-12 12:11:41 (GMT) |
commit | 8d21a6d884641cebfbefca38bd0112521e5096a4 (patch) | |
tree | 5fd3454cff92e869083d537aafece4a959a694e7 | |
parent | d22e6908227e9b950165cf2dc29d436ed2667c27 (diff) |
Pass the event time in key events
-rw-r--r-- | src/sugar/sugar-key-grabber.c | 14 | ||||
-rw-r--r-- | src/sugar/sugar-marshal.list | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/sugar/sugar-key-grabber.c b/src/sugar/sugar-key-grabber.c index 65476ef..8139ce1 100644 --- a/src/sugar/sugar-key-grabber.c +++ b/src/sugar/sugar-key-grabber.c @@ -83,8 +83,9 @@ sugar_key_grabber_class_init(SugarKeyGrabberClass *grabber_class) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (SugarKeyGrabberClass, key_pressed), NULL, NULL, - sugar_marshal_BOOLEAN__UINT_UINT, - G_TYPE_BOOLEAN, 2, + sugar_marshal_BOOLEAN__UINT_UINT_UINT, + G_TYPE_BOOLEAN, 3, + G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); signals[KEY_RELEASED] = g_signal_new ("key-released", @@ -92,8 +93,9 @@ sugar_key_grabber_class_init(SugarKeyGrabberClass *grabber_class) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (SugarKeyGrabberClass, key_released), NULL, NULL, - sugar_marshal_BOOLEAN__UINT_UINT, - G_TYPE_BOOLEAN, 2, + sugar_marshal_BOOLEAN__UINT_UINT_UINT, + G_TYPE_BOOLEAN, 3, + G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); } @@ -123,7 +125,7 @@ filter_events(GdkXEvent *xevent, GdkEvent *event, gpointer data) if (xev->type == KeyRelease) { int return_value; g_signal_emit (grabber, signals[KEY_RELEASED], 0, xev->xkey.keycode, - xev->xkey.state, &return_value); + xev->xkey.state, xev->xkey.time, &return_value); if(return_value) return GDK_FILTER_REMOVE; } @@ -131,7 +133,7 @@ filter_events(GdkXEvent *xevent, GdkEvent *event, gpointer data) if (xev->type == KeyPress) { int return_value; g_signal_emit (grabber, signals[KEY_PRESSED], 0, xev->xkey.keycode, - xev->xkey.state, &return_value); + xev->xkey.state, xev->xkey.time, &return_value); if(return_value) return GDK_FILTER_REMOVE; } diff --git a/src/sugar/sugar-marshal.list b/src/sugar/sugar-marshal.list index 41ce620..cb5ec08 100644 --- a/src/sugar/sugar-marshal.list +++ b/src/sugar/sugar-marshal.list @@ -1 +1 @@ -BOOLEAN:UINT,UINT +BOOLEAN:UINT,UINT,UINT |