diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-10-24 07:28:04 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-10-24 07:57:36 -0400 |
| commit | 1dbe31493708790f6fafb4c9da8d24cbb3fa07b9 (patch) | |
| tree | 42e7dbbe8b77403aa00983befc256f7b7a7742ca /backend/x11/backend.c | |
| parent | 6fcac087fe1d7b7fa3cd0628a6b7818d26222678 (diff) | |
| parent | 1b7918f50e8b22cbaba978c695b7cc5921125c55 (diff) | |
Merge branch 'master' into feature/data-device-selection
Diffstat (limited to 'backend/x11/backend.c')
| -rw-r--r-- | backend/x11/backend.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 11dd8568..0e98b8d9 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -15,7 +15,7 @@ #endif #include <wlr/backend/interface.h> #include <wlr/backend/x11.h> -#include <wlr/egl.h> +#include <wlr/render/egl.h> #include <wlr/interfaces/wlr_output.h> #include <wlr/interfaces/wlr_input_device.h> #include <wlr/interfaces/wlr_keyboard.h> @@ -121,9 +121,7 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e case XCB_CONFIGURE_NOTIFY: { xcb_configure_notify_event_t *ev = (xcb_configure_notify_event_t *)event; - output->wlr_output.width = ev->width; - output->wlr_output.height = ev->height; - wlr_output_update_matrix(&output->wlr_output); + wlr_output_update_size(&output->wlr_output, ev->width, ev->height); wl_signal_emit(&output->wlr_output.events.resolution, output); // Move the pointer to its new location @@ -264,7 +262,7 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) { output->x11 = x11; - wlr_output_init(&output->wlr_output, &output_impl); + wlr_output_init(&output->wlr_output, &x11->backend, &output_impl); snprintf(output->wlr_output.name, sizeof(output->wlr_output.name), "X11-1"); output->win = xcb_generate_id(x11->xcb_conn); |