|
18110
|
1 |
diff -rup compiz-plugins-main-0.8.2/configure.ac compiz-plugins-main-0.8.2.fix/configure.ac
|
|
|
2 |
--- compiz-plugins-main-0.8.2/configure.ac 2009-03-05 04:36:21.000000000 +0100
|
|
|
3 |
+++ compiz-plugins-main-0.8.2.fix/configure.ac 2009-09-03 16:28:53.347532732 +0200
|
|
|
4 |
@@ -1,6 +1,6 @@
|
|
|
5 |
AC_PREREQ(2.57)
|
|
|
6 |
|
|
|
7 |
-m4_define([plugins_main_version], [esyscmd(. ./VERSION;echo -n $VERSION)])
|
|
|
8 |
+m4_define([plugins_main_version], [esyscmd(. ./VERSION;echo $VERSION | tr -d "\n")])
|
|
|
9 |
|
|
|
10 |
AC_INIT([compiz-plugins-main], [plugins_main_version], [[email protected]])
|
|
|
11 |
|
|
|
12 |
diff -rup compiz-plugins-main-0.8.2/include/compiz-animation.h compiz-plugins-main-0.8.2.fix/include/compiz-animation.h
|
|
|
13 |
--- compiz-plugins-main-0.8.2/include/compiz-animation.h 2009-03-05 04:36:21.000000000 +0100
|
|
|
14 |
+++ compiz-plugins-main-0.8.2.fix/include/compiz-animation.h 2009-09-03 16:28:53.353094573 +0200
|
|
|
15 |
@@ -215,7 +215,7 @@ typedef struct _AnimBaseFunctions {
|
|
|
16 |
|
|
|
17 |
#define OPTION_GETTERS(extensionBaseFunctions, \
|
|
|
18 |
extensionPluginInfo, firstEffectOption) \
|
|
|
19 |
-static inline CompOptionValue * \
|
|
|
20 |
+static CompOptionValue * \
|
|
|
21 |
animGetOptVal (CompWindow *w, \
|
|
|
22 |
int optionId) \
|
|
|
23 |
{ \
|
|
|
24 |
@@ -223,35 +223,35 @@ animGetOptVal (CompWindow *w, \
|
|
|
25 |
(w, (extensionPluginInfo), optionId - (firstEffectOption)); \
|
|
|
26 |
} \
|
|
|
27 |
\
|
|
|
28 |
-inline Bool \
|
|
|
29 |
+Bool \
|
|
|
30 |
animGetB (CompWindow *w, \
|
|
|
31 |
int optionId) \
|
|
|
32 |
{ \
|
|
|
33 |
return animGetOptVal (w, optionId)->b; \
|
|
|
34 |
} \
|
|
|
35 |
\
|
|
|
36 |
-inline int \
|
|
|
37 |
+int \
|
|
|
38 |
animGetI (CompWindow *w, \
|
|
|
39 |
int optionId) \
|
|
|
40 |
{ \
|
|
|
41 |
return animGetOptVal (w, optionId)->i; \
|
|
|
42 |
} \
|
|
|
43 |
\
|
|
|
44 |
-inline float \
|
|
|
45 |
+float \
|
|
|
46 |
animGetF (CompWindow *w, \
|
|
|
47 |
int optionId) \
|
|
|
48 |
{ \
|
|
|
49 |
return animGetOptVal (w, optionId)->f; \
|
|
|
50 |
} \
|
|
|
51 |
\
|
|
|
52 |
-inline char * \
|
|
|
53 |
+char * \
|
|
|
54 |
animGetS (CompWindow *w, \
|
|
|
55 |
int optionId) \
|
|
|
56 |
{ \
|
|
|
57 |
return animGetOptVal (w, optionId)->s; \
|
|
|
58 |
} \
|
|
|
59 |
\
|
|
|
60 |
-inline unsigned short * \
|
|
|
61 |
+unsigned short * \
|
|
|
62 |
animGetC (CompWindow *w, \
|
|
|
63 |
int optionId) \
|
|
|
64 |
{ \
|
|
|
65 |
@@ -260,23 +260,23 @@ animGetC (CompWindow *w, \
|
|
|
66 |
|
|
|
67 |
#define OPTION_GETTERS_HDR \
|
|
|
68 |
\
|
|
|
69 |
-inline Bool \
|
|
|
70 |
+Bool \
|
|
|
71 |
animGetB (CompWindow *w, \
|
|
|
72 |
int optionId); \
|
|
|
73 |
\
|
|
|
74 |
-inline int \
|
|
|
75 |
+int \
|
|
|
76 |
animGetI (CompWindow *w, \
|
|
|
77 |
int optionId); \
|
|
|
78 |
\
|
|
|
79 |
-inline float \
|
|
|
80 |
+float \
|
|
|
81 |
animGetF (CompWindow *w, \
|
|
|
82 |
int optionId); \
|
|
|
83 |
\
|
|
|
84 |
-inline char * \
|
|
|
85 |
+char * \
|
|
|
86 |
animGetS (CompWindow *w, \
|
|
|
87 |
int optionId); \
|
|
|
88 |
\
|
|
|
89 |
-inline unsigned short * \
|
|
|
90 |
+unsigned short * \
|
|
|
91 |
animGetC (CompWindow *w, \
|
|
|
92 |
int optionId);
|
|
|
93 |
|
|
|
94 |
diff -rup compiz-plugins-main-0.8.2/metadata/animation.xml.in compiz-plugins-main-0.8.2.fix/metadata/animation.xml.in
|
|
|
95 |
--- compiz-plugins-main-0.8.2/metadata/animation.xml.in 2009-03-05 04:36:21.000000000 +0100
|
|
|
96 |
+++ compiz-plugins-main-0.8.2.fix/metadata/animation.xml.in 2009-09-03 16:28:53.347953996 +0200
|
|
|
97 |
@@ -294,7 +294,7 @@
|
|
|
98 |
<min>50</min>
|
|
|
99 |
<max>4000</max>
|
|
|
100 |
<default>
|
|
|
101 |
- <value>300</value>
|
|
|
102 |
+ <value>200</value>
|
|
|
103 |
</default>
|
|
|
104 |
</option>
|
|
|
105 |
<option name="focus_matches" type="list">
|
|
|
106 |
diff -rup compiz-plugins-main-0.8.2/metadata/colorfilter.xml.in compiz-plugins-main-0.8.2.fix/metadata/colorfilter.xml.in
|
|
|
107 |
--- compiz-plugins-main-0.8.2/metadata/colorfilter.xml.in 2009-03-05 04:36:21.000000000 +0100
|
|
|
108 |
+++ compiz-plugins-main-0.8.2.fix/metadata/colorfilter.xml.in 2009-09-03 16:28:53.348168749 +0200
|
|
|
109 |
@@ -13,17 +13,17 @@
|
|
|
110 |
<option name="toggle_window_key" type="key">
|
|
|
111 |
<_short>Toggle window filtering</_short>
|
|
|
112 |
<_long>Toggle filtering for currently focused window.</_long>
|
|
|
113 |
- <default><Super>f</default>
|
|
|
114 |
+ <default><Mod4>f</default>
|
|
|
115 |
</option>
|
|
|
116 |
<option name="toggle_screen_key" type="key">
|
|
|
117 |
<_short>Toggle screen filtering</_short>
|
|
|
118 |
<_long>Toggle filtering for every window on the screen.</_long>
|
|
|
119 |
- <default><Super>d</default>
|
|
|
120 |
+ <default><Mod4>d</default>
|
|
|
121 |
</option>
|
|
|
122 |
<option name="switch_filter_key" type="key">
|
|
|
123 |
<_short>Switch filter</_short>
|
|
|
124 |
<_long>Select filter to use from filters list : either apply all filters or only one specific filter (triggering this action switches filters one by one and eventually comes back to the "all filters" mode).</_long>
|
|
|
125 |
- <default><Control><Super>s</default>
|
|
|
126 |
+ <default><Control><Mod4>s</default>
|
|
|
127 |
</option>
|
|
|
128 |
</display>
|
|
|
129 |
<screen>
|
|
|
130 |
diff -rup compiz-plugins-main-0.8.2/metadata/expo.xml.in compiz-plugins-main-0.8.2.fix/metadata/expo.xml.in
|
|
|
131 |
--- compiz-plugins-main-0.8.2/metadata/expo.xml.in 2009-03-05 04:36:21.000000000 +0100
|
|
|
132 |
+++ compiz-plugins-main-0.8.2.fix/metadata/expo.xml.in 2009-09-03 16:28:53.348454925 +0200
|
|
|
133 |
@@ -20,7 +20,7 @@
|
|
|
134 |
<option name="expo_key" type="key">
|
|
|
135 |
<_short>Expo key</_short>
|
|
|
136 |
<_long>Engage wall expo mode key binding</_long>
|
|
|
137 |
- <default><Super>e</default>
|
|
|
138 |
+ <default><Mod4>e</default>
|
|
|
139 |
</option>
|
|
|
140 |
<option name="expo_button" type="button">
|
|
|
141 |
<_short>Expo button</_short>
|
|
|
142 |
@@ -110,7 +110,7 @@
|
|
|
143 |
<option name="deform" type="int">
|
|
|
144 |
<_short>Deformation</_short>
|
|
|
145 |
<_long>Deformation of the expo wall</_long>
|
|
|
146 |
- <default>0</default>
|
|
|
147 |
+ <default>2</default>
|
|
|
148 |
<min>0</min>
|
|
|
149 |
<max>2</max>
|
|
|
150 |
<desc>
|
|
|
151 |
@@ -166,7 +166,7 @@
|
|
|
152 |
<option name="mipmaps" type="bool">
|
|
|
153 |
<_short>Mipmaps</_short>
|
|
|
154 |
<_long>Generate mipmaps in expo mode</_long>
|
|
|
155 |
- <default>false</default>
|
|
|
156 |
+ <default>true</default>
|
|
|
157 |
</option>
|
|
|
158 |
<option name="multioutput_mode" type="int">
|
|
|
159 |
<_short>Multi Output Mode</_short>
|
|
|
160 |
diff -rup compiz-plugins-main-0.8.2/metadata/ezoom.xml.in compiz-plugins-main-0.8.2.fix/metadata/ezoom.xml.in
|
|
|
161 |
--- compiz-plugins-main-0.8.2/metadata/ezoom.xml.in 2009-03-05 04:36:21.000000000 +0100
|
|
|
162 |
+++ compiz-plugins-main-0.8.2.fix/metadata/ezoom.xml.in 2009-09-03 16:30:27.772055719 +0200
|
|
|
163 |
@@ -22,7 +22,7 @@
|
|
|
164 |
<option type="button" name="zoom_in_button">
|
|
|
165 |
<_short>Zoom In</_short>
|
|
|
166 |
<_long>Zoom In</_long>
|
|
|
167 |
- <default><Super>Button4</default>
|
|
|
168 |
+ <default><Mod4>Button4</default>
|
|
|
169 |
</option>
|
|
|
170 |
<option type="key" name="zoom_in_key">
|
|
|
171 |
<_short>Zoom In</_short>
|
|
|
172 |
@@ -31,7 +31,7 @@
|
|
|
173 |
<option type="button" name="zoom_out_button">
|
|
|
174 |
<_short>Zoom Out</_short>
|
|
|
175 |
<_long>Zoom Out</_long>
|
|
|
176 |
- <default><Super>Button5</default>
|
|
|
177 |
+ <default><Mod4>Button5</default>
|
|
|
178 |
</option>
|
|
|
179 |
<option type="key" name="zoom_out_key">
|
|
|
180 |
<_short>Zoom Out</_short>
|
|
|
181 |
@@ -40,7 +40,7 @@
|
|
|
182 |
<option type="button" name="zoom_box_button">
|
|
|
183 |
<_short>Zoom Box</_short>
|
|
|
184 |
<_long>Zoom in on a boxed area</_long>
|
|
|
185 |
- <default><Super>Button2</default>
|
|
|
186 |
+ <default><Mod4>Button2</default>
|
|
|
187 |
</option>
|
|
|
188 |
</group>
|
|
|
189 |
<group>
|
|
|
190 |
@@ -134,7 +134,7 @@
|
|
|
191 |
<option type="key" name="fit_to_window_key">
|
|
|
192 |
<_short>Fit zoomed area to window</_short>
|
|
|
193 |
<_long>Zooms in/out so the focused window is zoomed to the maximum while still being fully visible.</_long>
|
|
|
194 |
- <default><Super>r</default>
|
|
|
195 |
+ <default><Mod4>r</default>
|
|
|
196 |
</option>
|
|
|
197 |
</subgroup>
|
|
|
198 |
</group>
|
|
|
199 |
diff -rup compiz-plugins-main-0.8.2/metadata/mag.xml.in compiz-plugins-main-0.8.2.fix/metadata/mag.xml.in
|
|
|
200 |
--- compiz-plugins-main-0.8.2/metadata/mag.xml.in 2009-03-05 04:36:21.000000000 +0100
|
|
|
201 |
+++ compiz-plugins-main-0.8.2.fix/metadata/mag.xml.in 2009-09-03 16:28:53.349531217 +0200
|
|
|
202 |
@@ -18,17 +18,17 @@
|
|
|
203 |
<option name="initiate" type="key">
|
|
|
204 |
<_short>Initiate</_short>
|
|
|
205 |
<_long>Zoom In</_long>
|
|
|
206 |
- <default><Super>m</default>
|
|
|
207 |
+ <default><Mod4>m</default>
|
|
|
208 |
</option>
|
|
|
209 |
<option name="zoom_in_button" type="button">
|
|
|
210 |
<_short>Zoom In</_short>
|
|
|
211 |
<_long>Zoom In</_long>
|
|
|
212 |
- <default><Super><Shift>Button4</default>
|
|
|
213 |
+ <default><Mod4><Shift>Button4</default>
|
|
|
214 |
</option>
|
|
|
215 |
<option name="zoom_out_button" type="button">
|
|
|
216 |
<_short>Zoom Out</_short>
|
|
|
217 |
<_long>Zoom Out</_long>
|
|
|
218 |
- <default><Super><Shift>Button5</default>
|
|
|
219 |
+ <default><Mod4><Shift>Button5</default>
|
|
|
220 |
</option>
|
|
|
221 |
</group>
|
|
|
222 |
</display>
|
|
|
223 |
diff -rup compiz-plugins-main-0.8.2/metadata/neg.xml.in compiz-plugins-main-0.8.2.fix/metadata/neg.xml.in
|
|
|
224 |
--- compiz-plugins-main-0.8.2/metadata/neg.xml.in 2009-03-05 04:36:21.000000000 +0100
|
|
|
225 |
+++ compiz-plugins-main-0.8.2.fix/metadata/neg.xml.in 2009-09-03 16:28:53.349723579 +0200
|
|
|
226 |
@@ -13,12 +13,12 @@
|
|
|
227 |
<option name="window_toggle_key" type="key">
|
|
|
228 |
<_short>Toggle Window Negative</_short>
|
|
|
229 |
<_long>Toggle active window negative</_long>
|
|
|
230 |
- <default><Super>n</default>
|
|
|
231 |
+ <default><Mod4>n</default>
|
|
|
232 |
</option>
|
|
|
233 |
<option name="screen_toggle_key" type="key">
|
|
|
234 |
<_short>Toggle Screen Negative</_short>
|
|
|
235 |
<_long>Toggle screen negative</_long>
|
|
|
236 |
- <default><Super>m</default>
|
|
|
237 |
+ <default><Mod4>m</default>
|
|
|
238 |
</option>
|
|
|
239 |
</display>
|
|
|
240 |
<screen>
|
|
|
241 |
diff -rup compiz-plugins-main-0.8.2/metadata/opacify.xml.in compiz-plugins-main-0.8.2.fix/metadata/opacify.xml.in
|
|
|
242 |
--- compiz-plugins-main-0.8.2/metadata/opacify.xml.in 2009-03-05 04:36:21.000000000 +0100
|
|
|
243 |
+++ compiz-plugins-main-0.8.2.fix/metadata/opacify.xml.in 2009-09-03 16:28:53.349919736 +0200
|
|
|
244 |
@@ -15,7 +15,7 @@
|
|
|
245 |
<option name="toggle_key" type="key">
|
|
|
246 |
<_short>Toggle Opacify</_short>
|
|
|
247 |
<_long>Use this to enable/disable Opacify on the fly. Previously opacified windows will not be reset once you disable it like this.</_long>
|
|
|
248 |
- <default><Super>o</default>
|
|
|
249 |
+ <default><Mod4>o</default>
|
|
|
250 |
</option>
|
|
|
251 |
</group>
|
|
|
252 |
<group>
|
|
|
253 |
diff -rup compiz-plugins-main-0.8.2/metadata/put.xml.in compiz-plugins-main-0.8.2.fix/metadata/put.xml.in
|
|
|
254 |
--- compiz-plugins-main-0.8.2/metadata/put.xml.in 2009-03-05 04:36:21.000000000 +0100
|
|
|
255 |
+++ compiz-plugins-main-0.8.2.fix/metadata/put.xml.in 2009-09-03 16:28:53.350393476 +0200
|
|
|
256 |
@@ -88,7 +88,7 @@
|
|
|
257 |
<option name="put_center_key" type="key">
|
|
|
258 |
<_short>Put Center</_short>
|
|
|
259 |
<_long>Move window to the center</_long>
|
|
|
260 |
- <default><Super>KP_Begin</default>
|
|
|
261 |
+ <default><Mod4>KP_Begin</default>
|
|
|
262 |
</option>
|
|
|
263 |
<option name="put_center_button" type="button">
|
|
|
264 |
<_short>Put Center</_short>
|
|
|
265 |
@@ -97,7 +97,7 @@
|
|
|
266 |
<option name="put_left_key" type="key">
|
|
|
267 |
<_short>Put Left</_short>
|
|
|
268 |
<_long>Move window to the left edge</_long>
|
|
|
269 |
- <default><Super>KP_Left</default>
|
|
|
270 |
+ <default><Mod4>KP_Left</default>
|
|
|
271 |
</option>
|
|
|
272 |
<option name="put_left_button" type="button">
|
|
|
273 |
<_short>Put Left</_short>
|
|
|
274 |
@@ -106,7 +106,7 @@
|
|
|
275 |
<option name="put_right_key" type="key">
|
|
|
276 |
<_short>Put Right</_short>
|
|
|
277 |
<_long>Move window to the right edge</_long>
|
|
|
278 |
- <default><Super>KP_Right</default>
|
|
|
279 |
+ <default><Mod4>KP_Right</default>
|
|
|
280 |
</option>
|
|
|
281 |
<option name="put_right_button" type="button">
|
|
|
282 |
<_short>Put Right</_short>
|
|
|
283 |
@@ -115,7 +115,7 @@
|
|
|
284 |
<option name="put_top_key" type="key">
|
|
|
285 |
<_short>Put Top</_short>
|
|
|
286 |
<_long>Move window to the top edge</_long>
|
|
|
287 |
- <default><Super>KP_Up</default>
|
|
|
288 |
+ <default><Mod4>KP_Up</default>
|
|
|
289 |
</option>
|
|
|
290 |
<option name="put_top_button" type="button">
|
|
|
291 |
<_short>Put Top</_short>
|
|
|
292 |
@@ -124,17 +124,17 @@
|
|
|
293 |
<option name="put_bottom_key" type="key">
|
|
|
294 |
<_short>Put Bottom</_short>
|
|
|
295 |
<_long>Move window to the bottom edge</_long>
|
|
|
296 |
- <default><Super>KP_Down</default>
|
|
|
297 |
+ <default><Mod4>KP_Down</default>
|
|
|
298 |
</option>
|
|
|
299 |
<option name="put_bottom_button" type="button">
|
|
|
300 |
<_short>Put Bottom</_short>
|
|
|
301 |
<_long>Move window to the bottom edge</_long>
|
|
|
302 |
- <default><Super>KP_Down</default>
|
|
|
303 |
+ <default><Mod4>KP_Down</default>
|
|
|
304 |
</option>
|
|
|
305 |
<option name="put_topleft_key" type="key">
|
|
|
306 |
<_short>Put Top Left</_short>
|
|
|
307 |
<_long>Move window to the top left corner</_long>
|
|
|
308 |
- <default><Super>KP_Home</default>
|
|
|
309 |
+ <default><Mod4>KP_Home</default>
|
|
|
310 |
</option>
|
|
|
311 |
<option name="put_topleft_button" type="button">
|
|
|
312 |
<_short>Put Top Left</_short>
|
|
|
313 |
@@ -143,7 +143,7 @@
|
|
|
314 |
<option name="put_topright_key" type="key">
|
|
|
315 |
<_short>Put Top Right</_short>
|
|
|
316 |
<_long>Move window to the top right corner</_long>
|
|
|
317 |
- <default><Super>KP_Prior</default>
|
|
|
318 |
+ <default><Mod4>KP_Prior</default>
|
|
|
319 |
</option>
|
|
|
320 |
<option name="put_topright_button" type="button">
|
|
|
321 |
<_short>Put Top Right</_short>
|
|
|
322 |
@@ -152,7 +152,7 @@
|
|
|
323 |
<option name="put_bottomleft_key" type="key">
|
|
|
324 |
<_short>Put Bottom Left</_short>
|
|
|
325 |
<_long>Move window to the bottom left corner</_long>
|
|
|
326 |
- <default><Super>KP_End</default>
|
|
|
327 |
+ <default><Mod4>KP_End</default>
|
|
|
328 |
</option>
|
|
|
329 |
<option name="put_bottomleft_button" type="button">
|
|
|
330 |
<_short>Put Bottom Left</_short>
|
|
|
331 |
@@ -161,7 +161,7 @@
|
|
|
332 |
<option name="put_bottomright_key" type="key">
|
|
|
333 |
<_short>Put Bottom Right</_short>
|
|
|
334 |
<_long>Move window to the bottom right corner</_long>
|
|
|
335 |
- <default><Super>KP_Next</default>
|
|
|
336 |
+ <default><Mod4>KP_Next</default>
|
|
|
337 |
</option>
|
|
|
338 |
<option name="put_bottomright_button" type="button">
|
|
|
339 |
<_short>Put Bottom Right</_short>
|
|
|
340 |
@@ -171,7 +171,7 @@
|
|
|
341 |
<option name="put_restore_key" type="key">
|
|
|
342 |
<_short>Restore Position</_short>
|
|
|
343 |
<_long>Move window to the last position</_long>
|
|
|
344 |
- <default><Super>KP_Insert</default>
|
|
|
345 |
+ <default><Mod4>KP_Insert</default>
|
|
|
346 |
</option>
|
|
|
347 |
<option name="put_restore_button" type="button">
|
|
|
348 |
<_short>Restore Position</_short>
|
|
|
349 |
@@ -180,7 +180,7 @@
|
|
|
350 |
<option name="put_pointer_key" type="key">
|
|
|
351 |
<_short>Put Pointer</_short>
|
|
|
352 |
<_long>Move window to the pointer position</_long>
|
|
|
353 |
- <default><Super>z</default>
|
|
|
354 |
+ <default><Mod4>z</default>
|
|
|
355 |
</option>
|
|
|
356 |
<option name="put_pointer_button" type="button">
|
|
|
357 |
<_short>Put Pointer</_short>
|
|
|
358 |
diff -rup compiz-plugins-main-0.8.2/metadata/resizeinfo.xml.in compiz-plugins-main-0.8.2.fix/metadata/resizeinfo.xml.in
|
|
|
359 |
--- compiz-plugins-main-0.8.2/metadata/resizeinfo.xml.in 2009-03-05 04:36:21.000000000 +0100
|
|
|
360 |
+++ compiz-plugins-main-0.8.2.fix/metadata/resizeinfo.xml.in 2009-09-03 16:28:53.350606770 +0200
|
|
|
361 |
@@ -14,7 +14,7 @@
|
|
|
362 |
<option name="fade_time" type="int">
|
|
|
363 |
<_short>Fade Time</_short>
|
|
|
364 |
<_long>Fade time (in ms) for popup window</_long>
|
|
|
365 |
- <default>500</default>
|
|
|
366 |
+ <default>100</default>
|
|
|
367 |
<min>10</min>
|
|
|
368 |
<max>5000</max>
|
|
|
369 |
</option>
|
|
|
370 |
@@ -22,7 +22,7 @@
|
|
|
371 |
<_short> Show resize info for all windows. </_short>
|
|
|
372 |
<_long> Show resize info for all windows as opposed to just
|
|
|
373 |
windows with a resize increment of greater than 1. </_long>
|
|
|
374 |
- <default>false</default>
|
|
|
375 |
+ <default>true</default>
|
|
|
376 |
</option>
|
|
|
377 |
<option name="text_color" type="color">
|
|
|
378 |
<_short> Text color. </_short>
|
|
|
379 |
diff -rup compiz-plugins-main-0.8.2/metadata/ring.xml.in compiz-plugins-main-0.8.2.fix/metadata/ring.xml.in
|
|
|
380 |
--- compiz-plugins-main-0.8.2/metadata/ring.xml.in 2009-03-05 04:36:21.000000000 +0100
|
|
|
381 |
+++ compiz-plugins-main-0.8.2.fix/metadata/ring.xml.in 2009-09-03 16:28:53.350905772 +0200
|
|
|
382 |
@@ -15,7 +15,7 @@
|
|
|
383 |
<option name="next_key" type="key">
|
|
|
384 |
<_short>Next Window</_short>
|
|
|
385 |
<_long>Show switcher if not visible and select next window.</_long>
|
|
|
386 |
- <default><Super>Tab</default>
|
|
|
387 |
+ <default><Mod4>Tab</default>
|
|
|
388 |
</option>
|
|
|
389 |
<option name="next_button" type="button">
|
|
|
390 |
<_short>Next Window</_short>
|
|
|
391 |
@@ -24,7 +24,7 @@
|
|
|
392 |
<option name="prev_key" type="key">
|
|
|
393 |
<_short>Previous Window</_short>
|
|
|
394 |
<_long>Show switcher if not visible and select previous window.</_long>
|
|
|
395 |
- <default><Super><Shift>Tab</default>
|
|
|
396 |
+ <default><Mod4><Shift>Tab</default>
|
|
|
397 |
</option>
|
|
|
398 |
<option name="prev_button" type="button">
|
|
|
399 |
<_short>Previous Window</_short>
|
|
|
400 |
@@ -33,7 +33,7 @@
|
|
|
401 |
<option name="next_all_key" type="key">
|
|
|
402 |
<_short>Next Window (All Workspaces)</_short>
|
|
|
403 |
<_long>Show switcher if not visible and select next window out of all windows.</_long>
|
|
|
404 |
- <default><Super><Alt>Tab</default>
|
|
|
405 |
+ <default><Mod4><Alt>Tab</default>
|
|
|
406 |
</option>
|
|
|
407 |
<option name="next_all_button" type="button">
|
|
|
408 |
<_short>Next Window (All Workspaces)</_short>
|
|
|
409 |
@@ -42,7 +42,7 @@
|
|
|
410 |
<option name="prev_all_key" type="key">
|
|
|
411 |
<_short>Previous Window (All Workspaces)</_short>
|
|
|
412 |
<_long>Show switcher if not visible and select previous window out of all windows.</_long>
|
|
|
413 |
- <default><Super><Shift><Alt>Tab</default>
|
|
|
414 |
+ <default><Mod4><Shift><Alt>Tab</default>
|
|
|
415 |
</option>
|
|
|
416 |
<option name="prev_all_button" type="button">
|
|
|
417 |
<_short>Previous Window (All Workspaces)</_short>
|
|
|
418 |
diff -rup compiz-plugins-main-0.8.2/metadata/shift.xml.in compiz-plugins-main-0.8.2.fix/metadata/shift.xml.in
|
|
|
419 |
--- compiz-plugins-main-0.8.2/metadata/shift.xml.in 2009-03-05 04:36:21.000000000 +0100
|
|
|
420 |
+++ compiz-plugins-main-0.8.2.fix/metadata/shift.xml.in 2009-09-03 16:28:53.351232099 +0200
|
|
|
421 |
@@ -19,7 +19,7 @@
|
|
|
422 |
<option name="initiate_key" type="key">
|
|
|
423 |
<_short>Initiate</_short>
|
|
|
424 |
<_long>Initiate switcher.</_long>
|
|
|
425 |
- <default><Super><Shift>s</default>
|
|
|
426 |
+ <default><Mod4><Shift>s</default>
|
|
|
427 |
</option>
|
|
|
428 |
<option name="initiate_button" type="button">
|
|
|
429 |
<_short>Initiate</_short>
|
|
|
430 |
@@ -49,7 +49,7 @@
|
|
|
431 |
<option name="next_key" type="key">
|
|
|
432 |
<_short>Next Window</_short>
|
|
|
433 |
<_long>Show switcher if not visible and select next window.</_long>
|
|
|
434 |
- <default><Super>Tab</default>
|
|
|
435 |
+ <default><Alt>Tab</default>
|
|
|
436 |
</option>
|
|
|
437 |
<option name="next_button" type="button">
|
|
|
438 |
<_short>Next Window</_short>
|
|
|
439 |
@@ -58,7 +58,7 @@
|
|
|
440 |
<option name="prev_key" type="key">
|
|
|
441 |
<_short>Previous Window</_short>
|
|
|
442 |
<_long>Show switcher if not visible and select previous window.</_long>
|
|
|
443 |
- <default><Super><Shift>Tab</default>
|
|
|
444 |
+ <default><Alt><Shift>Tab</default>
|
|
|
445 |
</option>
|
|
|
446 |
<option name="prev_button" type="button">
|
|
|
447 |
<_short>Previous Window</_short>
|
|
|
448 |
@@ -67,7 +67,7 @@
|
|
|
449 |
<option name="next_all_key" type="key">
|
|
|
450 |
<_short>Next Window (All Workspaces)</_short>
|
|
|
451 |
<_long>Show switcher if not visible and select next window out of all windows.</_long>
|
|
|
452 |
- <default><Super><Alt>Tab</default>
|
|
|
453 |
+ <default><Mod4><Alt>Tab</default>
|
|
|
454 |
</option>
|
|
|
455 |
<option name="next_all_button" type="button">
|
|
|
456 |
<_short>Next Window (All Workspaces)</_short>
|
|
|
457 |
@@ -76,7 +76,7 @@
|
|
|
458 |
<option name="prev_all_key" type="key">
|
|
|
459 |
<_short>Previous Window (All Workspaces)</_short>
|
|
|
460 |
<_long>Show switcher if not visible and select previous window out of all windows.</_long>
|
|
|
461 |
- <default><Super><Shift><Alt>Tab</default>
|
|
|
462 |
+ <default><Mod4><Shift><Alt>Tab</default>
|
|
|
463 |
</option>
|
|
|
464 |
<option name="prev_all_button" type="button">
|
|
|
465 |
<_short>Previous Window (All Workspaces)</_short>
|
|
|
466 |
diff -rup compiz-plugins-main-0.8.2/metadata/thumbnail.xml.in compiz-plugins-main-0.8.2.fix/metadata/thumbnail.xml.in
|
|
|
467 |
--- compiz-plugins-main-0.8.2/metadata/thumbnail.xml.in 2009-03-05 04:36:21.000000000 +0100
|
|
|
468 |
+++ compiz-plugins-main-0.8.2.fix/metadata/thumbnail.xml.in 2009-09-03 16:28:53.351456968 +0200
|
|
|
469 |
@@ -18,7 +18,7 @@
|
|
|
470 |
<option name="thumb_size" type="int">
|
|
|
471 |
<_short>Thumbnail Window Size</_short>
|
|
|
472 |
<_long>Thumbnail window size.</_long>
|
|
|
473 |
- <default>200</default>
|
|
|
474 |
+ <default>300</default>
|
|
|
475 |
<min>50</min>
|
|
|
476 |
<max>1500</max>
|
|
|
477 |
</option>
|
|
|
478 |
@@ -49,7 +49,7 @@
|
|
|
479 |
<option name="fade_speed" type="float">
|
|
|
480 |
<_short>Fade In/Out Duration</_short>
|
|
|
481 |
<_long>Fade In/Out Duration in seconds.</_long>
|
|
|
482 |
- <default>0.5</default>
|
|
|
483 |
+ <default>0.1</default>
|
|
|
484 |
<min>0.0</min>
|
|
|
485 |
<max>5.0</max>
|
|
|
486 |
<precision>0.1</precision>
|
|
|
487 |
@@ -75,7 +75,7 @@
|
|
|
488 |
<option name="mipmap" type="bool">
|
|
|
489 |
<_short>Generate Mipmaps</_short>
|
|
|
490 |
<_long>Generate mipmaps when possible for higher quality scaling.</_long>
|
|
|
491 |
- <default>false</default>
|
|
|
492 |
+ <default>true</default>
|
|
|
493 |
</option>
|
|
|
494 |
<subgroup>
|
|
|
495 |
<_short>Window title</_short>
|
|
|
496 |
diff -rup compiz-plugins-main-0.8.2/metadata/wall.xml.in compiz-plugins-main-0.8.2.fix/metadata/wall.xml.in
|
|
|
497 |
--- compiz-plugins-main-0.8.2/metadata/wall.xml.in 2009-03-05 04:36:21.000000000 +0100
|
|
|
498 |
+++ compiz-plugins-main-0.8.2.fix/metadata/wall.xml.in 2009-09-03 16:28:53.351702111 +0200
|
|
|
499 |
@@ -178,12 +178,12 @@
|
|
|
500 |
<option name="allow_wraparound" type="bool">
|
|
|
501 |
<_short>Allow Wrap-Around</_short>
|
|
|
502 |
<_long>Allow wrap-around when moving the wall up/down/left/right</_long>
|
|
|
503 |
- <default>false</default>
|
|
|
504 |
+ <default>true</default>
|
|
|
505 |
</option>
|
|
|
506 |
<option name="slide_duration" type="float">
|
|
|
507 |
<_short>Wall Sliding Duration</_short>
|
|
|
508 |
<_long>Duration (in s) for wall sliding viewport switching animation</_long>
|
|
|
509 |
- <default>0.3</default>
|
|
|
510 |
+ <default>0.2</default>
|
|
|
511 |
<min>0.0</min>
|
|
|
512 |
<max>5.0</max>
|
|
|
513 |
<precision>0.05</precision>
|
|
|
514 |
diff -rup compiz-plugins-main-0.8.2/src/animation/animation-internal.h compiz-plugins-main-0.8.2.fix/src/animation/animation-internal.h
|
|
|
515 |
--- compiz-plugins-main-0.8.2/src/animation/animation-internal.h 2009-03-05 04:36:21.000000000 +0100
|
|
|
516 |
+++ compiz-plugins-main-0.8.2.fix/src/animation/animation-internal.h 2009-09-03 16:28:53.352497873 +0200
|
|
|
517 |
@@ -426,7 +426,7 @@ applyPerspectiveSkew (CompOutput *output
|
|
|
518 |
CompTransform *transform,
|
|
|
519 |
Point *center);
|
|
|
520 |
|
|
|
521 |
-inline void
|
|
|
522 |
+void
|
|
|
523 |
applyTransform (CompTransform *wTransform,
|
|
|
524 |
CompTransform *transform);
|
|
|
525 |
|
|
|
526 |
diff -rup compiz-plugins-main-0.8.2/src/animation/zoomside.c compiz-plugins-main-0.8.2.fix/src/animation/zoomside.c
|
|
|
527 |
--- compiz-plugins-main-0.8.2/src/animation/zoomside.c 2009-03-05 04:36:21.000000000 +0100
|
|
|
528 |
+++ compiz-plugins-main-0.8.2.fix/src/animation/zoomside.c 2009-09-03 16:28:53.352743710 +0200
|
|
|
529 |
@@ -303,7 +303,7 @@ getZoomCenterScaleFull (CompWindow *w,
|
|
|
530 |
*pRotateProgress = rotateProgress;
|
|
|
531 |
}
|
|
|
532 |
|
|
|
533 |
-inline void
|
|
|
534 |
+void
|
|
|
535 |
getZoomCenterScale (CompWindow *w,
|
|
|
536 |
Point *pCurCenter, Point *pCurScale)
|
|
|
537 |
{
|
|
|
538 |
--- compiz-plugins-main-0.8.2.fix/src/session/session.c 2009-03-05 04:36:21.000000000 +0100
|
|
|
539 |
+++ compiz-plugins-main-0.8.2/src/session/session.c 2009-09-04 16:05:21.074608920 +0200
|
|
|
540 |
@@ -42,6 +42,25 @@
|
|
|
541 |
#define SESSION_DISPLAY_OPTION_IGNORE_MATCH 1
|
|
|
542 |
#define SESSION_DISPLAY_OPTION_NUM 2
|
|
|
543 |
|
|
|
544 |
+char *strndup ( const char *s, size_t n)
|
|
|
545 |
+{
|
|
|
546 |
+ size_t nAvail;
|
|
|
547 |
+ char *p;
|
|
|
548 |
+
|
|
|
549 |
+ if ( !s )
|
|
|
550 |
+ return 0;
|
|
|
551 |
+
|
|
|
552 |
+ if ( strlen(s) > n )
|
|
|
553 |
+ nAvail = n + 1;
|
|
|
554 |
+ else
|
|
|
555 |
+ nAvail = strlen(s) + 1;
|
|
|
556 |
+ p = malloc ( nAvail );
|
|
|
557 |
+ memcpy ( p, s, nAvail );
|
|
|
558 |
+ p[nAvail - 1] = '\0';
|
|
|
559 |
+
|
|
|
560 |
+ return p;
|
|
|
561 |
+}
|
|
|
562 |
+
|
|
|
563 |
typedef struct _SessionWindowList
|
|
|
564 |
{
|
|
|
565 |
struct _SessionWindowList *next;
|
|
|
566 |
diff -rup compiz-plugins-main-0.8.2/src/snap/snap.c compiz-plugins-main-0.8.2.fix/src/snap/snap.c
|
|
|
567 |
--- compiz-plugins-main-0.8.2/src/snap/snap.c 2009-03-05 04:36:21.000000000 +0100
|
|
|
568 |
+++ compiz-plugins-main-0.8.2.fix/src/snap/snap.c 2009-09-03 16:28:53.352163745 +0200
|
|
|
569 |
@@ -304,7 +304,11 @@ static void snapAddRegionEdges(SnapWindo
|
|
|
570 |
* snapping to screen edges, it's considered a snap-window.
|
|
|
571 |
*/
|
|
|
572 |
|
|
|
573 |
+#ifdef _GNUC__
|
|
|
574 |
#define UNLIKELY(x) __builtin_expect(!!(x),0)
|
|
|
575 |
+#else
|
|
|
576 |
+#define UNLIKELY(x) (x)
|
|
|
577 |
+#endif
|
|
|
578 |
|
|
|
579 |
static inline Bool isSnapWindow(CompWindow * w)
|
|
|
580 |
{
|