diff options
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/drm/renderer.c | 3 | ||||
| -rw-r--r-- | backend/meson.build | 2 | ||||
| -rw-r--r-- | backend/x11/backend.c | 34 |
3 files changed, 28 insertions, 11 deletions
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c index c5840436..0d338490 100644 --- a/backend/drm/renderer.c +++ b/backend/drm/renderer.c @@ -14,6 +14,7 @@ #include <wlr/render/gles2.h> #include <wlr/render.h> #include "backend/drm/drm.h" +#include "render/glapi.h" bool wlr_drm_renderer_init(struct wlr_drm_backend *drm, struct wlr_drm_renderer *renderer) { @@ -191,7 +192,7 @@ static struct wlr_texture *get_tex_for_bo(struct wlr_drm_renderer *renderer, str EGL_NONE, }; - tex->img = renderer->egl.eglCreateImageKHR(renderer->egl.display, EGL_NO_CONTEXT, + tex->img = eglCreateImageKHR(renderer->egl.display, EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, NULL, attribs); if (!tex->img) { wlr_log(L_ERROR, "Failed to create EGL image: %s", egl_error()); diff --git a/backend/meson.build b/backend/meson.build index c5c73288..cf62a56f 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -38,5 +38,5 @@ lib_wlr_backend = static_library( 'wlr_backend', backend_files, include_directories: wlr_inc, - dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_protos], + dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos], ) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 2134536c..1eb5a952 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -62,16 +62,31 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e case XCB_BUTTON_PRESS: case XCB_BUTTON_RELEASE: { xcb_button_press_event_t *ev = (xcb_button_press_event_t *)event; - struct wlr_event_pointer_button button = { - .device = &x11->pointer_dev, - .time_sec = ev->time / 1000, - .time_usec = ev->time * 1000, - .button = xcb_button_to_wl(ev->detail), - .state = event->response_type == XCB_BUTTON_PRESS ? - WLR_BUTTON_PRESSED : WLR_BUTTON_RELEASED, - }; - wl_signal_emit(&x11->pointer.events.button, &button); + if (ev->detail == XCB_BUTTON_INDEX_4 || + ev->detail == XCB_BUTTON_INDEX_5) { + double delta = (ev->detail == XCB_BUTTON_INDEX_4 ? -15 : 15); + struct wlr_event_pointer_axis axis = { + .device = &x11->pointer_dev, + .time_sec = ev->time / 1000, + .time_usec = ev->time * 1000, + .source = WLR_AXIS_SOURCE_WHEEL, + .orientation = WLR_AXIS_ORIENTATION_VERTICAL, + .delta = delta, + }; + wl_signal_emit(&x11->pointer.events.axis, &axis); + } else { + struct wlr_event_pointer_button button = { + .device = &x11->pointer_dev, + .time_sec = ev->time / 1000, + .time_usec = ev->time * 1000, + .button = xcb_button_to_wl(ev->detail), + .state = event->response_type == XCB_BUTTON_PRESS ? + WLR_BUTTON_PRESSED : WLR_BUTTON_RELEASED, + }; + + wl_signal_emit(&x11->pointer.events.button, &button); + } x11->time = ev->time; break; } @@ -260,6 +275,7 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) { xcb_map_window(x11->xcb_conn, output->win); xcb_flush(x11->xcb_conn); + wlr_output_create_global(&output->wlr_output, x11->wl_display); wl_signal_emit(&x11->backend.events.output_add, output); wl_signal_emit(&x11->backend.events.input_add, &x11->keyboard_dev); |