WM menu: move wMenuItemWithTitle to menu.c

Author: trunkmaster

Applications/Workspace/WM/appmenu.c

@@ -785,18 +785,6 @@ void wApplicationMenuShow(WMenu *menu)
   }
 }
 
-WMenuItem *wMenuItemWithTitle(WMenu *menu, char *title)
-{
-  WMenuItem **items = menu->items;
-
-  for (int i = 0; i < menu->items_count; i++) {
-    if (!strcmp(items[i]->text, title)) {
-      return items[i];
-    }
-  }
-  return NULL;
-}
-
 // Menu state
 //--------------------------------------------------------------------------------------------------
 

Applications/Workspace/WM/appmenu.h

@@ -35,7 +35,5 @@ void wApplicationMenuShow(WMenu *menu);
 void wApplicationMenuSaveState(WMenu *main_menu, CFMutableArrayRef menus_state);
 void wApplicationMenuRestoreFromState(WMenu *menu, CFArrayRef state);
 
-WMenuItem *wMenuItemWithTitle(WMenu *menu, char *title);
-
 void wApplicationMenuSetKeyGrabs(WWindow *wwin);
 Bool wApplicationMenuHandleKeyPress(struct WWindow *focused_window, XEvent *event);

Applications/Workspace/WM/menu.c

@@ -2198,3 +2198,24 @@ void wMenuRestoreState(WScreen *scr)
 
   restoreMenu(scr, menu);
 }
+
+WMenuItem *wMenuItemWithTitle(WMenu *menu, char *title)
+{
+  WMenuItem *item = NULL;
+
+  for (short i = 0; i < menu->items_count; i++) {
+    item = menu->items[i];
+    if (strcmp(item->text, title) == 0) {
+      break;
+    }
+    if (item->submenu_index >= 0) {
+      item = wMenuItemWithTitle(menu->submenus[item->submenu_index], title);
+      if (item) {
+        break;
+      }
+    }
+    item = NULL;
+  }
+
+  return item;
+}

Applications/Workspace/WM/menu.h

@@ -83,15 +83,15 @@ typedef struct WMenu {
   void (*on_destroy)(struct WMenu *menu);
 
   struct {
-    unsigned int titled : 1;
+    unsigned int titled   : 1;
     unsigned int realized : 1; /* whether the window was configured */
     unsigned int restored : 1; /* whether the menu was restored from saved state */
     unsigned int app_menu : 1; /* this is a application or root menu */
-    unsigned int mapped : 1;   /* if menu is already mapped on screen*/
-    unsigned int hidden : 1;   /* if menu was hidden on app deactivation */
-    unsigned int tornoff : 1;  /* if the close button is visible (menu was torn off) */
-    unsigned int lowered : 1;
-    unsigned int brother : 1;  /* if this is a copy of the menu */
+    unsigned int mapped   : 1; /* if menu is already mapped on screen*/
+    unsigned int hidden   : 1; /* if menu was hidden on app deactivation */
+    unsigned int tornoff  : 1; /* if the close button is visible (menu was torn off) */
+    unsigned int lowered  : 1;
+    unsigned int brother  : 1; /* if this is a copy of the menu */
   } flags;
 } WMenu;
 
@@ -128,4 +128,6 @@ WMenu *wMenuUnderPointer(WScreen *screen);
 void wMenuSaveState(WScreen *scr);
 void wMenuRestoreState(WScreen *scr);
 
+WMenuItem *wMenuItemWithTitle(WMenu *menu, char *title);
+
 #endif /* __WORKSPACE_WM_MENU__ */