From 6d0442c0c2cfcb75f855348b8133abcb2f3c2427 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 27 Sep 2018 17:09:05 +1000 Subject: [PATCH] Rename view_set_csd_from_client to view_update_csd_from_client --- include/sway/tree/view.h | 2 +- sway/decoration.c | 2 +- sway/desktop/xdg_shell.c | 2 +- sway/desktop/xdg_shell_v6.c | 2 +- sway/desktop/xwayland.c | 2 +- sway/tree/view.c | 2 +- sway/xdg_decoration.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 49df7c88f..e7aaffd7d 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -275,7 +275,7 @@ void view_set_csd_from_server(struct sway_view *view, bool enabled); * Updates the view's border setting when the client unexpectedly changes their * decoration mode. */ -void view_set_csd_from_client(struct sway_view *view, bool enabled); +void view_update_csd_from_client(struct sway_view *view, bool enabled); void view_set_tiled(struct sway_view *view, bool tiled); diff --git a/sway/decoration.c b/sway/decoration.c index fea6ed4c0..849fa89c9 100644 --- a/sway/decoration.c +++ b/sway/decoration.c @@ -28,7 +28,7 @@ static void server_decoration_handle_mode(struct wl_listener *listener, bool csd = deco->wlr_server_decoration->mode == WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; - view_set_csd_from_client(view, csd); + view_update_csd_from_client(view, csd); arrange_container(view->container); transaction_commit_dirty(); diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index d563edaec..2680af649 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c @@ -381,7 +381,7 @@ static void handle_map(struct wl_listener *listener, void *data) { decoration_from_surface(xdg_surface->surface); bool csd = !deco || deco->wlr_server_decoration->mode == WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; - view_set_csd_from_client(view, csd); + view_update_csd_from_client(view, csd); if (xdg_surface->toplevel->client_pending.fullscreen) { container_set_fullscreen(view->container, true); diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 8c8085f72..a7838c0fb 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -378,7 +378,7 @@ static void handle_map(struct wl_listener *listener, void *data) { decoration_from_surface(xdg_surface->surface); bool csd = !deco || deco->wlr_server_decoration->mode == WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; - view_set_csd_from_client(view, csd); + view_update_csd_from_client(view, csd); if (xdg_surface->toplevel->client_pending.fullscreen) { container_set_fullscreen(view->container, true); diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index f1205518d..4c710f7ec 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -250,7 +250,7 @@ static void handle_set_decorations(struct wl_listener *listener, void *data) { struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; bool csd = xsurface->decorations != WLR_XWAYLAND_SURFACE_DECORATIONS_ALL; - view_set_csd_from_client(view, csd); + view_update_csd_from_client(view, csd); } static void _close(struct sway_view *view) { diff --git a/sway/tree/view.c b/sway/tree/view.c index c370de2d5..1c94de4c0 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -318,7 +318,7 @@ void view_set_csd_from_server(struct sway_view *view, bool enabled) { } } -void view_set_csd_from_client(struct sway_view *view, bool enabled) { +void view_update_csd_from_client(struct sway_view *view, bool enabled) { if (enabled && view->border != B_CSD) { view->saved_border = view->border; view->border = B_CSD; diff --git a/sway/xdg_decoration.c b/sway/xdg_decoration.c index 2e7e4bd04..80b2f57e3 100644 --- a/sway/xdg_decoration.c +++ b/sway/xdg_decoration.c @@ -26,7 +26,7 @@ static void xdg_decoration_handle_surface_commit(struct wl_listener *listener, WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE; struct sway_view *view = decoration->view; - view_set_csd_from_client(view, csd); + view_update_csd_from_client(view, csd); arrange_container(view->container); transaction_commit_dirty();