~compiz-team/compiz/compiz.fix_1077866

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu-config.patch

first packaging

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
=== modified file 'metadata/core.xml.in'
 
2
Index: compiz-0.9.8/metadata/core.xml.in
 
3
===================================================================
 
4
--- compiz-0.9.8.orig/metadata/core.xml.in      2012-05-29 12:09:56.000000000 +0200
 
5
+++ compiz-0.9.8/metadata/core.xml.in   2012-05-29 16:14:12.422129037 +0200
 
6
@@ -138,7 +138,7 @@
 
7
                        <option name="focus_prevention_match" type="match">
 
8
                        <_short>Focus Prevention Windows</_short>
 
9
                        <_long>Focus prevention windows</_long>
 
10
-                       <default>any</default>
 
11
+                       <default>!(class=Polkit-gnome-authentication-agent-1)</default>
 
12
                        </option>
 
13
                </group>
 
14
                <group>
 
15
@@ -173,7 +173,7 @@
 
16
                        <option name="minimize_window_key" type="key">
 
17
                        <_short>Minimize Window</_short>
 
18
                        <_long>Minimize active window</_long>
 
19
-                       <default>&lt;Alt&gt;F9</default>
 
20
+                       <default>&lt;Control&gt;&lt;Alt&gt;KP_0</default>
 
21
                        </option>
 
22
                        <option name="minimize_window_button" type="button">
 
23
                        <_short>Minimize Window</_short>
 
24
@@ -182,12 +182,12 @@
 
25
                        <option name="maximize_window_key" type="key">
 
26
                        <_short>Maximize Window</_short>
 
27
                        <_long>Maximize active window</_long>
 
28
-                       <default>&lt;Alt&gt;F10</default>
 
29
+                       <default>&lt;Control&gt;&lt;Super&gt;Up</default>
 
30
                        </option>
 
31
                        <option name="unmaximize_window_key" type="key">
 
32
                        <_short>Unmaximize Window</_short>
 
33
                        <_long>Unmaximize active window</_long>
 
34
-                       <default>&lt;Alt&gt;F5</default>
 
35
+                       <default>&lt;Control&gt;&lt;Super&gt;Down</default>
 
36
                        </option>
 
37
                        <option name="maximize_window_horizontally_key" type="key">
 
38
                        <_short>Maximize Window Horizontally</_short>
 
39
@@ -210,7 +210,7 @@
 
40
                        <option name="show_desktop_key" type="key">
 
41
                        <_short>Show Desktop</_short>
 
42
                        <_long>Hide all windows and focus desktop</_long>
 
43
-                       <default>&lt;Control&gt;&lt;Alt&gt;d</default>
 
44
+                       <default>&lt;Control&gt;&lt;Super&gt;d</default>
 
45
                        </option>
 
46
                        <option name="show_desktop_edge" type="edge">
 
47
                        <_short>Show Desktop</_short>
 
48
@@ -220,6 +220,7 @@
 
49
                        <option name="toggle_window_maximized_key" type="key">
 
50
                        <_short>Toggle Window Maximized</_short>
 
51
                        <_long>Toggle active window maximized</_long>
 
52
+            <default>&lt;Control&gt;&lt;Alt&gt;KP_5</default>
 
53
                        </option>
 
54
                        <option name="toggle_window_maximized_button" type="button">
 
55
                        <_short>Toggle Window Maximized</_short>
 
56
@@ -244,14 +245,14 @@
 
57
                        <option name="hsize" type="int">
 
58
                        <_short>Horizontal Virtual Size</_short>
 
59
                        <_long>Screen size multiplier for horizontal virtual size</_long>
 
60
-                       <default>4</default>
 
61
+                       <default>2</default>
 
62
                        <min>1</min>
 
63
                        <max>32</max>
 
64
                        </option>
 
65
                        <option name="vsize" type="int">
 
66
                        <_short>Vertical Virtual Size</_short>
 
67
                        <_long>Screen size multiplier for vertical virtual size</_long>
 
68
-                       <default>1</default>
 
69
+                       <default>2</default>
 
70
                        <min>1</min>
 
71
                        <max>32</max>
 
72
                        </option>
 
73
Index: compiz-0.9.8/plugins/fade/fade.xml.in
 
74
===================================================================
 
75
--- compiz-0.9.8.orig/plugins/fade/fade.xml.in  2012-05-29 12:09:56.000000000 +0200
 
76
+++ compiz-0.9.8/plugins/fade/fade.xml.in       2012-05-29 16:14:12.422129037 +0200
 
77
@@ -9,6 +9,7 @@
 
78
            </requirement>
 
79
            <relation type="after">
 
80
                <plugin>decor</plugin>
 
81
+               <plugin>staticswitcher</plugin>
 
82
            </relation>
 
83
            <relation type="before">
 
84
                <plugin>cube</plugin>
 
85
@@ -49,7 +50,7 @@
 
86
            <option name="window_match" type="match">
 
87
                <_short>Fade windows</_short>
 
88
                <_long>Windows that should be fading</_long>
 
89
-               <default>any</default>
 
90
+                <default>any &amp; !(title=notify-osd)</default>
 
91
            </option>
 
92
            <option name="visual_bell" type="bell">
 
93
                <_short>Visual Bell</_short>
 
94
Index: compiz-0.9.8/plugins/place/place.xml.in
 
95
===================================================================
 
96
--- compiz-0.9.8.orig/plugins/place/place.xml.in        2012-05-29 12:09:56.000000000 +0200
 
97
+++ compiz-0.9.8/plugins/place/place.xml.in     2012-05-29 16:14:12.422129037 +0200
 
98
@@ -19,8 +19,8 @@
 
99
            <option name="mode" type="int">
 
100
                <_short>Placement Mode</_short>
 
101
                <_long>Algorithm to use for window placement</_long>
 
102
-               <default>0</default>
 
103
-               <min>2</min>
 
104
+               <default>2</default>
 
105
+               <min>0</min>
 
106
                <max>5</max>
 
107
                <desc>
 
108
                    <value>0</value>
 
109
Index: compiz-0.9.8/plugins/resize/resize.xml.in
 
110
===================================================================
 
111
--- compiz-0.9.8.orig/plugins/resize/resize.xml.in      2012-05-29 12:09:56.000000000 +0200
 
112
+++ compiz-0.9.8/plugins/resize/resize.xml.in   2012-05-29 16:14:12.426129038 +0200
 
113
@@ -28,7 +28,7 @@
 
114
            <option name="mode" type="int">
 
115
                <_short>Default Resize Mode</_short>
 
116
                <_long>Default mode used for window resizing</_long>
 
117
-               <default>0</default>
 
118
+               <default>2</default>
 
119
                <min>0</min>
 
120
                <max>3</max>
 
121
                <desc>
 
122
@@ -57,9 +57,9 @@
 
123
                <_short>Border Color</_short>
 
124
                <_long>Border color used for outline and rectangle resize modes</_long>
 
125
                <default>
 
126
-                   <red>0x2f2f</red>
 
127
-                   <green>0x2f2f</green>
 
128
-                   <blue>0x4f4f</blue>
 
129
+                   <red>0xfbfb</red>
 
130
+                   <green>0x8b8b</green>
 
131
+                   <blue>0x0</blue>
 
132
                    <alpha>0x9f9f</alpha>
 
133
                </default>
 
134
            </option>
 
135
@@ -67,10 +67,10 @@
 
136
                <_short>Fill Color</_short>
 
137
                <_long>Fill color used for rectangle resize mode</_long>
 
138
                <default>
 
139
-                   <red>0x2f2f</red>
 
140
-                   <green>0x2f2f</green>
 
141
-                   <blue>0x4f4f</blue>
 
142
-                   <alpha>0x4f4f</alpha>
 
143
+                   <red>0xfbfb</red>
 
144
+                   <green>0x8b8b</green>
 
145
+                   <blue>0x0</blue>
 
146
+                   <alpha>0x1919</alpha>
 
147
                </default>
 
148
            </option>
 
149
            <subgroup>
 
150
Index: compiz-0.9.8/plugins/scale/scale.xml.in
 
151
===================================================================
 
152
--- compiz-0.9.8.orig/plugins/scale/scale.xml.in        2012-05-29 12:09:56.000000000 +0200
 
153
+++ compiz-0.9.8/plugins/scale/scale.xml.in     2012-05-29 16:14:12.426129038 +0200
 
154
@@ -18,14 +18,14 @@
 
155
                        <option name="spacing" type="int">
 
156
                                <_short>Spacing</_short>
 
157
                                <_long>Space between windows</_long>
 
158
-                               <default>10</default>
 
159
+                               <default>68</default>
 
160
                                <min>0</min>
 
161
                                <max>250</max>
 
162
                        </option>
 
163
                        <option name="speed" type="float">
 
164
                                <_short>Speed</_short>
 
165
                                <_long>Scale speed</_long>
 
166
-                               <default>1.5</default>
 
167
+                               <default>2.4</default>
 
168
                                <min>0.1</min>
 
169
                                <max>50</max>
 
170
                                <precision>0.1</precision>
 
171
@@ -33,7 +33,7 @@
 
172
                        <option name="timestep" type="float">
 
173
                                <_short>Timestep</_short>
 
174
                                <_long>Scale timestep</_long>
 
175
-                               <default>1.2</default>
 
176
+                               <default>0.1</default>
 
177
                                <min>0.1</min>
 
178
                                <max>50</max>
 
179
                                <precision>0.1</precision>
 
180
@@ -46,7 +46,7 @@
 
181
                        <option name="opacity" type="int">
 
182
                                <_short>Opacity</_short>
 
183
                                <_long>Amount of opacity in percent</_long>
 
184
-                               <default>75</default>
 
185
+                               <default>100</default>
 
186
                                <min>0</min>
 
187
                                <max>100</max>
 
188
                        </option>
 
189
@@ -55,7 +55,7 @@
 
190
                                <_long>Overlay an icon on windows once they are scaled</_long>
 
191
                                <min>0</min>
 
192
                                <max>2</max>
 
193
-                               <default>1</default>
 
194
+                               <default>0</default>
 
195
                                <desc>
 
196
                                        <value>0</value>
 
197
                                        <_name>None</_name>
 
198
@@ -96,7 +96,7 @@
 
199
                                <_long>Selects where windows are scaled if multiple output devices are used.</_long>
 
200
                                <min>0</min>
 
201
                                <max>1</max>
 
202
-                               <default>0</default>
 
203
+                               <default>1</default>
 
204
                                <desc>
 
205
                                        <value>0</value>
 
206
                                        <_name>On current output device</_name>
 
207
@@ -112,7 +112,7 @@
 
208
                        <option name="key_bindings_toggle" type="bool">
 
209
                            <_short>Key Bindings Toggle Scale Mode</_short>
 
210
                            <_long>Key bindings toggle scale mode instead of enabling it when pressed and disabling it when released.</_long>
 
211
-                           <default>false</default>
 
212
+                           <default>true</default>
 
213
                        </option>
 
214
                        <option name="button_bindings_toggle" type="bool">
 
215
                            <_short>Button Bindings Toggle Scale Mode</_short>
 
216
@@ -122,9 +122,6 @@
 
217
                        <option name="initiate_edge" type="edge">
 
218
                                <_short>Initiate Window Picker</_short>
 
219
                                <_long>Layout and start transforming windows</_long>
 
220
-                               <default>
 
221
-                               <edge name="TopRight"/>
 
222
-                               </default>
 
223
                                <allowed edgednd="true"/>
 
224
                        </option>
 
225
                        <option name="initiate_key" type="key">
 
226
@@ -148,6 +145,7 @@
 
227
                        <option name="initiate_all_key" type="key">
 
228
                                <_short>Initiate Window Picker For All Windows</_short>
 
229
                                <_long>Layout and start transforming all windows</_long>
 
230
+                               <default>&lt;Super&gt;w</default>
 
231
                        </option>
 
232
                        <option name="initiate_group_edge" type="edge">
 
233
                                <_short>Initiate Window Picker For Window Group</_short>
 
234
@@ -178,7 +176,7 @@
 
235
                        <option name="show_desktop" type="bool">
 
236
                                <_short>Click Desktop to Show Desktop</_short>
 
237
                                <_long>Enter Show Desktop mode when Desktop is clicked during Scale</_long>
 
238
-                               <default>true</default>
 
239
+                               <default>false</default>
 
240
                        </option>
 
241
            </group>
 
242
        </options>
 
243
Index: compiz-0.9.8/plugins/decor/decor.xml.in
 
244
===================================================================
 
245
--- compiz-0.9.8.orig/plugins/decor/decor.xml.in        2012-05-29 12:09:56.000000000 +0200
 
246
+++ compiz-0.9.8/plugins/decor/decor.xml.in     2012-05-29 16:14:12.426129038 +0200
 
247
@@ -30,7 +30,7 @@
 
248
                <option name="active_shadow_opacity" type="float">
 
249
                    <_short>Shadow Opacity</_short>
 
250
                    <_long>Drop shadow opacity</_long>
 
251
-                   <default>0.5</default>
 
252
+                   <default>0.8</default>
 
253
                    <min>0.01</min>
 
254
                    <max>6.0</max>
 
255
                    <precision>0.01</precision>
 
256
@@ -65,7 +65,7 @@
 
257
                <option name="inactive_shadow_radius" type="float">
 
258
                    <_short>Shadow Radius</_short>
 
259
                    <_long>Drop shadow radius</_long>
 
260
-                   <default>8.0</default>
 
261
+                   <default>5.0</default>
 
262
                    <min>0.1</min>
 
263
                    <max>13.0</max>
 
264
                    <precision>0.1</precision>
 
265
@@ -73,7 +73,7 @@
 
266
                <option name="inactive_shadow_opacity" type="float">
 
267
                    <_short>Shadow Opacity</_short>
 
268
                    <_long>Drop shadow opacity</_long>
 
269
-                   <default>0.5</default>
 
270
+                   <default>0.4</default>
 
271
                    <min>0.01</min>
 
272
                    <max>6.0</max>
 
273
                    <precision>0.01</precision>
 
274
@@ -100,6 +100,7 @@
 
275
            <option name="command" type="string">
 
276
                <_short>Command</_short>
 
277
                <_long>Decorator command line that is executed if no decorator is already running</_long>
 
278
+               <default>/usr/bin/gtk-window-decorator</default>
 
279
            </option>
 
280
            <option name="mipmap" type="bool">
 
281
                <_short>Mipmap</_short>
 
282
Index: compiz-0.9.8/plugins/gnomecompat/gnomecompat.xml.in
 
283
===================================================================
 
284
--- compiz-0.9.8.orig/plugins/gnomecompat/gnomecompat.xml.in    2012-05-29 12:09:56.000000000 +0200
 
285
+++ compiz-0.9.8/plugins/gnomecompat/gnomecompat.xml.in 2012-05-29 16:14:12.426129038 +0200
 
286
@@ -52,6 +52,7 @@
 
287
                <option name="run_command_terminal_key" type="key">
 
288
                    <_short>Open a terminal</_short>
 
289
                    <_long>Open a terminal</_long>
 
290
+                   <default>&lt;Control&gt;&lt;Alt&gt;T</default>
 
291
                </option>
 
292
            </group>
 
293
        </options>
 
294
Index: compiz-0.9.8/plugins/animation/animation.xml.in
 
295
===================================================================
 
296
--- compiz-0.9.8.orig/plugins/animation/animation.xml.in        2012-05-29 12:09:56.000000000 +0200
 
297
+++ compiz-0.9.8/plugins/animation/animation.xml.in     2012-05-29 16:16:51.074133577 +0200
 
298
@@ -35,7 +35,7 @@
 
299
            <extensible/>
 
300
            <sort start="2"/>
 
301
            <default>
 
302
-             <value>animation:Zoom</value>
 
303
+             <value>animation:Glide 2</value>
 
304
              <value>animation:Fade</value>
 
305
              <value>animation:Fade</value>
 
306
            </default>
 
307
@@ -47,9 +47,9 @@
 
308
            <min>50</min>
 
309
            <max>4000</max>
 
310
            <default>
 
311
-             <value>200</value>
 
312
-             <value>150</value>
 
313
-             <value>150</value>
 
314
+             <value>120</value>
 
315
+             <value>80</value>
 
316
+             <value>80</value>
 
317
            </default>
 
318
          </option>
 
319
          <option name="open_matches" type="list">
 
320
@@ -57,8 +57,8 @@
 
321
            <_long>The windows that will be animated.</_long>
 
322
            <type>match</type>
 
323
            <default>
 
324
-             <value>(type=Normal | Dialog | ModalDialog | Unknown) &amp; !(name=gnome-screensaver)</value>
 
325
-             <value>(type=Menu | PopupMenu | DropdownMenu | Combo)</value>
 
326
+             <value>((type=Normal | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) &amp; !(role=toolTipTip | role=qtooltip_label) &amp; !(type=Normal &amp; override_redirect=1) &amp; !(name=gnome-screensaver)</value>
 
327
+             <value>(type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal)</value>
 
328
              <value>(type=Tooltip | Notification | Utility) &amp; !(name=compiz) &amp; !(title=notify-osd)</value>
 
329
            </default>
 
330
          </option>
 
331
@@ -101,7 +101,7 @@
 
332
            <extensible/>
 
333
            <sort start="2"/>
 
334
            <default>
 
335
-             <value>animation:Zoom</value>
 
336
+             <value>animation:Glide 2</value>
 
337
              <value>animation:Fade</value>
 
338
              <value>animation:Fade</value>
 
339
            </default>
 
340
@@ -113,9 +113,9 @@
 
341
            <min>50</min>
 
342
            <max>4000</max>
 
343
            <default>
 
344
-             <value>200</value>
 
345
-             <value>150</value>
 
346
-             <value>150</value>
 
347
+             <value>120</value>
 
348
+             <value>80</value>
 
349
+             <value>50</value>
 
350
            </default>
 
351
          </option>
 
352
          <option name="close_matches" type="list">
 
353
@@ -123,8 +123,8 @@
 
354
            <_long>The windows that will be animated.</_long>
 
355
            <type>match</type>
 
356
            <default>
 
357
-             <value>(type=Normal | Dialog | ModalDialog | Unknown) &amp; !(name=gnome-screensaver)</value>
 
358
-             <value>(type=Menu | PopupMenu | DropdownMenu | Combo)</value>
 
359
+             <value>((type=Normal | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) &amp; !(role=toolTipTip | role=qtooltip_label) &amp; !(type=Normal &amp; override_redirect=1) &amp; !(name=gnome-screensaver) &amp; !(name=gnome-screenshot)</value>
 
360
+             <value>(type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal)</value>
 
361
              <value>(type=Tooltip | Notification | Utility) &amp; !(name=compiz) &amp; !(title=notify-osd)</value>
 
362
            </default>
 
363
          </option>
 
364
@@ -167,7 +167,7 @@
 
365
            <extensible/>
 
366
            <sort start="2"/>
 
367
            <default>
 
368
-             <value>animation:Magic Lamp</value>
 
369
+             <value>animation:Zoom</value>
 
370
            </default>
 
371
          </option>
 
372
          <option name="minimize_durations" type="list">
 
373
@@ -177,7 +177,7 @@
 
374
            <min>50</min>
 
375
            <max>4000</max>
 
376
            <default>
 
377
-             <value>300</value>
 
378
+             <value>220</value>
 
379
            </default>
 
380
          </option>
 
381
          <option name="minimize_matches" type="list">
 
382
@@ -282,7 +282,7 @@
 
383
            <extensible/>
 
384
            <sort start="1"/>
 
385
            <default>
 
386
-             <value>animation:None</value>
 
387
+             <value>animation:Fade</value>
 
388
            </default>
 
389
          </option>
 
390
          <option name="focus_durations" type="list">
 
391
@@ -292,7 +292,7 @@
 
392
            <min>50</min>
 
393
            <max>4000</max>
 
394
            <default>
 
395
-             <value>300</value>
 
396
+             <value>150</value>
 
397
            </default>
 
398
          </option>
 
399
          <option name="focus_matches" type="list">
 
400
@@ -326,7 +326,7 @@
 
401
        <option name="time_step" type="int">
 
402
          <_short>Animation Time Step</_short>
 
403
          <_long>The amount of time in milliseconds between each render of the animation. The higher the number, the jerkier the movements become.</_long>
 
404
-         <default>10</default>
 
405
+         <default>16</default>
 
406
          <min>1</min>
 
407
          <max>400</max>
 
408
        </option>
 
409
@@ -414,7 +414,7 @@
 
410
          <option name="glide2_away_position" type="float">
 
411
            <_short>Away Position</_short>
 
412
            <_long>Closeness of window to camera at the end of the animation (1.0: Close to camera, -2.0: Away from camera).</_long>
 
413
-           <default>-0.4</default>
 
414
+           <default>-0.1</default>
 
415
            <min>-2</min>
 
416
            <max>1</max>
 
417
            <precision>0.05</precision>
 
418
@@ -422,7 +422,7 @@
 
419
          <option name="glide2_away_angle" type="float">
 
420
            <_short>Away Angle</_short>
 
421
            <_long>Angle of window at the end of the animation.</_long>
 
422
-           <default>-45</default>
 
423
+           <default>0</default>
 
424
            <min>-540</min>
 
425
            <max>540</max>
 
426
            <precision>5</precision>
 
427
@@ -627,7 +627,7 @@
 
428
          <option name="zoom_springiness" type="float">
 
429
            <_short>Springiness</_short>
 
430
            <_long>How spring-like the Zoom animation should be.</_long>
 
431
-           <default>0.0</default>
 
432
+           <default>0.08</default>
 
433
            <min>0</min>
 
434
            <max>1</max>
 
435
            <precision>0.01</precision>
 
436
Index: compiz-0.9.8/plugins/ezoom/ezoom.xml.in
 
437
===================================================================
 
438
--- compiz-0.9.8.orig/plugins/ezoom/ezoom.xml.in        2012-05-29 12:09:56.000000000 +0200
 
439
+++ compiz-0.9.8/plugins/ezoom/ezoom.xml.in     2012-05-29 16:16:51.074133577 +0200
 
440
@@ -29,7 +29,6 @@
 
441
                <option type="button" name="zoom_in_button">
 
442
                    <_short>Zoom In</_short>
 
443
                    <_long>Zoom In</_long>
 
444
-                   <default>&lt;Super&gt;Button4</default>
 
445
                </option>
 
446
                <option type="key" name="zoom_in_key">
 
447
                    <_short>Zoom In</_short>
 
448
@@ -38,7 +37,6 @@
 
449
                <option type="button" name="zoom_out_button">
 
450
                    <_short>Zoom Out</_short>
 
451
                    <_long>Zoom Out</_long>
 
452
-                   <default>&lt;Super&gt;Button5</default>
 
453
                </option>
 
454
                <option type="key" name="zoom_out_key">
 
455
                    <_short>Zoom Out</_short>
 
456
@@ -47,7 +45,6 @@
 
457
                <option type="button" name="zoom_box_button">
 
458
                    <_short>Zoom Box</_short>
 
459
                    <_long>Zoom in on a boxed area</_long>
 
460
-                   <default>&lt;Super&gt;Button2</default>
 
461
                </option>
 
462
            </group>
 
463
            <group>
 
464
@@ -141,7 +138,7 @@
 
465
                    <option type="key" name="fit_to_window_key">
 
466
                        <_short>Fit zoomed area to window</_short>
 
467
                        <_long>Zooms in/out so the focused window is zoomed to the maximum while still being fully visible.</_long>
 
468
-                       <default>&lt;Super&gt;r</default>
 
469
+                       <default></default>
 
470
                    </option>
 
471
                </subgroup>
 
472
            </group>
 
473
Index: compiz-0.9.8/plugins/grid/grid.xml.in
 
474
===================================================================
 
475
--- compiz-0.9.8.orig/plugins/grid/grid.xml.in  2012-05-29 12:09:56.000000000 +0200
 
476
+++ compiz-0.9.8/plugins/grid/grid.xml.in       2012-05-29 16:16:51.074133577 +0200
 
477
@@ -23,17 +23,16 @@
 
478
                <option name="put_center_key" type="key">
 
479
                    <_short>Put Center</_short>
 
480
                    <_long>Move window to the center</_long>
 
481
-                   <default>&lt;Control&gt;&lt;Alt&gt;KP_5</default>
 
482
                </option>
 
483
                <option name="put_left_key" type="key">
 
484
                    <_short>Put Left</_short>
 
485
                    <_long>Move window to the left edge</_long>
 
486
-                   <default>&lt;Control&gt;&lt;Alt&gt;KP_4</default>
 
487
+                   <default>&lt;Control&gt;&lt;Super&gt;Left</default>
 
488
                </option>
 
489
                <option name="put_right_key" type="key">
 
490
                    <_short>Put Right</_short>
 
491
                    <_long>Move window to the right edge</_long>
 
492
-                   <default>&lt;Control&gt;&lt;Alt&gt;KP_6</default>
 
493
+                   <default>&lt;Control&gt;&lt;Super&gt;Right</default>
 
494
                </option>
 
495
                <option name="put_top_key" type="key">
 
496
                    <_short>Put Top</_short>
 
497
@@ -68,7 +67,6 @@
 
498
                <option name="put_maximize_key" type="key">
 
499
                    <_short>Maximize</_short>
 
500
                    <_long>Maximize window</_long>
 
501
-                   <default>&lt;Control&gt;&lt;Alt&gt;KP_0</default>
 
502
                </option>
 
503
                <option name="put_restore_key" type="key">
 
504
                    <_short>Restore</_short>
 
505
Index: compiz-0.9.8/plugins/staticswitcher/staticswitcher.xml.in
 
506
===================================================================
 
507
--- compiz-0.9.8.orig/plugins/staticswitcher/staticswitcher.xml.in      2012-05-29 12:09:56.000000000 +0200
 
508
+++ compiz-0.9.8/plugins/staticswitcher/staticswitcher.xml.in   2012-05-29 16:16:51.074133577 +0200
 
509
@@ -10,7 +10,6 @@
 
510
            <relation type="after">
 
511
                <plugin>composite</plugin>
 
512
                <plugin>opengl</plugin>
 
513
-               <plugin>fade</plugin>
 
514
                <plugin>compiztoolbox</plugin>
 
515
                <plugin>decor</plugin>
 
516
            </relation>
 
517
@@ -139,12 +138,12 @@
 
518
                <option name="auto_change_vp" type="bool">
 
519
                    <_short>Auto Change Viewport</_short>
 
520
                    <_long>Change to the viewport of the selected window while switching</_long>
 
521
-                   <default>false</default>
 
522
+                   <default>true</default>
 
523
                </option>
 
524
                <option name="popup_delay" type="float">
 
525
                    <_short>Popup Window Delay</_short>
 
526
                    <_long>Time (in s) the popup window should be delayed before appearing</_long>
 
527
-                   <default>0.0</default>
 
528
+                   <default>0.2</default>
 
529
                    <min>0.0</min>
 
530
                    <max>2.0</max>
 
531
                    <precision>0.05</precision>
 
532
@@ -152,7 +151,7 @@
 
533
                <option name="mouse_select" type="bool">
 
534
                    <_short>Allow Mouse Selection</_short>
 
535
                    <_long>Allow selection of windows from the switcher window with the mouse</_long>
 
536
-                   <default>false</default>
 
537
+                   <default>true</default>
 
538
                </option>
 
539
            </group>
 
540
            <group>
 
541
@@ -160,14 +159,14 @@
 
542
                <option name="saturation" type="int">
 
543
                    <_short>Saturation</_short>
 
544
                    <_long>Amount of saturation in percent</_long>
 
545
-                   <default>50</default>
 
546
+                   <default>100</default>
 
547
                    <min>0</min>
 
548
                    <max>100</max>
 
549
                </option>
 
550
                <option name="brightness" type="int">
 
551
                    <_short>Brightness</_short>
 
552
                    <_long>Amount of brightness in percent</_long>
 
553
-                   <default>50</default>
 
554
+                   <default>100</default>
 
555
                    <min>0</min>
 
556
                    <max>100</max>
 
557
                </option>
 
558
@@ -191,7 +190,7 @@
 
559
                <option name="mipmap" type="bool">
 
560
                    <_short>Mipmap</_short>
 
561
                    <_long>Generate mipmaps when possible for higher quality scaling</_long>
 
562
-                   <default>true</default>
 
563
+                   <default>false</default>
 
564
                </option>
 
565
                <option name="row_align" type="int">
 
566
                    <_short>Row Alignment</_short>
 
567
@@ -220,7 +219,7 @@
 
568
                    <option name="bring_to_front" type="bool">
 
569
                        <_short>Bring To Front</_short>
 
570
                        <_long>Bring selected window to front</_long>
 
571
-                       <default>true</default>
 
572
+                       <default>false</default>
 
573
                    </option>
 
574
                    <_short>Selected Window Highlight</_short>
 
575
                    <option name="highlight_mode" type="int">
 
576
@@ -228,7 +227,7 @@
 
577
                        <_long>Mode for highlighting the currently selected window</_long>
 
578
                        <min>0</min>
 
579
                        <max>2</max>
 
580
-                       <default>1</default>
 
581
+                       <default>0</default>
 
582
                        <desc>
 
583
                            <value>0</value>
 
584
                            <_name>None</_name>
 
585
Index: compiz-0.9.8/plugins/vpswitch/vpswitch.xml.in
 
586
===================================================================
 
587
--- compiz-0.9.8.orig/plugins/vpswitch/vpswitch.xml.in  2012-05-29 12:09:56.000000000 +0200
 
588
+++ compiz-0.9.8/plugins/vpswitch/vpswitch.xml.in       2012-05-29 16:16:51.074133577 +0200
 
589
@@ -95,13 +95,11 @@
 
590
                                <option name="next_button" type="button">
 
591
                                        <_short>Move Next</_short>
 
592
                                        <_long>Move to the next viewport</_long>
 
593
-                                       <default>Button5</default>
 
594
                                        <internal/>
 
595
                                </option>
 
596
                                <option name="prev_button" type="button">
 
597
                                        <_short>Move Prev</_short>
 
598
                                        <_long>Move to the previous viewport</_long>
 
599
-                                       <default>Button4</default>
 
600
                                        <internal/>
 
601
                                </option>
 
602
                                <option name="initiate_button" type="button">
 
603
Index: compiz-0.9.8/plugins/wall/wall.xml.in
 
604
===================================================================
 
605
--- compiz-0.9.8.orig/plugins/wall/wall.xml.in  2012-05-29 12:09:56.000000000 +0200
 
606
+++ compiz-0.9.8/plugins/wall/wall.xml.in       2012-05-29 16:16:51.074133577 +0200
 
607
@@ -31,12 +31,12 @@
 
608
                                <option name="miniscreen" type="bool">
 
609
                                        <_short>Show Live Viewport Previews</_short>
 
610
                                        <_long>Show live viewport previews in switcher window</_long>
 
611
-                                       <default>false</default>
 
612
+                                       <default>true</default>
 
613
                                </option>
 
614
                                <option name="preview_timeout" type="float">
 
615
                                        <_short>Switch Target Preview Visibility Time</_short>
 
616
                                        <_long>Duration (in s) the switch target preview should remain visible after switching ends.</_long>
 
617
-                                       <default>0.4</default>
 
618
+                                       <default>0.2</default>
 
619
                                        <min>0.0</min>
 
620
                                        <max>2.0</max>
 
621
                                        <precision>0.05</precision>
 
622
@@ -44,7 +44,7 @@
 
623
                                <option name="preview_scale" type="int">
 
624
                                        <_short>Preview Scale</_short>
 
625
                                        <_long>Size of the preview in %</_long>
 
626
-                                       <default>100</default>
 
627
+                                       <default>130</default>
 
628
                                        <min>0</min>
 
629
                                        <max>400</max>
 
630
                                </option>
 
631
@@ -58,7 +58,7 @@
 
632
                                <option name="border_width" type="int">
 
633
                                        <_short>Border Width</_short>
 
634
                                        <_long>Width of the border between the previews</_long>
 
635
-                                       <default>10</default>
 
636
+                                       <default>7</default>
 
637
                                        <min>0</min>
 
638
                                        <max>30</max>
 
639
                                </option>
 
640
@@ -66,10 +66,10 @@
 
641
                                        <_short>Outline Color</_short>
 
642
                                        <_long>Outline color of the switcher window.</_long>
 
643
                                        <default>
 
644
-                                               <red>0x3333</red>
 
645
-                                               <green>0x3333</green>
 
646
-                                               <blue>0x3333</blue>
 
647
-                                               <alpha>0xd998</alpha>
 
648
+                                               <red>0xffff</red>
 
649
+                                               <green>0xffff</green>
 
650
+                                               <blue>0xffff</blue>
 
651
+                                               <alpha>0x3232</alpha>
 
652
                                                </default>
 
653
                                </option>
 
654
                                <subgroup>
 
655
@@ -79,30 +79,30 @@
 
656
                                                <_short>Base Color</_short>
 
657
                                                <_long>First color for the background gradient of the switcher window.</_long>
 
658
                                                <default>
 
659
-                                                       <red>0xcccc</red>
 
660
-                                                       <green>0xcccc</green>
 
661
-                                                       <blue>0xe665</blue>
 
662
-                                                       <alpha>0xd998</alpha>
 
663
+                                                       <red>0x0000</red>
 
664
+                                                       <green>0x0000</green>
 
665
+                                                       <blue>0x0000</blue>
 
666
+                                                       <alpha>0x6464</alpha>
 
667
                                                </default>
 
668
                                        </option>
 
669
                                        <option name="background_gradient_highlight_color" type="color">
 
670
                                                <_short>Highlight Color</_short>
 
671
                                                <_long>Second color for the background gradient of the switcher window.</_long>
 
672
                                                <default>
 
673
-                                                       <red>0xf332</red>
 
674
-                                                       <green>0xf332</green>
 
675
-                                                       <blue>0xffff</blue>
 
676
-                                                       <alpha>0xd998</alpha>
 
677
+                                                       <red>0x0000</red>
 
678
+                                                       <green>0x0000</green>
 
679
+                                                       <blue>0x0000</blue>
 
680
+                                                       <alpha>0x6464</alpha>
 
681
                                                </default>
 
682
                                        </option>
 
683
                                        <option name="background_gradient_shadow_color" type="color">
 
684
                                                <_short>Shadow Color</_short>
 
685
                                                <_long>Third color for the background gradient of the switcher window.</_long>
 
686
                                                <default>
 
687
-                                                       <red>0xf332</red>
 
688
-                                                       <green>0xf332</green>
 
689
-                                                       <blue>0xffff</blue>
 
690
-                                                       <alpha>0xd998</alpha>
 
691
+                                                       <red>0x0000</red>
 
692
+                                                       <green>0x0000</green>
 
693
+                                                       <blue>0x0000</blue>
 
694
+                                                       <alpha>0x6464</alpha>
 
695
                                                </default>
 
696
                                        </option>
 
697
                                </subgroup>
 
698
@@ -113,20 +113,20 @@
 
699
                                                <_short>Base Color</_short>
 
700
                                                <_long>First color for the thumb gradient of the switcher window.</_long>
 
701
                                                <default>
 
702
-                                                       <red>0x3333</red>
 
703
-                                                       <green>0x3333</green>
 
704
-                                                       <blue>0x3333</blue>
 
705
-                                                       <alpha>0x5999</alpha>
 
706
+                                                       <red>0x5555</red>
 
707
+                                                       <green>0x5555</green>
 
708
+                                                       <blue>0x5555</blue>
 
709
+                                                       <alpha>0x3232</alpha>
 
710
                                                </default>
 
711
                                        </option>
 
712
                                        <option name="thumb_gradient_highlight_color" type="color">
 
713
                                                <_short>Highlight Color</_short>
 
714
                                                <_long>Second color for the thumb gradient of the switcher window.</_long>
 
715
                                                <default>
 
716
-                                                       <red>0x3fff</red>
 
717
-                                                       <green>0x3fff</green>
 
718
-                                                       <blue>0x3fff</blue>
 
719
-                                                       <alpha>0x3fff</alpha>
 
720
+                                                       <red>0x5555</red>
 
721
+                                                       <green>0x5555</green>
 
722
+                                                       <blue>0x5555</blue>
 
723
+                                                       <alpha>0x3232</alpha>
 
724
                                                </default>
 
725
                                        </option>
 
726
                                </subgroup>
 
727
@@ -140,7 +140,7 @@
 
728
                                                        <red>0xffff</red>
 
729
                                                        <green>0xffff</green>
 
730
                                                        <blue>0xffff</blue>
 
731
-                                                       <alpha>0xf332</alpha>
 
732
+                                                       <alpha>0xffff</alpha>
 
733
                                                </default>
 
734
                                        </option>
 
735
                                        <option name="thumb_highlight_gradient_shadow_color" type="color">
 
736
@@ -150,7 +150,7 @@
 
737
                                                        <red>0xdfff</red>
 
738
                                                        <green>0xdfff</green>
 
739
                                                        <blue>0xdfff</blue>
 
740
-                                                       <alpha>0xa665</alpha>
 
741
+                                                       <alpha>0xffff</alpha>
 
742
                                                </default>
 
743
                                        </option>
 
744
                                </subgroup>
 
745
@@ -348,7 +348,7 @@
 
746
                                <option name="edgeflip_move" type="bool">
 
747
                                        <_short>Edge Flip Move</_short>
 
748
                                        <_long>Flip viewport when moving a window to a screen edge</_long>
 
749
-                                       <default>true</default>
 
750
+                                       <default>false</default>
 
751
                                </option>
 
752
                                <option name="edgeflip_dnd" type="bool">
 
753
                                        <_short>Edge Flip DnD</_short>