mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-14 09:25:57 +01:00
backend/x11: Add new Xinput events
This commit is contained in:
parent
88b2d6fe25
commit
d89e868cc9
3 changed files with 158 additions and 1 deletions
|
@ -9,6 +9,7 @@
|
|||
#endif
|
||||
|
||||
#include <xcb/xcb.h>
|
||||
#include <xcb/xinput.h>
|
||||
#if WLR_HAS_XCB_XKB
|
||||
#include <xcb/xkb.h>
|
||||
#endif
|
||||
|
@ -26,7 +27,6 @@ static uint32_t xcb_button_to_wl(uint32_t button) {
|
|||
case XCB_BUTTON_INDEX_1: return BTN_LEFT;
|
||||
case XCB_BUTTON_INDEX_2: return BTN_MIDDLE;
|
||||
case XCB_BUTTON_INDEX_3: return BTN_RIGHT;
|
||||
// XXX: I'm not sure the scroll-wheel direction is right
|
||||
case XCB_BUTTON_INDEX_4: return BTN_GEAR_UP;
|
||||
case XCB_BUTTON_INDEX_5: return BTN_GEAR_DOWN;
|
||||
default: return 0;
|
||||
|
@ -142,6 +142,143 @@ void handle_x11_input_event(struct wlr_x11_backend *x11,
|
|||
}
|
||||
}
|
||||
|
||||
static void send_key_event(struct wlr_x11_backend *x11, uint32_t key,
|
||||
enum wlr_key_state st, xcb_timestamp_t time) {
|
||||
struct wlr_event_keyboard_key ev = {
|
||||
.time_msec = time,
|
||||
.keycode = key,
|
||||
.state = st,
|
||||
.update_state = true,
|
||||
};
|
||||
wlr_keyboard_notify_key(&x11->keyboard, &ev);
|
||||
}
|
||||
|
||||
static void send_button_event(struct wlr_x11_output *output, uint32_t key,
|
||||
enum wlr_button_state st, xcb_timestamp_t time) {
|
||||
struct wlr_event_pointer_button ev = {
|
||||
.device = &output->pointer_dev,
|
||||
.time_msec = time,
|
||||
.button = key,
|
||||
.state = st,
|
||||
};
|
||||
wlr_signal_emit_safe(&output->pointer.events.button, &ev);
|
||||
}
|
||||
|
||||
static void send_axis_event(struct wlr_x11_output *output, int32_t delta,
|
||||
xcb_timestamp_t time) {
|
||||
struct wlr_event_pointer_axis ev = {
|
||||
.device = &output->pointer_dev,
|
||||
.time_msec = time,
|
||||
.source = WLR_AXIS_SOURCE_WHEEL,
|
||||
.orientation = WLR_AXIS_ORIENTATION_VERTICAL,
|
||||
// 15 is a typical value libinput sends for one scroll
|
||||
.delta = delta * 15,
|
||||
.delta_discrete = delta,
|
||||
};
|
||||
wlr_signal_emit_safe(&output->pointer.events.axis, &ev);
|
||||
}
|
||||
|
||||
void handle_x11_xinput_event(struct wlr_x11_backend *x11,
|
||||
xcb_ge_generic_event_t *event) {
|
||||
struct wlr_x11_output *output;
|
||||
|
||||
switch (event->event_type) {
|
||||
case XCB_INPUT_KEY_PRESS: {
|
||||
xcb_input_key_press_event_t *ev =
|
||||
(xcb_input_key_press_event_t *)event;
|
||||
|
||||
wlr_keyboard_notify_modifiers(&x11->keyboard, ev->mods.base,
|
||||
ev->mods.latched, ev->mods.locked, ev->mods.effective);
|
||||
send_key_event(x11, ev->detail - 8, WLR_KEY_PRESSED, ev->time);
|
||||
x11->time = ev->time;
|
||||
break;
|
||||
}
|
||||
case XCB_INPUT_KEY_RELEASE: {
|
||||
xcb_input_key_release_event_t *ev =
|
||||
(xcb_input_key_release_event_t *)event;
|
||||
|
||||
wlr_keyboard_notify_modifiers(&x11->keyboard, ev->mods.base,
|
||||
ev->mods.latched, ev->mods.locked, ev->mods.effective);
|
||||
send_key_event(x11, ev->detail - 8, WLR_KEY_RELEASED, ev->time);
|
||||
x11->time = ev->time;
|
||||
break;
|
||||
}
|
||||
case XCB_INPUT_BUTTON_PRESS: {
|
||||
xcb_input_button_press_event_t *ev =
|
||||
(xcb_input_button_press_event_t *)event;
|
||||
|
||||
output = get_x11_output_from_window_id(x11, ev->event);
|
||||
if (!output) {
|
||||
return;
|
||||
}
|
||||
|
||||
switch (ev->detail) {
|
||||
case XCB_BUTTON_INDEX_1:
|
||||
send_button_event(output, BTN_LEFT, WLR_BUTTON_PRESSED,
|
||||
ev->time);
|
||||
break;
|
||||
case XCB_BUTTON_INDEX_2:
|
||||
send_button_event(output, BTN_MIDDLE, WLR_BUTTON_PRESSED,
|
||||
ev->time);
|
||||
break;
|
||||
case XCB_BUTTON_INDEX_3:
|
||||
send_button_event(output, BTN_RIGHT, WLR_BUTTON_PRESSED,
|
||||
ev->time);
|
||||
break;
|
||||
case XCB_BUTTON_INDEX_4:
|
||||
send_axis_event(output, -1, ev->time);
|
||||
break;
|
||||
case XCB_BUTTON_INDEX_5:
|
||||
send_axis_event(output, 1, ev->time);
|
||||
break;
|
||||
}
|
||||
|
||||
x11->time = ev->time;
|
||||
break;
|
||||
}
|
||||
case XCB_INPUT_BUTTON_RELEASE: {
|
||||
xcb_input_button_release_event_t *ev =
|
||||
(xcb_input_button_release_event_t *)event;
|
||||
|
||||
output = get_x11_output_from_window_id(x11, ev->event);
|
||||
if (!output) {
|
||||
return;
|
||||
}
|
||||
|
||||
switch (ev->detail) {
|
||||
case XCB_BUTTON_INDEX_1:
|
||||
send_button_event(output, BTN_LEFT, WLR_BUTTON_RELEASED,
|
||||
ev->time);
|
||||
break;
|
||||
case XCB_BUTTON_INDEX_2:
|
||||
send_button_event(output, BTN_MIDDLE, WLR_BUTTON_RELEASED,
|
||||
ev->time);
|
||||
break;
|
||||
case XCB_BUTTON_INDEX_3:
|
||||
send_button_event(output, BTN_RIGHT, WLR_BUTTON_RELEASED,
|
||||
ev->time);
|
||||
break;
|
||||
}
|
||||
|
||||
x11->time = ev->time;
|
||||
break;
|
||||
}
|
||||
case XCB_INPUT_MOTION: {
|
||||
xcb_input_motion_event_t *ev = (xcb_input_motion_event_t *)event;
|
||||
|
||||
output = get_x11_output_from_window_id(x11, ev->event);
|
||||
if (!output) {
|
||||
return;
|
||||
}
|
||||
|
||||
x11_handle_pointer_position(output, ev->event_x >> 16,
|
||||
ev->event_y >> 16, ev->time);
|
||||
x11->time = ev->time;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void input_device_destroy(struct wlr_input_device *wlr_device) {
|
||||
// Don't free the input device, it's on the stack
|
||||
}
|
||||
|
|
|
@ -4,6 +4,9 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <xcb/xcb.h>
|
||||
#include <xcb/xinput.h>
|
||||
|
||||
#include <wlr/interfaces/wlr_output.h>
|
||||
#include <wlr/interfaces/wlr_pointer.h>
|
||||
#include <wlr/util/log.h>
|
||||
|
@ -160,6 +163,21 @@ struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) {
|
|||
x11->screen->root, 0, 0, wlr_output->width, wlr_output->height, 1,
|
||||
XCB_WINDOW_CLASS_INPUT_OUTPUT, x11->screen->root_visual, mask, values);
|
||||
|
||||
#if 0
|
||||
struct {
|
||||
xcb_input_event_mask_t head;
|
||||
xcb_input_xi_event_mask_t mask;
|
||||
} xinput_mask = {
|
||||
.head = { .deviceid = XCB_INPUT_DEVICE_ALL_MASTER, .mask_len = 1 },
|
||||
.mask = XCB_INPUT_XI_EVENT_MASK_KEY_PRESS |
|
||||
XCB_INPUT_XI_EVENT_MASK_KEY_RELEASE |
|
||||
XCB_INPUT_XI_EVENT_MASK_BUTTON_PRESS |
|
||||
XCB_INPUT_XI_EVENT_MASK_BUTTON_RELEASE |
|
||||
XCB_INPUT_XI_EVENT_MASK_MOTION,
|
||||
};
|
||||
xcb_input_xi_select_events(x11->xcb, output->win, 1, &xinput_mask.head);
|
||||
#endif
|
||||
|
||||
output->surf = wlr_egl_create_surface(&x11->egl, &output->win);
|
||||
if (!output->surf) {
|
||||
wlr_log(WLR_ERROR, "Failed to create EGL surface");
|
||||
|
|
|
@ -89,6 +89,8 @@ extern const struct wlr_input_device_impl input_device_impl;
|
|||
|
||||
void handle_x11_input_event(struct wlr_x11_backend *x11,
|
||||
xcb_generic_event_t *event);
|
||||
void handle_x11_xinput_event(struct wlr_x11_backend *x11,
|
||||
xcb_ge_generic_event_t *event);
|
||||
void update_x11_pointer_position(struct wlr_x11_output *output,
|
||||
xcb_timestamp_t time);
|
||||
|
||||
|
|
Loading…
Reference in a new issue