Add a case to handle bi screen in Linux when separate screen + xinera…

…ma are used #10
mikrosimage · Nov 23, 2012 · 9ffd281 · 9ffd281
1 parent ff801fe
commit 9ffd281
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 7 deletions.
diff --git a/ColorTribe/ColorKeeper/src/core/ZooperLocalHost.cpp b/ColorTribe/ColorKeeper/src/core/ZooperLocalHost.cpp
@@ -10,6 +10,9 @@
 #ifdef __WIN32__
 #include "windows.h"
 #endif
+#ifdef __linux__	
+#include <GNULUTLoader.h>
+#endif
 
 #include <fstream>
 #include <iostream>
@@ -86,13 +89,21 @@ void ZooperLocalHost::searchDisorders() {
 		os <<"_effectiveScreenNumber = "<< _effectiveScreenNumber<<endl;
 		os <<"_calibableScreenNumber = "<< _calibableScreenNumber<<endl;
 		_isSeparateXScreenDisorder = true;
-	} else if(_qtNbScreens == _edidNbScreens) {// one x screen for several screens
-		_effectiveScreenNumber = _edidNbScreens;
-		_calibableScreenNumber = _xNbScreens;
-		os<<"XScreen disorder"<<endl;
-		os <<"_effectiveScreenNumber = "<< _effectiveScreenNumber<<endl;
-		os <<"_calibableScreenNumber = "<< _calibableScreenNumber<<endl;
-		_isXScreenDisorder = true;
+	} else if(_qtNbScreens == _edidNbScreens) {// one x screen for several screens	
+
+		if(GNULUTLoader::isScreenGammaAble(1)){
+			os<<"XScreenDisorder suppected but several LUTs can be loaded. Calibrable devices : "<<_qtNbScreens<<endl;
+			_effectiveScreenNumber = _qtNbScreens;
+			_calibableScreenNumber = _qtNbScreens;
+		}else{
+			_effectiveScreenNumber = _edidNbScreens;
+			_calibableScreenNumber = _xNbScreens;
+			os<<"XScreen disorder"<<endl;
+			os <<"_effectiveScreenNumber = "<< _effectiveScreenNumber<<endl;
+			os <<"_calibableScreenNumber = "<< _calibableScreenNumber<<endl;
+			_isXScreenDisorder = true;
+		}
+
 	} else if(_qtNbScreens != _edidNbScreens && _qtNbScreens>_edidNbScreens) {
 		os<<"XScreen disorder and one or more EDID(s) not found"<<endl;
 		os <<"_effectiveScreenNumber = "<< _effectiveScreenNumber<<endl;
@@ -102,6 +113,8 @@ void ZooperLocalHost::searchDisorders() {
 		_effectiveScreenNumber = _xNbScreens;
 		_calibableScreenNumber = _xNbScreens;
 
+
+
 	} else {
 		os<<"Unexpected disorder. Try with nbScreen = "<<_xNbScreens<<endl;
 		os <<"_effectiveScreenNumber = "<< _effectiveScreenNumber<<endl;

diff --git a/ColorTribe/ColorLib_cpp/src/colorRamdac/lutloader/GNULUTLoader.cpp b/ColorTribe/ColorLib_cpp/src/colorRamdac/lutloader/GNULUTLoader.cpp
@@ -66,6 +66,25 @@ int GNULUTLoader::setGammaRamp(const int screenIndex,
 	return 0;
 }
 
+bool GNULUTLoader::isScreenGammaAble(const unsigned int screenIndex){
+	Display* dpy = XOpenDisplay(NULL);
+	bool res;
+	int rampSize = -1;
+	try {
+		res = XF86VidModeGetGammaRampSize(dpy, screenIndex, &rampSize);
+	} catch(...) {
+		res=false;
+	}
+
+	if(rampSize<=0)
+		res=false;
+
+	XCloseDisplay(dpy) ;
+
+	return res;
+
+}
+
 unsigned short* GNULUTLoader::getGammaRamp(const int screenIndex, int * rampSize) const
 throw (CannotGetLutException) {
 

diff --git a/ColorTribe/ColorLib_cpp/src/colorRamdac/lutloader/GNULUTLoader.h b/ColorTribe/ColorLib_cpp/src/colorRamdac/lutloader/GNULUTLoader.h
@@ -12,6 +12,7 @@ class GNULUTLoader : public AbstractLutLoader {
 			setGammaRamp(const int screenIndex,
 					const LUT2DCorrection * const lut) const throw (CannotSetLutException);
 	unsigned short* getGammaRamp(const int screenIndex, int * rampSize) const throw (CannotGetLutException);
+	static bool isScreenGammaAble(const unsigned int screenIndex);
 #else
 	int setGammaRamp(const int screenIndex, const LUT2DCorrection * const lut) const throw (CannotSetLutException) =0;
 	unsigned short* getGammaRamp(const int screenIndex, int * rampSize) const throw (CannotGetLutException) =0;