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

x11_handle_input_event: Remove return value 

handle_x11_event() and x11_handle_input_event() react to different kinds
of events, so it does not make much of a difference if
x11_handle_input_event() signals if it handled an event or not.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2018-04-15 10:33:53 +02:00
parent 3728abd1fc
commit 98f8ec6a08
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/x11/backend.c
View File

@ -67,9 +67,7 @@ void x11_output_layout_get_box(struct wlr_x11_backend *backend,
static void handle_x11_event(struct wlr_x11_backend *x11,
xcb_generic_event_t *event) {
if (x11_handle_input_event(x11, event)) {
return;
}
x11_handle_input_event(x11, event);
switch (event->response_type & XCB_EVENT_RESPONSE_TYPE_MASK) {
case XCB_EXPOSE: {

18
backend/x11/input_device.c
View File

@ -56,7 +56,7 @@ static void x11_handle_pointer_position(struct wlr_x11_output *output,
x11->time = time;
}
bool x11_handle_input_event(struct wlr_x11_backend *x11,
void x11_handle_input_event(struct wlr_x11_backend *x11,
xcb_generic_event_t *event) {
switch (event->response_type & XCB_EVENT_RESPONSE_TYPE_MASK) {
case XCB_KEY_PRESS:
@ -73,7 +73,7 @@ bool x11_handle_input_event(struct wlr_x11_backend *x11,
// TODO use xcb-xkb for more precise modifiers state?
wlr_keyboard_notify_key(&x11->keyboard, &key);
x11->time = ev->time;
return true;
return;
}
case XCB_BUTTON_PRESS: {
xcb_button_press_event_t *ev = (xcb_button_press_event_t *)event;
@ -110,19 +110,17 @@ bool x11_handle_input_event(struct wlr_x11_backend *x11,
wlr_signal_emit_safe(&x11->pointer.events.button, &button);
}
x11->time = ev->time;
return true;
return;
}
case XCB_MOTION_NOTIFY: {
xcb_motion_notify_event_t *ev = (xcb_motion_notify_event_t *)event;
struct wlr_x11_output *output =
x11_output_from_window_id(x11, ev->event);
if (output == NULL) {
return false;
if (output != NULL) {
x11_handle_pointer_position(output, ev->event_x, ev->event_y, ev->time);
}
x11_handle_pointer_position(output, ev->event_x, ev->event_y, ev->time);
return true;
return;
}
default:
#ifdef WLR_HAS_XCB_XKB
@ -131,13 +129,11 @@ bool x11_handle_input_event(struct wlr_x11_backend *x11,
(xcb_xkb_state_notify_event_t *)event;
wlr_keyboard_notify_modifiers(&x11->keyboard, ev->baseMods,
ev->latchedMods, ev->lockedMods, ev->lockedGroup);
return true;
return;
}
#endif
break;
}
return false;
}
const struct wlr_input_device_impl input_device_impl = { 0 };

2
include/backend/x11.h
View File

@ -79,7 +79,7 @@ void x11_output_layout_get_box(struct wlr_x11_backend *backend,
const struct wlr_input_device_impl input_device_impl;
bool x11_handle_input_event(struct wlr_x11_backend *x11,
void x11_handle_input_event(struct wlr_x11_backend *x11,
xcb_generic_event_t *event);
void x11_update_pointer_position(struct wlr_x11_output *output,
xcb_timestamp_t time);