Changeset View
Changeset View
Standalone View
Standalone View
ksmserver/main.cpp
Show All 36 Lines | |||||
37 | #include <KLocalizedString> | 37 | #include <KLocalizedString> | ||
38 | #include <kconfig.h> | 38 | #include <kconfig.h> | ||
39 | #include <KSharedConfig> | 39 | #include <KSharedConfig> | ||
40 | #include <kmanagerselection.h> | 40 | #include <kmanagerselection.h> | ||
41 | #include <kwindowsystem.h> | 41 | #include <kwindowsystem.h> | ||
42 | #include <ksmserver_debug.h> | 42 | #include <ksmserver_debug.h> | ||
43 | #include "server.h" | 43 | #include "server.h" | ||
44 | #include "startup.h" | 44 | #include "startup.h" | ||
45 | #include "shutdown.h" | ||||
45 | #include <QX11Info> | 46 | #include <QX11Info> | ||
46 | 47 | | |||
47 | #include <QApplication> | 48 | #include <QApplication> | ||
48 | #include <QCommandLineParser> | 49 | #include <QCommandLineParser> | ||
49 | #include <QQuickWindow> | 50 | #include <QQuickWindow> | ||
50 | #include <X11/extensions/Xrender.h> | 51 | #include <X11/extensions/Xrender.h> | ||
51 | 52 | | |||
52 | static const char version[] = "0.4"; | 53 | static const char version[] = "0.4"; | ||
▲ Show 20 Lines • Show All 255 Lines • ▼ Show 20 Line(s) | 308 | if (parser.isSet(lockscreenOption)) { | |||
308 | flags |= KSMServer::InitFlag::ImmediateLockScreen; | 309 | flags |= KSMServer::InitFlag::ImmediateLockScreen; | ||
309 | } | 310 | } | ||
310 | if (parser.isSet(noLockscreenOption)) { | 311 | if (parser.isSet(noLockscreenOption)) { | ||
311 | flags |= KSMServer::InitFlag::NoLockScreen; | 312 | flags |= KSMServer::InitFlag::NoLockScreen; | ||
312 | } | 313 | } | ||
313 | 314 | | |||
314 | KSMServer *server = new KSMServer( wm, flags); | 315 | KSMServer *server = new KSMServer( wm, flags); | ||
315 | auto startup = new Startup(server); | 316 | auto startup = new Startup(server); | ||
317 | new Shutdown(a); | ||||
316 | 318 | | |||
317 | // for the KDE-already-running check in startkde | 319 | // for the KDE-already-running check in startkde | ||
318 | KSelectionOwner kde_running( "_KDE_RUNNING", 0 ); | 320 | KSelectionOwner kde_running( "_KDE_RUNNING", 0 ); | ||
319 | kde_running.claim( false ); | 321 | kde_running.claim( false ); | ||
320 | 322 | | |||
321 | IceSetIOErrorHandler( IoErrorHandler ); | 323 | IceSetIOErrorHandler( IoErrorHandler ); | ||
322 | 324 | | |||
323 | KConfigGroup config(KSharedConfig::openConfig(), "General"); | 325 | KConfigGroup config(KSharedConfig::openConfig(), "General"); | ||
Show All 26 Lines |