isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

display: Export the timestamp of the event as well

Browse Source 
When passing on keybindings, make sure to pass the timestamp
of the event as well as the deviceid and the action.

https://bugzilla.gnome.org/show_bug.cgi?id=704858
This commit is contained in:
Bastien Nocera 2013-07-25 14:13:27 +02:00
parent 90a3d613ca
commit 56fb8a81b3
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/display-private.h
View File

@ -460,7 +460,8 @@ void meta_display_remove_autoraise_callback (MetaDisplay *display);
void meta_display_overlay_key_activate (MetaDisplay *display); void meta_display_overlay_key_activate (MetaDisplay *display);
void meta_display_accelerator_activate (MetaDisplay *display, void meta_display_accelerator_activate (MetaDisplay *display,
guint action, guint action,
guint deviceid); guint deviceid,
guint timestamp);
gboolean meta_display_modifiers_accelerator_activate (MetaDisplay *display); gboolean meta_display_modifiers_accelerator_activate (MetaDisplay *display);
/* In above-tab-keycode.c */ /* In above-tab-keycode.c */

7
src/core/display.c
View File

@ -254,7 +254,7 @@ meta_display_class_init (MetaDisplayClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
0, 0,
NULL, NULL, NULL, NULL, NULL, NULL,
G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
/** /**
* MetaDisplay::modifiers-accelerator-activated: * MetaDisplay::modifiers-accelerator-activated:
@ -5892,10 +5892,11 @@ meta_display_overlay_key_activate (MetaDisplay *display)
void void
meta_display_accelerator_activate (MetaDisplay *display, meta_display_accelerator_activate (MetaDisplay *display,
guint action, guint action,
guint deviceid) guint deviceid,
guint timestamp)
{ {
g_signal_emit (display, display_signals[ACCELERATOR_ACTIVATED], g_signal_emit (display, display_signals[ACCELERATOR_ACTIVATED],
0, action, deviceid); 0, action, deviceid, timestamp);
} }
gboolean gboolean

2
src/core/keybindings.c
View File

@ -1312,7 +1312,7 @@ handle_external_grab (MetaDisplay *display,
guint action = meta_display_get_keybinding_action (display, guint action = meta_display_get_keybinding_action (display,
binding->keycode, binding->keycode,
binding->mask); binding->mask);
meta_display_accelerator_activate (display, action, event->deviceid); meta_display_accelerator_activate (display, action, event->deviceid, event->time);
} }