gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

Removed WScreen args not used

Browse Source 
The WScreen arguments in the functions wWorkspaceMenuUpdate() and
makeMakeShortcutMenu() is not used now, so can be removed.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
This commit is contained in:
Rodolfo García Peñas (kix)
2013-10-08 00:56:36 +02:00
committed by Carlos R. Mafra
parent e86b8dcb2f
commit 074092f319
6 changed files with 14 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/defaults.c
View File

@@ -1203,9 +1203,9 @@ void wReadDefaults(WScreen * scr, WMPropList * new_dict)
if (needs_refresh & REFRESH_WORKSPACE_MENU) { if (needs_refresh & REFRESH_WORKSPACE_MENU) {
if (w_global.workspace.menu) if (w_global.workspace.menu)
wWorkspaceMenuUpdate(scr, w_global.workspace.menu); wWorkspaceMenuUpdate(w_global.workspace.menu);
if (w_global.clip.ws_menu) if (w_global.clip.ws_menu)
wWorkspaceMenuUpdate(scr, w_global.clip.ws_menu); wWorkspaceMenuUpdate(w_global.clip.ws_menu);
if (w_global.workspace.submenu) if (w_global.workspace.submenu)
w_global.workspace.submenu->flags.realized = 0; w_global.workspace.submenu->flags.realized = 0;
if (w_global.clip.submenu) if (w_global.clip.submenu)

2
src/dock.c
View File

@@ -3965,7 +3965,7 @@ static void iconMouseDown(WObjDescriptor *desc, XEvent *event)
WMenu *wsMenu = w_global.clip.ws_menu; WMenu *wsMenu = w_global.clip.ws_menu;
int xpos; int xpos;
wWorkspaceMenuUpdate(scr, wsMenu); wWorkspaceMenuUpdate(wsMenu);
xpos = event->xbutton.x_root - wsMenu->frame->core->width / 2 - 1; xpos = event->xbutton.x_root - wsMenu->frame->core->width / 2 - 1;
if (xpos < 0) { if (xpos < 0) {

2
src/rootmenu.c
View File

@@ -780,7 +780,7 @@ static WMenuEntry *addWorkspaceMenu(WScreen *scr, WMenu *menu, const char *title
entry = wMenuAddCallback(menu, title, NULL, NULL); entry = wMenuAddCallback(menu, title, NULL, NULL);
wMenuEntrySetCascade(menu, entry, wsmenu); wMenuEntrySetCascade(menu, entry, wsmenu);
wWorkspaceMenuUpdate(scr, wsmenu); wWorkspaceMenuUpdate(wsmenu);
} }
return entry; return entry;
} }

19
src/winmenu.c
View File

@@ -356,19 +356,9 @@ static WMenu *makeWorkspaceMenu(WScreen * scr)
return menu; return menu;
} }
static WMenu *makeMakeShortcutMenu(WScreen * scr, WMenu * menu) static WMenu *makeMakeShortcutMenu(WMenu *menu)
{ {
/*
WMenu *menu;
*/
int i; int i;
/*
menu = wMenuCreate(scr, NULL, False);
if (!menu) {
wwarning(_("could not create submenu for window menu"));
return NULL;
}
*/
for (i = 0; i < MAX_WINDOW_SHORTCUTS; i++) { for (i = 0; i < MAX_WINDOW_SHORTCUTS; i++) {
WMenuEntry *entry; WMenuEntry *entry;
@@ -443,12 +433,7 @@ static WMenu *createWindowMenu(WScreen * scr)
entry = wMenuAddCallback(menu, _("Attributes..."), execMenuCommand, NULL); entry = wMenuAddCallback(menu, _("Attributes..."), execMenuCommand, NULL);
entry = wMenuAddCallback(menu, _("Options"), NULL, NULL); entry = wMenuAddCallback(menu, _("Options"), NULL, NULL);
wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr, makeOptionsMenu(scr))); wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(makeOptionsMenu(scr)));
/*
entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
*/
entry = wMenuAddCallback(menu, _("Launch"), execMenuCommand, NULL); entry = wMenuAddCallback(menu, _("Launch"), execMenuCommand, NULL);
entry->rtext = GetShortcutKey(wKeyBindings[WKBD_RELAUNCH]); entry->rtext = GetShortcutKey(wKeyBindings[WKBD_RELAUNCH]);

14
src/workspace.c
View File

@@ -114,8 +114,8 @@ int wWorkspaceNew(WScreen *scr)
w_global.workspace.array = list; w_global.workspace.array = list;
wWorkspaceMenuUpdate(scr, w_global.workspace.menu); wWorkspaceMenuUpdate(w_global.workspace.menu);
wWorkspaceMenuUpdate(scr, w_global.clip.ws_menu); wWorkspaceMenuUpdate(w_global.clip.ws_menu);
wNETWMUpdateDesktop(scr); wNETWMUpdateDesktop(scr);
WMPostNotificationName(WMNWorkspaceCreated, scr, (void *)(uintptr_t) (w_global.workspace.count - 1)); WMPostNotificationName(WMNWorkspaceCreated, scr, (void *)(uintptr_t) (w_global.workspace.count - 1));
XFlush(dpy); XFlush(dpy);
@@ -165,9 +165,9 @@ Bool wWorkspaceDelete(WScreen * scr, int workspace)
w_global.workspace.count--; w_global.workspace.count--;
/* update menu */ /* update menu */
wWorkspaceMenuUpdate(scr, w_global.workspace.menu); wWorkspaceMenuUpdate(w_global.workspace.menu);
/* clip workspace menu */ /* clip workspace menu */
wWorkspaceMenuUpdate(scr, w_global.clip.ws_menu); wWorkspaceMenuUpdate(w_global.clip.ws_menu);
/* update also window menu */ /* update also window menu */
if (w_global.workspace.submenu) { if (w_global.workspace.submenu) {
@@ -482,9 +482,9 @@ void wWorkspaceForceChange(WScreen * scr, int workspace)
w_global.workspace.last_used = w_global.workspace.current; w_global.workspace.last_used = w_global.workspace.current;
w_global.workspace.current = workspace; w_global.workspace.current = workspace;
wWorkspaceMenuUpdate(scr, w_global.workspace.menu); wWorkspaceMenuUpdate(w_global.workspace.menu);
wWorkspaceMenuUpdate(scr, w_global.clip.ws_menu); wWorkspaceMenuUpdate(w_global.clip.ws_menu);
toUnmapSize = 16; toUnmapSize = 16;
toUnmapCount = 0; toUnmapCount = 0;
@@ -737,7 +737,7 @@ WMenu *wWorkspaceMenuMake(WScreen * scr, Bool titled)
return wsmenu; return wsmenu;
} }
void wWorkspaceMenuUpdate(WScreen * scr, WMenu * menu) void wWorkspaceMenuUpdate(WMenu *menu)
{ {
int i; int i;
long ws; long ws;

2
src/workspace.h
View File

@@ -36,7 +36,7 @@ Bool wWorkspaceDelete(WScreen *scr, int workspace);
void wWorkspaceChange(WScreen *scr, int workspace); void wWorkspaceChange(WScreen *scr, int workspace);
void wWorkspaceForceChange(WScreen *scr, int workspace); void wWorkspaceForceChange(WScreen *scr, int workspace);
WMenu *wWorkspaceMenuMake(WScreen *scr, Bool titled); WMenu *wWorkspaceMenuMake(WScreen *scr, Bool titled);
void wWorkspaceMenuUpdate(WScreen *scr, WMenu *menu); void wWorkspaceMenuUpdate(WMenu *menu);
void wWorkspaceMenuEdit(WScreen *scr); void wWorkspaceMenuEdit(WScreen *scr);
void wWorkspaceSaveState(WScreen *scr, WMPropList *old_state); void wWorkspaceSaveState(WScreen *scr, WMPropList *old_state);
void wWorkspaceRestoreState(WScreen *scr); void wWorkspaceRestoreState(WScreen *scr);