rpms/compiz/devel compiz.spec,1.35,1.36 plane.patch,1.4,1.5
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Sep 12 21:19:46 UTC 2006
Author: sandmann
Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21289
Modified Files:
compiz.spec plane.patch
Log Message:
Don't attempt to move viewport when dx = dy = 0 (206088)
Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- compiz.spec 12 Sep 2006 20:55:35 -0000 1.35
+++ compiz.spec 12 Sep 2006 21:19:43 -0000 1.36
@@ -152,6 +152,9 @@
%{_includedir}/compiz
%changelog
+* Tue Sep 12 2006 Soren Sandmann <sandmann at redhat.com>
+- Don't attempt to move the viewport when dx = dy = 0.(last bit of 206088).
+
* Tue Sep 12 2006 Soren Sandmann <sandamnn at redhat.com>
- Fix plane.patch to draw correctly when no timeout is running. (206088).
plane.patch:
include/compiz.h | 20
plugins/Makefile.am | 5
plugins/compiz.schemas.in | 962 +++++++++++++++++++++++++++++++++++++++++++++-
plugins/cube.c | 66 +--
plugins/place.c | 13
plugins/plane.c | 896 ++++++++++++++++++++++++++++++++++++++++++
plugins/rotate.c | 57 +-
src/event.c | 3
src/screen.c | 180 +++++---
src/window.c | 72 ++-
10 files changed, 2109 insertions(+), 165 deletions(-)
Index: plane.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/plane.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plane.patch 12 Sep 2006 20:55:35 -0000 1.4
+++ plane.patch 12 Sep 2006 21:19:43 -0000 1.5
@@ -1,5 +1,5 @@
--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/Makefile.am.plane 2006-08-17 17:36:07.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/Makefile.am 2006-09-05 17:31:40.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/Makefile.am 2006-09-12 16:54:06.000000000 -0400
@@ -46,6 +46,10 @@
libwater_la_LIBADD = @COMPIZ_LIBS@
libwater_la_SOURCES = water.c
@@ -20,7 +20,7 @@
EXTRA_DIST = $(schema_in_files)
--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/compiz.schemas.in.plane 2006-08-17 17:36:07.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/compiz.schemas.in 2006-09-05 17:31:40.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/compiz.schemas.in 2006-09-12 16:54:06.000000000 -0400
@@ -13,7 +13,7 @@
<owner>compiz</owner>
<type>list</type>
@@ -1055,7 +1055,7 @@
<schema>
--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c.plane 2006-08-17 17:36:07.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c 2006-09-05 17:31:40.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c 2006-09-12 16:54:06.000000000 -0400
@@ -593,8 +593,10 @@
getOuterRectOfWindow (window, &rect);
@@ -1105,7 +1105,7 @@
if (find_first_fit (window, windows, x, y, &x, &y))
goto done_check_denied_focus;
--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/rotate.c.plane 2006-08-17 17:36:07.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/rotate.c 2006-09-05 17:31:40.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/rotate.c 2006-09-12 16:54:06.000000000 -0400
@@ -419,15 +419,15 @@
rs->xrot += rs->xVelocity * chunk;
rs->yrot += rs->yVelocity * chunk;
@@ -1254,8 +1254,8 @@
o[0].type = CompOptionTypeInt;
o[0].name = "x";
--- /dev/null 2006-09-11 12:25:53.882564752 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/plane.c 2006-09-12 16:35:54.000000000 -0400
-@@ -0,0 +1,891 @@
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/plane.c 2006-09-12 17:07:50.000000000 -0400
+@@ -0,0 +1,896 @@
+/*
+ * Copyright © 2006 Red Hat, Inc.
+ *
@@ -1416,6 +1416,9 @@
+{
+ PLANE_SCREEN (screen);
+
++ if (dx == 0 && dy == 0)
++ return;
++
+ if (ps->timeout_handle)
+ {
+ compute_translation (ps, &ps->cur_x, &ps->cur_y);
@@ -1480,8 +1483,10 @@
+ {
+ double dx, dy, tx, ty;
+ int vx, vy;
++
++ printf ("plane plugin painting transformed screen\n");
+
-+ glClearColor (0.0, 0.0, 0.0, 1.0);
++ glClearColor (1.0, 0.0, 1.0, 1.0);
+ glClear (GL_COLOR_BUFFER_BIT);
+
+ compute_translation (ps, &dx, &dy);
@@ -2147,8 +2152,8 @@
+{
+ return &planeVTable;
+}
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c.plane 2006-09-05 17:31:40.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c 2006-09-05 17:31:40.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c.plane 2006-09-12 16:54:06.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c 2006-09-12 16:54:06.000000000 -0400
@@ -741,7 +741,7 @@
case CUBE_SCREEN_OPTION_IN:
if (compSetBoolOption (o, value))
@@ -2330,8 +2335,8 @@
return FALSE;
if (cs->imgNFile)
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h.plane 2006-09-05 17:31:40.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h 2006-09-05 17:31:40.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h.plane 2006-09-12 16:54:06.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h 2006-09-12 16:54:06.000000000 -0400
@@ -1055,7 +1055,8 @@
#define COMP_SCREEN_OPTION_OPACITY_STEP 4
#define COMP_SCREEN_OPTION_UNREDIRECT_FS 5
@@ -2394,8 +2399,8 @@
CompIcon *
getWindowIcon (CompWindow *w,
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c.plane 2006-09-05 17:31:40.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c 2006-09-05 17:31:40.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c.plane 2006-09-12 16:54:06.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c 2006-09-12 16:54:06.000000000 -0400
@@ -1763,7 +1763,8 @@
if (!(w->state & CompWindowStateHiddenMask))
@@ -2406,8 +2411,8 @@
applyStartupProperties (w->screen, w);
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c.plane 2006-09-05 17:31:40.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c 2006-09-05 17:31:40.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c.plane 2006-09-12 16:54:06.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c 2006-09-12 16:54:06.000000000 -0400
@@ -48,9 +48,13 @@
#define DETECT_REFRESH_RATE_DEFAULT TRUE
@@ -2563,7 +2568,7 @@
for (i = 0; i < SCREEN_EDGE_NUM; i++)
{
-@@ -2493,61 +2528,87 @@
+@@ -2495,61 +2530,87 @@
void
moveScreenViewport (CompScreen *s,
int tx,
@@ -2690,7 +2695,7 @@
}
}
-@@ -2556,7 +2617,7 @@
+@@ -2558,7 +2619,7 @@
int x,
Bool sync)
{
@@ -2699,7 +2704,7 @@
x += w->screen->x * w->screen->width;
x = MOD (x, vWidth);
-@@ -2684,7 +2745,10 @@
+@@ -2686,7 +2747,10 @@
}
if (s)
@@ -2711,8 +2716,8 @@
}
void
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c.plane 2006-09-05 17:31:40.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c 2006-09-05 17:31:40.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c.plane 2006-09-12 16:54:06.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c 2006-09-12 16:54:06.000000000 -0400
@@ -1501,7 +1501,8 @@
w->shaded = FALSE;
w->hidden = FALSE;
More information about the fedora-cvs-commits
mailing list