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

wayland: Fetch keyboard event codes from ClutterEvents

Browse Source 
When running as a native compositor, we can just do that. However, the
previous code must stay for whenever it's run as a X11 client.

https://bugzilla.gnome.org/show_bug.cgi?id=758239
This commit is contained in:
Carlos Garnacho 2015-11-17 18:02:08 +01:00
parent 7309b20c25
commit 3078f70f90
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/wayland/meta-wayland-keyboard.c
View File

@ -56,11 +56,16 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <clutter/evdev/clutter-evdev.h>
#include "backends/meta-backend-private.h" #include "backends/meta-backend-private.h"
#include "meta-wayland-private.h" #include "meta-wayland-private.h"
#ifdef HAVE_NATIVE_BACKEND
#include "backends/native/meta-backend-native.h"
#endif
static void meta_wayland_keyboard_update_xkb_state (MetaWaylandKeyboard *keyboard); static void meta_wayland_keyboard_update_xkb_state (MetaWaylandKeyboard *keyboard);
static void notify_modifiers (MetaWaylandKeyboard *keyboard); static void notify_modifiers (MetaWaylandKeyboard *keyboard);
@ -452,6 +457,10 @@ meta_wayland_keyboard_handle_event (MetaWaylandKeyboard *keyboard,
{ {
gboolean is_press = event->type == CLUTTER_KEY_PRESS; gboolean is_press = event->type == CLUTTER_KEY_PRESS;
gboolean handled; gboolean handled;
guint32 code;
#ifdef HAVE_NATIVE_BACKEND
MetaBackend *backend = meta_get_backend ();
#endif
/* Synthetic key events are for autorepeat. Ignore those, as /* Synthetic key events are for autorepeat. Ignore those, as
* autorepeat in Wayland is done on the client side. */ * autorepeat in Wayland is done on the client side. */
@ -462,7 +471,14 @@ meta_wayland_keyboard_handle_event (MetaWaylandKeyboard *keyboard,
is_press ? "press" : "release", is_press ? "press" : "release",
event->hardware_keycode); event->hardware_keycode);
handled = notify_key (keyboard, event->time, evdev_code (event), is_press); #ifdef HAVE_NATIVE_BACKEND
if (META_IS_BACKEND_NATIVE (backend))
code = clutter_evdev_event_get_event_code ((const ClutterEvent *) event);
else
#endif
code = evdev_code (event);
handled = notify_key (keyboard, event->time, code, is_press);
if (handled) if (handled)
meta_verbose ("Sent event to wayland client\n"); meta_verbose ("Sent event to wayland client\n");