diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2018-03-30 16:16:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-30 16:16:52 -0400 |
| commit | 212d957c69b15e57a791eec52de34dcde4241e86 (patch) | |
| tree | ca322e83acc15308f6aeb516a76a0c1fbd324c8c /xwayland | |
| parent | e8cb5e89e915294b410a5349ccbdae40a456d0ff (diff) | |
| parent | 865b0aa123172852b49df4178437e6e8a020bc60 (diff) | |
Merge pull request #779 from emersion/xwayland-map-consistency
xwayland: rename map_notify to map for consistency
Diffstat (limited to 'xwayland')
| -rw-r--r-- | xwayland/xwm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 8911c553..2743cc53 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -107,8 +107,8 @@ static struct wlr_xwayland_surface *wlr_xwayland_surface_create( wl_signal_init(&surface->events.request_resize); wl_signal_init(&surface->events.request_maximize); wl_signal_init(&surface->events.request_fullscreen); - wl_signal_init(&surface->events.map_notify); - wl_signal_init(&surface->events.unmap_notify); + wl_signal_init(&surface->events.map); + wl_signal_init(&surface->events.unmap); wl_signal_init(&surface->events.set_class); wl_signal_init(&surface->events.set_title); wl_signal_init(&surface->events.set_parent); @@ -581,7 +581,7 @@ static void xwm_map_shell_surface(struct wlr_xwm *xwm, wl_signal_add(&surface->events.destroy, &xsurface->surface_destroy); xsurface->mapped = true; - wlr_signal_emit_safe(&xsurface->events.map_notify, xsurface); + wlr_signal_emit_safe(&xsurface->events.map, xsurface); } static void xwm_handle_create_notify(struct wlr_xwm *xwm, @@ -713,7 +713,7 @@ static void xwm_handle_unmap_notify(struct wlr_xwm *xwm, if (xsurface->mapped) { xsurface->mapped = false; - wlr_signal_emit_safe(&xsurface->events.unmap_notify, xsurface); + wlr_signal_emit_safe(&xsurface->events.unmap, xsurface); } xsurface_set_wm_state(xsurface, ICCCM_WITHDRAWN_STATE); @@ -1531,4 +1531,3 @@ bool xwm_atoms_contains(struct wlr_xwm *xwm, xcb_atom_t *atoms, return false; } - |