1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00

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

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

View File

@@ -238,7 +238,7 @@ void UpdateSwitchMenu(WScreen * scr, WWindow * wwin, int action)
snprintf(entry->rtext, MAX_WORKSPACENAME_WIDTH, "[*]");
else
snprintf(entry->rtext, MAX_WORKSPACENAME_WIDTH, "[%s]",
scr->workspaces[wwin->frame->workspace]->name);
w_global.workspace.array[wwin->frame->workspace]->name);
if (wwin->flags.hidden) {
entry->flags.indicator_type = MI_HIDDEN;
@@ -296,7 +296,7 @@ void UpdateSwitchMenu(WScreen * scr, WWindow * wwin, int action)
} else {
snprintf(entry->rtext, MAX_WORKSPACENAME_WIDTH,
"[%s]",
scr->workspaces[wwin->frame->workspace]->name);
w_global.workspace.array[wwin->frame->workspace]->name);
}
rt = entry->rtext;
@@ -374,7 +374,7 @@ static void UpdateSwitchMenuWorkspace(WScreen *scr, int workspace)
snprintf(menu->entries[i]->rtext, MAX_WORKSPACENAME_WIDTH, "[*]");
else
snprintf(menu->entries[i]->rtext, MAX_WORKSPACENAME_WIDTH, "[%s]",
scr->workspaces[wwin->frame->workspace]->name);
w_global.workspace.array[wwin->frame->workspace]->name);
menu->flags.realized = 0;
}
}