rpms/compiz/devel compiz.spec,1.32,1.33 plane.patch,1.2,1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Sep 5 21:52:48 UTC 2006
- Previous message (by thread): rpms/anaconda/devel .cvsignore, 1.328, 1.329 anaconda.spec, 1.454, 1.455 sources, 1.451, 1.452
- Next message (by thread): rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-always-mouse-thyself.patch, 1.1, 1.2 xorg-x11-server.spec, 1.165, 1.166
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sandmann
Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24350
Modified Files:
compiz.spec plane.patch
Log Message:
Make vertical size of workspace configurable
Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- compiz.spec 5 Sep 2006 19:30:33 -0000 1.32
+++ compiz.spec 5 Sep 2006 21:52:45 -0000 1.33
@@ -10,7 +10,7 @@
License: X11/MIT/GPL
Group: User Interface/Desktops
Version: 0.0.13
-Release: 0.24.%{snapshot}git%{?dist}
+Release: 0.25.%{snapshot}git%{?dist}
Summary: OpenGL window and compositing manager
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -152,6 +152,9 @@
%{_includedir}/compiz
%changelog
+* Tue Sep 5 2006 Soren Sandmann <sandmann at redhat.com> - 0.0.13-0.25.20060817git.fc6
+- Make number of vertical size configurable
+
* Tue Sep 5 2006 Soren Sandmann <sandmann at redhat.com> - 0.0.13-0.24.20060817git.fc6
- Fix vertical viewport support in the plane patch.
plane.patch:
include/compiz.h | 20
plugins/Makefile.am | 5
plugins/compiz.schemas.in | 962 +++++++++++++++++++++++++++++++++++++++++++++-
plugins/cube.c | 66 +--
plugins/place.c | 13
plugins/plane.c | 922 ++++++++++++++++++++++++++++++++++++++++++++
plugins/rotate.c | 57 +-
src/event.c | 3
src/screen.c | 180 +++++---
src/window.c | 72 ++-
10 files changed, 2135 insertions(+), 165 deletions(-)
Index: plane.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/plane.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plane.patch 5 Sep 2006 19:20:37 -0000 1.2
+++ plane.patch 5 Sep 2006 21:52:45 -0000 1.3
@@ -1,5 +1,5 @@
--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/Makefile.am.plane 2006-08-17 17:36:07.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/Makefile.am 2006-09-05 13:45:56.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/Makefile.am 2006-09-05 13:55:04.000000000 -0400
@@ -46,6 +46,10 @@
libwater_la_LIBADD = @COMPIZ_LIBS@
libwater_la_SOURCES = water.c
@@ -19,8 +19,1043 @@
$(libgconf_dump_module)
EXTRA_DIST = $(schema_in_files)
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c.plane 2006-09-05 13:51:49.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c 2006-09-05 13:52:50.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/compiz.schemas.in.plane 2006-09-05 17:05:39.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/compiz.schemas.in 2006-09-05 17:12:48.000000000 -0400
+@@ -13,7 +13,7 @@
+ <owner>compiz</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+- <default>[gconf,decoration,wobbly,fade,minimize,cube,rotate,zoom,scale,move,resize,place,dbus,switcher,water]</default>
++ <default>[gconf,decoration,wobbly,fade,minimize,cube,rotate,zoom,scale,move,resize,place,dbus,switcher,water,plane]</default>
+ <locale name="C">
+ <short>Active Plugins</short>
+ <long>List of currently active plugins</long>
+@@ -9021,7 +9021,7 @@
+ <applyto>/apps/compiz/general/screen0/options/refresh_rate</applyto>
+ <owner>compiz</owner>
+ <type>int</type>
+- <default>85</default>
++ <default>60</default>
+ <locale name="C">
+ <short>Refresh Rate</short>
+ <long>The rate at which the screen is redrawn (times/second) (1-200)</long>
+@@ -9083,55 +9083,55 @@
+ <type>int</type>
+ <default>4</default>
+ <locale name="C">
+- <short>Virtual Size</short>
++ <short>Horizontal Virtual Size</short>
+ <long>Screen size multiplier for virtual size (4-32)</long>
+ </locale>
+ <locale name="cs">
+- <short>Virtuálnà velikost</short>
++ <short>Horizontal Virtual Size</short>
+ <long>NásobiÄ velikosti obrazovky pro virtuálnà velikost (4-32)</long>
+ </locale>
+ <locale name="de">
+- <short>Virtuelle Größe</short>
++ <short>Horizontal Virtual Size</short>
+ <long>Fenstergrößen-Multiplikator für virtuelle Größe (4-32)</long>
+ </locale>
+ <locale name="es">
+- <short>Tamaño virtual</short>
++ <short>Horizontal Virtual Size</short>
+ <long>Multiplicador de tamaño de pantalla para el tamaño virtual (de 4 a 32) (4-32)</long>
+ </locale>
+ <locale name="fi">
+- <short>Virtuaalinen koko</short>
++ <short>Horizontal Virtual Size</short>
+ <long>Näytön virtuaalikoon suhde todelliseen kokoon (4-32)</long>
+ </locale>
+ <locale name="fr">
+- <short>Taille virtuelle</short>
++ <short>Horizontal Virtual Size</short>
+ <long>Multiplicateur de taille d'écran pour taille virtuelle (4-32)</long>
+ </locale>
+ <locale name="hu">
+- <short>Virtuális méret</short>
++ <short>Horizontal Virtual Size</short>
+ <long>Képernyőméret-szorzó a virtuális mérethez (4-32)</long>
+ </locale>
+ <locale name="it">
+- <short>Dimensioni virtuali</short>
++ <short>Horizontal Virtual Size</short>
+ <long>Moltiplicatore dimensioni finestra per dimensioni virtuali (4-32)</long>
+ </locale>
+ <locale name="ja">
+- <short>仮想サイズ</short>
++ <short>Horizontal Virtual Size</short>
+ <long>仮想サイズã®ç”»é¢ã‚µã‚¤ã‚ºä¹—æ•°(4-32) (4-32)</long>
+ </locale>
+ <locale name="pl">
+- <short>Rozmiar wirtualny</short>
++ <short>Horizontal Virtual Size</short>
+ <long>Mnożnik rozmiaru ekranu dla rozmiaru wirtualnego (4-32)</long>
+ </locale>
+ <locale name="pt_BR">
+- <short>Tamanho Virtual</short>
++ <short>Horizontal Virtual Size</short>
+ <long>Multiplicador de tamanho de tela para tamanho virtual (4-32)</long>
+ </locale>
+ <locale name="zh_CN">
+- <short>虚拟大å°</short>
++ <short>Horizontal Virtual Size</short>
+ <long>虚拟大å°çš„å±å¹•å¤§å°æ”¾å¤§å™¨ (4-32)</long>
+ </locale>
+ <locale name="zh_TW">
+- <short>虛擬大å°</short>
++ <short>Horizontal Virtual Size</short>
+ <long>虛擬大å°çš„螢幕大å°å€æ•¸ (4-32)</long>
+ </locale>
+ </schema>
+@@ -9316,6 +9316,18 @@
+ </locale>
+ </schema>
+
++ <schema>
++ <key>/schemas/apps/compiz/general/screen0/options/vsize</key>
++ <applyto>/apps/compiz/general/screen0/options/vsize</applyto>
++ <owner>compiz</owner>
++ <type>int</type>
++ <default>1</default>
++ <locale name="C">
++ <short>Vertical Virtual Size</short>
++ <long>Screen size multiplier for vertical virtual size (1-32)</long>
++ </locale>
++ </schema>
++
+ <!-- cube options -->
+
+ <schema>
+@@ -13135,6 +13147,926 @@
+ </locale>
+ </schema>
+
++ <!-- plane options -->
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/info</key>
++ <applyto>/apps/compiz/plugins/plane/info</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default></default>
++ <locale name="C">
++ <short>Desktop Plane</short>
++ <long>Place windows on a plane</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/load_before</key>
++ <applyto>/apps/compiz/plugins/plane/load_before</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plugins that this must load before</short>
++ <long>Do not modify</long>
++ </locale>
++ <locale name="cs">
++ <short>Moduly, které musà být tÃmto pÅ™edem naÄteny</short>
++ <long>Neměnit</long>
++ </locale>
++ <locale name="de">
++ <short>Plugins, die zuvor geladen werden müssen</short>
++ <long>Nicht ändern</long>
++ </locale>
++ <locale name="es">
++ <short>Complementos que esto debe cargar antes</short>
++ <long>No modificar</long>
++ </locale>
++ <locale name="fi">
++ <short>Etukäteen tätä varten ladattavat liitännäiset</short>
++ <long>Älä muuta</long>
++ </locale>
++ <locale name="fr">
++ <short>Plug-ins à charger avant</short>
++ <long>Ne pas modifier</long>
++ </locale>
++ <locale name="hu">
++ <short>Kötelezően betöltendő beépülő modulok </short>
++ <long>Nem módosÃt</long>
++ </locale>
++ <locale name="it">
++ <short>Plug-in da caricare per primi</short>
++ <long>Non modificare</long>
++ </locale>
++ <locale name="ja">
++ <short>ã“れをå‰ã«ãƒãƒ¼ãƒ‰ã™ã‚‹å¿…è¦ã®ã‚るプラグイン</short>
++ <long>変更ã—ãªã„ã§ãã ã•ã„</long>
++ </locale>
++ <locale name="pl">
++ <short>Wtyczki, które muszą zostać załadowane przed</short>
++ <long>Bez zmian</long>
++ </locale>
++ <locale name="pt_BR">
++ <short>Plug-ins que devem ser carregados antes de</short>
++ <long>Não modificar</long>
++ </locale>
++ <locale name="zh_CN">
++ <short>必须先装载的æ’件</short>
++ <long>ä¸ä¿®æ”¹</long>
++ </locale>
++ <locale name="zh_TW">
++ <short>在æ¤ä¹‹å‰å¿…é ˆå…ˆè¼‰å…¥çš„å¤–æŽ›ç¨‹å¼</short>
++ <long>ä¸è¦ä¿®æ”¹</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/requires</key>
++ <applyto>/apps/compiz/plugins/plane/requires</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plugins that this requires</short>
++ <long>Do not modify</long>
++ </locale>
++ <locale name="cs">
++ <short>Moduly, které jsou tÃmto vyžadovány</short>
++ <long>Neměnit</long>
++ </locale>
++ <locale name="de">
++ <short>Erforderliche Plugins</short>
++ <long>Nicht ändern</long>
++ </locale>
++ <locale name="es">
++ <short>Complementos que esto requiere</short>
++ <long>No modificar</long>
++ </locale>
++ <locale name="fi">
++ <short>Tähän vaadittavat liitännäiset</short>
++ <long>Älä muuta</long>
++ </locale>
++ <locale name="fr">
++ <short>Plug-ins requis</short>
++ <long>Ne pas modifier</long>
++ </locale>
++ <locale name="hu">
++ <short>Szükséges beépülő modulok</short>
++ <long>Nem módosÃt</long>
++ </locale>
++ <locale name="it">
++ <short>Plug-in necessari</short>
++ <long>Non modificare</long>
++ </locale>
++ <locale name="ja">
++ <short>ã“ã‚ŒãŒå¿…è¦ãªãƒ—ラグイン</short>
++ <long>変更ã—ãªã„ã§ãã ã•ã„</long>
++ </locale>
++ <locale name="pl">
++ <short>Wtyczki wymagane przez ten element</short>
++ <long>Bez zmian</long>
++ </locale>
++ <locale name="pt_BR">
++ <short>Plug-ins necessários</short>
++ <long>Não modificar</long>
++ </locale>
++ <locale name="zh_CN">
++ <short>需è¦çš„æ’件</short>
++ <long>ä¸ä¿®æ”¹</long>
++ </locale>
++ <locale name="zh_TW">
++ <short>這時需è¦çš„外掛程å¼</short>
++ <long>ä¸è¦ä¿®æ”¹</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_left_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_left_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default><Control><Alt>Left</default>
++ <locale name="C">
++ <short>Plane Left</short>
++ <long>Plane left</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_left_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_left_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane Left</short>
++ <long>Plane left</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_left_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_left_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane Left</short>
++ <long>Plane left</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_left_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_left_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane Left</short>
++ <long>Plane left (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_right_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_right_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default><Control><Alt>Right</default>
++ <locale name="C">
++ <short>Plane Right</short>
++ <long>Plane right</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_right_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_right_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane Right</short>
++ <long>Plane right</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_right_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_right_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane Right</short>
++ <long>Plane right</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_right_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_right_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane Right</short>
++ <long>Plane right (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_down_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_down_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default><Control><Alt>Down</default>
++ <locale name="C">
++ <short>Plane Down</short>
++ <long>Plane down</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_down_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_down_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane Down</short>
++ <long>Plane down</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_down_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_down_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane Down</short>
++ <long>Plane down</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_down_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_down_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane Down</short>
++ <long>Plane down (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_up_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_up_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default><Control><Alt>Up</default>
++ <locale name="C">
++ <short>Plane Up</short>
++ <long>Plane up</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_up_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_up_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane Up</short>
++ <long>Plane up</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_up_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_up_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane Up</short>
++ <long>Plane up</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_up_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_up_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane Up</short>
++ <long>Plane up (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_1_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_1_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 1</short>
++ <long>Plane to face 1</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_1_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_1_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 1</short>
++ <long>Plane to face 1</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_1_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_1_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane To Face 1</short>
++ <long>Plane to face 1</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_1_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_1_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane To Face 1</short>
++ <long>Plane to face 1 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_2_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_2_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 2</short>
++ <long>Plane to face 2</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_2_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_2_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 2</short>
++ <long>Plane to face 2</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_2_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_2_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane To Face 2</short>
++ <long>Plane to face 2</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_2_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_2_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane To Face 2</short>
++ <long>Plane to face 2 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_3_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_3_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 3</short>
++ <long>Plane to face 3</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_3_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_3_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 3</short>
++ <long>Plane to face 3</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_3_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_3_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane To Face 3</short>
++ <long>Plane to face 3</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_3_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_3_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane To Face 3</short>
++ <long>Plane to face 3 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_4_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_4_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 4</short>
++ <long>Plane to face 4</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_4_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_4_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 4</short>
++ <long>Plane to face 4</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_4_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_4_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane To Face 4</short>
++ <long>Plane to face 4</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_4_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_4_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane To Face 4</short>
++ <long>Plane to face 4 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_5_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_5_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 5</short>
++ <long>Plane to face 5</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_5_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_5_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 5</short>
++ <long>Plane to face 5</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_5_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_5_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane To Face 5</short>
++ <long>Plane to face 5</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_5_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_5_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane To Face 5</short>
++ <long>Plane to face 5 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_6_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_6_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 6</short>
++ <long>Plane to face 6</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_6_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_6_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 6</short>
++ <long>Plane to face 6</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_6_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_6_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane To Face 6</short>
++ <long>Plane to face 6</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_6_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_6_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane To Face 6</short>
++ <long>Plane to face 6 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_7_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_7_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 7</short>
++ <long>Plane to face 7</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_7_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_7_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 7</short>
++ <long>Plane to face 7</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_7_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_7_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane To Face 7</short>
++ <long>Plane to face 7</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_7_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_7_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane To Face 7</short>
++ <long>Plane to face 7 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_8_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_8_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 8</short>
++ <long>Plane to face 8</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_8_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_8_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 8</short>
++ <long>Plane to face 8</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_8_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_8_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane To Face 8</short>
++ <long>Plane to face 8</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_8_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_8_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane To Face 8</short>
++ <long>Plane to face 8 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_9_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_9_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 9</short>
++ <long>Plane to face 9</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_9_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_9_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 9</short>
++ <long>Plane to face 9</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_9_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_9_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane To Face 9</short>
++ <long>Plane to face 9</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_9_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_9_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane To Face 9</short>
++ <long>Plane to face 9 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_10_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_10_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 10</short>
++ <long>Plane to face 10</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_10_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_10_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 10</short>
++ <long>Plane to face 10</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_10_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_10_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane To Face 10</short>
++ <long>Plane to face 10</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_10_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_10_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane To Face 10</short>
++ <long>Plane to face 10 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_11_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_11_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 11</short>
++ <long>Plane to face 11</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_11_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_11_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 11</short>
++ <long>Plane to face 11</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_11_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_11_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane To Face 11</short>
++ <long>Plane to face 11</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_11_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_11_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane To Face 11</short>
++ <long>Plane to face 11 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_12_key</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_12_key</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 12</short>
++ <long>Plane to face 12</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_12_button</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_12_button</applyto>
++ <owner>compiz</owner>
++ <type>string</type>
++ <default>Disabled</default>
++ <locale name="C">
++ <short>Plane To Face 12</short>
++ <long>Plane to face 12</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_12_bell</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_12_bell</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Plane To Face 12</short>
++ <long>Plane to face 12</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/compiz/plugins/plane/allscreens/options/plane_to_12_edge</key>
++ <applyto>/apps/compiz/plugins/plane/allscreens/options/plane_to_12_edge</applyto>
++ <owner>compiz</owner>
++ <type>list</type>
++ <list_type>string</list_type>
++ <default>[]</default>
++ <locale name="C">
++ <short>Plane To Face 12</short>
++ <long>Plane to face 12 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
++ </locale>
++ </schema>
++
+ <!-- resize options -->
+
+ <schema>
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c.plane 2006-08-17 17:36:07.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c 2006-09-05 13:55:04.000000000 -0400
@@ -593,8 +593,10 @@
getOuterRectOfWindow (window, &rect);
@@ -70,7 +1105,7 @@
if (find_first_fit (window, windows, x, y, &x, &y))
goto done_check_denied_focus;
--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/rotate.c.plane 2006-08-17 17:36:07.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/rotate.c 2006-09-05 13:45:56.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/rotate.c 2006-09-05 13:55:04.000000000 -0400
@@ -419,15 +419,15 @@
rs->xrot += rs->xVelocity * chunk;
rs->yrot += rs->yVelocity * chunk;
@@ -219,7 +1254,7 @@
o[0].type = CompOptionTypeInt;
o[0].name = "x";
--- /dev/null 2006-08-31 19:15:36.944167750 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/plane.c 2006-09-05 13:45:56.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/plane.c 2006-09-05 13:55:04.000000000 -0400
@@ -0,0 +1,922 @@
+/*
+ * Copyright © 2006 Red Hat, Inc.
@@ -1143,8 +2178,8 @@
+{
+ return &planeVTable;
+}
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c.plane 2006-09-05 13:45:56.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c 2006-09-05 13:45:56.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c.plane 2006-09-05 13:55:04.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c 2006-09-05 13:55:04.000000000 -0400
@@ -741,7 +741,7 @@
case CUBE_SCREEN_OPTION_IN:
if (compSetBoolOption (o, value))
@@ -1326,9 +2361,19 @@
return FALSE;
if (cs->imgNFile)
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h.plane 2006-09-05 13:45:56.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h 2006-09-05 13:45:56.000000000 -0400
-@@ -1232,7 +1232,8 @@
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h.plane 2006-09-05 13:55:04.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h 2006-09-05 17:06:56.000000000 -0400
+@@ -1055,7 +1055,8 @@
+ #define COMP_SCREEN_OPTION_OPACITY_STEP 4
+ #define COMP_SCREEN_OPTION_UNREDIRECT_FS 5
+ #define COMP_SCREEN_OPTION_DEFAULT_ICON 6
+-#define COMP_SCREEN_OPTION_NUM 7
++#define COMP_SCREEN_OPTION_VSIZE 7
++#define COMP_SCREEN_OPTION_NUM 8
+
+ #ifndef GLX_EXT_texture_from_pixmap
+ #define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0
+@@ -1232,7 +1233,8 @@
typedef struct _CompStartupSequence {
struct _CompStartupSequence *next;
SnStartupSequence *sequence;
@@ -1338,7 +2383,7 @@
} CompStartupSequence;
typedef struct _CompFBConfig {
-@@ -1281,7 +1282,9 @@
+@@ -1281,7 +1283,9 @@
int width;
int height;
int x;
@@ -1349,7 +2394,7 @@
REGION region;
Region damage;
unsigned long damageMask;
-@@ -1541,6 +1544,7 @@
+@@ -1541,6 +1545,7 @@
void
moveScreenViewport (CompScreen *s,
int tx,
@@ -1357,7 +2402,7 @@
Bool sync);
void
-@@ -1670,7 +1674,8 @@
+@@ -1670,7 +1675,8 @@
int destroyRefCnt;
int unmapRefCnt;
@@ -1367,7 +2412,7 @@
Bool placed;
Bool minimized;
-@@ -2010,8 +2015,10 @@
+@@ -2010,8 +2016,10 @@
void
redirectWindow (CompWindow *w);
@@ -1380,8 +2425,8 @@
CompIcon *
getWindowIcon (CompWindow *w,
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c.plane 2006-09-05 13:48:54.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c 2006-09-05 13:49:20.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c.plane 2006-09-05 13:55:04.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c 2006-09-05 13:55:04.000000000 -0400
@@ -1763,7 +1763,8 @@
if (!(w->state & CompWindowStateHiddenMask))
@@ -1392,9 +2437,26 @@
applyStartupProperties (w->screen, w);
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c.plane 2006-09-05 13:45:56.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c 2006-09-05 13:45:56.000000000 -0400
-@@ -104,19 +104,21 @@
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c.plane 2006-09-05 13:55:04.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c 2006-09-05 17:07:48.000000000 -0400
+@@ -48,9 +48,13 @@
+
+ #define DETECT_REFRESH_RATE_DEFAULT TRUE
+
+-#define SCREEN_SIZE_DEFAULT 4
+-#define SCREEN_SIZE_MIN 4
+-#define SCREEN_SIZE_MAX 32
++#define SCREEN_SIZE_DEFAULT 4
++#define SCREEN_SIZE_MIN 4
++#define SCREEN_SIZE_MAX 32
++
++#define SCREEN_VSIZE_DEFAULT 1
++#define SCREEN_VSIZE_MIN 1
++#define SCREEN_VSIZE_MAX 32
+
+ #define LIGHTING_DEFAULT TRUE
+
+@@ -104,19 +108,21 @@
static void
setVirtualScreenSize (CompScreen *screen,
@@ -1420,22 +2482,57 @@
}
static Bool
-@@ -198,10 +200,13 @@
+@@ -198,10 +204,24 @@
case COMP_SCREEN_OPTION_SIZE:
if (compSetIntOption (o, value))
{
-+ /* FIXME */
-+ int vsize = 4;
++ CompOption *vsize = compFindOption (screen->opt, NUM_OPTIONS (screen), "vsize", NULL);
+
if (o->value.i * screen->width > MAXSHORT)
return FALSE;
- setVirtualScreenSize (screen, o->value.i);
-+ setVirtualScreenSize (screen, o->value.i, vsize);
++ setVirtualScreenSize (screen, o->value.i, vsize->value.i);
++ return TRUE;
++ }
++ break;
++ case COMP_SCREEN_OPTION_VSIZE:
++ if (compSetIntOption (o, value))
++ {
++ CompOption *hsize = compFindOption (screen->opt, NUM_OPTIONS (screen), "size", NULL);
++
++ if (o->value.i * screen->height > MAXSHORT)
++ return FALSE;
++
++ setVirtualScreenSize (screen, hsize->value.i, o->value.i);
return TRUE;
}
break;
-@@ -352,7 +357,8 @@
+@@ -267,13 +287,22 @@
+
+ o = &screen->opt[COMP_SCREEN_OPTION_SIZE];
+ o->name = "size";
+- o->shortDesc = N_("Virtual Size");
++ o->shortDesc = N_("Horizontal Virtual Size");
+ o->longDesc = N_("Screen size multiplier for virtual size");
+ o->type = CompOptionTypeInt;
+ o->value.i = SCREEN_SIZE_DEFAULT;
+ o->rest.i.min = SCREEN_SIZE_MIN;
+ o->rest.i.max = SCREEN_SIZE_MAX;
+
++ o = &(screen->opt[COMP_SCREEN_OPTION_VSIZE]);
++ o->name = "vsize";
++ o->shortDesc = N_("Vertical Virtual Size");
++ o->longDesc = N_("Screen size multiplier for vertical virtual size");
++ o->type = CompOptionTypeInt;
++ o->value.i = SCREEN_VSIZE_DEFAULT;
++ o->rest.i.min = SCREEN_VSIZE_MIN;
++ o->rest.i.max = SCREEN_VSIZE_MAX;
++
+ o = &screen->opt[COMP_SCREEN_OPTION_OPACITY_STEP];
+ o->name = "opacity_step";
+ o->shortDesc = N_("Opacity Step");
+@@ -352,7 +381,8 @@
s->next = screen->startupSequences;
s->sequence = sequence;
@@ -1445,7 +2542,7 @@
screen->startupSequences = s;
-@@ -826,22 +832,25 @@
+@@ -826,22 +856,25 @@
{
memcpy (data, propData, sizeof (unsigned long));
@@ -1475,7 +2572,7 @@
XChangeProperty (d->display, s->root, d->desktopGeometryAtom,
XA_CARDINAL, 32, PropModeReplace,
-@@ -865,7 +874,7 @@
+@@ -865,7 +898,7 @@
d->showingDesktopAtom, 0L, 1L, FALSE,
XA_CARDINAL, &actual, &format,
&n, &left, &propData);
@@ -1484,7 +2581,7 @@
if (result == Success && n && propData)
{
memcpy (data, propData, sizeof (unsigned long));
-@@ -956,8 +965,10 @@
+@@ -956,8 +989,10 @@
if (!s->damage)
return FALSE;
@@ -1497,7 +2594,7 @@
for (i = 0; i < SCREEN_EDGE_NUM; i++)
{
-@@ -2493,61 +2504,87 @@
+@@ -2493,61 +2528,87 @@
void
moveScreenViewport (CompScreen *s,
int tx,
@@ -1516,28 +2613,28 @@
- {
- CompWindow *w;
- int m, wx, vWidth = s->width * s->size;
+-
+- s->x += tx;
+ ty = s->y - ty;
+ ty = MOD (ty, s->vsize);
+ ty -= s->y;
-- s->x += tx;
+- tx *= -s->width;
+ if (!tx && !ty)
+ return;
-- tx *= -s->width;
-+ s->x += tx;
-+ s->y += ty;
-
- for (w = s->windows; w; w = w->next)
- {
- if (w->attrib.override_redirect)
- continue;
-+ tx *= -s->width;
-+ ty *= -s->height;
++ s->x += tx;
++ s->y += ty;
- if (w->type & (CompWindowTypeDesktopMask | CompWindowTypeDockMask))
- continue;
--
++ tx *= -s->width;
++ ty *= -s->height;
+
- if (w->state & CompWindowStateStickyMask)
- continue;
+ vWidth = s->width * s->hsize;
@@ -1624,7 +2721,7 @@
}
}
-@@ -2556,7 +2593,7 @@
+@@ -2556,7 +2617,7 @@
int x,
Bool sync)
{
@@ -1633,7 +2730,7 @@
x += w->screen->x * w->screen->width;
x = MOD (x, vWidth);
-@@ -2684,7 +2721,10 @@
+@@ -2684,7 +2745,10 @@
}
if (s)
@@ -1645,8 +2742,8 @@
}
void
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c.plane 2006-09-05 13:45:56.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c 2006-09-05 13:45:56.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c.plane 2006-09-05 13:55:04.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c 2006-09-05 13:55:04.000000000 -0400
@@ -1501,7 +1501,8 @@
w->shaded = FALSE;
w->hidden = FALSE;
- Previous message (by thread): rpms/anaconda/devel .cvsignore, 1.328, 1.329 anaconda.spec, 1.454, 1.455 sources, 1.451, 1.452
- Next message (by thread): rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-always-mouse-thyself.patch, 1.1, 1.2 xorg-x11-server.spec, 1.165, 1.166
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list