[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/compiz/devel compiz.spec,1.53,1.54 plane.patch,1.9,1.10



Author: sandmann

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8663

Modified Files:
	compiz.spec plane.patch 
Log Message:
Don't use plane plugin by default; make default keybinding for shrink Pause


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- compiz.spec	27 Sep 2006 22:46:30 -0000	1.53
+++ compiz.spec	28 Sep 2006 17:33:49 -0000	1.54
@@ -177,6 +177,10 @@
 %{_includedir}/compiz
 
 %changelog
+* Thu Sep 28 2006 Soren Sandmann <sandmann redhat com>
+- Change default plugin list to not include the plane plugin. (Bug 208448).
+- Change default keybinding for shrink to be Pause (Bug 206187).
+
 * Wed Sep 27 2006 Soren Sandmann <sandmann redhat com>
 - Add patch to show a menu when the window icon is clicked. (Bug 201629).
 

plane.patch:
 include/compiz.h          |   20 
 plugins/Makefile.am       |    5 
 plugins/compiz.schemas.in | 1254 ++++++++++++++++++++++++++++++++++++++++------
 plugins/cube.c            |   66 +-
 plugins/place.c           |   13 
 plugins/plane.c           |  894 ++++++++++++++++++++++++++++++++
 plugins/rotate.c          |   57 +-
 plugins/scale.c           |    4 
 src/event.c               |    3 
 src/screen.c              |  177 ++++--
 src/window.c              |   72 +-
 11 files changed, 2258 insertions(+), 307 deletions(-)

Index: plane.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/plane.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plane.patch	25 Sep 2006 22:54:17 -0000	1.9
+++ plane.patch	28 Sep 2006 17:33:49 -0000	1.10
@@ -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-25 18:32:40.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/Makefile.am	2006-09-28 13:22:29.000000000 -0400
 @@ -46,6 +46,10 @@
  libwater_la_LIBADD = @COMPIZ_LIBS@
  libwater_la_SOURCES = water.c
@@ -20,16 +20,7 @@
  
  EXTRA_DIST = $(schema_in_files)
 --- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/compiz.schemas.in.plane	2006-08-17 17:36:07.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/compiz.schemas.in	2006-09-25 18:32:40.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>
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/compiz.schemas.in	2006-09-28 13:22:29.000000000 -0400
 @@ -9021,7 +9021,7 @@
              <applyto>/apps/compiz/general/screen0/options/refresh_rate</applyto>
              <owner>compiz</owner>
@@ -127,10 +118,201 @@
          <!-- cube options -->
  
          <schema>
-@@ -13135,6 +13147,926 @@
+@@ -12947,191 +12959,1111 @@
+                 <short>放置窗口</short>
+                 <long>映射时将窗口放置在适当位置</long>
              </locale>
-         </schema>
- 
+-            <locale name="zh_TW">
+-                <short>放置視窗</short>
+-                <long>在映射時將視窗放置到適當位置</long>
++            <locale name="zh_TW">
++                <short>放置視窗</short>
++                <long>在映射時將視窗放置到適當位置</long>
++            </locale>
++        </schema>
++
++        <schema>
++            <key>/schemas/apps/compiz/plugins/place/load_before</key>
++            <applyto>/apps/compiz/plugins/place/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/place/requires</key>
++            <applyto>/apps/compiz/plugins/place/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/place/screen0/options/workarounds</key>
++            <applyto>/apps/compiz/plugins/place/screen0/options/workarounds</applyto>
++            <owner>compiz</owner>
++            <type>bool</type>
++            <default>true</default>
++            <locale name="C">
++                <short>Workarounds</short>
++                <long>Window placement workarounds</long>
++            </locale>
++            <locale name="cs">
++                <short>Řešení problémů</short>
++                <long>Nouzová řešení umístění oken</long>
++            </locale>
++            <locale name="de">
++                <short>Workarounds</short>
++                <long>Fensterplatzierungs-Workarounds</long>
++            </locale>
++            <locale name="es">
++                <short>Soluciones alternativas</short>
++                <long>Procedimientos alternativos para colocación de ventanas</long>
++            </locale>
++            <locale name="fi">
++                <short>Poikkeukset</short>
++                <long>Poikkeukset ikkunoiden asettelussa</long>
++            </locale>
++            <locale name="fr">
++                <short>Solutions</short>
++                <long>Solution de placement de fenêtre</long>
++            </locale>
++            <locale name="hu">
++                <short>Kerülő megoldások</short>
++                <long>Kerülőmegoldások az ablak elhelyezésére</long>
++            </locale>
++            <locale name="it">
++                <short>Alternative</short>
++                <long>Alternative posizionamento finestre</long>
++            </locale>
++            <locale name="ja">
++                <short>回避方法</short>
++                <long>ウィンドウ配置の回避策</long>
++            </locale>
++            <locale name="pl">
++                <short>Obejścia problemów</short>
++                <long>Obejścia problemów z rozmieszczeniem okien</long>
++            </locale>
++            <locale name="pt_BR">
++                <short>Soluções</short>
++                <long>Soluções para colocação de janelas</long>
++            </locale>
++            <locale name="zh_CN">
++                <short>工作区</short>
++                <long>窗口放置工作区</long>
++            </locale>
++            <locale name="zh_TW">
++                <short>解決方式</short>
++                <long>視窗位置解決方式</long>
++            </locale>
++        </schema>
++
 +        <!-- plane options -->
 +
 +        <schema>
@@ -839,20 +1021,63 @@
 +            <locale name="C">
 +                <short>Plane To Face 8</short>
 +                <long>Plane to face 8</long>
-+            </locale>
-+        </schema>
-+
-+        <schema>
+             </locale>
+         </schema>
+ 
+         <schema>
+-            <key>/schemas/apps/compiz/plugins/place/load_before</key>
+-            <applyto>/apps/compiz/plugins/place/load_before</applyto>
 +            <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">
+             <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>
 +                <short>Plane To Face 8</short>
 +                <long>Plane to face 8 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
-+            </locale>
+             </locale>
+-            <locale name="pt_BR">
+-                <short>Plug-ins que devem ser carregados antes de</short>
+-                <long>Não modificar</long>
 +        </schema>
 +
 +        <schema>
@@ -864,7 +1089,10 @@
 +            <locale name="C">
 +                <short>Plane To Face 9</short>
 +                <long>Plane to face 9</long>
-+            </locale>
+             </locale>
+-            <locale name="zh_CN">
+-                <short>必须先装载的插件</short>
+-                <long>不修改</long>
 +        </schema>
 +
 +        <schema>
@@ -876,7 +1104,10 @@
 +            <locale name="C">
 +                <short>Plane To Face 9</short>
 +                <long>Plane to face 9</long>
-+            </locale>
+             </locale>
+-            <locale name="zh_TW">
+-                <short>在此之前必須先載入的外掛程式</short>
+-                <long>不要修改</long>
 +        </schema>
 +
 +        <schema>
@@ -888,20 +1119,67 @@
 +            <locale name="C">
 +                <short>Plane To Face 9</short>
 +                <long>Plane to face 9</long>
-+            </locale>
-+        </schema>
-+
-+        <schema>
+             </locale>
+         </schema>
+ 
+         <schema>
+-            <key>/schemas/apps/compiz/plugins/place/requires</key>
+-            <applyto>/apps/compiz/plugins/place/requires</applyto>
 +            <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">
+             <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>
 +                <short>Plane To Face 9</short>
 +                <long>Plane to face 9 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
-+            </locale>
+             </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>
 +        </schema>
 +
 +        <schema>
@@ -913,7 +1191,10 @@
 +            <locale name="C">
 +                <short>Plane To Face 10</short>
 +                <long>Plane to face 10</long>
-+            </locale>
+             </locale>
+-            <locale name="zh_TW">
+-                <short>這時需要的外掛程式</short>
+-                <long>不要修改</long>
 +        </schema>
 +
 +        <schema>
@@ -925,19 +1206,39 @@
 +            <locale name="C">
 +                <short>Plane To Face 10</short>
 +                <long>Plane to face 10</long>
-+            </locale>
-+        </schema>
-+
-+        <schema>
+             </locale>
+         </schema>
+ 
+         <schema>
+-            <key>/schemas/apps/compiz/plugins/place/screen0/options/workarounds</key>
+-            <applyto>/apps/compiz/plugins/place/screen0/options/workarounds</applyto>
 +            <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>
+             <owner>compiz</owner>
+             <type>bool</type>
+-            <default>true</default>
 +            <default>false</default>
-+            <locale name="C">
+             <locale name="C">
+-                <short>Workarounds</short>
+-                <long>Window placement workarounds</long>
+-            </locale>
+-            <locale name="cs">
+-                <short>Řešení problémů</short>
+-                <long>Nouzová řešení umístění oken</long>
+-            </locale>
+-            <locale name="de">
+-                <short>Workarounds</short>
+-                <long>Fensterplatzierungs-Workarounds</long>
+-            </locale>
+-            <locale name="es">
+-                <short>Soluciones alternativas</short>
+-                <long>Procedimientos alternativos para colocación de ventanas</long>
 +                <short>Plane To Face 10</short>
 +                <long>Plane to face 10</long>
-+            </locale>
+             </locale>
+-            <locale name="fi">
+-                <short>Poikkeukset</short>
+-                <long>Poikkeukset ikkunoiden asettelussa</long>
 +        </schema>
 +
 +        <schema>
@@ -950,7 +1251,10 @@
 +            <locale name="C">
 +                <short>Plane To Face 10</short>
 +                <long>Plane to face 10 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
-+            </locale>
+             </locale>
+-            <locale name="fr">
+-                <short>Solutions</short>
+-                <long>Solution de placement de fenêtre</long>
 +        </schema>
 +
 +        <schema>
@@ -962,7 +1266,10 @@
 +            <locale name="C">
 +                <short>Plane To Face 11</short>
 +                <long>Plane to face 11</long>
-+            </locale>
+             </locale>
+-            <locale name="hu">
+-                <short>Kerülő megoldások</short>
+-                <long>Kerülőmegoldások az ablak elhelyezésére</long>
 +        </schema>
 +
 +        <schema>
@@ -974,7 +1281,10 @@
 +            <locale name="C">
 +                <short>Plane To Face 11</short>
 +                <long>Plane to face 11</long>
-+            </locale>
+             </locale>
+-            <locale name="it">
+-                <short>Alternative</short>
+-                <long>Alternative posizionamento finestre</long>
 +        </schema>
 +
 +        <schema>
@@ -986,7 +1296,10 @@
 +            <locale name="C">
 +                <short>Plane To Face 11</short>
 +                <long>Plane to face 11</long>
-+            </locale>
+             </locale>
+-            <locale name="ja">
+-                <short>回避方法</short>
+-                <long>ウィンドウ配置の回避策</long>
 +        </schema>
 +
 +        <schema>
@@ -999,7 +1312,10 @@
 +            <locale name="C">
 +                <short>Plane To Face 11</short>
 +                <long>Plane to face 11 (Left, Right, Top, Bottom, TopLeft, TopRight, BottomLeft, BottomRight)</long>
-+            </locale>
+             </locale>
+-            <locale name="pl">
+-                <short>Obejścia problemów</short>
+-                <long>Obejścia problemów z rozmieszczeniem okien</long>
 +        </schema>
 +
 +        <schema>
@@ -1011,7 +1327,10 @@
 +            <locale name="C">
 +                <short>Plane To Face 12</short>
 +                <long>Plane to face 12</long>
-+            </locale>
+             </locale>
+-            <locale name="pt_BR">
+-                <short>Soluções</short>
+-                <long>Soluções para colocação de janelas</long>
 +        </schema>
 +
 +        <schema>
@@ -1023,7 +1342,10 @@
 +            <locale name="C">
 +                <short>Plane To Face 12</short>
 +                <long>Plane to face 12</long>
-+            </locale>
+             </locale>
+-            <locale name="zh_CN">
+-                <short>工作区</short>
+-                <long>窗口放置工作区</long>
 +        </schema>
 +
 +        <schema>
@@ -1035,7 +1357,10 @@
 +            <locale name="C">
 +                <short>Plane To Face 12</short>
 +                <long>Plane to face 12</long>
-+            </locale>
+             </locale>
+-            <locale name="zh_TW">
+-                <short>解決方式</short>
+-                <long>視窗位置解決方式</long>
 +        </schema>
 +
 +        <schema>
@@ -1048,14 +1373,20 @@
 +            <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 -->
+             </locale>
+         </schema>
  
-         <schema>
+@@ -19030,7 +19962,7 @@
+             <applyto>/apps/compiz/plugins/scale/allscreens/options/initiate_key</applyto>
+             <owner>compiz</owner>
+             <type>string</type>
+-            <default>&lt;Control&gt;&lt;Alt&gt;Up</default>
++            <default>Pause</default>
+             <locale name="C">
+                 <short>Initiate Window Picker</short>
+                 <long>Layout and start transforming windows</long>
 --- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c.plane	2006-08-17 17:36:07.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c	2006-09-25 18:32:40.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c	2006-09-28 13:22:29.000000000 -0400
 @@ -593,8 +593,10 @@
      getOuterRectOfWindow (window, &rect);
  
@@ -1105,7 +1436,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-25 18:32:40.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/rotate.c	2006-09-28 13:22:29.000000000 -0400
 @@ -419,15 +419,15 @@
  	    rs->xrot += rs->xVelocity * chunk;
  	    rs->yrot += rs->yVelocity * chunk;
@@ -1253,8 +1584,8 @@
  
  		    o[0].type    = CompOptionTypeInt;
  		    o[0].name    = "x";
---- /dev/null	2006-09-23 14:54:58.013763397 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/plane.c	2006-09-25 18:32:41.000000000 -0400
+--- /dev/null	2006-09-28 10:50:23.971501381 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/plane.c	2006-09-28 13:22:29.000000000 -0400
 @@ -0,0 +1,894 @@
 +/*
 + * Copyright © 2006 Red Hat, Inc.
@@ -2150,8 +2481,21 @@
 +{
 +    return &planeVTable;
 +}
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c.plane	2006-09-25 18:32:40.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c	2006-09-25 18:32:41.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/scale.c.plane	2006-09-28 13:22:36.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/scale.c	2006-09-28 13:22:48.000000000 -0400
+@@ -44,8 +44,8 @@
+ 
+ #define SCALE_SLOPPY_FOCUS_DEFAULT TRUE
+ 
+-#define SCALE_INITIATE_KEY_DEFAULT       "Up"
+-#define SCALE_INITIATE_MODIFIERS_DEFAULT (ControlMask | CompAltMask)
++#define SCALE_INITIATE_KEY_DEFAULT       "Pause"
++#define SCALE_INITIATE_MODIFIERS_DEFAULT 0
+ 
+ #define SCALE_SPEED_DEFAULT   1.5f
+ #define SCALE_SPEED_MIN       0.1f
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c.plane	2006-09-28 13:22:29.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c	2006-09-28 13:22:29.000000000 -0400
 @@ -741,7 +741,7 @@
      case CUBE_SCREEN_OPTION_IN:
  	if (compSetBoolOption (o, value))
@@ -2333,8 +2677,8 @@
  	return FALSE;
  
      if (cs->imgNFile)
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h.plane	2006-09-25 18:32:40.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h	2006-09-25 18:32:41.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h.plane	2006-09-28 13:22:29.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h	2006-09-28 13:22:29.000000000 -0400
 @@ -1055,7 +1055,8 @@
  #define COMP_SCREEN_OPTION_OPACITY_STEP        4
  #define COMP_SCREEN_OPTION_UNREDIRECT_FS       5
@@ -2397,8 +2741,8 @@
  
  CompIcon *
  getWindowIcon (CompWindow *w,
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c.plane	2006-09-25 18:32:40.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c	2006-09-25 18:32:41.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c.plane	2006-09-28 13:22:29.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c	2006-09-28 13:22:29.000000000 -0400
 @@ -1763,7 +1763,8 @@
  
  	    if (!(w->state & CompWindowStateHiddenMask))
@@ -2409,8 +2753,8 @@
  
  		applyStartupProperties (w->screen, w);
  
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c.plane	2006-09-25 18:32:40.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c	2006-09-25 18:33:53.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c.plane	2006-09-28 13:22:29.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c	2006-09-28 13:22:29.000000000 -0400
 @@ -48,9 +48,13 @@
  
  #define DETECT_REFRESH_RATE_DEFAULT TRUE
@@ -2585,23 +2929,23 @@
 -    {
 -	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;
--
++    s->x += tx;
++    s->y += ty;
+ 
 -	    if (w->type & (CompWindowTypeDesktopMask | CompWindowTypeDockMask))
 -		continue;
 +    tx *= -s->width;
@@ -2717,8 +3061,8 @@
  }
  
  void
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c.plane	2006-09-25 18:32:40.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c	2006-09-25 18:32:41.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c.plane	2006-09-28 13:22:29.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c	2006-09-28 13:22:29.000000000 -0400
 @@ -1501,7 +1501,8 @@
      w->shaded		 = FALSE;
      w->hidden		 = FALSE;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]