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

fixed crash on restart bug

Browse Source
This commit is contained in:
kojima
2000-04-08 23:53:22 +00:00
parent bdd5d5342b
commit 0b87b7fab9
1 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/shutdown.c
View File

@@ -146,6 +146,44 @@ Shutdown(WShutdownMode mode)
static restoreWindows(WMBag *bag, WMBagIterator iter)
{
WCoreWindow *next;
WCoreWindow *core;
WWindow *wwin;
if (iter == NULL) {
core = WMBagFirst(bag, &iter);
} else {
core = WMBagNext(bag, &iter);
}
if (core == NULL)
return;
restoreWindows(bag, iter);
/* go to the end of the list */
while (core->stacking->under)
core = core->stacking->under;
while (core) {
next = core->stacking->above;
if (core->descriptor.parent_type==WCLASS_WINDOW) {
Window window;
wwin = core->descriptor.parent;
window = wwin->client_win;
wUnmanageWindow(wwin, !wwin->flags.internal_window, False);
XMapWindow(dpy, window);
}
core = next;
}
}
/* /*
*---------------------------------------------------------------------- *----------------------------------------------------------------------
* RestoreDesktop-- * RestoreDesktop--
@@ -161,9 +199,6 @@ Shutdown(WShutdownMode mode)
void void
RestoreDesktop(WScreen *scr) RestoreDesktop(WScreen *scr)
{ {
WMBagIterator iter;
WCoreWindow *core;
if (scr->helper_pid > 0) { if (scr->helper_pid > 0) {
kill(scr->helper_pid, SIGTERM); kill(scr->helper_pid, SIGTERM);
scr->helper_pid = 0; scr->helper_pid = 0;
@@ -173,30 +208,7 @@ RestoreDesktop(WScreen *scr)
wDestroyInspectorPanels(); wDestroyInspectorPanels();
/* reparent windows back to the root window, keeping the stacking order */ /* reparent windows back to the root window, keeping the stacking order */
for (core = WMBagFirst(scr->stacking_list, &iter); restoreWindows(scr->stacking_list, NULL);
iter != NULL && core != NULL;
core = WMBagNext(scr->stacking_list, &iter)) {
WCoreWindow *next;
WWindow *wwin;
/* go to the end of the list */
while (core->stacking->under)
core = core->stacking->under;
while (core) {
next = core->stacking->above;
if (core->descriptor.parent_type==WCLASS_WINDOW) {
Window window;
wwin = core->descriptor.parent;
window = wwin->client_win;
wUnmanageWindow(wwin, !wwin->flags.internal_window, False);
XMapWindow(dpy, window);
}
core = next;
}
}
XUngrabServer(dpy); XUngrabServer(dpy);
XSetInputFocus(dpy, PointerRoot, RevertToParent, CurrentTime); XSetInputFocus(dpy, PointerRoot, RevertToParent, CurrentTime);