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

Merge branch 'wmdrawer' into next

Browse Source
This commit is contained in:
Carlos R. Mafra
2013-04-12 02:14:41 +01:00
parent 46c8d6d2bf 878a57d7b2
commit 529ee0bd21
38 changed files with 3853 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/screen.c
View File

@@ -94,6 +94,7 @@ static WMPropList *dApplications = NULL;
static WMPropList *dWorkspace;
static WMPropList *dDock;
static WMPropList *dClip;
static WMPropList *dDrawers = NULL;
static void make_keys(void)
{
@@ -104,6 +105,7 @@ static void make_keys(void)
dWorkspace = WMCreatePLString("Workspace");
dDock = WMCreatePLString("Dock");
dClip = WMCreatePLString("Clip");
dDrawers = WMCreatePLString("Drawers");
}
/*
@@ -842,12 +844,18 @@ void wScreenRestoreState(WScreen * scr)
if (!wPreferences.flags.nodock) {
state = WMGetFromPLDictionary(scr->session_state, dDock);
scr->dock = wDockRestoreState(scr, state, WM_DOCK);
/* If clip_merged_in_dock, setting scr->clip_icon is done by
* wDockRestoreState()->wDockCreate()->mainIconCreate() */
}
if (!wPreferences.flags.noclip) {
state = WMGetFromPLDictionary(scr->session_state, dClip);
scr->clip_icon = wClipRestoreState(scr, state);
}
if (!wPreferences.flags.nodrawer) {
wDrawersRestoreState(scr);
}
wWorkspaceRestoreState(scr);
@@ -895,6 +903,15 @@ void wScreenSaveState(WScreen * scr)
wWorkspaceSaveState(scr, old_state);
if (!wPreferences.flags.nodrawer) {
wDrawersSaveState(scr);
} else {
if ((foo = WMGetFromPLDictionary(old_state, dDrawers)) != NULL) {
WMPutInPLDictionary(scr->session_state, dDrawers, foo);
}
}
if (wPreferences.save_session_on_exit) {
wSessionSaveState(scr);
} else {