blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add mouse button presses

This commit is contained in:
Scott Anderson 2017-09-28 21:47:12 +13:00
parent 8027232ae5
commit fc0e45f2ee
1 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
backend/x11/backend.c
View File

@ -7,6 +7,7 @@
#include <wayland-server.h>
#include <xcb/xcb.h>
#include <X11/Xlib-xcb.h>
#include <linux/input-event-codes.h>
#include <wlr/backend/interface.h>
#include <wlr/backend/x11.h>
#include <wlr/egl.h>
@ -64,6 +65,54 @@ int x11_event(int fd, uint32_t mask, void *data) {
wl_signal_emit(&x11->keyboard.events.key, &key);
break;
}
case XCB_BUTTON_PRESS: {
xcb_button_press_event_t *press = (xcb_button_press_event_t *)event;
struct wlr_event_pointer_button button = {
.device = &x11->pointer_dev,
.time_sec = ts.tv_sec,
.time_usec = ts.tv_nsec / 1000,
.state = WLR_BUTTON_PRESSED,
};
switch (press->detail) {
case XCB_BUTTON_INDEX_1:
button.button = BTN_LEFT;
break;
case XCB_BUTTON_INDEX_2:
button.button = BTN_MIDDLE;
break;
case XCB_BUTTON_INDEX_3:
button.button = BTN_RIGHT;
break;
}
wl_signal_emit(&x11->pointer.events.button, &button);
break;
}
case XCB_BUTTON_RELEASE: {
xcb_button_release_event_t *press = (xcb_button_release_event_t *)event;
struct wlr_event_pointer_button button = {
.device = &x11->pointer_dev,
.time_sec = ts.tv_sec,
.time_usec = ts.tv_nsec / 1000,
.state = WLR_BUTTON_RELEASED,
};
switch (press->detail) {
case XCB_BUTTON_INDEX_1:
button.button = BTN_LEFT;
break;
case XCB_BUTTON_INDEX_2:
button.button = BTN_MIDDLE;
break;
case XCB_BUTTON_INDEX_3:
button.button = BTN_RIGHT;
break;
}
wl_signal_emit(&x11->pointer.events.button, &button);
break;
}
default:
wlr_log(L_INFO, "Unknown event");
break;
@ -150,7 +199,9 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) {
uint32_t mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK;
uint32_t values[2] = {
x11->screen->white_pixel,
XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE
XCB_EVENT_MASK_EXPOSURE |
XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE |
XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE
};
output->x11 = x11;