From a598e6d026548ce7ab580504e05a71a5296b83f0 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Fri, 22 Sep 2017 14:58:41 +1200 Subject: [PATCH 01/17] Add X11 backend skeleton --- backend/backend.c | 7 ++++--- backend/meson.build | 1 + backend/x11/backend.c | 30 ++++++++++++++++++++++++++++++ include/backend/x11.h | 8 ++++++++ include/wlr/backend/x11.h | 11 +++++++++++ 5 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 backend/x11/backend.c create mode 100644 include/backend/x11.h create mode 100644 include/wlr/backend/x11.h diff --git a/backend/backend.c b/backend/backend.c index 88b9dfbc..21f342ad 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -77,9 +78,9 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) { } } - if (getenv("DISPLAY")) { - wlr_log(L_ERROR, "X11 backend is not implemented"); // TODO - return NULL; + const char *x11_display = getenv("DISPLAY"); + if (x11_display) { + return wlr_x11_backend_create(x11_display); } // Attempt DRM+libinput diff --git a/backend/meson.build b/backend/meson.build index a3cb7b64..9e3b6fed 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -22,6 +22,7 @@ backend_files = files( 'wayland/registry.c', 'wayland/wl_seat.c', 'wayland/os-compatibility.c', + 'x11/backend.c', ) if systemd.found() diff --git a/backend/x11/backend.c b/backend/x11/backend.c new file mode 100644 index 00000000..be022a7a --- /dev/null +++ b/backend/x11/backend.c @@ -0,0 +1,30 @@ +#include +#include +#include +#include +#include "backend/x11.h" + +struct wlr_backend *wlr_x11_backend_create(const char *display) { + return NULL; +} + +static bool wlr_x11_backend_start(struct wlr_backend *backend) { + return false; +} + +static void wlr_x11_backend_destroy(struct wlr_backend *backend) { +} + +struct wlr_egl *wlr_x11_backend_get_egl(struct wlr_backend *backend) { + return NULL; +} + +static struct wlr_backend_impl backend_impl = { + .start = wlr_x11_backend_start, + .destroy = wlr_x11_backend_destroy, + .get_egl = wlr_x11_backend_get_egl, +}; + +bool wlr_backend_is_x11(struct wlr_backend *backend) { + return backend->impl == &backend_impl; +} diff --git a/include/backend/x11.h b/include/backend/x11.h new file mode 100644 index 00000000..2f319672 --- /dev/null +++ b/include/backend/x11.h @@ -0,0 +1,8 @@ +#ifndef WLR_X11_H +#define WLR_X11_H + +struct wlr_x11_backend { + struct wlr_backend backend; +}; + +#endif diff --git a/include/wlr/backend/x11.h b/include/wlr/backend/x11.h new file mode 100644 index 00000000..28d027c5 --- /dev/null +++ b/include/wlr/backend/x11.h @@ -0,0 +1,11 @@ +#ifndef WLR_BACKEND_X11_H +#define WLR_BACKEND_X11_H + +#include +#include + +struct wlr_backend *wlr_x11_backend_create(const char *display); + +bool wlr_backend_is_x11(struct wlr_backend *backend); + +#endif From 7ad2a57feb4c7e4b191edfbaa68ff3a2fd703f9f Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Fri, 22 Sep 2017 16:00:27 +1200 Subject: [PATCH 02/17] Open X11 Window --- backend/backend.c | 2 +- backend/x11/backend.c | 101 +++++++++++++++++++++++++++++++++++--- include/backend/x11.h | 12 +++++ include/wlr/backend/x11.h | 6 ++- meson.build | 2 + 5 files changed, 114 insertions(+), 9 deletions(-) diff --git a/backend/backend.c b/backend/backend.c index 21f342ad..ec309da4 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -80,7 +80,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) { const char *x11_display = getenv("DISPLAY"); if (x11_display) { - return wlr_x11_backend_create(x11_display); + return wlr_x11_backend_create(display, x11_display); } // Attempt DRM+libinput diff --git a/backend/x11/backend.c b/backend/x11/backend.c index be022a7a..d02bd6eb 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -1,30 +1,119 @@ #include +#include +#include +#include +#include #include #include #include +#include #include "backend/x11.h" -struct wlr_backend *wlr_x11_backend_create(const char *display) { +static struct wlr_backend_impl backend_impl; + +int x11_event(int fd, uint32_t mask, void *data) { + struct wlr_x11_backend *x11 = data; + + xcb_generic_event_t *event = xcb_wait_for_event(x11->xcb_conn); + if (!event) { + return 0; + } + + switch (event->response_type) { + case XCB_EXPOSE: + break; + case XCB_KEY_PRESS: + break; + default: + wlr_log(L_INFO, "Unknown event"); + break; + } + + free(event); + return 0; +} + +struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, + const char *x11_display) { + struct wlr_x11_backend *x11 = calloc(1, sizeof(*x11)); + if (!x11) { + return NULL; + } + + wlr_backend_init(&x11->backend, &backend_impl); + + x11->xlib_conn = XOpenDisplay(x11_display); + if (!x11->xlib_conn) { + wlr_log(L_ERROR, "Failed to open X connection"); + return NULL; + } + + x11->xcb_conn = XGetXCBConnection(x11->xlib_conn); + if (!x11->xcb_conn || xcb_connection_has_error(x11->xcb_conn)) { + wlr_log(L_ERROR, "Failed to open xcb connection"); + goto error; + } + + int fd = xcb_get_file_descriptor(x11->xcb_conn); + struct wl_event_loop *ev = wl_display_get_event_loop(display); + x11->event_source = wl_event_loop_add_fd(ev, fd, WL_EVENT_READABLE, x11_event, x11); + if (!x11->event_source) { + wlr_log(L_ERROR, "Could not create event source"); + goto error; + } + + return &x11->backend; + +error: + xcb_disconnect(x11->xcb_conn); + XCloseDisplay(x11->xlib_conn); + free(x11); return NULL; } static bool wlr_x11_backend_start(struct wlr_backend *backend) { - return false; + struct wlr_x11_backend *x11 = (struct wlr_x11_backend *)backend; + + xcb_screen_t *screen = xcb_setup_roots_iterator(xcb_get_setup(x11->xcb_conn)).data; + uint32_t mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK; + uint32_t values[2] = { + screen->white_pixel, + XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_KEY_PRESS + }; + + x11->win = xcb_generate_id(x11->xcb_conn); + + xcb_create_window(x11->xcb_conn, XCB_COPY_FROM_PARENT, x11->win, screen->root, + 0, 0, 1024, 768, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, + screen->root_visual, mask, values); + + xcb_map_window(x11->xcb_conn, x11->win); + xcb_flush(x11->xcb_conn); + + return true; } static void wlr_x11_backend_destroy(struct wlr_backend *backend) { + if (!backend) { + return; + } + + struct wlr_x11_backend *x11 = (struct wlr_x11_backend *)backend; + + xcb_disconnect(x11->xcb_conn); + free(x11); } struct wlr_egl *wlr_x11_backend_get_egl(struct wlr_backend *backend) { return NULL; } +bool wlr_backend_is_x11(struct wlr_backend *backend) { + return backend->impl == &backend_impl; +} + static struct wlr_backend_impl backend_impl = { .start = wlr_x11_backend_start, .destroy = wlr_x11_backend_destroy, .get_egl = wlr_x11_backend_get_egl, }; - -bool wlr_backend_is_x11(struct wlr_backend *backend) { - return backend->impl == &backend_impl; -} diff --git a/include/backend/x11.h b/include/backend/x11.h index 2f319672..6ef86c8a 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -1,8 +1,20 @@ #ifndef WLR_X11_H #define WLR_X11_H +#include +#include +#include +#include + struct wlr_x11_backend { struct wlr_backend backend; + + Display *xlib_conn; + xcb_connection_t *xcb_conn; + xcb_window_t win; + + struct wlr_egl egl; + struct wl_event_source *event_source; }; #endif diff --git a/include/wlr/backend/x11.h b/include/wlr/backend/x11.h index 28d027c5..3901649b 100644 --- a/include/wlr/backend/x11.h +++ b/include/wlr/backend/x11.h @@ -1,10 +1,12 @@ #ifndef WLR_BACKEND_X11_H #define WLR_BACKEND_X11_H -#include #include +#include +#include -struct wlr_backend *wlr_x11_backend_create(const char *display); +struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, + const char *x11_display); bool wlr_backend_is_x11(struct wlr_backend *backend); diff --git a/meson.build b/meson.build index c0fb50e1..520eceb9 100644 --- a/meson.build +++ b/meson.build @@ -45,6 +45,7 @@ udev = dependency('libudev') pixman = dependency('pixman-1') xcb = dependency('xcb') xcb_composite = dependency('xcb-composite') +x11_xcb = dependency('x11-xcb') libcap = dependency('libcap', required: false) systemd = dependency('libsystemd', required: false) elogind = dependency('libelogind', required: false) @@ -85,6 +86,7 @@ wlr_deps = [ pixman, xcb, xcb_composite, + x11_xcb, libcap, systemd, math, From 517ba0bc168d9968891e8ec0ca595e26ced535bf Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Tue, 26 Sep 2017 14:57:23 +1300 Subject: [PATCH 03/17] Change egl_get_config to always use visual id --- backend/drm/drm.c | 3 ++- backend/wayland/backend.c | 3 ++- include/wlr/egl.h | 2 +- render/egl.c | 23 +++++++---------------- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 8e70e528..1a656172 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -182,7 +182,8 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd) { return false; } - if (!wlr_egl_init(&renderer->egl, EGL_PLATFORM_GBM_MESA, renderer->gbm)) { + if (!wlr_egl_init(&renderer->egl, EGL_PLATFORM_GBM_MESA, + GBM_FORMAT_ARGB8888, renderer->gbm)) { gbm_device_destroy(renderer->gbm); return false; } diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c index 264ce338..e57f3583 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -42,6 +42,7 @@ static bool wlr_wl_backend_start(struct wlr_backend *_backend) { } backend->started = true; + for (size_t i = 0; i < backend->requested_outputs; ++i) { wlr_wl_output_create(&backend->backend); } @@ -145,7 +146,7 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display) { return false; } - wlr_egl_init(&backend->egl, EGL_PLATFORM_WAYLAND_EXT, backend->remote_display); + wlr_egl_init(&backend->egl, EGL_PLATFORM_WAYLAND_EXT, WL_SHM_FORMAT_ARGB8888, backend->remote_display); wlr_egl_bind_display(&backend->egl, backend->local_display); return &backend->backend; diff --git a/include/wlr/egl.h b/include/wlr/egl.h index b37317a5..25329175 100644 --- a/include/wlr/egl.h +++ b/include/wlr/egl.h @@ -30,7 +30,7 @@ struct wlr_egl { * Initializes an egl context for the given platform and remote display. * Will attempt to load all possibly required api functions. */ -bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *display); +bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, EGLint visual_id, void *display); /** * Frees all related egl resources, makes the context not-current and diff --git a/render/egl.c b/render/egl.c index 048626ba..82dea50c 100644 --- a/render/egl.c +++ b/render/egl.c @@ -1,7 +1,6 @@ #include #include #include -#include // GBM_FORMAT_XRGB8888 #include #include #include @@ -68,7 +67,7 @@ static bool egl_exts(struct wlr_egl *egl) { return true; } -static bool egl_get_config(EGLDisplay disp, EGLConfig *out, EGLenum platform) { +static bool egl_get_config(EGLDisplay disp, EGLConfig *out, EGLint visual_id) { EGLint count = 0, matched = 0, ret; ret = eglGetConfigs(disp, NULL, 0, &count); @@ -86,21 +85,13 @@ static bool egl_get_config(EGLDisplay disp, EGLConfig *out, EGLenum platform) { } for (int i = 0; i < matched; ++i) { - EGLint gbm_format; - - if (platform == EGL_PLATFORM_WAYLAND_EXT) { - *out = configs[i]; - return true; - } - - if (!eglGetConfigAttrib(disp, - configs[i], - EGL_NATIVE_VISUAL_ID, - &gbm_format)) { + EGLint visual; + if (!eglGetConfigAttrib(disp, configs[i], + EGL_NATIVE_VISUAL_ID, &visual)) { continue; } - if (gbm_format == GBM_FORMAT_ARGB8888) { + if (visual == visual_id) { *out = configs[i]; return true; } @@ -110,7 +101,7 @@ static bool egl_get_config(EGLDisplay disp, EGLConfig *out, EGLenum platform) { return false; } -bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, +bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, EGLint visual_id, void *remote_display) { if (!egl_exts(egl)) { return false; @@ -133,7 +124,7 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, goto error; } - if (!egl_get_config(egl->display, &egl->config, platform)) { + if (!egl_get_config(egl->display, &egl->config, visual_id)) { wlr_log(L_ERROR, "Failed to get EGL config"); goto error; } From bbe90d41bbb52d96e08a79d6c18aad59bee38472 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Tue, 26 Sep 2017 15:16:25 +1300 Subject: [PATCH 04/17] Add EGL for X11 --- backend/x11/backend.c | 29 ++++++++++++++++++++--------- include/backend/x11.h | 1 + 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index d02bd6eb..b75f1f04 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -51,7 +51,7 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, x11->xcb_conn = XGetXCBConnection(x11->xlib_conn); if (!x11->xcb_conn || xcb_connection_has_error(x11->xcb_conn)) { wlr_log(L_ERROR, "Failed to open xcb connection"); - goto error; + goto error_x11; } int fd = xcb_get_file_descriptor(x11->xcb_conn); @@ -59,12 +59,21 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, x11->event_source = wl_event_loop_add_fd(ev, fd, WL_EVENT_READABLE, x11_event, x11); if (!x11->event_source) { wlr_log(L_ERROR, "Could not create event source"); - goto error; + goto error_x11; + } + + x11->screen = xcb_setup_roots_iterator(xcb_get_setup(x11->xcb_conn)).data; + + if (!wlr_egl_init(&x11->egl, EGL_PLATFORM_X11_KHR, + x11->screen->root_visual, x11->xlib_conn)) { + goto error_event; } return &x11->backend; -error: +error_event: + wl_event_source_remove(x11->event_source); +error_x11: xcb_disconnect(x11->xcb_conn); XCloseDisplay(x11->xlib_conn); free(x11); @@ -74,18 +83,17 @@ error: static bool wlr_x11_backend_start(struct wlr_backend *backend) { struct wlr_x11_backend *x11 = (struct wlr_x11_backend *)backend; - xcb_screen_t *screen = xcb_setup_roots_iterator(xcb_get_setup(x11->xcb_conn)).data; uint32_t mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK; uint32_t values[2] = { - screen->white_pixel, + x11->screen->white_pixel, XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_KEY_PRESS }; x11->win = xcb_generate_id(x11->xcb_conn); - xcb_create_window(x11->xcb_conn, XCB_COPY_FROM_PARENT, x11->win, screen->root, + xcb_create_window(x11->xcb_conn, XCB_COPY_FROM_PARENT, x11->win, x11->screen->root, 0, 0, 1024, 768, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, - screen->root_visual, mask, values); + x11->screen->root_visual, mask, values); xcb_map_window(x11->xcb_conn, x11->win); xcb_flush(x11->xcb_conn); @@ -100,12 +108,15 @@ static void wlr_x11_backend_destroy(struct wlr_backend *backend) { struct wlr_x11_backend *x11 = (struct wlr_x11_backend *)backend; + wlr_egl_free(&x11->egl); + xcb_disconnect(x11->xcb_conn); free(x11); } -struct wlr_egl *wlr_x11_backend_get_egl(struct wlr_backend *backend) { - return NULL; +static struct wlr_egl *wlr_x11_backend_get_egl(struct wlr_backend *backend) { + struct wlr_x11_backend *x11 = (struct wlr_x11_backend *)backend; + return &x11->egl; } bool wlr_backend_is_x11(struct wlr_backend *backend) { diff --git a/include/backend/x11.h b/include/backend/x11.h index 6ef86c8a..f169f725 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -11,6 +11,7 @@ struct wlr_x11_backend { Display *xlib_conn; xcb_connection_t *xcb_conn; + xcb_screen_t *screen; xcb_window_t win; struct wlr_egl egl; From 3a5b150df21ee5b330130754b970a65de224c0fc Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Tue, 26 Sep 2017 16:04:07 +1300 Subject: [PATCH 05/17] Basic rendering --- backend/x11/backend.c | 67 ++++++++++++++++++++++++++++++++++++++++--- include/backend/x11.h | 15 +++++++++- 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index b75f1f04..587e5fdb 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -1,11 +1,14 @@ #include +#include #include +#include +#include #include #include -#include #include #include #include +#include #include #include "backend/x11.h" @@ -20,7 +23,11 @@ int x11_event(int fd, uint32_t mask, void *data) { } switch (event->response_type) { + struct wlr_x11_output *output; + case XCB_EXPOSE: + output = &x11->output; + wl_signal_emit(&output->wlr_output.events.frame, output); break; case XCB_KEY_PRESS: break; @@ -80,8 +87,11 @@ error_x11: return NULL; } +static struct wlr_output_impl output_impl; + static bool wlr_x11_backend_start(struct wlr_backend *backend) { struct wlr_x11_backend *x11 = (struct wlr_x11_backend *)backend; + struct wlr_x11_output *output = &x11->output; uint32_t mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK; uint32_t values[2] = { @@ -89,15 +99,27 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) { XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_KEY_PRESS }; - x11->win = xcb_generate_id(x11->xcb_conn); + output->x11 = x11; + + wlr_output_init(&output->wlr_output, &output_impl); + snprintf(output->wlr_output.name, sizeof(output->wlr_output.name), "X11-1"); - xcb_create_window(x11->xcb_conn, XCB_COPY_FROM_PARENT, x11->win, x11->screen->root, + output->win = xcb_generate_id(x11->xcb_conn); + xcb_create_window(x11->xcb_conn, XCB_COPY_FROM_PARENT, output->win, x11->screen->root, 0, 0, 1024, 768, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, x11->screen->root_visual, mask, values); - xcb_map_window(x11->xcb_conn, x11->win); + output->surf = wlr_egl_create_surface(&x11->egl, &output->win); + if (!output->surf) { + wlr_log(L_ERROR, "Failed to create EGL surface"); + return false; + } + + xcb_map_window(x11->xcb_conn, output->win); xcb_flush(x11->xcb_conn); + wl_signal_emit(&x11->backend.events.output_add, output); + return true; } @@ -128,3 +150,40 @@ static struct wlr_backend_impl backend_impl = { .destroy = wlr_x11_backend_destroy, .get_egl = wlr_x11_backend_get_egl, }; + +static void output_transform(struct wlr_output *output, enum wl_output_transform transform) { + // TODO +} + +static void output_destroy(struct wlr_output *wlr_output) { + struct wlr_x11_output *output = (struct wlr_x11_output *)wlr_output; + struct wlr_x11_backend *x11 = output->x11; + + eglDestroySurface(x11->egl.display, output->surf); + xcb_destroy_window(x11->xcb_conn, output->win); +} + +static void output_make_current(struct wlr_output *wlr_output) { + struct wlr_x11_output *output = (struct wlr_x11_output *)wlr_output; + struct wlr_x11_backend *x11 = output->x11; + + if (!eglMakeCurrent(x11->egl.display, output->surf, output->surf, x11->egl.context)) { + wlr_log(L_ERROR, "eglMakeCurrent failed: %s", egl_error()); + } +} + +static void output_swap_buffers(struct wlr_output *wlr_output) { + struct wlr_x11_output *output = (struct wlr_x11_output *)wlr_output; + struct wlr_x11_backend *x11 = output->x11; + + if (!eglSwapBuffers(x11->egl.display, output->surf)) { + wlr_log(L_ERROR, "eglSwapBuffers failed: %s", egl_error()); + } +} + +static struct wlr_output_impl output_impl = { + .transform = output_transform, + .destroy = output_destroy, + .make_current = output_make_current, + .swap_buffers = output_swap_buffers, +}; diff --git a/include/backend/x11.h b/include/backend/x11.h index f169f725..eb46e77e 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -1,10 +1,22 @@ #ifndef WLR_X11_H #define WLR_X11_H +#include #include #include #include #include +#include + +struct wlr_x11_backend; + +struct wlr_x11_output { + struct wlr_output wlr_output; + struct wlr_x11_backend *x11; + + xcb_window_t win; + EGLSurface surf; +}; struct wlr_x11_backend { struct wlr_backend backend; @@ -12,7 +24,8 @@ struct wlr_x11_backend { Display *xlib_conn; xcb_connection_t *xcb_conn; xcb_screen_t *screen; - xcb_window_t win; + + struct wlr_x11_output output; struct wlr_egl egl; struct wl_event_source *event_source; From 9ca5b0cae86aaed18db6882eadf04c402550d755 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Wed, 27 Sep 2017 16:39:44 +1300 Subject: [PATCH 06/17] Add basic input --- backend/x11/backend.c | 78 +++++++++++++++++++++++++++++++++++++++++-- include/backend/x11.h | 7 ++++ 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 587e5fdb..23291bb7 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -1,6 +1,8 @@ +#define _POSIX_C_SOURCE 199309L #include #include #include +#include #include #include #include @@ -9,10 +11,16 @@ #include #include #include +#include +#include +#include #include #include "backend/x11.h" static struct wlr_backend_impl backend_impl; +static struct wlr_input_device_impl input_impl; +static struct wlr_keyboard_impl keyboard_impl; +static struct wlr_pointer_impl pointer_impl; int x11_event(int fd, uint32_t mask, void *data) { struct wlr_x11_backend *x11 = data; @@ -22,6 +30,9 @@ int x11_event(int fd, uint32_t mask, void *data) { return 0; } + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + switch (event->response_type) { struct wlr_x11_output *output; @@ -29,8 +40,30 @@ int x11_event(int fd, uint32_t mask, void *data) { output = &x11->output; wl_signal_emit(&output->wlr_output.events.frame, output); break; - case XCB_KEY_PRESS: + case XCB_KEY_PRESS: { + xcb_key_press_event_t *press = (xcb_key_press_event_t *)event; + struct wlr_event_keyboard_key key = { + .time_sec = ts.tv_sec, + .time_usec = ts.tv_nsec / 1000, + .keycode = press->detail, + .state = WLR_KEY_PRESSED, + }; + + wl_signal_emit(&x11->keyboard.events.key, &key); + break; + } + case XCB_KEY_RELEASE: { + xcb_key_release_event_t *press = (xcb_key_release_event_t *)event; + struct wlr_event_keyboard_key key = { + .time_sec = ts.tv_sec, + .time_usec = ts.tv_nsec / 1000, + .keycode = press->detail, + .state = WLR_KEY_RELEASED, + }; + + wl_signal_emit(&x11->keyboard.events.key, &key); break; + } default: wlr_log(L_INFO, "Unknown event"); break; @@ -76,6 +109,16 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, goto error_event; } + wlr_input_device_init(&x11->keyboard_dev, WLR_INPUT_DEVICE_KEYBOARD, + &input_impl, "X11 keyboard", 0, 0); + wlr_keyboard_init(&x11->keyboard, &keyboard_impl); + x11->keyboard_dev.keyboard = &x11->keyboard; + + wlr_input_device_init(&x11->pointer_dev, WLR_INPUT_DEVICE_POINTER, + &input_impl, "X11 pointer", 0, 0); + wlr_pointer_init(&x11->pointer, &pointer_impl); + x11->pointer_dev.pointer = &x11->pointer; + return &x11->backend; error_event: @@ -96,7 +139,7 @@ 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_EXPOSURE | XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE }; output->x11 = x11; @@ -119,6 +162,8 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) { xcb_flush(x11->xcb_conn); wl_signal_emit(&x11->backend.events.output_add, output); + wl_signal_emit(&x11->backend.events.input_add, &x11->keyboard_dev); + wl_signal_emit(&x11->backend.events.input_add, &x11->pointer_dev); return true; } @@ -187,3 +232,32 @@ static struct wlr_output_impl output_impl = { .make_current = output_make_current, .swap_buffers = output_swap_buffers, }; + +static void input_destroy(struct wlr_input_device *input_dev) { + // Do nothing +} + +static struct wlr_input_device_impl input_impl = { + .destroy = input_destroy, +}; + +static void keyboard_destroy(struct wlr_keyboard *keyboard) { + // Do nothing +} + +static void keyboard_led_update(struct wlr_keyboard *keyboard, uint32_t leds) { + // Do nothing +} + +static struct wlr_keyboard_impl keyboard_impl = { + .destroy = keyboard_destroy, + .led_update = keyboard_led_update, +}; + +static void pointer_destroy(struct wlr_pointer *pointer) { + // Do nothing +} + +static struct wlr_pointer_impl pointer_impl = { + .destroy = pointer_destroy, +}; diff --git a/include/backend/x11.h b/include/backend/x11.h index eb46e77e..707f4ca8 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -7,6 +7,7 @@ #include #include #include +#include struct wlr_x11_backend; @@ -27,6 +28,12 @@ struct wlr_x11_backend { struct wlr_x11_output output; + struct wlr_keyboard keyboard; + struct wlr_input_device keyboard_dev; + + struct wlr_pointer pointer; + struct wlr_input_device pointer_dev; + struct wlr_egl egl; struct wl_event_source *event_source; }; From 38bc0ab1ccefccc521e58e31762fc156bacaadcf Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Thu, 28 Sep 2017 20:47:11 +1300 Subject: [PATCH 07/17] Fix keycodes --- backend/x11/backend.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 23291bb7..1bf2b99c 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -45,7 +45,7 @@ int x11_event(int fd, uint32_t mask, void *data) { struct wlr_event_keyboard_key key = { .time_sec = ts.tv_sec, .time_usec = ts.tv_nsec / 1000, - .keycode = press->detail, + .keycode = press->detail - 8, .state = WLR_KEY_PRESSED, }; @@ -57,7 +57,7 @@ int x11_event(int fd, uint32_t mask, void *data) { struct wlr_event_keyboard_key key = { .time_sec = ts.tv_sec, .time_usec = ts.tv_nsec / 1000, - .keycode = press->detail, + .keycode = press->detail - 8, .state = WLR_KEY_RELEASED, }; @@ -94,6 +94,8 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, goto error_x11; } + XSetEventQueueOwner(x11->xlib_conn, XCBOwnsEventQueue); + int fd = xcb_get_file_descriptor(x11->xcb_conn); struct wl_event_loop *ev = wl_display_get_event_loop(display); x11->event_source = wl_event_loop_add_fd(ev, fd, WL_EVENT_READABLE, x11_event, x11); From 8027232ae56f0d02c6c1ce1033a5e1b9a2b54b7f Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Thu, 28 Sep 2017 21:46:58 +1300 Subject: [PATCH 08/17] Add timer for rendering loop --- backend/x11/backend.c | 14 +++++++++++++- include/backend/x11.h | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 1bf2b99c..aa8ce5a5 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -25,7 +25,7 @@ static struct wlr_pointer_impl pointer_impl; int x11_event(int fd, uint32_t mask, void *data) { struct wlr_x11_backend *x11 = data; - xcb_generic_event_t *event = xcb_wait_for_event(x11->xcb_conn); + xcb_generic_event_t *event = xcb_poll_for_event(x11->xcb_conn); if (!event) { return 0; } @@ -73,6 +73,13 @@ int x11_event(int fd, uint32_t mask, void *data) { return 0; } +int signal_frame(void *data) { + struct wlr_x11_backend *x11 = data; + wl_signal_emit(&x11->output.wlr_output.events.frame, &x11->output); + wl_event_source_timer_update(x11->frame_timer, 16); + return 0; +} + struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, const char *x11_display) { struct wlr_x11_backend *x11 = calloc(1, sizeof(*x11)); @@ -104,6 +111,8 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, goto error_x11; } + x11->frame_timer = wl_event_loop_add_timer(ev, signal_frame, x11); + x11->screen = xcb_setup_roots_iterator(xcb_get_setup(x11->xcb_conn)).data; if (!wlr_egl_init(&x11->egl, EGL_PLATFORM_X11_KHR, @@ -167,6 +176,8 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) { wl_signal_emit(&x11->backend.events.input_add, &x11->keyboard_dev); wl_signal_emit(&x11->backend.events.input_add, &x11->pointer_dev); + signal_frame(x11); + return true; } @@ -177,6 +188,7 @@ static void wlr_x11_backend_destroy(struct wlr_backend *backend) { struct wlr_x11_backend *x11 = (struct wlr_x11_backend *)backend; + wl_event_source_remove(x11->frame_timer); wlr_egl_free(&x11->egl); xcb_disconnect(x11->xcb_conn); diff --git a/include/backend/x11.h b/include/backend/x11.h index 707f4ca8..c46c944f 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -36,6 +36,7 @@ struct wlr_x11_backend { struct wlr_egl egl; struct wl_event_source *event_source; + struct wl_event_source *frame_timer; }; #endif From fc0e45f2ee01c9402698c96399000ed492fdf534 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Thu, 28 Sep 2017 21:47:12 +1300 Subject: [PATCH 09/17] Add mouse button presses --- backend/x11/backend.c | 53 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index aa8ce5a5..c7724e3f 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -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; From e00b4455fe8205c309f7f5e3550b670f6a880cd9 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Thu, 28 Sep 2017 22:02:21 +1300 Subject: [PATCH 10/17] Add pointer motion --- backend/x11/backend.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index c7724e3f..f5fb026f 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -113,6 +113,21 @@ int x11_event(int fd, uint32_t mask, void *data) { wl_signal_emit(&x11->pointer.events.button, &button); break; } + case XCB_MOTION_NOTIFY: { + xcb_motion_notify_event_t *motion = (xcb_motion_notify_event_t *)event; + struct wlr_event_pointer_motion_absolute abs = { + .device = &x11->pointer_dev, + .time_sec = ts.tv_sec, + .time_usec = ts.tv_nsec / 1000, + .x_mm = motion->event_x, + .y_mm = motion->event_y, + .width_mm = 1024, + .height_mm = 768, + }; + + wl_signal_emit(&x11->pointer.events.motion_absolute, &abs); + break; + } default: wlr_log(L_INFO, "Unknown event"); break; @@ -201,7 +216,8 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) { x11->screen->white_pixel, 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_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE | + XCB_EVENT_MASK_POINTER_MOTION }; output->x11 = x11; From ce76cfba0f36232256f42907616cb97b2cd38055 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Thu, 28 Sep 2017 22:38:12 +1300 Subject: [PATCH 11/17] Add window resizing --- backend/x11/backend.c | 71 ++++++++++++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 17 deletions(-) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index f5fb026f..773e51e6 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -23,22 +24,14 @@ static struct wlr_input_device_impl input_impl; static struct wlr_keyboard_impl keyboard_impl; static struct wlr_pointer_impl pointer_impl; -int x11_event(int fd, uint32_t mask, void *data) { - struct wlr_x11_backend *x11 = data; - - xcb_generic_event_t *event = xcb_poll_for_event(x11->xcb_conn); - if (!event) { - return 0; - } +void handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *event) { + struct wlr_x11_output *output = &x11->output; struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); switch (event->response_type) { - struct wlr_x11_output *output; - case XCB_EXPOSE: - output = &x11->output; wl_signal_emit(&output->wlr_output.events.frame, output); break; case XCB_KEY_PRESS: { @@ -121,19 +114,62 @@ int x11_event(int fd, uint32_t mask, void *data) { .time_usec = ts.tv_nsec / 1000, .x_mm = motion->event_x, .y_mm = motion->event_y, - .width_mm = 1024, - .height_mm = 768, + .width_mm = output->wlr_output.width, + .height_mm = output->wlr_output.height, }; wl_signal_emit(&x11->pointer.events.motion_absolute, &abs); break; } + case XCB_CONFIGURE_NOTIFY: { + xcb_configure_notify_event_t *conf = (xcb_configure_notify_event_t *)event; + + output->wlr_output.width = conf->width; + output->wlr_output.height = conf->height; + wlr_output_update_matrix(&output->wlr_output); + wl_signal_emit(&output->wlr_output.events.resolution, output); + + // Move the pointer to its new location + xcb_query_pointer_cookie_t cookie = + xcb_query_pointer(x11->xcb_conn, output->win); + xcb_query_pointer_reply_t *pointer = + xcb_query_pointer_reply(x11->xcb_conn, cookie, NULL); + if (!pointer) { + break; + } + + struct wlr_event_pointer_motion_absolute abs = { + .device = &x11->pointer_dev, + .time_sec = ts.tv_sec, + .time_usec = ts.tv_nsec / 1000, + .x_mm = pointer->root_x, + .y_mm = pointer->root_y, + .width_mm = output->wlr_output.width, + .height_mm = output->wlr_output.height, + }; + + wl_signal_emit(&x11->pointer.events.motion_absolute, &abs); + break; + } + case XCB_MAP_NOTIFY: + case XCB_REPARENT_NOTIFY: + case XCB_GLX_GET_CONVOLUTION_FILTER: + break; default: - wlr_log(L_INFO, "Unknown event"); + wlr_log(L_INFO, "Unknown event: %d", event->response_type); break; } +} + +int x11_event(int fd, uint32_t mask, void *data) { + struct wlr_x11_backend *x11 = data; + xcb_generic_event_t *e; + + while ((e = xcb_poll_for_event(x11->xcb_conn))) { + handle_x11_event(x11, e); + free(e); + } - free(event); return 0; } @@ -215,9 +251,10 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) { 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_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE | - XCB_EVENT_MASK_POINTER_MOTION + 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 }; output->x11 = x11; From 6bf508df816750f41b9b0c362f5bc6f64f737a70 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Thu, 28 Sep 2017 23:16:35 +1300 Subject: [PATCH 12/17] Add closing with WM button --- backend/x11/backend.c | 35 ++++++++++++++++++++++++++--------- include/backend/x11.h | 11 +++++++++++ 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 773e51e6..8b0b3f0d 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -24,7 +24,7 @@ static struct wlr_input_device_impl input_impl; static struct wlr_keyboard_impl keyboard_impl; static struct wlr_pointer_impl pointer_impl; -void handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *event) { +static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *event) { struct wlr_x11_output *output = &x11->output; struct timespec ts; @@ -151,35 +151,44 @@ void handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *event) { wl_signal_emit(&x11->pointer.events.motion_absolute, &abs); break; } - case XCB_MAP_NOTIFY: - case XCB_REPARENT_NOTIFY: - case XCB_GLX_GET_CONVOLUTION_FILTER: + case XCB_GLX_DELETE_QUERIES_ARB: { + wl_display_terminate(x11->wl_display); + return true; break; + } default: - wlr_log(L_INFO, "Unknown event: %d", event->response_type); break; } + + return false; } -int x11_event(int fd, uint32_t mask, void *data) { +static int x11_event(int fd, uint32_t mask, void *data) { struct wlr_x11_backend *x11 = data; xcb_generic_event_t *e; + bool quit = false; - while ((e = xcb_poll_for_event(x11->xcb_conn))) { - handle_x11_event(x11, e); + while (!quit && (e = xcb_poll_for_event(x11->xcb_conn))) { + quit = handle_x11_event(x11, e); free(e); } return 0; } -int signal_frame(void *data) { +static int signal_frame(void *data) { struct wlr_x11_backend *x11 = data; wl_signal_emit(&x11->output.wlr_output.events.frame, &x11->output); wl_event_source_timer_update(x11->frame_timer, 16); return 0; } +static void init_atom(struct wlr_x11_backend *x11, struct wlr_x11_atom *atom, + uint8_t only_if_exists, const char *name) { + atom->cookie = xcb_intern_atom(x11->xcb_conn, only_if_exists, strlen(name), name); + atom->reply = xcb_intern_atom_reply(x11->xcb_conn, atom->cookie, NULL); +} + struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, const char *x11_display) { struct wlr_x11_backend *x11 = calloc(1, sizeof(*x11)); @@ -188,6 +197,7 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, } wlr_backend_init(&x11->backend, &backend_impl); + x11->wl_display = display; x11->xlib_conn = XOpenDisplay(x11_display); if (!x11->xlib_conn) { @@ -273,6 +283,13 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) { return false; } + init_atom(x11, &x11->atoms.wm_protocols, 1, "WM_PROTOCOLS"); + init_atom(x11, &x11->atoms.wm_delete_window, 0, "WM_DELETE_WINDOW"); + + xcb_change_property(x11->xcb_conn, XCB_PROP_MODE_REPLACE, output->win, + x11->atoms.wm_protocols.reply->atom, XCB_ATOM_ATOM, 32, 1, + &x11->atoms.wm_delete_window.reply->atom); + xcb_map_window(x11->xcb_conn, output->win); xcb_flush(x11->xcb_conn); diff --git a/include/backend/x11.h b/include/backend/x11.h index c46c944f..a22005a2 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -19,8 +19,14 @@ struct wlr_x11_output { EGLSurface surf; }; +struct wlr_x11_atom { + xcb_intern_atom_cookie_t cookie; + xcb_intern_atom_reply_t *reply; +}; + struct wlr_x11_backend { struct wlr_backend backend; + struct wl_display *wl_display; Display *xlib_conn; xcb_connection_t *xcb_conn; @@ -37,6 +43,11 @@ struct wlr_x11_backend { struct wlr_egl egl; struct wl_event_source *event_source; struct wl_event_source *frame_timer; + + struct { + struct wlr_x11_atom wm_protocols; + struct wlr_x11_atom wm_delete_window; + } atoms; }; #endif From 22d5652599ec3efa618e54ee6357122d7de54588 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Thu, 28 Sep 2017 23:20:54 +1300 Subject: [PATCH 13/17] Don't ask for frame immediately after starting --- backend/x11/backend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 8b0b3f0d..908df362 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -297,7 +297,7 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) { wl_signal_emit(&x11->backend.events.input_add, &x11->keyboard_dev); wl_signal_emit(&x11->backend.events.input_add, &x11->pointer_dev); - signal_frame(x11); + wl_event_source_timer_update(x11->frame_timer, 16); return true; } From abe549e01d3a7ef37644f0f6177f41f3829d6423 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Thu, 28 Sep 2017 23:48:54 +1300 Subject: [PATCH 14/17] Cleanup x11 event handler --- backend/x11/backend.c | 106 ++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 65 deletions(-) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 908df362..fd47295a 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include @@ -24,96 +23,73 @@ static struct wlr_input_device_impl input_impl; static struct wlr_keyboard_impl keyboard_impl; static struct wlr_pointer_impl pointer_impl; +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; + // 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; + } +} + static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *event) { struct wlr_x11_output *output = &x11->output; - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - switch (event->response_type) { - case XCB_EXPOSE: + case XCB_EXPOSE: { wl_signal_emit(&output->wlr_output.events.frame, output); break; - case XCB_KEY_PRESS: { - xcb_key_press_event_t *press = (xcb_key_press_event_t *)event; + xcb_key_press_event_t *ev = (xcb_key_press_event_t *)event; struct wlr_event_keyboard_key key = { - .time_sec = ts.tv_sec, - .time_usec = ts.tv_nsec / 1000, - .keycode = press->detail - 8, + .time_sec = ev->time / 1000, + .time_usec = (ev->time % 1000) * 1000, + .keycode = ev->detail - 8, .state = WLR_KEY_PRESSED, }; wl_signal_emit(&x11->keyboard.events.key, &key); break; } + case XCB_KEY_PRESS: case XCB_KEY_RELEASE: { - xcb_key_release_event_t *press = (xcb_key_release_event_t *)event; + xcb_key_press_event_t *ev = (xcb_key_press_event_t *)event; struct wlr_event_keyboard_key key = { - .time_sec = ts.tv_sec, - .time_usec = ts.tv_nsec / 1000, - .keycode = press->detail - 8, - .state = WLR_KEY_RELEASED, + .time_sec = ev->time / 1000, + .time_usec = (ev->time % 1000) * 1000, + .keycode = ev->detail - 8, + .state = event->response_type == XCB_KEY_PRESS ? + WLR_KEY_PRESSED : WLR_KEY_RELEASED, }; 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_PRESS: case XCB_BUTTON_RELEASE: { - xcb_button_release_event_t *press = (xcb_button_release_event_t *)event; + xcb_button_press_event_t *ev = (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_RELEASED, + .time_sec = ev->time / 1000, + .time_usec = (ev->time % 1000) * 1000, + .button = xcb_button_to_wl(ev->detail), + .state = event->response_type == XCB_BUTTON_PRESS ? + WLR_BUTTON_PRESSED : 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; } case XCB_MOTION_NOTIFY: { - xcb_motion_notify_event_t *motion = (xcb_motion_notify_event_t *)event; + xcb_motion_notify_event_t *ev = (xcb_motion_notify_event_t *)event; struct wlr_event_pointer_motion_absolute abs = { .device = &x11->pointer_dev, - .time_sec = ts.tv_sec, - .time_usec = ts.tv_nsec / 1000, - .x_mm = motion->event_x, - .y_mm = motion->event_y, + .time_sec = ev->time / 1000, + .time_usec = (ev->time % 1000) * 1000, + .x_mm = ev->event_x, + .y_mm = ev->event_y, .width_mm = output->wlr_output.width, .height_mm = output->wlr_output.height, }; @@ -122,10 +98,10 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e break; } case XCB_CONFIGURE_NOTIFY: { - xcb_configure_notify_event_t *conf = (xcb_configure_notify_event_t *)event; + xcb_configure_notify_event_t *ev = (xcb_configure_notify_event_t *)event; - output->wlr_output.width = conf->width; - output->wlr_output.height = conf->height; + output->wlr_output.width = ev->width; + output->wlr_output.height = ev->height; wlr_output_update_matrix(&output->wlr_output); wl_signal_emit(&output->wlr_output.events.resolution, output); @@ -140,8 +116,8 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e struct wlr_event_pointer_motion_absolute abs = { .device = &x11->pointer_dev, - .time_sec = ts.tv_sec, - .time_usec = ts.tv_nsec / 1000, + //.time_sec = ev->time / 1000, + //.time_usec = (ev->time % 1000) * 1000, .x_mm = pointer->root_x, .y_mm = pointer->root_y, .width_mm = output->wlr_output.width, From 5ca9a5c0836a7eff8ad833e0f47a4deea4794bfb Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Fri, 29 Sep 2017 16:20:35 +1300 Subject: [PATCH 15/17] Remove dead code --- backend/x11/backend.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index fd47295a..34801252 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -42,16 +42,6 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e case XCB_EXPOSE: { wl_signal_emit(&output->wlr_output.events.frame, output); break; - xcb_key_press_event_t *ev = (xcb_key_press_event_t *)event; - struct wlr_event_keyboard_key key = { - .time_sec = ev->time / 1000, - .time_usec = (ev->time % 1000) * 1000, - .keycode = ev->detail - 8, - .state = WLR_KEY_PRESSED, - }; - - wl_signal_emit(&x11->keyboard.events.key, &key); - break; } case XCB_KEY_PRESS: case XCB_KEY_RELEASE: { From 68c3806377e5ad7bd35bece53345913c24ce6e24 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Fri, 29 Sep 2017 16:24:01 +1300 Subject: [PATCH 16/17] Remove unused device interfaces --- backend/x11/backend.c | 43 +++++-------------------------------------- 1 file changed, 5 insertions(+), 38 deletions(-) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 34801252..34511ab4 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -19,9 +19,7 @@ #include "backend/x11.h" static struct wlr_backend_impl backend_impl; -static struct wlr_input_device_impl input_impl; -static struct wlr_keyboard_impl keyboard_impl; -static struct wlr_pointer_impl pointer_impl; +static struct wlr_output_impl output_impl; static uint32_t xcb_button_to_wl(uint32_t button) { switch (button) { @@ -197,13 +195,13 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, } wlr_input_device_init(&x11->keyboard_dev, WLR_INPUT_DEVICE_KEYBOARD, - &input_impl, "X11 keyboard", 0, 0); - wlr_keyboard_init(&x11->keyboard, &keyboard_impl); + NULL, "X11 keyboard", 0, 0); + wlr_keyboard_init(&x11->keyboard, NULL); x11->keyboard_dev.keyboard = &x11->keyboard; wlr_input_device_init(&x11->pointer_dev, WLR_INPUT_DEVICE_POINTER, - &input_impl, "X11 pointer", 0, 0); - wlr_pointer_init(&x11->pointer, &pointer_impl); + NULL, "X11 pointer", 0, 0); + wlr_pointer_init(&x11->pointer, NULL); x11->pointer_dev.pointer = &x11->pointer; return &x11->backend; @@ -217,8 +215,6 @@ error_x11: return NULL; } -static struct wlr_output_impl output_impl; - static bool wlr_x11_backend_start(struct wlr_backend *backend) { struct wlr_x11_backend *x11 = (struct wlr_x11_backend *)backend; struct wlr_x11_output *output = &x11->output; @@ -333,32 +329,3 @@ static struct wlr_output_impl output_impl = { .make_current = output_make_current, .swap_buffers = output_swap_buffers, }; - -static void input_destroy(struct wlr_input_device *input_dev) { - // Do nothing -} - -static struct wlr_input_device_impl input_impl = { - .destroy = input_destroy, -}; - -static void keyboard_destroy(struct wlr_keyboard *keyboard) { - // Do nothing -} - -static void keyboard_led_update(struct wlr_keyboard *keyboard, uint32_t leds) { - // Do nothing -} - -static struct wlr_keyboard_impl keyboard_impl = { - .destroy = keyboard_destroy, - .led_update = keyboard_led_update, -}; - -static void pointer_destroy(struct wlr_pointer *pointer) { - // Do nothing -} - -static struct wlr_pointer_impl pointer_impl = { - .destroy = pointer_destroy, -}; From 1b18b0a27d285270c12e57781738c48377d5529b Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Fri, 29 Sep 2017 16:31:04 +1300 Subject: [PATCH 17/17] Fix time and transform --- backend/x11/backend.c | 13 +++++++++---- include/backend/x11.h | 3 +++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 34511ab4..88c022d1 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -53,6 +54,7 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e }; wl_signal_emit(&x11->keyboard.events.key, &key); + x11->time = ev->time; break; } case XCB_BUTTON_PRESS: @@ -68,6 +70,7 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e }; wl_signal_emit(&x11->pointer.events.button, &button); + x11->time = ev->time; break; } case XCB_MOTION_NOTIFY: { @@ -83,6 +86,7 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e }; wl_signal_emit(&x11->pointer.events.motion_absolute, &abs); + x11->time = ev->time; break; } case XCB_CONFIGURE_NOTIFY: { @@ -104,8 +108,8 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e struct wlr_event_pointer_motion_absolute abs = { .device = &x11->pointer_dev, - //.time_sec = ev->time / 1000, - //.time_usec = (ev->time % 1000) * 1000, + .time_sec = x11->time / 1000, + .time_usec = (x11->time % 1000) * 1000, .x_mm = pointer->root_x, .y_mm = pointer->root_y, .width_mm = output->wlr_output.width, @@ -293,8 +297,9 @@ static struct wlr_backend_impl backend_impl = { .get_egl = wlr_x11_backend_get_egl, }; -static void output_transform(struct wlr_output *output, enum wl_output_transform transform) { - // TODO +static void output_transform(struct wlr_output *wlr_output, enum wl_output_transform transform) { + struct wlr_x11_output *output = (struct wlr_x11_output *)wlr_output; + output->wlr_output.transform = transform; } static void output_destroy(struct wlr_output *wlr_output) { diff --git a/include/backend/x11.h b/include/backend/x11.h index a22005a2..b4284b63 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -48,6 +48,9 @@ struct wlr_x11_backend { struct wlr_x11_atom wm_protocols; struct wlr_x11_atom wm_delete_window; } atoms; + + // The time we last received an event + xcb_timestamp_t time; }; #endif