diff options
| -rw-r--r-- | backend/x11/backend.c | 15 | ||||
| -rw-r--r-- | backend/x11/input_device.c | 18 | ||||
| -rw-r--r-- | backend/x11/output.c | 5 | ||||
| -rw-r--r-- | include/backend/x11.h | 2 | ||||
| -rw-r--r-- | rootston/layer_shell.c | 6 |
5 files changed, 18 insertions, 28 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 02f5ef6f..b4b0f154 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -65,11 +65,9 @@ void x11_output_layout_get_box(struct wlr_x11_backend *backend, box->height = max_y - min_y; } -static bool handle_x11_event(struct wlr_x11_backend *x11, +static void handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *event) { - if (x11_handle_input_event(x11, event)) { - return false; - } + x11_handle_input_event(x11, event); switch (event->response_type & XCB_EVENT_RESPONSE_TYPE_MASK) { case XCB_EXPOSE: { @@ -77,7 +75,7 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, struct wlr_x11_output *output = x11_output_from_window_id(x11, ev->window); if (output != NULL) { - wlr_output_send_frame(&output->wlr_output); + wlr_output_update_needs_swap(&output->wlr_output); } break; } @@ -103,8 +101,6 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, break; } } - - return false; } static int x11_event(int fd, uint32_t mask, void *data) { @@ -117,11 +113,8 @@ static int x11_event(int fd, uint32_t mask, void *data) { xcb_generic_event_t *e; while ((e = xcb_poll_for_event(x11->xcb_conn))) { - bool quit = handle_x11_event(x11, e); + handle_x11_event(x11, e); free(e); - if (quit) { - break; - } } return 0; diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c index 55e543e6..4433568d 100644 --- a/backend/x11/input_device.c +++ b/backend/x11/input_device.c @@ -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 }; diff --git a/backend/x11/output.c b/backend/x11/output.c index ff625fbe..df4ff043 100644 --- a/backend/x11/output.c +++ b/backend/x11/output.c @@ -114,9 +114,8 @@ struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) { wl_list_length(&x11->outputs) + 1); parse_xcb_setup(wlr_output, x11->xcb_conn); - uint32_t mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK; - uint32_t values[2] = { - x11->screen->white_pixel, + 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 | diff --git a/include/backend/x11.h b/include/backend/x11.h index 1c88cefc..aa946912 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -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); diff --git a/rootston/layer_shell.c b/rootston/layer_shell.c index 9794071b..895b0385 100644 --- a/rootston/layer_shell.c +++ b/rootston/layer_shell.c @@ -270,8 +270,10 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&layer->map.link); wl_list_remove(&layer->unmap.link); wl_list_remove(&layer->surface_commit.link); - wl_list_remove(&layer->output_destroy.link); - arrange_layers((struct roots_output *)layer->layer_surface->output->data); + if (layer->layer_surface->output) { + wl_list_remove(&layer->output_destroy.link); + arrange_layers((struct roots_output *)layer->layer_surface->output->data); + } free(layer); } |