Add per-user display settings

This partially resolves Bug 1264
Fix displayconfig crashes and warnings
Slightly clean up iccconfig and hwmanager

3 files changed, 87 insertions, 0 deletions

diff --git a/tdeinit/CMakeLists.txt b/tdeinit/CMakeLists.txt
index 6f1f7ba96..3fd7d934e 100644
--- a/tdeinit/CMakeLists.txt
+++ b/tdeinit/CMakeLists.txt
@@ -12,6 +12,7 @@
 include_directories(
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}
 )
 
 link_directories(
@@ -26,3 +27,15 @@ tde_add_executable( tdeinit_phase1
   LINK tdecore-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
+
+
+##### tdeinit_displayconfig (executable) #######################
+if( WITH_XRANDR )
+  set( TDEINIT_DISPLAYCONFIG_OPTIONAL_LINK "krandr-shared" )
+endif ( )
+
+tde_add_executable( tdeinit_displayconfig
+  SOURCES displayconfig.cpp
+  LINK tdecore-shared ${TDEINIT_DISPLAYCONFIG_OPTIONAL_LINK}
+  DESTINATION ${BIN_INSTALL_DIR}
+)
\ No newline at end of file
diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp
new file mode 100644
index 000000000..75445a98c
--- /dev/null
+++ b/tdeinit/displayconfig.cpp
@@ -0,0 +1,72 @@
+/***************************************************************************
+ *   Copyright (C) 2012 Timothy Pearson <[email protected]>      *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
+#include <config.h>
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <kapplication.h>
+#include <kaboutdata.h>
+#include <kcmdlineargs.h>
+#include <kstandarddirs.h>
+#include <klocale.h>
+#include <kdebug.h>
+#include <kconfig.h>
+
+#include <pwd.h>
+#include <signal.h>
+
+#ifdef WITH_XRANDR
+#include <libkrandr/libkrandr.h>
+#endif
+
+static const char description[] = I18N_NOOP("TDE Initialization Display Configuration");
+
+static const char version[] = "0.1";
+
+static KCmdLineOptions options[] =
+{
+	KCmdLineLastOption
+};
+
+int main(int argc, char **argv)
+{
+	int return_code = -1;
+
+	KAboutData about("tdeinit_displayconfig", I18N_NOOP("tdeinit_displayconfig"), version, description,
+			KAboutData::License_GPL, "(C) 2013 Timothy Pearson", 0, 0, "[email protected]");
+	about.addAuthor( "Timothy Pearson", 0, "[email protected]" );
+	KCmdLineArgs::init(argc, argv, &about);
+	KCmdLineArgs::addCmdLineOptions( options );
+
+	KApplication::disableAutoDcopRegistration();
+	KApplication app;
+
+#ifdef WITH_XRANDR
+	// Load up user specific display settings
+	KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();
+	randrsimple->applySystemwideDisplayConfiguration("", locateLocal("config", "/", true));
+	delete randrsimple;
+#endif
+
+	return return_code = 0;
+}
+
diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp
index e667503c2..32f5249ac 100644
--- a/tdeinit/phase1.cpp
+++ b/tdeinit/phase1.cpp
@@ -17,6 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include <config.h>
+
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>