isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 19:10:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

core: Emit ::accelerator-activated with a ClutterInputDevice argument

Browse Source 
The device ID is kind of pointless on Wayland, so it might be better to
stick to something that works for both backends. Passing the device here
allows the higher layers to pick.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/676
This commit is contained in:
Carlos Garnacho 2019-07-08 11:42:06 +02:00 committed by Florian Müllner
parent 62f4e0501f
commit dd8c8e82f2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/display.c
View File

@ -257,7 +257,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, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); G_TYPE_NONE, 3, G_TYPE_UINT, CLUTTER_TYPE_INPUT_DEVICE, G_TYPE_UINT);
/** /**
* MetaDisplay::modifiers-accelerator-activated: * MetaDisplay::modifiers-accelerator-activated:
@ -2622,9 +2622,7 @@ meta_display_accelerator_activate (MetaDisplay *display,
ClutterKeyEvent *event) ClutterKeyEvent *event)
{ {
g_signal_emit (display, display_signals[ACCELERATOR_ACTIVATED], g_signal_emit (display, display_signals[ACCELERATOR_ACTIVATED],
0, action, 0, action, event->device, event->time);
clutter_input_device_get_device_id (event->device),
event->time);
} }
gboolean gboolean