Merge pull request #727 from martinetd/x11_wl_backend_fixes
Address sanitizer fixes
This commit is contained in:
commit
00bb9de29b
|
@ -26,6 +26,11 @@ static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer,
|
|||
// GNOME sends a pointer enter when the surface is being destroyed
|
||||
return;
|
||||
}
|
||||
if (wlr_wl_pointer->current_output) {
|
||||
wl_list_remove(&wlr_wl_pointer->output_destroy_listener.link);
|
||||
}
|
||||
wl_signal_add(&output->wlr_output.events.destroy,
|
||||
&wlr_wl_pointer->output_destroy_listener);
|
||||
wlr_wl_pointer->current_output = output;
|
||||
output->enter_serial = serial;
|
||||
wlr_wl_output_update_cursor(output);
|
||||
|
@ -49,7 +54,7 @@ static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer,
|
|||
struct wlr_wl_pointer *wlr_wl_pointer =
|
||||
(struct wlr_wl_pointer *)dev->pointer;
|
||||
if (!wlr_wl_pointer->current_output) {
|
||||
wlr_log(L_ERROR, "pointer motion event without current output");
|
||||
wlr_log(L_DEBUG, "pointer motion event without current output");
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -231,6 +236,14 @@ static struct wlr_input_device *allocate_device(struct wlr_wl_backend *backend,
|
|||
return wlr_device;
|
||||
}
|
||||
|
||||
static void wlr_wl_pointer_handle_output_destroy(struct wl_listener *listener,
|
||||
void *data) {
|
||||
struct wlr_wl_pointer *wlr_wl_pointer =
|
||||
wl_container_of(listener, wlr_wl_pointer, output_destroy_listener);
|
||||
wlr_wl_pointer->current_output = NULL;
|
||||
wl_list_remove(&wlr_wl_pointer->output_destroy_listener.link);
|
||||
}
|
||||
|
||||
static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
|
||||
enum wl_seat_capability caps) {
|
||||
struct wlr_wl_backend *backend = data;
|
||||
|
@ -243,6 +256,8 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
|
|||
wlr_log(L_ERROR, "Unable to allocate wlr_wl_pointer");
|
||||
return;
|
||||
}
|
||||
wlr_wl_pointer->output_destroy_listener.notify =
|
||||
wlr_wl_pointer_handle_output_destroy;
|
||||
|
||||
struct wlr_input_device *wlr_device;
|
||||
if (!(wlr_device = allocate_device(backend, WLR_INPUT_DEVICE_POINTER))) {
|
||||
|
|
|
@ -143,6 +143,7 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e
|
|||
};
|
||||
|
||||
wlr_signal_emit_safe(&x11->pointer.events.motion_absolute, &abs);
|
||||
free(pointer);
|
||||
break;
|
||||
}
|
||||
case XCB_CLIENT_MESSAGE: {
|
||||
|
@ -317,12 +318,20 @@ static void wlr_x11_backend_destroy(struct wlr_backend *backend) {
|
|||
|
||||
wlr_signal_emit_safe(&backend->events.destroy, backend);
|
||||
|
||||
if (x11->event_source) {
|
||||
wl_event_source_remove(x11->event_source);
|
||||
}
|
||||
wl_list_remove(&x11->display_destroy.link);
|
||||
|
||||
wl_event_source_remove(x11->frame_timer);
|
||||
wlr_egl_finish(&x11->egl);
|
||||
|
||||
xcb_disconnect(x11->xcb_conn);
|
||||
if (x11->xcb_conn) {
|
||||
xcb_disconnect(x11->xcb_conn);
|
||||
}
|
||||
if (x11->xlib_conn) {
|
||||
XCloseDisplay(x11->xlib_conn);
|
||||
}
|
||||
free(x11);
|
||||
}
|
||||
|
||||
|
|
|
@ -71,6 +71,7 @@ struct wlr_wl_pointer {
|
|||
struct wlr_pointer wlr_pointer;
|
||||
enum wlr_axis_source axis_source;
|
||||
struct wlr_wl_backend_output *current_output;
|
||||
struct wl_listener output_destroy_listener;
|
||||
};
|
||||
|
||||
void wlr_wl_registry_poll(struct wlr_wl_backend *backend);
|
||||
|
|
|
@ -53,6 +53,7 @@ struct wlr_xdg_popup_grab {
|
|||
struct wlr_seat *seat;
|
||||
struct wl_list popups;
|
||||
struct wl_list link; // wlr_xdg_shell::popup_grabs
|
||||
struct wl_listener seat_destroy;
|
||||
};
|
||||
|
||||
enum wlr_xdg_surface_role {
|
||||
|
|
|
@ -53,6 +53,7 @@ struct wlr_xdg_popup_grab_v6 {
|
|||
struct wlr_seat *seat;
|
||||
struct wl_list popups;
|
||||
struct wl_list link; // wlr_xdg_shell_v6::popup_grabs
|
||||
struct wl_listener seat_destroy;
|
||||
};
|
||||
|
||||
enum wlr_xdg_surface_v6_role {
|
||||
|
|
|
@ -680,6 +680,7 @@ static void damage_from_surface(struct wlr_surface *surface,
|
|||
}
|
||||
pixman_region32_translate(&damage, box.x, box.y);
|
||||
wlr_output_damage_add(output->damage, &damage);
|
||||
pixman_region32_fini(&damage);
|
||||
} else {
|
||||
pixman_box32_t *extents =
|
||||
pixman_region32_extents(&surface->current->surface_damage);
|
||||
|
|
|
@ -14,7 +14,10 @@ void wlr_pointer_init(struct wlr_pointer *pointer,
|
|||
}
|
||||
|
||||
void wlr_pointer_destroy(struct wlr_pointer *pointer) {
|
||||
if (pointer && pointer->impl && pointer->impl->destroy) {
|
||||
if (!pointer) {
|
||||
return;
|
||||
}
|
||||
if (pointer->impl && pointer->impl->destroy) {
|
||||
pointer->impl->destroy(pointer);
|
||||
} else {
|
||||
wl_list_remove(&pointer->events.motion.listener_list);
|
||||
|
|
|
@ -131,6 +131,24 @@ static const struct wlr_keyboard_grab_interface xdg_keyboard_grab_impl = {
|
|||
.cancel = xdg_keyboard_grab_cancel,
|
||||
};
|
||||
|
||||
static void xdg_surface_destroy(struct wlr_xdg_surface *surface);
|
||||
|
||||
static void wlr_xdg_popup_grab_handle_seat_destroy(
|
||||
struct wl_listener *listener, void *data) {
|
||||
struct wlr_xdg_popup_grab *xdg_grab =
|
||||
wl_container_of(listener, xdg_grab, seat_destroy);
|
||||
|
||||
wl_list_remove(&xdg_grab->seat_destroy.link);
|
||||
|
||||
struct wlr_xdg_popup *popup, *next;
|
||||
wl_list_for_each_safe(popup, next, &xdg_grab->popups, grab_link) {
|
||||
xdg_surface_destroy(popup->base);
|
||||
}
|
||||
|
||||
wl_list_remove(&xdg_grab->link);
|
||||
free(xdg_grab);
|
||||
}
|
||||
|
||||
static struct wlr_xdg_popup_grab *xdg_shell_popup_grab_from_seat(
|
||||
struct wlr_xdg_shell *shell, struct wlr_seat *seat) {
|
||||
struct wlr_xdg_popup_grab *xdg_grab;
|
||||
|
@ -155,6 +173,9 @@ static struct wlr_xdg_popup_grab *xdg_shell_popup_grab_from_seat(
|
|||
wl_list_insert(&shell->popup_grabs, &xdg_grab->link);
|
||||
xdg_grab->seat = seat;
|
||||
|
||||
xdg_grab->seat_destroy.notify = wlr_xdg_popup_grab_handle_seat_destroy;
|
||||
wl_signal_add(&seat->events.destroy, &xdg_grab->seat_destroy);
|
||||
|
||||
return xdg_grab;
|
||||
}
|
||||
|
||||
|
|
|
@ -131,6 +131,24 @@ static const struct wlr_keyboard_grab_interface xdg_keyboard_grab_impl = {
|
|||
.cancel = xdg_keyboard_grab_cancel,
|
||||
};
|
||||
|
||||
static void xdg_surface_destroy(struct wlr_xdg_surface_v6 *surface);
|
||||
|
||||
static void wlr_xdg_popup_grab_handle_seat_destroy(
|
||||
struct wl_listener *listener, void *data) {
|
||||
struct wlr_xdg_popup_grab_v6 *xdg_grab =
|
||||
wl_container_of(listener, xdg_grab, seat_destroy);
|
||||
|
||||
wl_list_remove(&xdg_grab->seat_destroy.link);
|
||||
|
||||
struct wlr_xdg_popup_v6 *popup, *next;
|
||||
wl_list_for_each_safe(popup, next, &xdg_grab->popups, grab_link) {
|
||||
xdg_surface_destroy(popup->base);
|
||||
}
|
||||
|
||||
wl_list_remove(&xdg_grab->link);
|
||||
free(xdg_grab);
|
||||
}
|
||||
|
||||
static struct wlr_xdg_popup_grab_v6 *xdg_shell_popup_grab_from_seat(
|
||||
struct wlr_xdg_shell_v6 *shell, struct wlr_seat *seat) {
|
||||
struct wlr_xdg_popup_grab_v6 *xdg_grab;
|
||||
|
@ -155,6 +173,9 @@ static struct wlr_xdg_popup_grab_v6 *xdg_shell_popup_grab_from_seat(
|
|||
wl_list_insert(&shell->popup_grabs, &xdg_grab->link);
|
||||
xdg_grab->seat = seat;
|
||||
|
||||
xdg_grab->seat_destroy.notify = wlr_xdg_popup_grab_handle_seat_destroy;
|
||||
wl_signal_add(&seat->events.destroy, &xdg_grab->seat_destroy);
|
||||
|
||||
return xdg_grab;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue