Merge lp:~thomas-voss/compiz-core/fix-option-color into lp:compiz-core/0.9.5

[Sam Spilsbury]

[Alan Griffiths (alan-griffiths)]

"void set( unsigned short s[4] )" - is that really intended? As opposed to, say, "void set( unsigned short (& s)[4] )" or "void set( unsigned short* s )"?

Unmerged revisions

=== modified file 'include/core/option.h'
--- include/core/option.h	2012-01-24 15:22:49 +0000
+++ include/core/option.h	2012-01-25 13:34:23 +0000
@@ -97,6 +97,11 @@
 		mValue(t)
 		{
 		}
+		
+		Value( unsigned short c[4] ) : mListType(TypeUnset),
+		mValue( static_cast<unsigned short*>(c) )
+		{
+		}
 
 		~Value();
 
@@ -117,6 +122,14 @@
 		{
 		    mValue = t;
 		}
+		
+		void set( const char* c ) {
+			mValue = CompString(c);
+		}
+		
+		void set( unsigned short s[4] ) {
+			mValue = static_cast<unsigned short*>(s);
+		}
 
 		/* In order to be exception safe, this MUST
 		 * return a copy. Prefer to use a specific

=== modified file 'src/option/tests/option.cpp'
--- src/option/tests/option.cpp	2012-01-18 16:56:31 +0000
+++ src/option/tests/option.cpp	2012-01-25 13:34:23 +0000
@@ -15,6 +15,9 @@
 	ASSERT_EQ(v.type(),type);
 	ASSERT_EQ (v.get<T>(),value);
     }
+    
+    unsigned short testColor[4] = {255, 0, 255, 0};
+    unsigned short testColor2[4] = {0, 255, 0, 255};
 }
 
 TEST(CompOption,Value)
@@ -26,10 +29,13 @@
     check_type_value<int> (CompOption::TypeInt, 1);
     check_type_value<float> (CompOption::TypeFloat, 1.f);
     check_type_value<CompString> (CompOption::TypeString, CompString("Check"));
-
+	check_type_value<CompString> (CompOption::TypeString,"core");
+    
     check_type_value<CompAction> (CompOption::TypeAction, CompAction());
     check_type_value<CompMatch> (CompOption::TypeMatch, CompMatch());
 
+	check_type_value<unsigned short*> (CompOption::TypeColor, testColor);
+	
     check_type_value<CompOption::Value::Vector> (CompOption::TypeList, CompOption::Value::Vector(5));
 
     CompOption::Value v1, v2;
@@ -37,3 +43,19 @@
     v1.set (CompString("SomeString"));
     ASSERT_TRUE(v1 != v2);
 }
+
+TEST(CompOption,Color)
+{
+
+    CompOption::Value value(testColor);
+    unsigned short * color = value.c();
+    std::cout << "color: " << color[0] << color[1] << color[2] << color[3] << std::endl;
+    color = value.get<unsigned short*>();
+    std::cout << "color: " << color[0] << color[1] << color[2] << color[3] << std::endl;
+    value.set(testColor2);
+    color = value.c();
+    std::cout << "color: " << color[0] << color[1] << color[2] << color[3] << std::endl;
+    color = value.get<unsigned short*>();
+    std::cout << "color: " << color[0] << color[1] << color[2] << color[3] << std::endl;
+    
+}