making metacity fun - pickup gtk colors

3 files changed, 58 insertions, 58 deletions

diff --git a/Kogaion-daylight/gtk-2.0/gtkrc b/Kogaion-daylight/gtk-2.0/gtkrc
index 76da2b0..a6c51e3 100755
--- a/Kogaion-daylight/gtk-2.0/gtkrc
+++ b/Kogaion-daylight/gtk-2.0/gtkrc
@@ -92,7 +92,7 @@ style "default" {
 	####################
 	bg[NORMAL]          = @theme_bg_color
 	bg[PRELIGHT]		= shade (1.02, @theme_bg_color)
-	bg[SELECTED]		= @selected_bg_color
+	bg[SELECTED]		= @window_active_color
 	bg[INSENSITIVE] 	= shade (1.20, @theme_bg_color)
 	bg[ACTIVE]         	= @theme_bg_color
 
diff --git a/Kogaion-daylight/metacity-1/metacity-theme-1.xml b/Kogaion-daylight/metacity-1/metacity-theme-1.xml
index 925d628..c36d5ce 100755
--- a/Kogaion-daylight/metacity-1/metacity-theme-1.xml
+++ b/Kogaion-daylight/metacity-1/metacity-theme-1.xml
@@ -50,23 +50,23 @@
 <!-- ACTUALLY DRAWING FRAMES -->
 
 <draw_ops name="title_background">   
-   <rectangle color="#a3b5d9" x="0" y="0" width="width" height="height" filled="true"/>
-   <rectangle color="#6c99c0" x="0" y="0" width="width-1" height="height"/>
+   <rectangle color="gtk:bg[SELECTED]" x="0" y="0" width="width" height="height" filled="true"/>
+   <rectangle color="gtk:dark[SELECTED]" x="0" y="0" width="width-1" height="height"/>
 </draw_ops>
 
 <draw_ops name="title_background_maximized">
-    <rectangle color="#a3b5d9" x="0" y="0" width="width" height="height" filled="true"/>  
-    <line color="#6c99c0" x1="0" y1="0" x2="width" y2="0"/>   
+    <rectangle color="gtk:bg[SELECTED]" x="0" y="0" width="width" height="height" filled="true"/>  
+    <line color="gtk:dark[SELECTED]" x1="0" y1="0" x2="width" y2="0"/>   
 </draw_ops>
 
 <draw_ops name="title_unfocused_background">
-    <rectangle color="#e1e1e1" x="0" y="0" width="width" height="height" filled="true"/>
-    <rectangle color="#cbcbcb" x="0" y="0" width="width-1" height="height" />
+    <rectangle color="gtk:bg[INSENSITIVE]" x="0" y="0" width="width" height="height" filled="true"/>
+    <rectangle color="gtk:dark[INSENSITIVE]" x="0" y="0" width="width-1" height="height" />
 </draw_ops>
 
 <draw_ops name="title_unfocused_background_maximized">
-    <rectangle color="#e1e1e1" x="0" y="0" width="width" height="height" filled="true"/>  
-    <line color="#cbcbcb" x1="0" y1="0" x2="width" y2="0"/> 
+    <rectangle color="gtk:bg[INSENSITIVE]" x="0" y="0" width="width" height="height" filled="true"/>  
+    <line color="gtk:dark[INSENSITIVE]" x1="0" y1="0" x2="width" y2="0"/> 
 </draw_ops>
 
 <draw_ops name="blank">
@@ -74,13 +74,13 @@
 </draw_ops>
 
 <draw_ops name="focus_outline">
-    <rectangle x="0" y="0" width="width" height="height" color="#a3b5d9" filled="true"/>
-    <rectangle x="0" y="0" width="width-1" height="height-1" color="#6c99c0" filled="false"/>
+    <rectangle x="0" y="0" width="width" height="height" color="gtk:bg[SELECTED]" filled="true"/>
+    <rectangle x="0" y="0" width="width-1" height="height-1" color="gtk:dark[SELECTED]" filled="false"/>
 </draw_ops>
 
 <draw_ops name="unfocus_outline">
-    <rectangle x="0" y="0" width="width" height="height" color="#e1e1e1" filled="true"/>
-    <rectangle x="0" y="0" width="width-1" height="height-1" color="#cbcbcb" filled="false"/>
+    <rectangle x="0" y="0" width="width" height="height" color="gtk:bg[INSENSITIVE]" filled="true"/>
+    <rectangle x="0" y="0" width="width-1" height="height-1" color="gtk:dark[INSENSITIVE]" filled="false"/>
 </draw_ops>
 
 <draw_ops name="focus_background">
@@ -134,12 +134,12 @@
 	</draw_ops>
 
 	<draw_ops name="minimize_focused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[SELECTED]" filled="true"/>
 		<image filename="minimize_focused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="minimize_focused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[SELECTED]" filled="true"/>
 		<image filename="minimize_focused_pressed.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
@@ -148,12 +148,12 @@
 	</draw_ops>
 
 	<draw_ops name="minimize_unfocused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#cbcbcb" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[INSENSITIVE]" filled="true"/>
 		<image filename="minimize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="minimize_unfocused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#cbcbcb" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[INSENSITIVE]" filled="true"/>
 		<image filename="minimize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 	<draw_ops name="maximize_focused_normal">
@@ -161,12 +161,12 @@
 	</draw_ops>
 
 	<draw_ops name="maximize_focused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[SELECTED]" filled="true"/>
 		<image filename="maximize_focused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="maximize_focused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[SELECTED]" filled="true"/>
 		<image filename="maximize_focused_pressed.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
@@ -175,12 +175,12 @@
 	</draw_ops>
 
 	<draw_ops name="maximize_unfocused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#cbcbcb" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[INSENSITIVE]" filled="true"/>
 		<image filename="maximize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="maximize_unfocused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#cbcbcb" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[INSENSITIVE]" filled="true"/>
 		<image filename="maximize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
@@ -189,12 +189,12 @@
 	</draw_ops>
 
 	<draw_ops name="unmaximize_focused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[SELECTED]" filled="true"/>
 		<image filename="unmaximize_focused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="unmaximize_focused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[SELECTED]" filled="true"/>
 		<image filename="unmaximize_focused_pressed.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
@@ -203,12 +203,12 @@
 	</draw_ops>
 
 	<draw_ops name="unmaximize_unfocused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#cbcbcb" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[INSENSITIVE]" filled="true"/>
 		<image filename="unmaximize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="unmaximize_unfocused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#cbcbcb" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[INSENSITIVE]" filled="true"/>
 		<image filename="unmaximize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
@@ -217,12 +217,12 @@
 	</draw_ops>
 
 	<draw_ops name="close_focused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[SELECTED]" filled="true"/>
 		<image filename="close_focused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="close_focused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[SELECTED]" filled="true"/>
 		<image filename="close_focused_pressed.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
@@ -231,12 +231,12 @@
 	</draw_ops>
 
 	<draw_ops name="close_unfocused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#cbcbcb" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[INSENSITIVE]" filled="true"/>
 		<image filename="close_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="close_unfocused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#cbcbcb" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[INSENSITIVE]" filled="true"/>
 		<image filename="close_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
diff --git a/Kogaion-nighttime/metacity-1/metacity-theme-1.xml b/Kogaion-nighttime/metacity-1/metacity-theme-1.xml
index 43604b5..a7b5e57 100755
--- a/Kogaion-nighttime/metacity-1/metacity-theme-1.xml
+++ b/Kogaion-nighttime/metacity-1/metacity-theme-1.xml
@@ -50,23 +50,23 @@
 <!-- ACTUALLY DRAWING FRAMES -->
 
 <draw_ops name="title_background">   
-   <rectangle color="#4f5e76" x="0" y="0" width="width" height="height" filled="true"/>
-   <rectangle color="#6c99c0" x="0" y="0" width="width-1" height="height"/>
+   <rectangle color="gtk:bg[SELECTED]" x="0" y="0" width="width" height="height" filled="true"/>
+   <rectangle color="gtk:light[SELECTED]" x="0" y="0" width="width-1" height="height"/>
 </draw_ops>
 
 <draw_ops name="title_background_maximized">
-    <rectangle color="#4f5e76" x="0" y="0" width="width" height="height" filled="true"/>  
-    <line color="#6c99c0" x1="0" y1="0" x2="width" y2="0"/>   
+    <rectangle color="gtk:bg[SELECTED]" x="0" y="0" width="width" height="height" filled="true"/>  
+    <line color="gtk:light[SELECTED]" x1="0" y1="0" x2="width" y2="0"/>   
 </draw_ops>
 
 <draw_ops name="title_unfocused_background">
-    <rectangle color="#626262" x="0" y="0" width="width" height="height" filled="true"/>
-    <rectangle color="#969696" x="0" y="0" width="width-1" height="height" />
+    <rectangle color="gtk:bg[INSENSITIVE]" x="0" y="0" width="width" height="height" filled="true"/>
+    <rectangle color="gtk:light[INSENSITIVE]" x="0" y="0" width="width-1" height="height" />
 </draw_ops>
 
 <draw_ops name="title_unfocused_background_maximized">
-    <rectangle color="#626262" x="0" y="0" width="width" height="height" filled="true"/>  
-    <line color="#969696" x1="0" y1="0" x2="width" y2="0"/> 
+    <rectangle color="gtk:bg[INSENSITIVE]" x="0" y="0" width="width" height="height" filled="true"/>  
+    <line color="gtk:light[INSENSITIVE]" x1="0" y1="0" x2="width" y2="0"/> 
 </draw_ops>
 
 <draw_ops name="blank">
@@ -74,13 +74,13 @@
 </draw_ops>
 
 <draw_ops name="focus_outline">
-    <rectangle x="0" y="0" width="width" height="height" color="#4f5e76" filled="true"/>
-    <rectangle x="0" y="0" width="width-1" height="height-1" color="#6c99c0" filled="false"/>
+    <rectangle x="0" y="0" width="width" height="height" color="gtk:bg[SELECTED]" filled="true"/>
+    <rectangle x="0" y="0" width="width-1" height="height-1" color="gtk:light[SELECTED]" filled="false"/>
 </draw_ops>
 
 <draw_ops name="unfocus_outline">
-    <rectangle x="0" y="0" width="width" height="height" color="#626262" filled="true"/>
-    <rectangle x="0" y="0" width="width-1" height="height-1" color="#969696" filled="false"/>
+    <rectangle x="0" y="0" width="width" height="height" color="gtk:bg[INSENSITIVE]" filled="true"/>
+    <rectangle x="0" y="0" width="width-1" height="height-1" color="gtk:light[INSENSITIVE]" filled="false"/>
 </draw_ops>
 
 <draw_ops name="focus_background">
@@ -102,7 +102,7 @@
 <!-- focused -->
 
 <draw_ops name="title_text_with_icon">
-    <title color="#969696"
+    <title color="gtk:light[INSENSITIVE]"
            x="(((width - title_width)  / 2) `max` 0)"
            y="((height - title_height) / 2) `max` 0"/> 
 </draw_ops>
@@ -142,12 +142,12 @@
 	</draw_ops>
 
 	<draw_ops name="minimize_focused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[SELECTED]" filled="true"/>
 		<image filename="minimize_focused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="minimize_focused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[SELECTED]" filled="true"/>
 		<image filename="minimize_focused_pressed.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
@@ -156,12 +156,12 @@
 	</draw_ops>
 
 	<draw_ops name="minimize_unfocused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[INSENSITIVE]" filled="true"/>
 		<image filename="minimize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="minimize_unfocused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[INSENSITIVE]" filled="true"/>
 		<image filename="minimize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
@@ -170,12 +170,12 @@
 	</draw_ops>
 
 	<draw_ops name="maximize_focused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[SELECTED]" filled="true"/>
 		<image filename="maximize_focused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="maximize_focused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[SELECTED]" filled="true"/>
 		<image filename="maximize_focused_pressed.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
@@ -184,12 +184,12 @@
 	</draw_ops>
 
 	<draw_ops name="maximize_unfocused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[INSENSITIVE]" filled="true"/>
 		<image filename="maximize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="maximize_unfocused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[INSENSITIVE]" filled="true"/>
 		<image filename="maximize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
@@ -198,12 +198,12 @@
 	</draw_ops>
 
 	<draw_ops name="unmaximize_focused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[SELECTED]" filled="true"/>
 		<image filename="unmaximize_focused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="unmaximize_focused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[SELECTED]" filled="true"/>
 		<image filename="unmaximize_focused_pressed.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
@@ -212,12 +212,12 @@
 	</draw_ops>
 
 	<draw_ops name="unmaximize_unfocused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[INSENSITIVE]" filled="true"/>
 		<image filename="unmaximize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="unmaximize_unfocused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[INSENSITIVE]" filled="true"/>
 		<image filename="unmaximize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
@@ -226,12 +226,12 @@
 	</draw_ops>
 
 	<draw_ops name="close_focused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[SELECTED]" filled="true"/>
 		<image filename="close_focused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="close_focused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[SELECTED]" filled="true"/>
 		<image filename="close_focused_pressed.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
@@ -240,12 +240,12 @@
 	</draw_ops>
 
 	<draw_ops name="close_unfocused_prelight">
-		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[INSENSITIVE]" filled="true"/>
 		<image filename="close_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="close_unfocused_pressed">
-		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<rectangle x="1" y="1" width="25" height="25" color="gtk:light[INSENSITIVE]" filled="true"/>
 		<image filename="close_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>