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

Array of workspaces moved to the workspace object in the global namespace

Browse Source 
The variable workspaces, that contains the list of workspaces
is moved to the global workspace properties.

Now the screen is not needed to know the workspaces.

The function getWindowState() doesn't need the WScreen argument.
This commit is contained in:
Rodolfo García Peñas (kix)
2013-10-08 00:56:33 +02:00
committed by Carlos R. Mafra
parent c610b8d7ce
commit f0c5073600
15 changed files with 92 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/appicon.c
View File

@@ -183,7 +183,7 @@ void unpaint_app_icon(WApplication *wapp)
return;
scr = wapp->main_window_desc->screen_ptr;
clip = scr->workspaces[w_global.workspace.current]->clip;
clip = w_global.workspace.array[w_global.workspace.current]->clip;
if (!clip || !aicon->attracted || !clip->collapsed)
XUnmapWindow(dpy, aicon->icon->core->window);
@@ -217,7 +217,7 @@ void paint_app_icon(WApplication *wapp)
attracting_dock = scr->attracting_drawer != NULL ?
scr->attracting_drawer :
scr->workspaces[w_global.workspace.current]->clip;
w_global.workspace.array[w_global.workspace.current]->clip;
if (attracting_dock && attracting_dock->attract_icons &&
wDockFindFreeSlot(attracting_dock, &x, &y)) {
wapp->app_icon->attracted = 1;
@@ -809,8 +809,8 @@ Bool wHandleAppIconMove(WAppIcon *aicon, XEvent *event)
allDocks[ i++ ] = scr->dock;
if (!wPreferences.flags.noclip &&
originalDock != scr->workspaces[w_global.workspace.current]->clip)
allDocks[ i++ ] = scr->workspaces[w_global.workspace.current]->clip;
originalDock != w_global.workspace.array[w_global.workspace.current]->clip)
allDocks[i++] = w_global.workspace.array[w_global.workspace.current]->clip;
for ( ; i < scr->drawer_count + 2; i++) /* In case the clip, the dock, or both, are disabled */
allDocks[ i ] = NULL;
@@ -865,7 +865,7 @@ Bool wHandleAppIconMove(WAppIcon *aicon, XEvent *event)
if (i == w_global.workspace.current)
continue;
wDockShowIcons(scr->workspaces[i]->clip);
wDockShowIcons(w_global.workspace.array[i]->clip);
/* Note: if dock is collapsed (for instance, because it
auto-collapses), its icons still won't show up */
}
@@ -1071,7 +1071,7 @@ Bool wHandleAppIconMove(WAppIcon *aicon, XEvent *event)
if (i == w_global.workspace.current)
continue;
wDockHideIcons(scr->workspaces[i]->clip);
wDockHideIcons(w_global.workspace.array[i]->clip);
}
}
if (wPreferences.auto_arrange_icons && !(originalDock != NULL && docked))
@@ -1151,7 +1151,7 @@ static void create_appicon_from_dock(WWindow *wwin, WApplication *wapp, Window m
if (!wapp->app_icon) {
int i;
for (i = 0; i < w_global.workspace.count; i++) {
WDock *dock = scr->workspaces[i]->clip;
WDock *dock = w_global.workspace.array[i]->clip;
if (dock)
wapp->app_icon = findDockIconFor(dock, main_window);