From 119ef87373057377fab97560c9bb72a6a123da6f Mon Sep 17 00:00:00 2001
From: Johan Malm <jgm323@gmail.com>
Date: Mon, 20 Sep 2021 22:12:34 +0100
Subject: [PATCH] s/focused_view()/desktop_focused_view()

---
 include/labwc.h |  2 +-
 src/action.c    | 12 ++++++------
 src/desktop.c   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/labwc.h b/include/labwc.h
index 0bafa478..2e053983 100644
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -337,7 +337,7 @@ void desktop_focus_view(struct seat *seat, struct view *view);
  * Note: If !current, the server->views second focusable view is returned
  */
 struct view *desktop_cycle_view(struct server *server, struct view *current);
-struct view *focused_view(struct server *server);
+struct view *desktop_focused_view(struct server *server);
 void desktop_focus_topmost_mapped_view(struct server *server);
 bool isfocusable(struct view *view);
 
diff --git a/src/action.c b/src/action.c
index 3f1f1d34..6e2b4bbb 100644
--- a/src/action.c
+++ b/src/action.c
@@ -24,7 +24,7 @@ action(struct server *server, const char *action, const char *command)
 	if (!action)
 		return;
 	if (!strcasecmp(action, "Close")) {
-		struct view *view = focused_view(server);
+		struct view *view = desktop_focused_view(server);
 		if (view) {
 			view->impl->close(view);
 		}
@@ -40,7 +40,7 @@ action(struct server *server, const char *action, const char *command)
 	} else if (!strcasecmp(action, "Exit")) {
 		wl_display_terminate(server->wl_display);
 	} else if (!strcasecmp(action, "MoveToEdge")) {
-		view_move_to_edge(focused_view(server), command);
+		view_move_to_edge(desktop_focused_view(server), command);
 	} else if (!strcasecmp(action, "NextWindow")) {
 		server->cycle_view =
 			desktop_cycle_view(server, server->cycle_view);
@@ -50,22 +50,22 @@ action(struct server *server, const char *action, const char *command)
 	} else if (!strcasecmp(action, "ShowMenu")) {
 		show_menu(server, command);
 	} else if (!strcasecmp(action, "ToggleMaximize")) {
-		struct view *view = focused_view(server);
+		struct view *view = desktop_focused_view(server);
 		if (view) {
 			view_toggle_maximize(view);
 		}
 	} else if (!strcasecmp(action, "ToggleFullscreen")) {
-		struct view *view = focused_view(server);
+		struct view *view = desktop_focused_view(server);
 		if (view) {
 			view_toggle_fullscreen(view);
 		}
 	} else if (!strcasecmp(action, "ToggleDecorations")) {
-		struct view *view = focused_view(server);
+		struct view *view = desktop_focused_view(server);
 		if (view) {
 			view_toggle_decorations(view);
 		}
 	} else if (!strcasecmp(action, "Iconify")) {
-		struct view *view = focused_view(server);
+		struct view *view = desktop_focused_view(server);
 		if (view) {
 			view_minimize(view, true);
 		}
diff --git a/src/desktop.c b/src/desktop.c
index 5ec31de8..4479816e 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -213,7 +213,7 @@ topmost_mapped_view(struct server *server)
 }
 
 struct view *
-focused_view(struct server *server)
+desktop_focused_view(struct server *server)
 {
 	struct seat *seat = &server->seat;
 	struct wlr_surface *focused_surface;