Compiz

Merge lp:~mc-return/compiz/compiz.merge-fix1160624-remove-empty-window-updateSync-function into lp:compiz/0.9.9

  1. compiz.merge-fix1160624-remove-empty-window-updateSync-function
  2. Merge into 0.9.9
Proposed by MC Return
Status: Superseded
Proposed branch: lp:~mc-return/compiz/compiz.merge-fix1160624-remove-empty-window-updateSync-function
Merge into: lp:compiz/0.9.9
Diff against target: 251 lines (+0/-41)
16 files modified
include/core/window.h (+0/-2)
plugins/expo/src/expo.cpp (+0/-1)
plugins/freewins/src/action.cpp (+0/-2)
plugins/freewins/src/events.cpp (+0/-1)
plugins/group/src/group.cpp (+0/-1)
plugins/group/src/queues.cpp (+0/-1)
plugins/group/src/tab.cpp (+0/-2)
plugins/move/src/move.cpp (+0/-7)
plugins/put/src/put.cpp (+0/-1)
plugins/rotate/src/rotate.cpp (+0/-5)
plugins/shelf/src/shelf.cpp (+0/-1)
plugins/showdesktop/src/showdesktop.cpp (+0/-3)
plugins/snap/src/snap.cpp (+0/-2)
plugins/wall/src/wall.cpp (+0/-6)
plugins/wobbly/src/wobbly.cpp (+0/-1)
src/window.cpp (+0/-5)
To merge this branch: bzr merge lp:~mc-return/compiz/compiz.merge-fix1160624-remove-empty-window-updateSync-function
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Sam Spilsbury Approve
Review via email: mp+155636@code.launchpad.net

This proposal has been superseded by a proposal from 2013-03-27.

Commit message

Removed empty and redundant CompWindow::syncPosition () function
and all calls to it.
Also removed some associated variables not needed anymore.

(LP: #1160624)

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

Cheers!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-trunk-autolanding/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-trunk-raring-amd64-autolanding/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-trunk-raring-i386-autolanding/13/console

review: Needs Fixing (continuous-integration)
Revision history for this message
MC Return (mc-return) wrote :

> FAILED: Autolanding.
> More details in the following jenkins job:
> http://jenkins.qa.ubuntu.com/job/compiz-trunk-autolanding/9/
> Executed test runs:
> FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-trunk-raring-
> amd64-autolanding/9/console
> FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-trunk-
> raring-i386-autolanding/13/console

Ups - my fault. Should be fixed now.

Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-trunk-autolanding/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-trunk-raring-amd64-autolanding/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-trunk-raring-i386-autolanding/15/console

review: Needs Fixing (continuous-integration)
lp:~mc-return/compiz/compiz.merge-fix1160624-remove-empty-window-updateSync-function updated
3640. By MC Return

Removed the unused variable CompWindow *w in RotateScreen::releaseMoveWindow ()

3641. By MC Return

Merged latest lp:compiz

Revision history for this message
MC Return (mc-return) wrote :

> FAILED: Autolanding.
> More details in the following jenkins job:
> http://jenkins.qa.ubuntu.com/job/compiz-trunk-autolanding/11/
> Executed test runs:
> FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-trunk-raring-
> amd64-autolanding/11/console
> FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-trunk-
> raring-i386-autolanding/15/console

Grmpf, another unused variable - but more simplification is always good. :)
Now I've test-built with WERROR enabled and confident Jenkins will accept this time... ;)

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

yeah, you should keep stuff like -DCOMPIZ_BUILD_TESTING=ON and -DCOMPIZ_WERROR on in your own builds now that CI is not running on upstream lp:compiz

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Btw, can you replace these:

65 - cw->syncPosition ();
66 +// cw->syncPosition ();

With
65 - cw->syncPosition ();

lp:~mc-return/compiz/compiz.merge-fix1160624-remove-empty-window-updateSync-function updated
3642. By MC Return

Removed last references to syncPosition ()

Revision history for this message
MC Return (mc-return) wrote :

> Btw, can you replace these:
>
> 65 - cw->syncPosition ();
> 66 +// cw->syncPosition ();
>
> With
> 65 - cw->syncPosition ();

Okay, done.

Revision history for this message
MC Return (mc-return) wrote :

/offtopic on

> yeah, you should keep stuff like -DCOMPIZ_BUILD_TESTING=ON and -DCOMPIZ_WERROR
> on in your own builds now that CI is not running on upstream lp:compiz

I'll do that, but I have some problems building with -DCOMPIZ_BUILD_TESTING=ON,
probably some configuration mistake on my side...
I get undefined reference to `pthread_getspecific' and undefined reference to
`pthread_key_delete' errors...

/offtopic off

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/core/window.h'
2--- include/core/window.h 2013-02-10 05:01:50 +0000
3+++ include/core/window.h 2013-03-27 02:12:22 +0000
4@@ -440,8 +440,6 @@
5
6 void move (int dx, int dy, bool immediate = true);
7
8- void syncPosition ();
9-
10 void moveInputFocusTo ();
11
12 void moveInputFocusToOtherWindow ();
13
14=== modified file 'plugins/expo/src/expo.cpp'
15--- plugins/expo/src/expo.cpp 2013-02-27 11:33:10 +0000
16+++ plugins/expo/src/expo.cpp 2013-03-27 02:12:22 +0000
17@@ -247,7 +247,6 @@
18 void
19 ExpoScreen::finishWindowMovement ()
20 {
21- dndWindow->syncPosition ();
22 dndWindow->ungrabNotify ();
23
24 screen->moveViewport (screen->vp ().x () - selectedVp.x (),
25
26=== modified file 'plugins/freewins/src/action.cpp'
27--- plugins/freewins/src/action.cpp 2013-02-20 14:24:30 +0000
28+++ plugins/freewins/src/action.cpp 2013-03-27 02:12:22 +0000
29@@ -234,7 +234,6 @@
30 WIN_REAL_H (mGrabWindow) / 2.0f);
31
32 mGrabWindow->move (distX, distY, true);
33- mGrabWindow->syncPosition ();
34
35 fww->calculateInputOrigin (WIN_REAL_X (mGrabWindow) +
36 WIN_REAL_W (mGrabWindow) / 2.0f,
37@@ -435,7 +434,6 @@
38 distY = (fww->mOutputRect.y1 () + (fww->mOutputRect.width () / 2.0f) - (WIN_REAL_Y (mGrabWindow) + WIN_REAL_H (mGrabWindow) / 2.0f));
39
40 mGrabWindow->move (distX, distY, true);
41- mGrabWindow->syncPosition ();
42
43 fww->calculateInputOrigin (WIN_REAL_X (mGrabWindow) +
44 WIN_REAL_W (mGrabWindow) / 2.0f,
45
46=== modified file 'plugins/freewins/src/events.cpp'
47--- plugins/freewins/src/events.cpp 2013-02-20 14:45:22 +0000
48+++ plugins/freewins/src/events.cpp 2013-03-27 02:12:22 +0000
49@@ -108,7 +108,6 @@
50 return;
51
52 window->move (dx, dy, fws->optionGetImmediateMoves ());
53- window->syncPosition ();
54
55 }
56
57
58=== modified file 'plugins/group/src/group.cpp'
59--- plugins/group/src/group.cpp 2012-12-10 05:35:03 +0000
60+++ plugins/group/src/group.cpp 2013-03-27 02:12:22 +0000
61@@ -520,7 +520,6 @@
62 }
63 if (GroupWindow::get (top)->mNeedsPosSync)
64 {
65- cw->syncPosition ();
66 gwtt->mNeedsPosSync = false;
67 }
68 gwtt->enqueueUngrabNotify ();
69
70=== modified file 'plugins/group/src/queues.cpp'
71--- plugins/group/src/queues.cpp 2010-10-19 14:20:32 +0000
72+++ plugins/group/src/queues.cpp 2013-03-27 02:12:22 +0000
73@@ -84,7 +84,6 @@
74 GROUP_WINDOW (sync->w);
75 if (gw->mNeedsPosSync)
76 {
77- sync->w->syncPosition ();
78 gw->mNeedsPosSync = false;
79 }
80
81
82=== modified file 'plugins/group/src/tab.cpp'
83--- plugins/group/src/tab.cpp 2012-12-30 11:13:36 +0000
84+++ plugins/group/src/tab.cpp 2013-03-27 02:12:22 +0000
85@@ -993,7 +993,6 @@
86 w->move (gw->mDestination.x () - WIN_X (w),
87 gw->mDestination.y () - WIN_Y (w), true);
88 gs->mQueued = false;
89- w->syncPosition ();
90
91 if (mUngroupState == UngroupSingle &&
92 (gw->mAnimateState & IS_UNGROUPING))
93@@ -1935,7 +1934,6 @@
94
95 mQueued = true;
96 w->move (dx, dy, false);
97- w->syncPosition ();
98 mQueued = false;
99 }
100
101
102=== modified file 'plugins/move/src/move.cpp'
103--- plugins/move/src/move.cpp 2013-01-03 16:05:26 +0000
104+++ plugins/move/src/move.cpp 2013-03-27 02:12:22 +0000
105@@ -187,8 +187,6 @@
106 ms->w->move (ms->savedX - ms->w->geometry ().x (),
107 ms->savedY - ms->w->geometry ().y (), false);
108
109- ms->w->syncPosition ();
110-
111 /* update window attributes as window constraints may have
112 changed - needed e.g. if a maximized window was moved
113 to another output device */
114@@ -446,11 +444,6 @@
115 {
116 int wy;
117
118- /* update server position before maximizing
119- window again so that it is maximized on
120- correct output */
121- w->syncPosition ();
122-
123 w->maximize (ms->origState);
124
125 wy = workArea.y () + (w->border ().top >> 1);
126
127=== modified file 'plugins/put/src/put.cpp'
128--- plugins/put/src/put.cpp 2012-09-05 16:42:03 +0000
129+++ plugins/put/src/put.cpp 2013-03-27 02:12:22 +0000
130@@ -328,7 +328,6 @@
131 w->move (pw->targetX - w->x (),
132 pw->targetY - w->y (),
133 true);
134- w->syncPosition ();
135
136 if (w->state () & (MAXIMIZE_STATE | CompWindowStateFullscreenMask))
137 w->updateAttributes (CompStackingUpdateModeNone);
138
139=== modified file 'plugins/rotate/src/rotate.cpp'
140--- plugins/rotate/src/rotate.cpp 2012-09-05 13:04:40 +0000
141+++ plugins/rotate/src/rotate.cpp 2013-03-27 02:12:22 +0000
142@@ -112,10 +112,6 @@
143 void
144 RotateScreen::releaseMoveWindow ()
145 {
146- CompWindow *w = screen->findWindow (mMoveWindow);
147- if (w)
148- w->syncPosition ();
149-
150 mMoveWindow = None;
151 }
152
153@@ -228,7 +224,6 @@
154 if (w)
155 {
156 w->move (mMoveWindowX - w->x (), 0);
157- w->syncPosition ();
158 }
159 }
160 /* only focus default window if switcher isn't active */
161
162=== modified file 'plugins/shelf/src/shelf.cpp'
163--- plugins/shelf/src/shelf.cpp 2012-09-07 23:29:42 +0000
164+++ plugins/shelf/src/shelf.cpp 2013-03-27 02:12:22 +0000
165@@ -534,7 +534,6 @@
166 dy = y - lastPointerY;
167
168 w->move (dx, dy, true);
169- w->syncPosition ();
170
171 lastPointerX += dx;
172 lastPointerY += dy;
173
174=== modified file 'plugins/showdesktop/src/showdesktop.cpp'
175--- plugins/showdesktop/src/showdesktop.cpp 2012-09-07 23:29:42 +0000
176+++ plugins/showdesktop/src/showdesktop.cpp 2013-03-27 02:12:22 +0000
177@@ -221,8 +221,6 @@
178 sw->placer->offScreenY - w->y (),
179 true);
180
181- w->syncPosition ();
182-
183 count++;
184 }
185
186@@ -525,7 +523,6 @@
187 cw->move (sw->placer->onScreenX - cw->x (),
188 sw->placer->onScreenY - cw->y (),
189 true);
190- cw->syncPosition ();
191
192 sw->setHints (false);
193 cw->setShowDesktopMode (false);
194
195=== modified file 'plugins/snap/src/snap.cpp'
196--- plugins/snap/src/snap.cpp 2012-07-30 10:15:41 +0000
197+++ plugins/snap/src/snap.cpp 2013-03-27 02:12:22 +0000
198@@ -52,8 +52,6 @@
199 window->move (dx, dy, true);
200 /* warp the pointer in the case of
201 * snap release */
202- if (sync)
203- window->syncPosition ();
204 skipNotify = false;
205 }
206
207
208=== modified file 'plugins/wall/src/wall.cpp'
209--- plugins/wall/src/wall.cpp 2013-01-04 08:43:45 +0000
210+++ plugins/wall/src/wall.cpp 2013-03-27 02:12:22 +0000
211@@ -352,12 +352,6 @@
212 void
213 WallScreen::releaseMoveWindow ()
214 {
215- CompWindow *window;
216-
217- window = screen->findWindow (moveWindow);
218- if (window)
219- window->syncPosition ();
220-
221 moveWindow = 0;
222 }
223
224
225=== modified file 'plugins/wobbly/src/wobbly.cpp'
226--- plugins/wobbly/src/wobbly.cpp 2012-12-10 03:28:47 +0000
227+++ plugins/wobbly/src/wobbly.cpp 2013-03-27 02:12:22 +0000
228@@ -1398,7 +1398,6 @@
229 w->output ().top -
230 w->geometry ().y (),
231 true);
232- w->syncPosition ();
233 }
234
235 ww->model = model;
236
237=== modified file 'src/window.cpp'
238--- src/window.cpp 2013-03-27 01:31:21 +0000
239+++ src/window.cpp 2013-03-27 02:12:22 +0000
240@@ -2170,11 +2170,6 @@
241 {
242 }
243
244-void
245-CompWindow::syncPosition ()
246-{
247-}
248-
249 bool
250 CompWindow::focus ()
251 {

Subscribers

People subscribed via source and target branches