From 35fbe8f408dde2fa0efe2aba3f8ecc78565e6696 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 7 May 2013 00:12:51 -0500 Subject: Fix TDM hang in certain circumstances when themed greeter is deleted This resolves Bug 1453 Resolve themed greeter drawing inconsistencies between composited and non-composited mode (cherry picked from commit 3421d01bb00aaf52883a4d21eade96e9c663e05d) --- kwin/main.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'kwin/main.cpp') diff --git a/kwin/main.cpp b/kwin/main.cpp index dcc4a7438..3c1dd171a 100644 --- a/kwin/main.cpp +++ b/kwin/main.cpp @@ -44,6 +44,7 @@ Options* options; Atoms* atoms; int screen_number = -1; +bool disable_kwin_composition_manager = false; static bool initting = FALSE; @@ -95,8 +96,13 @@ Application::Application( ) config()->reparseConfiguration(); } - if (screen_number == -1) + if (screen_number == -1) { screen_number = DefaultScreen(qt_xdisplay()); + } + + if (args->isSet( "disablecompositionmanager" )) { + disable_kwin_composition_manager = true; + } if( !owner.claim( args->isSet( "replace" ), true )) { @@ -234,6 +240,7 @@ static KCmdLineOptions args[] = { { "lock", I18N_NOOP("Disable configuration options"), 0 }, { "replace", I18N_NOOP("Replace already-running ICCCM2.0-compliant window manager"), 0 }, + { "disablecompositionmanager", I18N_NOOP("Do not start composition manager"), 0 }, KCmdLineLastOption }; -- cgit v1.2.3