gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-22 05:48:01 +01:00
Code Issues Projects Releases Wiki Activity

Clip, Dock and Drawers menu moved to appropriate global namespace

Browse Source 
The clip, dock, workspaces and drawers menus are common for all
workspaces, so they should be included in the global namespace
instead of the screen struct.
This commit is contained in:
Rodolfo García Peñas (kix)
2013-10-08 00:56:35 +02:00
committed by Carlos R. Mafra
parent 9c252988f8
commit e86b8dcb2f
6 changed files with 69 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/workspace.c
View File

@@ -115,7 +115,7 @@ int wWorkspaceNew(WScreen *scr)
w_global.workspace.array = list;
wWorkspaceMenuUpdate(scr, w_global.workspace.menu);
wWorkspaceMenuUpdate(scr, scr->clip_ws_menu);
wWorkspaceMenuUpdate(scr, w_global.clip.ws_menu);
wNETWMUpdateDesktop(scr);
WMPostNotificationName(WMNWorkspaceCreated, scr, (void *)(uintptr_t) (w_global.workspace.count - 1));
XFlush(dpy);
@@ -167,11 +167,11 @@ Bool wWorkspaceDelete(WScreen * scr, int workspace)
/* update menu */
wWorkspaceMenuUpdate(scr, w_global.workspace.menu);
/* clip workspace menu */
wWorkspaceMenuUpdate(scr, scr->clip_ws_menu);
wWorkspaceMenuUpdate(scr, w_global.clip.ws_menu);
/* update also window menu */
if (scr->workspace_submenu) {
WMenu *menu = scr->workspace_submenu;
if (w_global.workspace.submenu) {
WMenu *menu = w_global.workspace.submenu;
i = menu->entry_no;
while (i > w_global.workspace.count)
@@ -179,8 +179,8 @@ Bool wWorkspaceDelete(WScreen * scr, int workspace)
wMenuRealize(menu);
}
/* and clip menu */
if (scr->clip_submenu) {
WMenu *menu = scr->clip_submenu;
if (w_global.clip.submenu) {
WMenu *menu = w_global.clip.submenu;
i = menu->entry_no;
while (i > w_global.workspace.count)
@@ -484,7 +484,7 @@ void wWorkspaceForceChange(WScreen * scr, int workspace)
wWorkspaceMenuUpdate(scr, w_global.workspace.menu);
wWorkspaceMenuUpdate(scr, scr->clip_ws_menu);
wWorkspaceMenuUpdate(scr, w_global.clip.ws_menu);
toUnmapSize = 16;
toUnmapCount = 0;
@@ -684,11 +684,11 @@ void wWorkspaceRename(WScreen *scr, int workspace, const char *name)
wfree(w_global.workspace.array[workspace]->name);
w_global.workspace.array[workspace]->name = wstrdup(buf);
if (scr->clip_ws_menu) {
if (strcmp(scr->clip_ws_menu->entries[workspace + MC_WORKSPACE1]->text, buf) != 0) {
wfree(scr->clip_ws_menu->entries[workspace + MC_WORKSPACE1]->text);
scr->clip_ws_menu->entries[workspace + MC_WORKSPACE1]->text = wstrdup(buf);
wMenuRealize(scr->clip_ws_menu);
if (w_global.clip.ws_menu) {
if (strcmp(w_global.clip.ws_menu->entries[workspace + MC_WORKSPACE1]->text, buf) != 0) {
wfree(w_global.clip.ws_menu->entries[workspace + MC_WORKSPACE1]->text);
w_global.clip.ws_menu->entries[workspace + MC_WORKSPACE1]->text = wstrdup(buf);
wMenuRealize(w_global.clip.ws_menu);
}
}
if (w_global.workspace.menu) {