Moved composite handling and opengl painting into separate plugins.

4 files changed, 83 insertions, 61 deletions

diff --git a/metadata/Makefile.am b/metadata/Makefile.am
index a73ac20..60066de 100644
--- a/metadata/Makefile.am
+++ b/metadata/Makefile.am
@@ -28,7 +28,9 @@ xml_in_files =		  \
 	video.xml.in      \
 	water.xml.in      \
 	wobbly.xml.in     \
-	zoom.xml.in
+	zoom.xml.in       \
+	composite.xml.in  \
+	opengl.xml.in
 xml_files    = $(xml_in_files:.xml.in=.xml)
 xml_DATA     = $(xml_files)
 
diff --git a/metadata/composite.xml.in b/metadata/composite.xml.in
new file mode 100644
index 0000000..4ab5d0b
--- /dev/null
+++ b/metadata/composite.xml.in
@@ -0,0 +1,36 @@
+<compiz>
+    <plugin name="composite">
+	<_short>Composite</_short>
+	<_long>Composite plugin</_long>
+	<display>
+	    <option name="slow_animations_key" type="key">
+		<_short>Slow Animations</_short>
+		<_long>Toggle use of slow animations</_long>
+	    </option>
+	</display>
+	<screen>
+	    <option name="detect_refresh_rate" type="bool">
+		<_short>Detect Refresh Rate</_short>
+		<_long>Automatic detection of refresh rate</_long>
+		<default>true</default>
+	    </option>
+	    <option name="refresh_rate" type="int">
+		<_short>Refresh Rate</_short>
+		<_long>The rate at which the screen is redrawn (times/second)</_long>
+		<default>50</default>
+		<min>1</min>
+		<max>200</max>
+	    </option>
+	    <option name="unredirect_fullscreen_windows" type="bool">
+		<_short>Unredirect Fullscreen Windows</_short>
+		<_long>Allow drawing of fullscreen windows to not be redirected to offscreen pixmaps</_long>
+		<default>false</default>
+	    </option>
+	    <option name="force_independent_output_painting" type="bool">
+		<_short>Force independent output painting.</_short>
+		<_long>Paint each output device independly, even if the output devices overlap</_long>
+		<default>false</default>
+	    </option>
+	</screen>
+    </plugin>
+</compiz>
diff --git a/metadata/core.xml.in b/metadata/core.xml.in
index 5b72bfb..61c0947 100644
--- a/metadata/core.xml.in
+++ b/metadata/core.xml.in
@@ -11,25 +11,6 @@
 		    <value>core</value>
 		</default>
 	    </option>
-	    <option name="texture_filter" type="int">
-		<_short>Texture Filter</_short>
-		<_long>Texture filtering</_long>
-		<default>1</default>
-		<min>0</min>
-		<max>2</max>
-		<desc>
-		    <value>0</value>
-		    <_name>Fast</_name>
-		</desc>
-		<desc>
-		    <value>1</value>
-		    <_name>Good</_name>
-		</desc>
-		<desc>
-		    <value>2</value>
-		    <_name>Best</_name>
-		</desc>
-	    </option>
 	    <option name="click_to_focus" type="bool">
 		<_short>Click To Focus</_short>
 		<_long>Click on window moves input focus to it</_long>
@@ -181,10 +162,6 @@
 		<_short>Run command 11</_short>
 		<_long>A keybinding that when invoked, will run the shell command identified by command11</_long>
 	    </option>
-	    <option name="slow_animations_key" type="key">
-		<_short>Slow Animations</_short>
-		<_long>Toggle use of slow animations</_long>
-	    </option>
 	    <option name="raise_window_key" type="key">
 		<_short>Raise Window</_short>
 		<_long>Raise window above other windows</_long>
@@ -329,23 +306,6 @@
 	    </option>
 	</display>
 	<screen>
-	    <option name="detect_refresh_rate" type="bool">
-		<_short>Detect Refresh Rate</_short>
-		<_long>Automatic detection of refresh rate</_long>
-		<default>true</default>
-	    </option>
-	    <option name="lighting" type="bool">
-		<_short>Lighting</_short>
-		<_long>Use diffuse light when screen is transformed</_long>
-		<default>true</default>
-	    </option>
-	    <option name="refresh_rate" type="int">
-		<_short>Refresh Rate</_short>
-		<_long>The rate at which the screen is redrawn (times/second)</_long>
-		<default>50</default>
-		<min>1</min>
-		<max>200</max>
-	    </option>
 	    <option name="hsize" type="int">
 		<_short>Horizontal Virtual Size</_short>
 		<_long>Screen size multiplier for horizontal virtual size</_long>
@@ -360,21 +320,11 @@
 		<min>1</min>
 		<max>32</max>
 	    </option>
-	    <option name="unredirect_fullscreen_windows" type="bool">
-		<_short>Unredirect Fullscreen Windows</_short>
-		<_long>Allow drawing of fullscreen windows to not be redirected to offscreen pixmaps</_long>
-		<default>false</default>
-	    </option>
 	    <option name="default_icon" type="string">
 		<_short>Default Icon</_short>
 		<_long>Default window icon image</_long>
 		<default>icon</default>
 	    </option>
-	    <option name="sync_to_vblank" type="bool">
-		<_short>Sync To VBlank</_short>
-		<_long>Only perform screen updates during vertical blanking period</_long>
-		<default>true</default>
-	    </option>
 	    <option name="number_of_desktops" type="int">
 		<_short>Number of Desktops</_short>
 		<_long>Number of virtual desktops</_long>
@@ -414,11 +364,6 @@
 		    <_name>Prefer smaller output</_name>
 		</desc>
 	    </option>
-	    <option name="force_independent_output_painting" type="bool">
-		<_short>Force independent output painting.</_short>
-		<_long>Paint each output device independly, even if the output devices overlap</_long>
-		<default>false</default>
-	    </option>
 	    <option name="focus_prevention_level" type="int">
 		<_short>Focus Prevention Level</_short>
 		<_long>Level of focus stealing prevention</_long>
@@ -447,11 +392,6 @@
 		<_long>Focus prevention windows</_long>
 		<default>any</default>
 	    </option>
-	    <option name="texture_compression" type="bool">
-		<_short>Texture Compression</_short>
-		<_long>If available use compression for textures converted from images</_long>
-		<default>true</default>
-	    </option>
 	</screen>
     </core>
 </compiz>
diff --git a/metadata/opengl.xml.in b/metadata/opengl.xml.in
new file mode 100644
index 0000000..7ce29c9
--- /dev/null
+++ b/metadata/opengl.xml.in
@@ -0,0 +1,44 @@
+<compiz>
+    <plugin name="opengl">
+	<_short>OpenGL</_short>
+	<_long>OpenGL Plugin</_long>
+	<display>
+	    <option name="texture_filter" type="int">
+		<_short>Texture Filter</_short>
+		<_long>Texture filtering</_long>
+		<default>1</default>
+		<min>0</min>
+		<max>2</max>
+		<desc>
+		    <value>0</value>
+		    <_name>Fast</_name>
+		</desc>
+		<desc>
+		    <value>1</value>
+		    <_name>Good</_name>
+		</desc>
+		<desc>
+		    <value>2</value>
+		    <_name>Best</_name>
+		</desc>
+	    </option>
+	</display>
+	<screen>
+	    <option name="lighting" type="bool">
+		<_short>Lighting</_short>
+		<_long>Use diffuse light when screen is transformed</_long>
+		<default>true</default>
+	    </option>
+	    <option name="sync_to_vblank" type="bool">
+		<_short>Sync To VBlank</_short>
+		<_long>Only perform screen updates during vertical blanking period</_long>
+		<default>true</default>
+	    </option>
+	    <option name="texture_compression" type="bool">
+		<_short>Texture Compression</_short>
+		<_long>If available use compression for textures converted from images</_long>
+		<default>true</default>
+	    </option>
+	</screen>
+    </plugin>
+</compiz>