diff options
author | Alexander Orzechowski <orzechowski.alexander@gmail.com> | 2022-08-18 07:16:16 -0400 |
---|---|---|
committer | Alexander Orzechowski <orzechowski.alexander@gmail.com> | 2022-08-18 07:16:16 -0400 |
commit | ef4baea0e2f799c7bdd2e077dac4174fa31e85df (patch) | |
tree | d71e1399e64b9e5bcdda1d52246c90eca15cf150 /xwayland | |
parent | 013f121f455efcc1e68e98c60c74aadfb51fd98e (diff) |
Use wl_signal_emit_mutable
Diffstat (limited to 'xwayland')
-rw-r--r-- | xwayland/server.c | 5 | ||||
-rw-r--r-- | xwayland/xwayland.c | 3 | ||||
-rw-r--r-- | xwayland/xwm.c | 55 |
3 files changed, 30 insertions, 33 deletions
diff --git a/xwayland/server.c b/xwayland/server.c index 0086ad65..75b919b4 100644 --- a/xwayland/server.c +++ b/xwayland/server.c @@ -16,7 +16,6 @@ #include <wlr/util/log.h> #include <wlr/xwayland.h> #include "sockets.h" -#include "util/signal.h" #include "xwayland/config.h" static void safe_close(int fd) { @@ -281,7 +280,7 @@ static int xserver_handle_ready(int fd, uint32_t mask, void *data) { .server = server, .wm_fd = server->wm_fd[0], }; - wlr_signal_emit_safe(&server->events.ready, &event); + wl_signal_emit_mutable(&server->events.ready, &event); /* We removed the source, so don't need recheck */ return 0; @@ -432,7 +431,7 @@ void wlr_xwayland_server_destroy(struct wlr_xwayland_server *server) { server_finish_process(server); server_finish_display(server); - wlr_signal_emit_safe(&server->events.destroy, NULL); + wl_signal_emit_mutable(&server->events.destroy, NULL); free(server); } diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c index cb62fcc1..d76f0eec 100644 --- a/xwayland/xwayland.c +++ b/xwayland/xwayland.c @@ -14,7 +14,6 @@ #include <wlr/util/log.h> #include <wlr/xwayland.h> #include "sockets.h" -#include "util/signal.h" #include "xwayland/xwm.h" struct wlr_xwayland_cursor { @@ -54,7 +53,7 @@ static void handle_server_ready(struct wl_listener *listener, void *data) { cur->height, cur->hotspot_x, cur->hotspot_y); } - wlr_signal_emit_safe(&xwayland->events.ready, NULL); + wl_signal_emit_mutable(&xwayland->events.ready, NULL); } void wlr_xwayland_destroy(struct wlr_xwayland *xwayland) { diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 1bacd1ce..fb9e7f44 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -16,7 +16,6 @@ #include <xcb/render.h> #include <xcb/res.h> #include <xcb/xfixes.h> -#include "util/signal.h" #include "xwayland/xwm.h" const char *const atom_map[ATOM_LAST] = { @@ -125,7 +124,7 @@ static struct wlr_xwayland_surface *lookup_surface(struct wlr_xwm *xwm, static int xwayland_surface_handle_ping_timeout(void *data) { struct wlr_xwayland_surface *surface = data; - wlr_signal_emit_safe(&surface->events.ping_timeout, surface); + wl_signal_emit_mutable(&surface->events.ping_timeout, surface); surface->pinging = false; return 1; } @@ -202,7 +201,7 @@ static struct wlr_xwayland_surface *xwayland_surface_create( wl_list_insert(&xwm->surfaces, &surface->link); - wlr_signal_emit_safe(&xwm->xwayland->events.new_surface, surface); + wl_signal_emit_mutable(&xwm->xwayland->events.new_surface, surface); return surface; } @@ -390,7 +389,7 @@ static void xwayland_surface_destroy( struct wlr_xwayland_surface *xsurface) { xsurface_unmap(xsurface); - wlr_signal_emit_safe(&xsurface->events.destroy, xsurface); + wl_signal_emit_mutable(&xsurface->events.destroy, xsurface); if (xsurface == xsurface->xwm->focus_surface) { xwm_surface_activate(xsurface->xwm, NULL); @@ -456,7 +455,7 @@ static void read_surface_class(struct wlr_xwm *xwm, surface->class = NULL; } - wlr_signal_emit_safe(&surface->events.set_class, surface); + wl_signal_emit_mutable(&surface->events.set_class, surface); } static void read_surface_startup_id(struct wlr_xwm *xwm, @@ -479,7 +478,7 @@ static void read_surface_startup_id(struct wlr_xwm *xwm, wlr_log(WLR_DEBUG, "XCB_ATOM_NET_STARTUP_ID: %s", xsurface->startup_id ? xsurface->startup_id: "(null)"); - wlr_signal_emit_safe(&xsurface->events.set_startup_id, xsurface); + wl_signal_emit_mutable(&xsurface->events.set_startup_id, xsurface); } static void read_surface_role(struct wlr_xwm *xwm, @@ -500,7 +499,7 @@ static void read_surface_role(struct wlr_xwm *xwm, xsurface->role = NULL; } - wlr_signal_emit_safe(&xsurface->events.set_role, xsurface); + wl_signal_emit_mutable(&xsurface->events.set_role, xsurface); } static void read_surface_title(struct wlr_xwm *xwm, @@ -527,7 +526,7 @@ static void read_surface_title(struct wlr_xwm *xwm, } xsurface->has_utf8_title = is_utf8; - wlr_signal_emit_safe(&xsurface->events.set_title, xsurface); + wl_signal_emit_mutable(&xsurface->events.set_title, xsurface); } static bool has_parent(struct wlr_xwayland_surface *parent, @@ -572,7 +571,7 @@ static void read_surface_parent(struct wlr_xwm *xwm, wl_list_init(&xsurface->parent_link); } - wlr_signal_emit_safe(&xsurface->events.set_parent, xsurface); + wl_signal_emit_mutable(&xsurface->events.set_parent, xsurface); } static void read_surface_client_id(struct wlr_xwm *xwm, @@ -606,7 +605,7 @@ static void read_surface_client_id(struct wlr_xwm *xwm, return; } xsurface->pid = *pid; - wlr_signal_emit_safe(&xsurface->events.set_pid, xsurface); + wl_signal_emit_mutable(&xsurface->events.set_pid, xsurface); free(reply); } @@ -629,7 +628,7 @@ static void read_surface_window_type(struct wlr_xwm *xwm, memcpy(xsurface->window_type, atoms, atoms_size); xsurface->window_type_len = atoms_len; - wlr_signal_emit_safe(&xsurface->events.set_window_type, xsurface); + wl_signal_emit_mutable(&xsurface->events.set_window_type, xsurface); } static void read_surface_protocols(struct wlr_xwm *xwm, @@ -674,7 +673,7 @@ static void read_surface_hints(struct wlr_xwm *xwm, xsurface->hints->input = true; } - wlr_signal_emit_safe(&xsurface->events.set_hints, xsurface); + wl_signal_emit_mutable(&xsurface->events.set_hints, xsurface); } static void read_surface_normal_hints(struct wlr_xwm *xwm, @@ -744,7 +743,7 @@ static void read_surface_motif_hints(struct wlr_xwm *xwm, WLR_XWAYLAND_SURFACE_DECORATIONS_NO_TITLE; } } - wlr_signal_emit_safe(&xsurface->events.set_decorations, xsurface); + wl_signal_emit_mutable(&xsurface->events.set_decorations, xsurface); } } @@ -837,7 +836,7 @@ static void xwayland_surface_role_commit(struct wlr_surface *wlr_surface) { if (!surface->mapped && wlr_surface_has_buffer(surface->surface)) { surface->mapped = true; - wlr_signal_emit_safe(&surface->events.map, surface); + wl_signal_emit_mutable(&surface->events.map, surface); xwm_set_net_client_list(surface->xwm); } } @@ -854,7 +853,7 @@ static void xwayland_surface_role_precommit(struct wlr_surface *wlr_surface, // This is a NULL commit if (surface->mapped) { surface->mapped = false; - wlr_signal_emit_safe(&surface->events.unmap, surface); + wl_signal_emit_mutable(&surface->events.unmap, surface); xwm_set_net_client_list(surface->xwm); } } @@ -909,7 +908,7 @@ static void xwm_map_shell_surface(struct wlr_xwm *xwm, static void xsurface_unmap(struct wlr_xwayland_surface *surface) { if (surface->mapped) { - wlr_signal_emit_safe(&surface->events.unmap, surface); + wl_signal_emit_mutable(&surface->events.unmap, surface); surface->mapped = false; xwm_set_net_client_list(surface->xwm); } @@ -977,7 +976,7 @@ static void xwm_handle_configure_request(struct wlr_xwm *xwm, .mask = mask, }; - wlr_signal_emit_safe(&surface->events.request_configure, &wlr_event); + wl_signal_emit_mutable(&surface->events.request_configure, &wlr_event); } static void xwm_handle_configure_notify(struct wlr_xwm *xwm, @@ -1000,11 +999,11 @@ static void xwm_handle_configure_notify(struct wlr_xwm *xwm, if (xsurface->override_redirect != ev->override_redirect) { xsurface->override_redirect = ev->override_redirect; - wlr_signal_emit_safe(&xsurface->events.set_override_redirect, xsurface); + wl_signal_emit_mutable(&xsurface->events.set_override_redirect, xsurface); } if (geometry_changed) { - wlr_signal_emit_safe(&xsurface->events.set_geometry, NULL); + wl_signal_emit_mutable(&xsurface->events.set_geometry, NULL); } } @@ -1086,7 +1085,7 @@ static void xwm_handle_map_notify(struct wlr_xwm *xwm, if (xsurface->override_redirect != ev->override_redirect) { xsurface->override_redirect = ev->override_redirect; - wlr_signal_emit_safe(&xsurface->events.set_override_redirect, xsurface); + wl_signal_emit_mutable(&xsurface->events.set_override_redirect, xsurface); } } @@ -1198,7 +1197,7 @@ static void xwm_handle_net_wm_moveresize_message(struct wlr_xwm *xwm, switch (detail) { case _NET_WM_MOVERESIZE_MOVE: move_event.surface = xsurface; - wlr_signal_emit_safe(&xsurface->events.request_move, &move_event); + wl_signal_emit_mutable(&xsurface->events.request_move, &move_event); break; case _NET_WM_MOVERESIZE_SIZE_TOPLEFT: case _NET_WM_MOVERESIZE_SIZE_TOP: @@ -1210,7 +1209,7 @@ static void xwm_handle_net_wm_moveresize_message(struct wlr_xwm *xwm, case _NET_WM_MOVERESIZE_SIZE_LEFT: resize_event.surface = xsurface; resize_event.edges = net_wm_edges_to_wlr(detail); - wlr_signal_emit_safe(&xsurface->events.request_resize, &resize_event); + wl_signal_emit_mutable(&xsurface->events.request_resize, &resize_event); break; case _NET_WM_MOVERESIZE_CANCEL: // handled by the compositor @@ -1300,7 +1299,7 @@ static void xwm_handle_net_wm_state_message(struct wlr_xwm *xwm, xsurface->saved_height = xsurface->height; } - wlr_signal_emit_safe(&xsurface->events.request_fullscreen, xsurface); + wl_signal_emit_mutable(&xsurface->events.request_fullscreen, xsurface); } if (maximized != xsurface_is_maximized(xsurface)) { @@ -1309,7 +1308,7 @@ static void xwm_handle_net_wm_state_message(struct wlr_xwm *xwm, xsurface->saved_height = xsurface->height; } - wlr_signal_emit_safe(&xsurface->events.request_maximize, xsurface); + wl_signal_emit_mutable(&xsurface->events.request_maximize, xsurface); } if (minimized != xsurface->minimized) { @@ -1322,7 +1321,7 @@ static void xwm_handle_net_wm_state_message(struct wlr_xwm *xwm, .surface = xsurface, .minimize = xsurface->minimized, }; - wlr_signal_emit_safe(&xsurface->events.request_minimize, &minimize_event); + wl_signal_emit_mutable(&xsurface->events.request_minimize, &minimize_event); } } @@ -1358,7 +1357,7 @@ static void xwm_handle_net_active_window_message(struct wlr_xwm *xwm, if (surface == NULL) { return; } - wlr_signal_emit_safe(&surface->events.request_activate, surface); + wl_signal_emit_mutable(&surface->events.request_activate, surface); } static void pending_startup_id_destroy(struct pending_startup_id *pending) { @@ -1423,7 +1422,7 @@ static void xwm_handle_net_startup_info_message(struct wlr_xwm *xwm, if (id) { struct wlr_xwayland_remove_startup_info_event data = { id, ev->window }; wlr_log(WLR_DEBUG, "Got startup id: %s", id); - wlr_signal_emit_safe(&xwm->xwayland->events.remove_startup_info, &data); + wl_signal_emit_mutable(&xwm->xwayland->events.remove_startup_info, &data); pending_startup_id_destroy(curr); } } @@ -1451,7 +1450,7 @@ static void xwm_handle_wm_change_state_message(struct wlr_xwm *xwm, .surface = xsurface, .minimize = minimize, }; - wlr_signal_emit_safe(&xsurface->events.request_minimize, &minimize_event); + wl_signal_emit_mutable(&xsurface->events.request_minimize, &minimize_event); } static void xwm_handle_client_message(struct wlr_xwm *xwm, |