Compiz

Merge lp:~vanvugt/compiz/fix-1076876 into lp:compiz/0.9.9

  1. fix-1076876
  2. Merge into 0.9.9
Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3459
Merged at revision: 3459
Proposed branch: lp:~vanvugt/compiz/fix-1076876
Merge into: lp:compiz/0.9.9
Diff against target: 419 lines (+51/-51)
1 file modified
debian/patches/100_expo_layout.patch (+51/-51)
To merge this branch: bzr merge lp:~vanvugt/compiz/fix-1076876
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+133617@code.launchpad.net

Commit message

Refresh 100_expo_layout.patch so it applies cleanly and reduces the
likelihood of conflicts later.
(LP: #1076876)

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/100_expo_layout.patch'
2--- debian/patches/100_expo_layout.patch 2012-11-08 06:22:21 +0000
3+++ debian/patches/100_expo_layout.patch 2012-11-09 06:28:19 +0000
4@@ -1,7 +1,7 @@
5 Index: ubuntu/plugins/expo/expo.xml.in
6 ===================================================================
7---- ubuntu.orig/plugins/expo/expo.xml.in 2012-09-12 22:20:42.944758828 +0800
8-+++ ubuntu/plugins/expo/expo.xml.in 2012-09-12 22:20:43.240760303 +0800
9+--- ubuntu.orig/plugins/expo/expo.xml.in 2012-11-09 14:08:43.708467616 +0800
10++++ ubuntu/plugins/expo/expo.xml.in 2012-11-09 14:09:37.532468627 +0800
11 @@ -17,6 +17,7 @@
12 <plugin>wobbly</plugin>
13 <plugin>animation</plugin>
14@@ -123,8 +123,8 @@
15 <precision>0.01</precision>
16 Index: ubuntu/plugins/expo/src/expo.cpp
17 ===================================================================
18---- ubuntu.orig/plugins/expo/src/expo.cpp 2012-09-12 22:09:32.323735000 +0800
19-+++ ubuntu/plugins/expo/src/expo.cpp 2012-09-12 22:29:50.643474721 +0800
20+--- ubuntu.orig/plugins/expo/src/expo.cpp 2012-11-09 14:08:43.708467616 +0800
21++++ ubuntu/plugins/expo/src/expo.cpp 2012-11-09 14:09:37.532468627 +0800
22 @@ -27,6 +27,8 @@
23
24 #include "expo.h"
25@@ -134,8 +134,8 @@
26 #include <math.h>
27 #ifndef USE_GLES
28 #include <GL/glu.h>
29-@@ -73,11 +75,10 @@
30-
31+@@ -65,11 +67,10 @@
32+ {
33 if (dndState == DnDDuring || dndState == DnDStart)
34 {
35 - if (dndWindow)
36@@ -147,7 +147,7 @@
37
38 action->setState (action->state () & CompAction::StateInitButton);
39 cScreen->damageScreen ();
40-@@ -113,7 +114,6 @@
41+@@ -101,7 +102,6 @@
42 clickTime = 0;
43
44 dndState = DnDNone;
45@@ -155,7 +155,7 @@
46
47 selectedVp = screen->vp ();
48 lastSelectedVp = screen->vp ();
49-@@ -156,8 +156,8 @@
50+@@ -140,8 +140,8 @@
51 else
52 vpUpdateMode = VPUpdateMouseOver;
53
54@@ -166,7 +166,7 @@
55
56 screen->removeAction (&optionGetDndButton ());
57 screen->removeAction (&optionGetExitButton ());
58-@@ -202,6 +202,8 @@
59+@@ -179,6 +179,8 @@
60 if (!expoMode)
61 return false;
62
63@@ -175,7 +175,7 @@
64 newX = selectedVp.x () + 1;
65 newY = selectedVp.y ();
66
67-@@ -225,7 +227,7 @@
68+@@ -202,7 +204,7 @@
69 CompAction::State state,
70 CompOption::Vector& options)
71 {
72@@ -184,7 +184,7 @@
73
74 if (!expoMode)
75 return false;
76-@@ -272,53 +274,39 @@
77+@@ -246,53 +248,39 @@
78 void
79 ExpoScreen::finishWindowMovement ()
80 {
81@@ -265,7 +265,7 @@
82 }
83
84 void
85-@@ -402,6 +390,80 @@
86+@@ -376,6 +364,80 @@
87 screen->handleEvent (event);
88 }
89
90@@ -346,7 +346,7 @@
91 void
92 ExpoScreen::preparePaint (int msSinceLastPaint)
93 {
94-@@ -412,33 +474,43 @@
95+@@ -386,33 +448,43 @@
96 else
97 expoCam = MAX (0.0, expoCam - val);
98
99@@ -409,7 +409,7 @@
100 {
101 float fi = (float) i;
102
103-@@ -509,6 +581,31 @@
104+@@ -483,6 +555,31 @@
105 cScreen->paint (outputs, mask);
106 }
107
108@@ -441,7 +441,7 @@
109 void
110 ExpoScreen::donePaint ()
111 {
112-@@ -539,6 +636,11 @@
113+@@ -513,6 +610,11 @@
114 foreach (float& vp, vpActivity)
115 if (vp != 0.0 && vp != 1.0)
116 cScreen->damageScreen ();
117@@ -453,7 +453,7 @@
118 }
119
120 if (grabIndex && expoCam <= 0.0f && !expoMode)
121-@@ -553,10 +655,25 @@
122+@@ -527,10 +629,25 @@
123 switch (dndState) {
124 case DnDDuring:
125 {
126@@ -483,7 +483,7 @@
127
128 prevCursor = newCursor;
129 cScreen->damageScreen ();
130-@@ -621,13 +738,13 @@
131+@@ -595,13 +712,13 @@
132 break;
133
134 dndState = DnDDuring;
135@@ -499,7 +499,7 @@
136
137 w->raise ();
138 w->moveInputFocusTo ();
139-@@ -762,6 +879,124 @@
140+@@ -736,6 +853,124 @@
141 }
142
143 void
144@@ -624,7 +624,7 @@
145 ExpoScreen::paintWall (const GLScreenPaintAttrib& attrib,
146 const GLMatrix& transform,
147 const CompRegion& region,
148-@@ -772,13 +1007,11 @@
149+@@ -746,13 +981,11 @@
150 GLfloat vertexData[12];
151 GLushort colorData[16];
152 GLMatrix sTransformW, sTransform (transform);
153@@ -641,7 +641,7 @@
154 float aspectX = 1.0f, aspectY = 1.0f;
155 GLVector cam;
156 CompPoint vpSize (screen->vpSize ().width (), screen->vpSize ().height ());
157-@@ -910,9 +1143,24 @@
158+@@ -884,9 +1117,24 @@
159 sTransform.rotate (rotation, 0.0f, 1.0f, 0.0f);
160 sTransform.scale (aspectX, aspectY, 1.0);
161
162@@ -668,7 +668,7 @@
163
164 if (optionGetDeform () == DeformCurve)
165 sTransform.translate ((vpSize.x () - 1) * sx * 0.5, 0.0, 0.0);
166-@@ -936,90 +1184,29 @@
167+@@ -910,90 +1158,29 @@
168
169 expoActive = true;
170
171@@ -774,7 +774,7 @@
172 // glNormal3f (0.0, 0.0, -1.0);
173
174 if (reflection)
175-@@ -1187,12 +1374,16 @@
176+@@ -1161,12 +1348,16 @@
177
178 expoActive = false;
179
180@@ -793,7 +793,7 @@
181 bool
182 ExpoScreen::glPaintOutput (const GLScreenPaintAttrib& attrib,
183 const GLMatrix& transform,
184-@@ -1243,10 +1434,15 @@
185+@@ -1217,10 +1408,15 @@
186
187 bool
188 ExpoWindow::glDraw (const GLMatrix& transform,
189@@ -810,7 +810,7 @@
190 if (eScreen->expoCam == 0.0f)
191 return gWindow->glDraw (transform, attrib, region, mask);
192
193-@@ -1275,8 +1471,11 @@
194+@@ -1249,8 +1445,11 @@
195 }
196 }
197
198@@ -824,7 +824,7 @@
199 }
200 else
201 {
202-@@ -1287,7 +1486,79 @@
203+@@ -1261,7 +1460,79 @@
204 (1 - sigmoidProgress (eScreen->expoCam));
205 }
206
207@@ -904,8 +904,8 @@
208 +
209 }
210
211- #define EXPO_GRID_SIZE 100
212-@@ -1425,11 +1696,17 @@
213+ static const unsigned short EXPO_GRID_SIZE = 100;
214+@@ -1399,11 +1670,17 @@
215 const CompRegion& region,
216 unsigned int mask)
217 {
218@@ -923,7 +923,7 @@
219
220 zoomAnim = eScreen->optionGetExpoAnimation () ==
221 ExpoScreen::ExpoAnimationZoom;
222-@@ -1458,9 +1735,47 @@
223+@@ -1432,9 +1709,47 @@
224
225 if (opacity <= 0)
226 mask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
227@@ -972,7 +972,7 @@
228 }
229
230 bool
231-@@ -1489,7 +1804,7 @@
232+@@ -1463,7 +1778,7 @@
233 expoActive (false),
234 expoMode (false),
235 dndState (DnDNone),
236@@ -981,7 +981,7 @@
237 origVp (s->vp ()),
238 selectedVp (s->vp ()),
239 lastSelectedVp (s->vp ()),
240-@@ -1497,14 +1812,21 @@
241+@@ -1471,14 +1786,21 @@
242 clickTime (0),
243 doubleClick (false),
244 vpNormals (360 * 3),
245@@ -1006,7 +1006,7 @@
246
247 EXPOINITBIND (ExpoKey, doExpo);
248 EXPOTERMBIND (ExpoKey, termExpo);
249-@@ -1522,12 +1844,58 @@
250+@@ -1496,12 +1818,58 @@
251 ScreenInterface::setHandler (screen, false);
252 CompositeScreenInterface::setHandler (cScreen, false);
253 GLScreenInterface::setHandler (gScreen, false);
254@@ -1067,7 +1067,7 @@
255 }
256
257 ExpoWindow::ExpoWindow (CompWindow *w) :
258-@@ -1535,10 +1903,28 @@
259+@@ -1509,10 +1877,28 @@
260 window (w),
261 cWindow (CompositeWindow::get (w)),
262 gWindow (GLWindow::get (w)),
263@@ -1099,8 +1099,8 @@
264 bool
265 Index: ubuntu/plugins/expo/src/expo.h
266 ===================================================================
267---- ubuntu.orig/plugins/expo/src/expo.h 2012-09-08 17:26:40.599035911 +0800
268-+++ ubuntu/plugins/expo/src/expo.h 2012-09-12 22:20:43.276760475 +0800
269+--- ubuntu.orig/plugins/expo/src/expo.h 2012-11-09 14:08:43.708467616 +0800
270++++ ubuntu/plugins/expo/src/expo.h 2012-11-09 14:09:37.536468627 +0800
271 @@ -30,6 +30,44 @@
272 #include <opengl/opengl.h>
273
274@@ -1285,7 +1285,7 @@
275 Index: ubuntu/plugins/expo/src/glow.cpp
276 ===================================================================
277 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
278-+++ ubuntu/plugins/expo/src/glow.cpp 2012-09-12 22:20:43.280760497 +0800
279++++ ubuntu/plugins/expo/src/glow.cpp 2012-11-09 14:09:37.536468627 +0800
280 @@ -0,0 +1,429 @@
281 +/**
282 + *
283@@ -1719,7 +1719,7 @@
284 Index: ubuntu/plugins/expo/src/glow.h
285 ===================================================================
286 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
287-+++ ubuntu/plugins/expo/src/glow.h 2012-09-12 22:20:43.280760497 +0800
288++++ ubuntu/plugins/expo/src/glow.h 2012-11-09 14:09:37.536468627 +0800
289 @@ -0,0 +1,66 @@
290 +/**
291 + *
292@@ -1790,7 +1790,7 @@
293 Index: ubuntu/plugins/expo/src/group_glow.h
294 ===================================================================
295 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
296-+++ ubuntu/plugins/expo/src/group_glow.h 2012-09-12 22:20:43.280760497 +0800
297++++ ubuntu/plugins/expo/src/group_glow.h 2012-11-09 14:09:37.536468627 +0800
298 @@ -0,0 +1,197 @@
299 +#ifndef _GROUP_GLOWTEX_H
300 +#define _GROUP_GLOWTEX_H
301@@ -1992,7 +1992,7 @@
302 Index: ubuntu/plugins/expo/src/wall_offset/CMakeLists.txt
303 ===================================================================
304 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
305-+++ ubuntu/plugins/expo/src/wall_offset/CMakeLists.txt 2012-09-12 22:20:43.280760497 +0800
306++++ ubuntu/plugins/expo/src/wall_offset/CMakeLists.txt 2012-11-09 14:09:37.536468627 +0800
307 @@ -0,0 +1,33 @@
308 +include_directories (
309 + ${CMAKE_CURRENT_SOURCE_DIR}/include
310@@ -2030,7 +2030,7 @@
311 Index: ubuntu/plugins/expo/src/wall_offset/include/wall-offset.h
312 ===================================================================
313 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
314-+++ ubuntu/plugins/expo/src/wall_offset/include/wall-offset.h 2012-09-12 22:20:43.280760497 +0800
315++++ ubuntu/plugins/expo/src/wall_offset/include/wall-offset.h 2012-11-09 14:09:37.536468627 +0800
316 @@ -0,0 +1,43 @@
317 +/**
318 + * Copyright © 2012 Canonical Ltd.
319@@ -2078,7 +2078,7 @@
320 Index: ubuntu/plugins/expo/src/wall_offset/src/wall-offset.cpp
321 ===================================================================
322 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
323-+++ ubuntu/plugins/expo/src/wall_offset/src/wall-offset.cpp 2012-09-12 22:20:43.280760497 +0800
324++++ ubuntu/plugins/expo/src/wall_offset/src/wall-offset.cpp 2012-11-09 14:09:37.536468627 +0800
325 @@ -0,0 +1,55 @@
326 +/**
327 + * Copyright © 2012 Canonical Ltd.
328@@ -2138,7 +2138,7 @@
329 Index: ubuntu/plugins/expo/src/wall_offset/tests/CMakeLists.txt
330 ===================================================================
331 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
332-+++ ubuntu/plugins/expo/src/wall_offset/tests/CMakeLists.txt 2012-09-12 22:20:43.280760497 +0800
333++++ ubuntu/plugins/expo/src/wall_offset/tests/CMakeLists.txt 2012-11-09 14:09:37.536468627 +0800
334 @@ -0,0 +1,19 @@
335 +if (NOT GTEST_FOUND)
336 + message ("Google Test not found - cannot build tests!")
337@@ -2162,7 +2162,7 @@
338 Index: ubuntu/plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp
339 ===================================================================
340 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
341-+++ ubuntu/plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp 2012-09-12 22:20:43.280760497 +0800
342++++ ubuntu/plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp 2012-11-09 14:09:37.536468627 +0800
343 @@ -0,0 +1,263 @@
344 +/*
345 + * Copyright © 2012 Canonical Ltd.
346@@ -2429,8 +2429,8 @@
347 + nAnimationSteps)));
348 Index: ubuntu/plugins/expo/CMakeLists.txt
349 ===================================================================
350---- ubuntu.orig/plugins/expo/CMakeLists.txt 2012-09-08 17:26:40.599035911 +0800
351-+++ ubuntu/plugins/expo/CMakeLists.txt 2012-09-12 22:20:43.300760590 +0800
352+--- ubuntu.orig/plugins/expo/CMakeLists.txt 2012-11-09 14:08:43.708467616 +0800
353++++ ubuntu/plugins/expo/CMakeLists.txt 2012-11-09 14:09:37.536468627 +0800
354 @@ -1,7 +1,16 @@
355 find_package (Compiz REQUIRED)
356 include (CompizPlugin)
357@@ -2452,7 +2452,7 @@
358 Index: ubuntu/plugins/expo/src/windows_on_viewport/CMakeLists.txt
359 ===================================================================
360 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
361-+++ ubuntu/plugins/expo/src/windows_on_viewport/CMakeLists.txt 2012-09-12 22:20:43.300760590 +0800
362++++ ubuntu/plugins/expo/src/windows_on_viewport/CMakeLists.txt 2012-11-09 14:09:37.536468627 +0800
363 @@ -0,0 +1,36 @@
364 +include_directories (
365 + ${CMAKE_CURRENT_SOURCE_DIR}/include
366@@ -2493,7 +2493,7 @@
367 Index: ubuntu/plugins/expo/src/windows_on_viewport/include/windows-on-viewport.h
368 ===================================================================
369 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
370-+++ ubuntu/plugins/expo/src/windows_on_viewport/include/windows-on-viewport.h 2012-09-12 22:31:06.807852402 +0800
371++++ ubuntu/plugins/expo/src/windows_on_viewport/include/windows-on-viewport.h 2012-11-09 14:09:37.536468627 +0800
372 @@ -0,0 +1,43 @@
373 +/**
374 + * Copyright © 2012 Canonical Ltd.
375@@ -2541,7 +2541,7 @@
376 Index: ubuntu/plugins/expo/src/windows_on_viewport/src/windows-on-viewport.cpp
377 ===================================================================
378 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
379-+++ ubuntu/plugins/expo/src/windows_on_viewport/src/windows-on-viewport.cpp 2012-09-12 22:20:43.300760590 +0800
380++++ ubuntu/plugins/expo/src/windows_on_viewport/src/windows-on-viewport.cpp 2012-11-09 14:09:37.536468627 +0800
381 @@ -0,0 +1,80 @@
382 +/**
383 + * Copyright © 2012 Canonical Ltd.
384@@ -2626,7 +2626,7 @@
385 Index: ubuntu/plugins/expo/src/windows_on_viewport/tests/CMakeLists.txt
386 ===================================================================
387 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
388-+++ ubuntu/plugins/expo/src/windows_on_viewport/tests/CMakeLists.txt 2012-09-12 22:20:43.300760590 +0800
389++++ ubuntu/plugins/expo/src/windows_on_viewport/tests/CMakeLists.txt 2012-11-09 14:09:37.536468627 +0800
390 @@ -0,0 +1,22 @@
391 +if (NOT GTEST_FOUND)
392 + message ("Google Test not found - cannot build tests!")
393@@ -2653,7 +2653,7 @@
394 Index: ubuntu/plugins/expo/src/windows_on_viewport/tests/test-windows-on-viewport.cpp
395 ===================================================================
396 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
397-+++ ubuntu/plugins/expo/src/windows_on_viewport/tests/test-windows-on-viewport.cpp 2012-09-12 22:20:43.304760606 +0800
398++++ ubuntu/plugins/expo/src/windows_on_viewport/tests/test-windows-on-viewport.cpp 2012-11-09 14:09:37.536468627 +0800
399 @@ -0,0 +1,149 @@
400 +/*
401 + * Copyright © 2012 Canonical Ltd.
402@@ -2807,7 +2807,7 @@
403 Index: ubuntu/plugins/expo/src/client-list-generator.h
404 ===================================================================
405 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
406-+++ ubuntu/plugins/expo/src/client-list-generator.h 2012-09-12 22:20:43.304760606 +0800
407++++ ubuntu/plugins/expo/src/client-list-generator.h 2012-11-09 14:09:37.536468627 +0800
408 @@ -0,0 +1,45 @@
409 +/*
410 + * Copyright © 2012 Canonical Ltd.
411@@ -2857,7 +2857,7 @@
412 Index: ubuntu/plugins/expo/src/viewport-member-window.h
413 ===================================================================
414 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
415-+++ ubuntu/plugins/expo/src/viewport-member-window.h 2012-09-12 22:20:43.304760606 +0800
416++++ ubuntu/plugins/expo/src/viewport-member-window.h 2012-11-09 14:09:37.536468627 +0800
417 @@ -0,0 +1,46 @@
418 +/*
419 + * Copyright © 2012 Canonical Ltd.

Subscribers

People subscribed via source and target branches