aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md1
-rw-r--r--backend/x11/backend.c33
-rw-r--r--backend/x11/input_device.c138
-rw-r--r--backend/x11/meson.build11
-rw-r--r--backend/x11/output.c8
-rw-r--r--include/backend/x11.h8
-rw-r--r--include/wlr/config.h.in1
-rw-r--r--meson.build1
-rw-r--r--meson_options.txt1
9 files changed, 14 insertions, 188 deletions
diff --git a/README.md b/README.md
index 9357cc59..a2fca488 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,6 @@ If you choose to enable X11 support:
* x11-xcb
* xcb-errors (optional, for improved error reporting)
* x11-icccm (optional, for improved Xwayland introspection)
-* xcb-xkb (optional, for improved keyboard handling on the X11 backend)
Run these commands:
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index d4e228b1..ce747976 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -13,9 +13,6 @@
#include <wayland-server.h>
#include <xcb/xcb.h>
#include <xcb/xinput.h>
-#if WLR_HAS_XCB_XKB
-#include <xcb/xkb.h>
-#endif
#include <wlr/backend/interface.h>
#include <wlr/backend/x11.h>
@@ -42,8 +39,6 @@ struct wlr_x11_output *get_x11_output_from_window_id(
static void handle_x11_event(struct wlr_x11_backend *x11,
xcb_generic_event_t *event) {
- handle_x11_input_event(x11, event);
-
switch (event->response_type & XCB_EVENT_RESPONSE_TYPE_MASK) {
case XCB_EXPOSE: {
xcb_expose_event_t *ev = (xcb_expose_event_t *)event;
@@ -120,34 +115,6 @@ static bool backend_start(struct wlr_backend *backend) {
0, 0);
xcb_free_pixmap(x11->xcb, pix);
-#if WLR_HAS_XCB_XKB
- const xcb_query_extension_reply_t *reply =
- xcb_get_extension_data(x11->xcb, &xcb_xkb_id);
- if (reply != NULL && reply->present) {
- x11->xkb_base_event = reply->first_event;
- x11->xkb_base_error = reply->first_error;
-
- xcb_xkb_use_extension_cookie_t cookie = xcb_xkb_use_extension(
- x11->xcb, XCB_XKB_MAJOR_VERSION, XCB_XKB_MINOR_VERSION);
- xcb_xkb_use_extension_reply_t *reply =
- xcb_xkb_use_extension_reply(x11->xcb, cookie, NULL);
- if (reply != NULL && reply->supported) {
- x11->xkb_supported = true;
-
- xcb_xkb_select_events(x11->xcb,
- XCB_XKB_ID_USE_CORE_KBD,
- XCB_XKB_EVENT_TYPE_STATE_NOTIFY,
- 0,
- XCB_XKB_EVENT_TYPE_STATE_NOTIFY,
- 0,
- 0,
- 0);
-
- free(reply);
- }
- }
-#endif
-
wlr_signal_emit_safe(&x11->backend.events.new_input, &x11->keyboard_dev);
for (size_t i = 0; i < x11->requested_outputs; ++i) {
diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c
index 6a0de1e8..08d982e6 100644
--- a/backend/x11/input_device.c
+++ b/backend/x11/input_device.c
@@ -10,9 +10,6 @@
#include <xcb/xcb.h>
#include <xcb/xinput.h>
-#if WLR_HAS_XCB_XKB
-#include <xcb/xkb.h>
-#endif
#include <wlr/interfaces/wlr_input_device.h>
#include <wlr/interfaces/wlr_keyboard.h>
@@ -22,126 +19,6 @@
#include "backend/x11.h"
#include "util/signal.h"
-static uint32_t xcb_button_to_wl(uint32_t button) {
- switch (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;
- case XCB_BUTTON_INDEX_4: return BTN_GEAR_UP;
- case XCB_BUTTON_INDEX_5: return BTN_GEAR_DOWN;
- default: return 0;
- }
-}
-
-static void x11_handle_pointer_position(struct wlr_x11_output *output,
- int16_t x, int16_t y, xcb_timestamp_t time) {
- struct wlr_x11_backend *x11 = output->x11;
- struct wlr_output *wlr_output = &output->wlr_output;
- struct wlr_event_pointer_motion_absolute event = {
- .device = &output->pointer_dev,
- .time_msec = time,
- .x = (double)x / wlr_output->width,
- .y = (double)y / wlr_output->height,
- };
- wlr_signal_emit_safe(&output->pointer.events.motion_absolute, &event);
-
- x11->time = time;
-}
-
-void handle_x11_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:
- case XCB_KEY_RELEASE: {
- xcb_key_press_event_t *ev = (xcb_key_press_event_t *)event;
- struct wlr_event_keyboard_key key = {
- .time_msec = ev->time,
- .keycode = ev->detail - 8,
- .state = event->response_type == XCB_KEY_PRESS ?
- WLR_KEY_PRESSED : WLR_KEY_RELEASED,
- .update_state = true,
- };
-
- // TODO use xcb-xkb for more precise modifiers state?
- wlr_keyboard_notify_key(&x11->keyboard, &key);
- x11->time = ev->time;
- return;
- }
- case XCB_BUTTON_PRESS: {
- xcb_button_press_event_t *ev = (xcb_button_press_event_t *)event;
-
- struct wlr_x11_output *output =
- get_x11_output_from_window_id(x11, ev->event);
- if (output == NULL) {
- break;
- }
-
- if (ev->detail == XCB_BUTTON_INDEX_4 ||
- ev->detail == XCB_BUTTON_INDEX_5) {
- int32_t delta_discrete = ev->detail == XCB_BUTTON_INDEX_4 ? -1 : 1;
- struct wlr_event_pointer_axis axis = {
- .device = &output->pointer_dev,
- .time_msec = ev->time,
- .source = WLR_AXIS_SOURCE_WHEEL,
- .orientation = WLR_AXIS_ORIENTATION_VERTICAL,
- // 15 is a typical value libinput sends for one scroll
- .delta = delta_discrete * 15,
- .delta_discrete = delta_discrete,
- };
- wlr_signal_emit_safe(&output->pointer.events.axis, &axis);
- x11->time = ev->time;
- break;
- }
- }
- /* fallthrough */
- case XCB_BUTTON_RELEASE: {
- xcb_button_press_event_t *ev = (xcb_button_press_event_t *)event;
-
- struct wlr_x11_output *output =
- get_x11_output_from_window_id(x11, ev->event);
- if (output == NULL) {
- break;
- }
-
- if (ev->detail != XCB_BUTTON_INDEX_4 &&
- ev->detail != XCB_BUTTON_INDEX_5) {
- struct wlr_event_pointer_button button = {
- .device = &output->pointer_dev,
- .time_msec = ev->time,
- .button = xcb_button_to_wl(ev->detail),
- .state = event->response_type == XCB_BUTTON_PRESS ?
- WLR_BUTTON_PRESSED : WLR_BUTTON_RELEASED,
- };
-
- wlr_signal_emit_safe(&output->pointer.events.button, &button);
- }
- x11->time = ev->time;
- return;
- }
- case XCB_MOTION_NOTIFY: {
- xcb_motion_notify_event_t *ev = (xcb_motion_notify_event_t *)event;
-
- struct wlr_x11_output *output =
- get_x11_output_from_window_id(x11, ev->event);
- if (output != NULL) {
- x11_handle_pointer_position(output, ev->event_x, ev->event_y, ev->time);
- }
- return;
- }
- default:
-#if WLR_HAS_XCB_XKB
- if (x11->xkb_supported && event->response_type == x11->xkb_base_event) {
- xcb_xkb_state_notify_event_t *ev =
- (xcb_xkb_state_notify_event_t *)event;
- wlr_keyboard_notify_modifiers(&x11->keyboard, ev->baseMods,
- ev->latchedMods, ev->lockedMods, ev->lockedGroup);
- return;
- }
-#endif
- break;
- }
-}
-
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 = {
@@ -178,6 +55,17 @@ static void send_axis_event(struct wlr_x11_output *output, int32_t delta,
wlr_signal_emit_safe(&output->pointer.events.axis, &ev);
}
+static void send_pointer_position_event(struct wlr_x11_output *output,
+ int16_t x, int16_t y, xcb_timestamp_t time) {
+ struct wlr_event_pointer_motion_absolute ev = {
+ .device = &output->pointer_dev,
+ .time_msec = time,
+ .x = (double)x / output->wlr_output.width,
+ .y = (double)y / output->wlr_output.height,
+ };
+ wlr_signal_emit_safe(&output->pointer.events.motion_absolute, &ev);
+}
+
void handle_x11_xinput_event(struct wlr_x11_backend *x11,
xcb_ge_generic_event_t *event) {
struct wlr_x11_output *output;
@@ -271,7 +159,7 @@ void handle_x11_xinput_event(struct wlr_x11_backend *x11,
return;
}
- x11_handle_pointer_position(output, ev->event_x >> 16,
+ send_pointer_position_event(output, ev->event_x >> 16,
ev->event_y >> 16, ev->time);
x11->time = ev->time;
break;
@@ -315,7 +203,7 @@ void update_x11_pointer_position(struct wlr_x11_output *output,
return;
}
- x11_handle_pointer_position(output, reply->win_x, reply->win_y, time);
+ send_pointer_position_event(output, reply->win_x, reply->win_y, time);
free(reply);
}
diff --git a/backend/x11/meson.build b/backend/x11/meson.build
index 04111a13..d9fd8d91 100644
--- a/backend/x11/meson.build
+++ b/backend/x11/meson.build
@@ -4,9 +4,6 @@ x11_required = [
'xcb',
'xcb-xinput',
]
-x11_optional = [
- 'xcb-xkb',
-]
foreach lib : x11_required
dep = dependency(lib, required: get_option('x11-backend'))
@@ -17,14 +14,6 @@ foreach lib : x11_required
x11_libs += dep
endforeach
-foreach lib : x11_optional
- dep = dependency(lib, required: get_option(lib))
- if dep.found()
- x11_libs += dep
- conf_data.set10('WLR_HAS_' + lib.underscorify().to_upper(), true)
- endif
-endforeach
-
lib_wlr_backend_x11 = static_library(
'wlr_backend_x11',
files(
diff --git a/backend/x11/output.c b/backend/x11/output.c
index 3acb41fd..ba70d5cb 100644
--- a/backend/x11/output.c
+++ b/backend/x11/output.c
@@ -152,18 +152,13 @@ struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) {
uint32_t mask = XCB_CW_EVENT_MASK;
uint32_t values[] = {
- XCB_EVENT_MASK_EXPOSURE |
- XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE |
- XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE |
- XCB_EVENT_MASK_POINTER_MOTION |
- XCB_EVENT_MASK_STRUCTURE_NOTIFY
+ XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_STRUCTURE_NOTIFY
};
output->win = xcb_generate_id(x11->xcb);
xcb_create_window(x11->xcb, XCB_COPY_FROM_PARENT, output->win,
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;
@@ -176,7 +171,6 @@ struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) {
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) {
diff --git a/include/backend/x11.h b/include/backend/x11.h
index ac0930b6..94de129f 100644
--- a/include/backend/x11.h
+++ b/include/backend/x11.h
@@ -69,12 +69,6 @@ struct wlr_x11_backend {
uint8_t xinput_opcode;
-#if WLR_HAS_XCB_XKB
- bool xkb_supported;
- uint8_t xkb_base_event;
- uint8_t xkb_base_error;
-#endif
-
struct wl_listener display_destroy;
};
@@ -87,8 +81,6 @@ extern const struct wlr_keyboard_impl keyboard_impl;
extern const struct wlr_pointer_impl pointer_impl;
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,
diff --git a/include/wlr/config.h.in b/include/wlr/config.h.in
index 17277c07..94273fac 100644
--- a/include/wlr/config.h.in
+++ b/include/wlr/config.h.in
@@ -12,6 +12,5 @@
#mesondefine WLR_HAS_XCB_ERRORS
#mesondefine WLR_HAS_XCB_ICCCM
-#mesondefine WLR_HAS_XCB_XKB
#endif
diff --git a/meson.build b/meson.build
index 7017e4b5..3d96d052 100644
--- a/meson.build
+++ b/meson.build
@@ -35,7 +35,6 @@ conf_data.set10('WLR_HAS_X11_BACKEND', false)
conf_data.set10('WLR_HAS_XWAYLAND', false)
conf_data.set10('WLR_HAS_XCB_ERRORS', false)
conf_data.set10('WLR_HAS_XCB_ICCCM', false)
-conf_data.set10('WLR_HAS_XCB_XKB', false)
wlr_inc = include_directories('.', 'include')
diff --git a/meson_options.txt b/meson_options.txt
index 360c6f6a..19a6cad7 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,7 +3,6 @@ option('logind', type: 'feature', value: 'auto', description: 'Enable support fo
option('logind-provider', type: 'combo', choices: ['systemd', 'elogind'], value: 'systemd', description: 'Provider of logind support library')
option('xcb-errors', type: 'feature', value: 'auto', description: 'Use xcb-errors util library')
option('xcb-icccm', type: 'feature', value: 'auto', description: 'Use xcb-icccm util library')
-option('xcb-xkb', type: 'feature', value: 'auto', description: 'Use xcb-xkb util library')
option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications')
option('x11-backend', type: 'feature', value: 'auto', description: 'Enable X11 backend')
option('rootston', type: 'boolean', value: true, description: 'Build the rootston example compositor')
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 10:29:38 +0000