[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/trinity/kdebase
From: Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date: 2011-10-29 20:12:45
Message-ID: 20111029201245.0D779AC889 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1261450 by tpearson:
Allow kdebase compilation with optional xrandr support disabled
Thanks to Francois Andriot for the patch!
M +3 -0 config.h.cmake
M +2 -2 kcontrol/CMakeLists.txt
M +4 -1 kdm/kfrontend/CMakeLists.txt
M +12 -0 kdm/kfrontend/kgapp.cpp
--- branches/trinity/kdebase/config.h.cmake #1261449:1261450
@@ -158,3 +158,6 @@
// kdm, kxkb
#cmakedefine XLIBDIR "@XLIBDIR@"
+
+// kdm, kcontrol
+#cmakedefine WITH_XRANDR "@WITH_XRANDR@"
--- branches/trinity/kdebase/kcontrol/CMakeLists.txt #1261449:1261450
@@ -65,14 +65,14 @@
add_subdirectory( kthememanager )
add_subdirectory( kfontinst )
add_subdirectory( access )
- add_subdirectory( displayconfig )
+ tde_conditional_add_subdirectory( WITH_XRANDR displayconfig )
tde_conditional_add_subdirectory( WITH_SAMBA samba )
tde_conditional_add_subdirectory( WITH_XRANDR randr )
tde_conditional_add_subdirectory( WITH_LIBRAW1394 view1394 )
if( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
- add_subdirectory( iccconfig )
+ tde_conditional_add_subdirectory( WITH_XRANDR iccconfig )
add_subdirectory( joystick )
endif( )
--- branches/trinity/kdebase/kdm/kfrontend/CMakeLists.txt #1261449:1261450
@@ -57,6 +57,9 @@
##### kdm_greet (executable) ####################
+if( WITH_XRANDR )
+ set( KDMGREET_OPTIONAL_LINK "krandr-shared" )
+endif ( )
tde_add_executable( kdm_greet AUTOMOC
SOURCES
@@ -64,7 +67,7 @@
kfdialog.cpp kgdialog.cpp kchooser.cpp kgverify.cpp
kdmshutdown.cpp kdmadmindialog.cpp kgreeter.cpp
kgapp.cpp sakdlg.cc
- LINK kdmthemer-static kdeui-shared Xtst krandr-shared
+ LINK kdmthemer-static kdeui-shared Xtst ${KDMGREET_OPTIONAL_LINK}
DESTINATION ${BIN_INSTALL_DIR}
)
--- branches/trinity/kdebase/kdm/kfrontend/kgapp.cpp #1261449:1261450
@@ -41,7 +41,9 @@
#include <ksimpleconfig.h>
#include <klocale.h>
#include <kdebug.h>
+#ifdef WITH_XRANDR
#include <libkrandr/libkrandr.h>
+#endif
#include <tqtimer.h>
#include <tqstring.h>
@@ -262,9 +264,11 @@
app->setStyle( _GUIStyle );
// Load up systemwide display settings
+#ifdef WITH_XRANDR
KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();
TQPoint primaryScreenPosition = \
randrsimple->applySystemwideDisplayConfiguration("", KDE_CONFDIR); delete \
randrsimple; +#endif
// Load up the systemwide ICC profile
TQString iccConfigFile = TQString(KDE_CONFDIR);
@@ -368,19 +372,27 @@
delete tgrt;
checkSAK(app);
dialog = new KStdGreeter;
+#ifdef WITH_XRANDR
dialog->move(dialog->x() + primaryScreenPosition.x(), dialog->y() + \
primaryScreenPosition.y()); +#endif
}
else {
+#ifdef WITH_XRANDR
dialog->move(primaryScreenPosition.x(), primaryScreenPosition.y());
+#endif
}
XSetErrorHandler( (XErrorHandler)0 );
} else {
checkSAK(app);
dialog = new KStdGreeter;
+#ifdef WITH_XRANDR
dialog->move(dialog->x() + primaryScreenPosition.x(), dialog->y() + \
primaryScreenPosition.y()); +#endif
}
TQPoint oldCursorPos = TQCursor::pos();
+#ifdef WITH_XRANDR
TQCursor::setPos(oldCursorPos.x() + primaryScreenPosition.x(), oldCursorPos.y() + \
primaryScreenPosition.y()); +#endif
if (*_preloader) {
proc2 = new KProcess;
*proc2 << _preloader;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic