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

Delay startup till the manager selection is claimed

Browse source 
Moving all the startup code into closure connected to the
claimedOwnership signal.
This commit is contained in:
Martin Gräßlin 2013-07-31 07:24:13 +02:00
parent dcc273fe0f
commit 8da23f76d3
1 changed files with 54 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
main.cpp
View file

@ -214,76 +214,77 @@ Application::Application()
} }
if (screen_number == -1) if (screen_number == -1)
screen_number = DefaultScreen(display()); screen_number = QX11Info::appScreen();
connect(&owner, &KSelectionOwner::failedToClaimOwnership, []{ connect(&owner, &KSelectionOwner::failedToClaimOwnership, []{
fputs(i18n("kwin: unable to claim manager selection, another wm running? (try using --replace)\n").toLocal8Bit().constData(), stderr); fputs(i18n("kwin: unable to claim manager selection, another wm running? (try using --replace)\n").toLocal8Bit().constData(), stderr);
::exit(1); ::exit(1);
}); });
connect(&owner, SIGNAL(lostOwnership()), SLOT(lostSelection())); connect(&owner, SIGNAL(lostOwnership()), SLOT(lostSelection()));
owner.claim(args->isSet("replace"), true); connect(&owner, &KSelectionOwner::claimedOwnership, [this, args, config]{
KCrash::setEmergencySaveFunction(Application::crashHandler);
KCrash::setEmergencySaveFunction(Application::crashHandler); crashes = args->getOption("crashes").toInt();
crashes = args->getOption("crashes").toInt(); if (crashes >= 4) {
if (crashes >= 4) { // Something has gone seriously wrong
// Something has gone seriously wrong AlternativeWMDialog dialog;
AlternativeWMDialog dialog; QString cmd = QStringLiteral(KWIN_NAME);
QString cmd = QStringLiteral(KWIN_NAME); if (dialog.exec() == QDialog::Accepted)
if (dialog.exec() == QDialog::Accepted) cmd = dialog.selectedWM();
cmd = dialog.selectedWM(); else
else ::exit(1);
if (cmd.length() > 500) {
kDebug(1212) << "Command is too long, truncating";
cmd = cmd.left(500);
}
kDebug(1212) << "Starting" << cmd << "and exiting";
char buf[1024];
sprintf(buf, "%s &", cmd.toAscii().data());
system(buf);
::exit(1); ::exit(1);
if (cmd.length() > 500) {
kDebug(1212) << "Command is too long, truncating";
cmd = cmd.left(500);
} }
kDebug(1212) << "Starting" << cmd << "and exiting"; if (crashes >= 2) {
char buf[1024]; // Disable compositing if we have had too many crashes
sprintf(buf, "%s &", cmd.toAscii().data()); kDebug(1212) << "Too many crashes recently, disabling compositing";
system(buf); KConfigGroup compgroup(config, "Compositing");
::exit(1); compgroup.writeEntry("Enabled", false);
} }
if (crashes >= 2) { // Reset crashes count if we stay up for more that 15 seconds
// Disable compositing if we have had too many crashes QTimer::singleShot(15 * 1000, this, SLOT(resetCrashesCount()));
kDebug(1212) << "Too many crashes recently, disabling compositing";
KConfigGroup compgroup(config, "Compositing");
compgroup.writeEntry("Enabled", false);
}
// Reset crashes count if we stay up for more that 15 seconds
QTimer::singleShot(15 * 1000, this, SLOT(resetCrashesCount()));
initting = true; // Startup... initting = true; // Startup...
installNativeEventFilter(m_eventFilter.data()); installNativeEventFilter(m_eventFilter.data());
// first load options - done internally by a different thread // first load options - done internally by a different thread
options = new Options; options = new Options;
// Check whether another windowmanager is running // Check whether another windowmanager is running
XSelectInput(display(), rootWindow(), SubstructureRedirectMask); XSelectInput(display(), rootWindow(), SubstructureRedirectMask);
syncX(); // Trigger error now syncX(); // Trigger error now
atoms = new Atoms; atoms = new Atoms;
// initting = false; // TODO // initting = false; // TODO
// This tries to detect compositing options and can use GLX. GLX problems // This tries to detect compositing options and can use GLX. GLX problems
// (X errors) shouldn't cause kwin to abort, so this is out of the // (X errors) shouldn't cause kwin to abort, so this is out of the
// critical startup section where x errors cause kwin to abort. // critical startup section where x errors cause kwin to abort.
// create workspace. // create workspace.
(void) new Workspace(isSessionRestored()); (void) new Workspace(isSessionRestored());
syncX(); // Trigger possible errors, there's still a chance to abort syncX(); // Trigger possible errors, there's still a chance to abort
initting = false; // Startup done, we are up and running now. initting = false; // Startup done, we are up and running now.
XEvent e; XEvent e;
e.xclient.type = ClientMessage; e.xclient.type = ClientMessage;
e.xclient.message_type = XInternAtom(display(), "_KDE_SPLASH_PROGRESS", False); e.xclient.message_type = XInternAtom(display(), "_KDE_SPLASH_PROGRESS", False);
e.xclient.display = display(); e.xclient.display = display();
e.xclient.window = rootWindow(); e.xclient.window = rootWindow();
e.xclient.format = 8; e.xclient.format = 8;
strcpy(e.xclient.data.b, "wm"); strcpy(e.xclient.data.b, "wm");
XSendEvent(display(), rootWindow(), False, SubstructureNotifyMask, &e); XSendEvent(display(), rootWindow(), False, SubstructureNotifyMask, &e);
});
owner.claim(args->isSet("replace"), true);
} }
Application::~Application() Application::~Application()