From 43d99cc2477266cb9072e179137f0e8485370b3d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 7 Nov 2011 20:26:07 -0600 Subject: Rename kwin to twin (part 1 of 2) --- kdm/config.def | 4 ++-- kdm/kfrontend/kdmshutdown.cpp | 6 +++--- kdm/kfrontend/kfdialog.cpp | 4 ++-- kdm/kfrontend/kgapp.cpp | 26 +++++++++++++------------- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'kdm') diff --git a/kdm/config.def b/kdm/config.def index 43e7f5971..06a2fe20e 100644 --- a/kdm/config.def +++ b/kdm/config.def @@ -1998,13 +1998,13 @@ Description: Key: WindowManager Type: string -Default: "kwin" +Default: "twin" User: greeter Instance: #*/"" Comment: Window manager binary name, if window decorations are desired. "" means no window manager support. Description: - Specify the Xorg window manager. Currently only kwin is supported. + Specify the Xorg window manager. Currently only twin is supported. Key: UseSAK Type: bool diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp index ecd8d5ee8..70fee982e 100644 --- a/kdm/kfrontend/kdmshutdown.cpp +++ b/kdm/kfrontend/kdmshutdown.cpp @@ -57,7 +57,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include -extern bool has_kwin; +extern bool has_twin; int KDMShutdownBase::curPlugin = -1; PluginList KDMShutdownBase::pluginList; @@ -480,7 +480,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) if(doUbuntuLogout) { TQVBoxLayout* vbox = new TQVBoxLayout( this ); - if (has_kwin) + if (has_twin) lfrm->setFrameStyle( TQFrame::NoFrame ); else lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); @@ -548,7 +548,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) else { TQHBoxLayout *hbox = new TQHBoxLayout( this, KDmh, KDsh ); - if (has_kwin) + if (has_twin) lfrm->setFrameStyle( TQFrame::NoFrame ); else lfrm->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); diff --git a/kdm/kfrontend/kfdialog.cpp b/kdm/kfrontend/kfdialog.cpp index b834ca450..285c3878e 100644 --- a/kdm/kfrontend/kfdialog.cpp +++ b/kdm/kfrontend/kfdialog.cpp @@ -38,11 +38,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include #include -extern bool has_kwin; +extern bool has_twin; extern bool is_themed; FDialog::FDialog( TQWidget *parent, bool framed ) - : inherited( parent, 0, true, (framed&&has_kwin)?0:WX11BypassWM ), winFrame(NULL), m_wmTitle(has_kwin) + : inherited( parent, 0, true, (framed&&has_twin)?0:WX11BypassWM ), winFrame(NULL), m_wmTitle(has_twin) { if (framed) { // Signal that we do not want any window controls to be shown at all diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp index b9038f698..f21741805 100644 --- a/kdm/kfrontend/kgapp.cpp +++ b/kdm/kfrontend/kgapp.cpp @@ -66,7 +66,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include bool argb_visual_available = false; -bool has_kwin = false; +bool has_twin = false; bool is_themed = false; bool trinity_desktop_lock_use_sak = TRUE; @@ -190,7 +190,7 @@ kg_main( const char *argv0 ) KProcess *tsak = 0; KProcess *proc = 0; KProcess *comp = 0; - KProcess *kwin = 0; + KProcess *twin = 0; trinity_desktop_lock_use_sak = _useSAK; if (trinity_desktop_lock_use_sak) { @@ -310,10 +310,10 @@ kg_main( const char *argv0 ) } if (!_windowManager.isEmpty()) { - kwin = new KProcess; - *kwin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii(); - kwin->start(); - has_kwin = true; + twin = new KProcess; + *twin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii(); + twin->start(); + has_twin = true; } GSendInt( G_Ready ); @@ -361,14 +361,14 @@ kg_main( const char *argv0 ) // This also prevents the user from being dropped to a console login if Xorg glitches or is buggy XSetErrorHandler( ignoreXError ); KThemedGreeter *tgrt; - bool has_kwin_bkp = has_kwin; + bool has_twin_bkp = has_twin; is_themed = true; - has_kwin = false; // [FIXME] The themed greeter is built on the assumption that there is no window manager available (i.e. it keeps stealing focus) and needs to be repaired. + has_twin = false; // [FIXME] The themed greeter is built on the assumption that there is no window manager available (i.e. it keeps stealing focus) and needs to be repaired. dialog = tgrt = new KThemedGreeter; kdDebug() << timestamp() << " themed" << endl; if (!tgrt->isOK()) { is_themed = false; - has_kwin = has_kwin_bkp; + has_twin = has_twin_bkp; delete tgrt; checkSAK(app); dialog = new KStdGreeter; @@ -450,10 +450,10 @@ kg_main( const char *argv0 ) comp->detach(); delete comp; } - if (kwin) { - kwin->closeStdin(); - kwin->detach(); - delete kwin; + if (twin) { + twin->closeStdin(); + twin->detach(); + delete twin; } delete proc; UnsecureDisplay( dpy ); -- cgit v1.2.3