Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kwin: resume ksmserver startup if setup fails

Browse source 
note that application instance is required before D-Bus connection is made
but connection is made by creating ksmserver interface before the
application instance

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-11-05 08:43:11 +02:00
parent 10032daa02
commit f00a3e808d
2 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
kwin/main.cpp
View file

@ -262,6 +262,27 @@ Application::Application()
kDebug(1212) << "Running KWin in sync mode";
}
setQuitOnLastWindowClosed(false);
if (screen_number == -1)
screen_number = DefaultScreen(display());
}
Application::~Application()
{
disconnect(owner, 0, this, 0);
delete Workspace::self();
if (owner->ownerWindow() != None) { // If there was no --replace (no new WM)
XSetInputFocus(display(), PointerRoot, RevertToPointerRoot, xTime());
}
owner->release();
delete owner;
delete options;
delete effects;
delete atoms;
}
bool Application::setup()
{
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
KSharedConfig::Ptr config = KGlobal::config();
if (!config->isImmutable() && args->isSet("lock")) {
@ -270,12 +291,9 @@ Application::Application()
config->reparseConfiguration();
}
if (screen_number == -1)
screen_number = DefaultScreen(display());
if (!owner->claim(args->isSet("replace"))) {
fputs(i18n("kwin: unable to claim manager selection, another wm running? (try using --replace)\n").toLocal8Bit(), stderr);
::exit(1);
return false;
}
connect(owner, SIGNAL(lostOwnership()), this, SLOT(lostSelection()));
@ -286,10 +304,11 @@ Application::Application()
// Something has gone seriously wrong
AlternativeWMDialog dialog;
QString cmd = "kwin";
if (dialog.exec() == QDialog::Accepted)
if (dialog.exec() == QDialog::Accepted) {
cmd = dialog.selectedWM();
else
::exit(1);
} else {
return false;
}
if (cmd.length() > 500) {
kDebug(1212) << "Command is too long, truncating";
cmd = cmd.left(500);
@ -298,7 +317,7 @@ Application::Application()
char buf[1024];
sprintf(buf, "%s &", cmd.toAscii().data());
system(buf);
::exit(1);
return false;
}
if (crashes >= 2) {
// Disable compositing if we have had too many crashes
@ -334,20 +353,7 @@ Application::Application()
syncX(); // Trigger possible errors, there's still a chance to abort
initting = false; // Startup done, we are up and running now.
}
Application::~Application()
{
disconnect(owner, 0, this, 0);
delete Workspace::self();
if (owner->ownerWindow() != None) { // If there was no --replace (no new WM)
XSetInputFocus(display(), PointerRoot, RevertToPointerRoot, xTime());
}
owner->release();
delete owner;
delete options;
delete effects;
delete atoms;
return true;
}
void Application::lostSelection()
@ -476,6 +482,11 @@ int main(int argc, char * argv[])
org::kde::KSMServerInterface ksmserver("org.kde.ksmserver", "/KSMServer", QDBusConnection::sessionBus());
ksmserver.suspendStartup("kwin");
KWin::Application a;
if (!a.setup()) {
ksmserver.resumeStartup("kwin");
a.exit(1);
return 1;
}
ksmserver.resumeStartup("kwin");
KWin::SessionManager weAreIndeed;

3
kwin/main.h
View file

@ -35,6 +35,9 @@ public:
Application();
~Application();
public:
bool setup();
protected:
bool x11EventFilter(XEvent*);
bool notify(QObject* o, QEvent* e);