mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-14 06:59:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wlr-keyboard: take out modifiers event struct (for now)

Browse source
This commit is contained in:
Tony Crisci 2017-11-09 17:29:28 -05:00
parent c680ace5e8
commit 739361aa70
9 changed files with 13 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

1
backend/libinput/keyboard.c
View file

@ -54,7 +54,6 @@ void handle_keyboard_key(struct libinput_event *event,
struct libinput_event_keyboard *kbevent =
libinput_event_get_keyboard_event(event);
struct wlr_event_keyboard_key wlr_event = { 0 };
wlr_event.device = wlr_dev;
wlr_event.time_msec =
usec_to_msec(libinput_event_keyboard_get_time_usec(kbevent));
wlr_event.keycode = libinput_event_keyboard_get_key(kbevent);

12
backend/wayland/wl_seat.c
View file

@ -151,7 +151,6 @@ static void keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard,
assert(dev && dev->keyboard);
struct wlr_event_keyboard_key wlr_event;
wlr_event.device = dev;
wlr_event.keycode = key;
wlr_event.state = state;
wlr_event.time_msec = time;
@ -163,15 +162,8 @@ static void keyboard_handle_modifiers(void *data, struct wl_keyboard *wl_keyboar
uint32_t mods_locked, uint32_t group) {
struct wlr_input_device *dev = data;
assert(dev && dev->keyboard);
struct wlr_event_keyboard_modifiers wlr_event;
wlr_event.device = dev;
wlr_event.keyboard = dev->keyboard;
wlr_event.mods_depressed = mods_depressed;
wlr_event.mods_latched = mods_latched;
wlr_event.mods_locked = mods_locked;
wlr_event.group = group;
wlr_keyboard_notify_modifiers(dev->keyboard, &wlr_event);
wlr_keyboard_notify_modifiers(dev->keyboard, mods_depressed, mods_latched,
mods_locked, group);
}
static void keyboard_handle_repeat_info(void *data, struct wl_keyboard *wl_keyboard,

1
backend/x11/backend.c
View file

@ -50,7 +50,6 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e
case XCB_KEY_RELEASE: {
xcb_key_press_event_t *ev = (xcb_key_press_event_t *)event;
struct wlr_event_keyboard_key key = {
.device = &x11->keyboard_dev,
.time_msec = ev->time,
.keycode = ev->detail - 8,
.state = event->response_type == XCB_KEY_PRESS ?