desktop: rename functions to increase consistency

...from
- desktop_raise_view()
- desktop_move_view_to_end_of_cycle()

to
- desktop_move_to_front()
- desktop_move_to_back()

diff --git a/include/labwc.h b/include/labwc.h
index cff99900f63fdc3d2f698de20b54384145addab5..d649e09e6d02aa2ce25dd180308cdec4cb3306ed 100644 (file)
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -396,8 +396,8 @@ void foreign_toplevel_handle_create(struct view *view);
  *              or pointer focus, in this compositor are they called together.
  */
 
-void desktop_raise_view(struct view *view);
-void desktop_move_view_to_end_of_cycle(struct view *to_end);
+void desktop_move_to_front(struct view *view);
+void desktop_move_to_back(struct view *view);
 void desktop_focus_and_activate_view(struct seat *seat, struct view *view);
 
 enum lab_cycle_dir {

diff --git a/src/action.c b/src/action.c
index e2ef598ba810e6e848f39d73f407943e955c637e..44fdba68e898d3c270bbfb2a0a3903cbe2d6155f 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -96,7 +96,7 @@ action(struct view *activator, struct server *server, const char *action, const
        } else if (!strcasecmp(action, "Raise")) {
                struct view *view = activator_or_focused_view(activator, server);
                if (view) {
-                       desktop_raise_view(view);
+                       desktop_move_to_front(view);
                        damage_all_outputs(server);
                }
        } else if (!strcasecmp(action, "Resize")) {

diff --git a/src/cursor.c b/src/cursor.c
index a9384bc0e3bd488932e2ba6f7a9e7b0a2930c9f2..78ad2389e5304082480b6f05d060d488818c5a07 100644 (file)
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -220,7 +220,7 @@ process_cursor_motion(struct server *server, uint32_t time)
        if (view && rc.focus_follow_mouse) {
                desktop_focus_and_activate_view(&server->seat, view);
                if (rc.raise_on_focus) {
-                       desktop_raise_view(view);
+                       desktop_move_to_front(view);
                }
        }
 

diff --git a/src/desktop.c b/src/desktop.c
index 43e5da6635b83321ad7432af3c78a9ca8e649363..ba4aec952ef92ccb4d8d8f09de83ac57fcd27bb9 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -52,7 +52,7 @@ move_xwayland_sub_views_to_front(struct view *parent)
 #endif
 
 void
-desktop_raise_view(struct view *view)
+desktop_move_to_front(struct view *view)
 {
        if (!view) {
                return;
@@ -63,6 +63,25 @@ desktop_raise_view(struct view *view)
 #endif
 }
 
+static void
+wl_list_insert_tail(struct wl_list *list, struct wl_list *elm)
+{
+       elm->prev = list->prev;
+       elm->next = list;
+       list->prev = elm;
+       elm->prev->next = elm;
+}
+
+void
+desktop_move_to_back(struct view *view)
+{
+       if (!view) {
+               return;
+       }
+       wl_list_remove(&view->link);
+       wl_list_insert_tail(&view->server->views, &view->link);
+}
+
 static void
 deactivate_all_views(struct server *server)
 {
@@ -170,22 +189,6 @@ desktop_cycle_view(struct server *server, struct view *current, enum lab_cycle_d
        return view;
 }
 
-static void
-wl_list_insert_tail(struct wl_list *list, struct wl_list *elm)
-{
-       elm->prev = list->prev;
-       elm->next = list;
-       list->prev = elm;
-       elm->prev->next = elm;
-}
-
-void
-desktop_move_view_to_end_of_cycle(struct view *to_end)
-{
-       wl_list_remove(&to_end->link);
-       wl_list_insert_tail(&to_end->server->views, &to_end->link);
-}
-
 static bool
 has_mapped_view(struct wl_list *wl_list)
 {
@@ -237,7 +240,7 @@ desktop_focus_topmost_mapped_view(struct server *server)
 {
        struct view *view = topmost_mapped_view(server);
        desktop_focus_and_activate_view(&server->seat, view);
-       desktop_raise_view(view);
+       desktop_move_to_front(view);
 }
 
 static bool

diff --git a/src/foreign.c b/src/foreign.c
index 3568237b13666b084200c8e828b73371817d458f..c61df26dbca92753651b4ade75d55167cb8529ec 100644 (file)
--- a/src/foreign.c
+++ b/src/foreign.c
@@ -36,7 +36,7 @@ handle_toplevel_handle_request_activate(struct wl_listener *listener, void *data
        // struct wlr_foreign_toplevel_handle_v1_activated_event *event = data;
        /* In a multi-seat world we would select seat based on event->seat here. */
        desktop_focus_and_activate_view(&view->server->seat, view);
-       desktop_raise_view(view);
+       desktop_move_to_front(view);
 }
 
 void

diff --git a/src/keyboard.c b/src/keyboard.c
index b1b7cef895bdda43d3d24554859841e897628d59..b0b8b56352293f9fe3d9112b329e8291dfa283dc 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -45,7 +45,7 @@ keyboard_modifiers_notify(struct wl_listener *listener, void *data)
                        /* end cycle */
                        desktop_focus_and_activate_view(&server->seat,
                                server->cycle_view);
-                       desktop_raise_view(server->cycle_view);
+                       desktop_move_to_front(server->cycle_view);
                        server->cycle_view = NULL;
                }
        }

diff --git a/src/view-impl.c b/src/view-impl.c
index 8b948b129e859cf72dfb2ac3e21e05d9b5b74fa7..d10dd2a41e35773d1a669d4265cd62ec49284928 100644 (file)
--- a/src/view-impl.c
+++ b/src/view-impl.c
@@ -8,7 +8,7 @@ void
 view_impl_map(struct view *view)
 {
        desktop_focus_and_activate_view(&view->server->seat, view);
-       desktop_raise_view(view);
+       desktop_move_to_front(view);
 
        view_update_title(view);
        view_update_app_id(view);

diff --git a/src/view.c b/src/view.c
index 7a5ad2034950db63235ad6a6adcdb236cf703d5a..ff36b6cbf8ebbcf39d934cb5a2442dbe20f20ea1 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -79,7 +79,7 @@ view_minimize(struct view *view, bool minimized)
        view->minimized = minimized;
        if (minimized) {
                view->impl->unmap(view);
-               desktop_move_view_to_end_of_cycle(view);
+               desktop_move_to_back(view);
        } else {
                view->impl->map(view);
        }