[PATCH] WindowMaker: removed OpenWorkspaceMenu

[Rodolfo kix Garcia]

>From bd7ca98fd410d3eab84ef69a2fc62490d7389533 Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <k...@kix.es>
Date: Sun, 12 Feb 2012 20:04:50 +0100
Subject: [PATCH] WindowMaker: removed OpenWorkspaceMenu

The function OpenWorkspaceMenu is not used, so can be removed.
---
 src/funcs.h |    2 --
 src/menu.c  |   33 ---------------------------------
 2 files changed, 0 insertions(+), 35 deletions(-)

diff --git a/src/funcs.h b/src/funcs.h
index 5d813ea..6d2c552 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -61,8 +61,6 @@ void OpenWindowMenu2(WWindow *wwin, int x, int y, int 
keyboard);
 
 void OpenMiniwindowMenu(WWindow *wwin, int x, int y);
 
-void OpenWorkspaceMenu(WScreen *scr, int x, int y);
-
 void CloseWindowMenu(WScreen *scr);
 
 void DestroyWindowMenu(WScreen *scr);
diff --git a/src/menu.c b/src/menu.c
index dd84ca2..ecbd6a6 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -2495,36 +2495,3 @@ void wMenuRestoreState(WScreen * scr)
        }
        restoreMenuRecurs(scr, menus, scr->root_menu, "");
 }
-
-void OpenWorkspaceMenu(WScreen * scr, int x, int y)
-{
-       WMenu *menu, *parent;
-       WMenuEntry *entry;
-
-       if (!scr->root_menu) {
-               OpenRootMenu(scr, scr->scr_width * 2, 0, False);
-               wMenuUnmap(scr->root_menu);
-       }
-
-       menu = scr->workspace_menu;
-       if (menu) {
-               if (menu->flags.mapped) {
-                       if (!menu->flags.buttoned) {
-                               wMenuUnmap(menu);
-                               parent = menu->parent;
-                               if (parent && parent->selected_entry >= 0) {
-                                       entry = 
parent->entries[parent->selected_entry];
-                                       if (parent->cascades[entry->cascade] == 
menu) {
-                                               selectEntry(parent, -1);
-                                               wMenuMapAt(menu, x, y, False);
-                                       }
-                               }
-                       } else {
-                               wRaiseFrame(menu->frame->core);
-                               wMenuMapCopyAt(menu, x, y);
-                       }
-               } else {
-                       wMenuMapAt(menu, x, y, False);
-               }
-       }
-}
-- 
1.7.7.3

-- 
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/

>From bd7ca98fd410d3eab84ef69a2fc62490d7389533 Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <k...@kix.es>
Date: Sun, 12 Feb 2012 20:04:50 +0100
Subject: [PATCH] WindowMaker: removed OpenWorkspaceMenu

The function OpenWorkspaceMenu is not used, so can be removed.
---
 src/funcs.h |    2 --
 src/menu.c  |   33 ---------------------------------
 2 files changed, 0 insertions(+), 35 deletions(-)

diff --git a/src/funcs.h b/src/funcs.h
index 5d813ea..6d2c552 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -61,8 +61,6 @@ void OpenWindowMenu2(WWindow *wwin, int x, int y, int keyboard);
 
 void OpenMiniwindowMenu(WWindow *wwin, int x, int y);
 
-void OpenWorkspaceMenu(WScreen *scr, int x, int y);
-
 void CloseWindowMenu(WScreen *scr);
 
 void DestroyWindowMenu(WScreen *scr);
diff --git a/src/menu.c b/src/menu.c
index dd84ca2..ecbd6a6 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -2495,36 +2495,3 @@ void wMenuRestoreState(WScreen * scr)
 	}
 	restoreMenuRecurs(scr, menus, scr->root_menu, "");
 }
-
-void OpenWorkspaceMenu(WScreen * scr, int x, int y)
-{
-	WMenu *menu, *parent;
-	WMenuEntry *entry;
-
-	if (!scr->root_menu) {
-		OpenRootMenu(scr, scr->scr_width * 2, 0, False);
-		wMenuUnmap(scr->root_menu);
-	}
-
-	menu = scr->workspace_menu;
-	if (menu) {
-		if (menu->flags.mapped) {
-			if (!menu->flags.buttoned) {
-				wMenuUnmap(menu);
-				parent = menu->parent;
-				if (parent && parent->selected_entry >= 0) {
-					entry = parent->entries[parent->selected_entry];
-					if (parent->cascades[entry->cascade] == menu) {
-						selectEntry(parent, -1);
-						wMenuMapAt(menu, x, y, False);
-					}
-				}
-			} else {
-				wRaiseFrame(menu->frame->core);
-				wMenuMapCopyAt(menu, x, y);
-			}
-		} else {
-			wMenuMapAt(menu, x, y, False);
-		}
-	}
-}
-- 
1.7.7.3