Slight refactor of wlmaker_root_menu_create, for bundling mapping + p…

…ointer-grabbing. (#146)
phkaeser · Dec 1, 2024 · 012e398 · 012e398
1 parent 9a92dd2
commit 012e398
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 23 deletions.
diff --git a/src/action.c b/src/action.c
@@ -261,19 +261,13 @@ void wlmaker_action_execute(wlmaker_server_t *server_ptr,
                 &server_ptr->style.window,
                 &server_ptr->style.menu,
                 false,
+                wlmtk_root_get_current_workspace(server_ptr->root_ptr),
                 server_ptr->env_ptr);
-        }
-
-        if (NULL == server_ptr->root_menu_ptr) break;
-
-        window_ptr = wlmaker_root_menu_window(server_ptr->root_menu_ptr);
-        workspace_ptr = wlmtk_window_get_workspace(window_ptr);
-        if (NULL == workspace_ptr) {
-            workspace_ptr = wlmtk_root_get_current_workspace(
-                server_ptr->root_ptr);
-            wlmtk_workspace_map_window(workspace_ptr, window_ptr);
         } else {
-            wlmtk_workspace_activate_window(workspace_ptr, window_ptr);
+            window_ptr = wlmaker_root_menu_window(server_ptr->root_menu_ptr);
+            wlmtk_workspace_activate_window(
+                workspace_ptr = wlmtk_window_get_workspace(window_ptr),
+                window_ptr);
         }
         break;
 

diff --git a/src/root_menu.c b/src/root_menu.c
@@ -75,6 +75,7 @@ wlmaker_root_menu_t *wlmaker_root_menu_create(
     const wlmtk_window_style_t *window_style_ptr,
     const wlmtk_menu_style_t *menu_style_ptr,
     bool right_click_mode,
+    wlmtk_workspace_t *workspace_ptr,
     wlmtk_env_t *env_ptr)
 {
     wlmaker_root_menu_t *root_menu_ptr = logged_calloc(
@@ -151,6 +152,14 @@ wlmaker_root_menu_t *wlmaker_root_menu_create(
     }
     wlmtk_window_set_properties(root_menu_ptr->window_ptr, properties);
 
+    wlmtk_workspace_map_window(workspace_ptr, root_menu_ptr->window_ptr);
+    if (right_click_mode) {
+        wlmtk_container_pointer_grab(
+            wlmtk_window_element(root_menu_ptr->window_ptr)->parent_container_ptr,
+            wlmtk_window_element(root_menu_ptr->window_ptr));
+    }
+
+
     return root_menu_ptr;
 }
 

diff --git a/src/root_menu.h b/src/root_menu.h
@@ -38,6 +38,7 @@ extern "C" {
  * @param window_style_ptr
  * @param menu_style_ptr
  * @param env_ptr
+ * @param workspace_ptr
  * @param right_click_mode
  *
  * @return Handle of the root menu, or NULL on error.
@@ -47,6 +48,7 @@ wlmaker_root_menu_t *wlmaker_root_menu_create(
     const wlmtk_window_style_t *window_style_ptr,
     const wlmtk_menu_style_t *menu_style_ptr,
     bool right_click_mode,
+    wlmtk_workspace_t *workspace_ptr,
     wlmtk_env_t *env_ptr);
 
 /**

diff --git a/src/server.c b/src/server.c
@@ -799,23 +799,13 @@ void _wlmaker_server_unclaimed_button_event_handler(
             &server_ptr->style.window,
             &server_ptr->style.menu,
             true,
+            wlmtk_root_get_current_workspace(server_ptr->root_ptr),
             server_ptr->env_ptr);
-
         if (NULL != server_ptr->root_menu_ptr) {
-
-            wlmtk_window_t *window_ptr = wlmaker_root_menu_window(
-                server_ptr->root_menu_ptr);
-            wlmtk_workspace_t *workspace_ptr =
-                wlmtk_root_get_current_workspace(server_ptr->root_ptr);
-            wlmtk_workspace_map_window(workspace_ptr, window_ptr);
-            wlmtk_container_pointer_grab(
-                wlmtk_window_element(window_ptr)->parent_container_ptr,
-                wlmtk_window_element(window_ptr));
-
             // TODO([email protected]): Keep the menu window's position entirely
             // within the desktop area.
             wlmtk_window_set_position(
-                window_ptr,
+                wlmaker_root_menu_window(server_ptr->root_menu_ptr),
                 server_ptr->cursor_ptr->wlr_cursor_ptr->x,
                 server_ptr->cursor_ptr->wlr_cursor_ptr->y);
         }