gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-22 22:28:02 +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

31
src/screen.c
View File

@@ -811,24 +811,25 @@ void wScreenRestoreState(WScreen * scr)
snprintf(buf, sizeof(buf), "WMState.%i", scr->screen);
path = wdefaultspathfordomain(buf);
}
scr->session_state = WMReadPropListFromFile(path);
w_global.session_state = WMReadPropListFromFile(path);
wfree(path);
if (!scr->session_state && wScreenCount > 1) {
if (!w_global.session_state && wScreenCount > 1) {
path = wdefaultspathfordomain("WMState");
scr->session_state = WMReadPropListFromFile(path);
w_global.session_state = WMReadPropListFromFile(path);
wfree(path);
}
if (!scr->session_state)
scr->session_state = WMCreatePLDictionary(NULL, NULL);
if (!w_global.session_state)
w_global.session_state = WMCreatePLDictionary(NULL, NULL);
if (!wPreferences.flags.nodock) {
state = WMGetFromPLDictionary(scr->session_state, dDock);
state = WMGetFromPLDictionary(w_global.session_state, dDock);
scr->dock = wDockRestoreState(scr, state, WM_DOCK);
}
if (!wPreferences.flags.noclip) {
state = WMGetFromPLDictionary(scr->session_state, dClip);
state = WMGetFromPLDictionary(w_global.session_state, dClip);
w_global.clip.icon = wClipRestoreState(scr, state);
}
@@ -857,8 +858,8 @@ void wScreenSaveState(WScreen * scr)
if (wPreferences.flags.noupdates)
return;
old_state = scr->session_state;
scr->session_state = WMCreatePLDictionary(NULL, NULL);
old_state = w_global.session_state;
w_global.session_state = WMCreatePLDictionary(NULL, NULL);
WMPLSetCaseSensitive(True);
@@ -867,14 +868,14 @@ void wScreenSaveState(WScreen * scr)
wDockSaveState(scr, old_state);
} else {
if ((foo = WMGetFromPLDictionary(old_state, dDock)) != NULL) {
WMPutInPLDictionary(scr->session_state, dDock, foo);
WMPutInPLDictionary(w_global.session_state, dDock, foo);
}
}
if (!wPreferences.flags.noclip) {
wClipSaveState(scr);
} else {
if ((foo = WMGetFromPLDictionary(old_state, dClip)) != NULL) {
WMPutInPLDictionary(scr->session_state, dClip, foo);
WMPutInPLDictionary(w_global.session_state, dClip, foo);
}
}
@@ -884,7 +885,7 @@ void wScreenSaveState(WScreen * scr)
wDrawersSaveState(scr);
} else {
if ((foo = WMGetFromPLDictionary(old_state, dDrawers)) != NULL) {
WMPutInPLDictionary(scr->session_state, dDrawers, foo);
WMPutInPLDictionary(w_global.session_state, dDrawers, foo);
}
}
@@ -893,10 +894,10 @@ void wScreenSaveState(WScreen * scr)
wSessionSaveState(scr);
} else {
if ((foo = WMGetFromPLDictionary(old_state, dApplications)) != NULL) {
WMPutInPLDictionary(scr->session_state, dApplications, foo);
WMPutInPLDictionary(w_global.session_state, dApplications, foo);
}
if ((foo = WMGetFromPLDictionary(old_state, dWorkspace)) != NULL) {
WMPutInPLDictionary(scr->session_state, dWorkspace, foo);
WMPutInPLDictionary(w_global.session_state, dWorkspace, foo);
}
}
@@ -912,7 +913,7 @@ void wScreenSaveState(WScreen * scr)
snprintf(buf, sizeof(buf), "WMState.%i", scr->screen);
str = wdefaultspathfordomain(buf);
}
if (!WMWritePropListToFile(scr->session_state, str)) {
if (!WMWritePropListToFile(w_global.session_state, str)) {
werror(_("could not save session state in %s"), str);
}
wfree(str);