yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WABA: Restart kwin when it crashes. I hope this isn't used as excuse not to

Browse source 
debug kwin crashes any more :-)

svn path=/trunk/kdebase/kwin/; revision=51570
This commit is contained in:
Waldo Bastian 2000-06-01 23:44:03 +00:00
parent b42ee22030
commit fc5367e74d
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
main.cpp
View file

@ -31,7 +31,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
#include <kcrash.h>
Options* options; Options* options;
Atoms* atoms; Atoms* atoms;
@ -39,6 +39,15 @@ Atoms* atoms;
Time kwin_time = CurrentTime; Time kwin_time = CurrentTime;
static bool initting = FALSE; static bool initting = FALSE;
static DCOPClient * client = 0;
static void crashHandler(int)
{
KCrash::setCrashHandler(0); // Exit on next crash.
delete client; client = 0; // Unregister with dcop.
system("kwin&"); // Try to restart
}
int x11ErrorHandler(Display *d, XErrorEvent *e){ int x11ErrorHandler(Display *d, XErrorEvent *e){
char msg[80], req[80], number[80]; char msg[80], req[80], number[80];
bool ignore_badwindow = TRUE; //maybe temporary bool ignore_badwindow = TRUE; //maybe temporary
@ -184,9 +193,10 @@ int main( int argc, char * argv[] )
signal(SIGHUP, SIG_IGN); signal(SIGHUP, SIG_IGN);
Application a; Application a;
KCrash::setCrashHandler(crashHandler); // Try to restart on crash
fcntl(ConnectionNumber(qt_xdisplay()), F_SETFD, 1); fcntl(ConnectionNumber(qt_xdisplay()), F_SETFD, 1);
DCOPClient * client = a.dcopClient(); client = a.dcopClient();
client->attach(); client->attach();
client->registerAs("kwin", false); client->registerAs("kwin", false);