s/focused_view()/desktop_focused_view()

diff --git a/include/labwc.h b/include/labwc.h
index 0bafa478d8df57cb4a4169614c1408c0fe42594c..2e0539835c3301c2d911d47c3ee622df4fc42b32 100644 (file)
--- 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 3f1f1d343bdf5b5cca0779a8d323d954d18258dd..6e2b4bbb72d55f9810b2bba6295598432066304f 100644 (file)
--- 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 5ec31de87ec0bb2b0c15795f5e62d06caf4e325b..4479816eb827e53b65fd0b489adf62f23ebc014b 100644 (file)
--- 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;