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

Remove command-line based hack and version check for graphics system setting, use the new API in 4.5.0 instead. Thank you Trolls.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=953375
This commit is contained in:
Andreas Hartmetz 2009-04-13 20:31:03 +00:00
parent 466201db06
commit 6cd06aaef7
1 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
main.cpp
View file

@ -408,6 +408,10 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
} }
} }
// KWin only works properly with Qt's native X11 backend; override any compile-time
// or command line settings to raster or OpenGL.
QApplication::setGraphicsSystem("native");
if( !restored ) if( !restored )
{ // We only do the multihead fork if we are not restored by the session { // We only do the multihead fork if we are not restored by the session
// manager, since the session manager will register multiple kwins, // manager, since the session manager will register multiple kwins,
@ -474,26 +478,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
aboutData.addAuthor( ki18n( "Daniel M. Duley" ),KLocalizedString(), "mosfet@kde.org" ); aboutData.addAuthor( ki18n( "Daniel M. Duley" ),KLocalizedString(), "mosfet@kde.org" );
aboutData.addAuthor( ki18n( "Luboš Luňák" ), ki18n( "Maintainer" ), "l.lunak@kde.org" ); aboutData.addAuthor( ki18n( "Luboš Luňák" ), ki18n( "Maintainer" ), "l.lunak@kde.org" );
int myargc = argc; KCmdLineArgs::init( argc, argv, &aboutData );
char **myargv = argv;
#if QT_VERSION >= 0x040a00
# error Qt version larger than 4.9, please fix me
#endif
if (qVersion()[2] >= '5')
{
// HACK: append "--graphicssystem native" to argument list to force KWin to use this backend
myargc = argc + 2;
myargv = (char **)malloc( ( myargc + 1 ) * sizeof(char *) );
for ( int i = 0; i < argc; i++ )
{
myargv[i] = argv[i];
}
myargv[ argc ] = "--graphicssystem";
myargv[ argc + 1 ] = "native";
myargv[ argc + 2 ] = 0;
}
KCmdLineArgs::init( myargc, myargv, &aboutData );
KCmdLineOptions args; KCmdLineOptions args;
args.add( "lock", ki18n( "Disable configuration options" )); args.add( "lock", ki18n( "Disable configuration options" ));