mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-04 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wl_keyboard: Add modifier event

Browse source 
This event sends the current keyboard modifier/group state from the
compositor to the client, allowing all clients to have a consistent view
of the keyboard state (e.g. current layout, Caps Lock, et al).  It
should be sent after a keyboard enter event, and also immediately after
any key event which changes the modifier state.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Daniel Stone 2012-05-30 16:31:47 +01:00 • committed by Kristian Høgsberg
parent f7a39ff69b
commit 9a1705c5f5
3 changed files with 34 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
protocol/wayland.xml
View file

@ -872,6 +872,19 @@
<arg name="key" type="uint"/> <arg name="key" type="uint"/>
<arg name="state" type="uint"/> <arg name="state" type="uint"/>
</event> </event>
<event name="modifiers">
<description summary="modifier and group state">
Notifies clients that the modifier and/or group state has
changed, and it should update its local state.
</description>
<arg name="serial" type="uint"/>
<arg name="mods_depressed" type="uint"/>
<arg name="mods_latched" type="uint"/>
<arg name="mods_locked" type="uint"/>
<arg name="group" type="uint"/>
</event>
</interface> </interface>
<interface name="wl_touch" version="1"> <interface name="wl_touch" version="1">

19
src/wayland-server.c
View file

@ -532,9 +532,26 @@ default_grab_key(struct wl_keyboard_grab *grab,
} }
} }
static void
default_grab_modifiers(struct wl_keyboard_grab *grab, uint32_t serial,
uint32_t mods_depressed, uint32_t mods_latched,
uint32_t mods_locked, uint32_t group)
{
struct wl_keyboard *keyboard = grab->keyboard;
struct wl_resource *resource;
resource = keyboard->focus_resource;
if (!resource)
return;
wl_keyboard_send_modifiers(resource, serial, mods_depressed,
mods_latched, mods_locked, group);
}
static const struct wl_keyboard_grab_interface static const struct wl_keyboard_grab_interface
default_keyboard_grab_interface = { default_keyboard_grab_interface = {
default_grab_key default_grab_key,
default_grab_modifiers,
}; };
WL_EXPORT void WL_EXPORT void

3
src/wayland-server.h
View file

@ -210,6 +210,9 @@ struct wl_keyboard_grab;
struct wl_keyboard_grab_interface { struct wl_keyboard_grab_interface {
void (*key)(struct wl_keyboard_grab *grab, uint32_t time, void (*key)(struct wl_keyboard_grab *grab, uint32_t time,
uint32_t key, uint32_t state); uint32_t key, uint32_t state);
void (*modifiers)(struct wl_keyboard_grab *grab, uint32_t serial,
uint32_t mods_depressed, uint32_t mods_latched,
uint32_t mods_locked, uint32_t group);
}; };
struct wl_keyboard_grab { struct wl_keyboard_grab {