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

Varible session_state moved to global namespace

Browse Source 
The variable session_state, defined in screen.h (WScreen), is moved to
the global variable w_global.

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:42 +02:00
committed by Carlos R. Mafra
parent d27ce03780
commit 40e1ea08b8
7 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/session.c
View File

@@ -280,9 +280,9 @@ void wSessionSaveState(WScreen * scr)
make_keys();
if (!scr->session_state) {
scr->session_state = WMCreatePLDictionary(NULL, NULL);
if (!scr->session_state)
if (!w_global.session_state) {
w_global.session_state = WMCreatePLDictionary(NULL, NULL);
if (!w_global.session_state)
return;
}
@@ -312,12 +312,13 @@ void wSessionSaveState(WScreen * scr)
}
wwin = wwin->prev;
}
WMRemoveFromPLDictionary(scr->session_state, sApplications);
WMPutInPLDictionary(scr->session_state, sApplications, list);
WMRemoveFromPLDictionary(w_global.session_state, sApplications);
WMPutInPLDictionary(w_global.session_state, sApplications, list);
WMReleasePropList(list);
wks = WMCreatePLString(w_global.workspace.array[w_global.workspace.current]->name);
WMPutInPLDictionary(scr->session_state, sWorkspace, wks);
WMPutInPLDictionary(w_global.session_state, sWorkspace, wks);
WMReleasePropList(wks);
WMFreeArray(wapp_list);
@@ -327,11 +328,11 @@ void wSessionClearState(WScreen * scr)
{
make_keys();
if (!scr->session_state)
if (!w_global.session_state)
return;
WMRemoveFromPLDictionary(scr->session_state, sApplications);
WMRemoveFromPLDictionary(scr->session_state, sWorkspace);
WMRemoveFromPLDictionary(w_global.session_state, sApplications);
WMRemoveFromPLDictionary(w_global.session_state, sWorkspace);
}
static pid_t execCommand(WScreen *scr, char *command)
@@ -431,12 +432,12 @@ void wSessionRestoreState(WScreen *scr)
make_keys();
if (!scr->session_state)
if (!w_global.session_state)
return;
WMPLSetCaseSensitive(True);
apps = WMGetFromPLDictionary(scr->session_state, sApplications);
apps = WMGetFromPLDictionary(w_global.session_state, sApplications);
if (!apps)
return;
@@ -536,12 +537,12 @@ void wSessionRestoreLastWorkspace(WScreen * scr)
make_keys();
if (!scr->session_state)
if (!w_global.session_state)
return;
WMPLSetCaseSensitive(True);
wks = WMGetFromPLDictionary(scr->session_state, sWorkspace);
wks = WMGetFromPLDictionary(w_global.session_state, sWorkspace);
if (!wks || !WMIsPLString(wks))
return;