rpms/compiz/devel compiz.spec,1.34,1.35 plane.patch,1.3,1.4
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Sep 12 20:55:37 UTC 2006
- Previous message (by thread): rpms/libXfont/FC-5 .cvsignore, 1.6, 1.7 libXfont.spec, 1.14, 1.15 sources, 1.7, 1.8 fdo-7535.patch, 1.1, NONE
- Next message (by thread): rpms/compiz/devel compiz.spec,1.35,1.36 plane.patch,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sandmann
Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5581
Modified Files:
compiz.spec plane.patch
Log Message:
Fix plane plugin to draw correctly when no timeout is active (206088)
Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- compiz.spec 6 Sep 2006 18:24:35 -0000 1.34
+++ compiz.spec 12 Sep 2006 20:55:35 -0000 1.35
@@ -152,6 +152,9 @@
%{_includedir}/compiz
%changelog
+* Tue Sep 12 2006 Soren Sandmann <sandamnn at redhat.com>
+- Fix plane.patch to draw correctly when no timeout is running. (206088).
+
* Wed Sep 6 2006 Kristian Høgsberg <krh at redhat.com>
- Update fbconfig-depth-fix.patch to also skip fbconfigs without
corresponding visuals.
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 | 891 ++++++++++++++++++++++++++++++++++++++++++
plugins/rotate.c | 57 +-
src/event.c | 3
src/screen.c | 180 +++++---
src/window.c | 72 ++-
10 files changed, 2104 insertions(+), 165 deletions(-)
Index: plane.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/plane.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plane.patch 5 Sep 2006 21:52:45 -0000 1.3
+++ plane.patch 12 Sep 2006 20:55:35 -0000 1.4
@@ -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 13:55:04.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/Makefile.am 2006-09-05 17:31:40.000000000 -0400
@@ -46,6 +46,10 @@
libwater_la_LIBADD = @COMPIZ_LIBS@
libwater_la_SOURCES = water.c
@@ -19,8 +19,8 @@
$(libgconf_dump_module)
EXTRA_DIST = $(schema_in_files)
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/compiz.schemas.in.plane 2006-09-05 17:05:39.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/compiz.schemas.in 2006-09-05 17:12:48.000000000 -0400
+--- 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
@@ -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 13:55:04.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c 2006-09-05 17:31:40.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 13:55:04.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/rotate.c 2006-09-05 17:31:40.000000000 -0400
@@ -419,15 +419,15 @@
rs->xrot += rs->xVelocity * chunk;
rs->yrot += rs->yVelocity * chunk;
@@ -1253,9 +1253,9 @@
o[0].type = CompOptionTypeInt;
o[0].name = "x";
---- /dev/null 2006-08-31 19:15:36.944167750 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/plane.c 2006-09-05 13:55:04.000000000 -0400
-@@ -0,0 +1,922 @@
+--- /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 @@
+/*
+ * Copyright © 2006 Red Hat, Inc.
+ *
@@ -1522,41 +1522,6 @@
+ vy--;
+ }
+
-+#if 0
-+ glPushMatrix ();
-+
-+ if (dx > 0)
-+ {
-+ glTranslatef (dx, dy, 0.0);
-+
-+ (* screen->paintTransformedScreen) (screen, sAttrib, mask);
-+
-+ glTranslatef (-1.0, 0.0, 0.0);
-+
-+ moveScreenViewport (screen, 1, 0, FALSE);
-+
-+ (* screen->paintTransformedScreen) (screen, sAttrib, mask);
-+
-+ moveScreenViewport (screen, -1, 0, FALSE);
-+ }
-+ else
-+ {
-+ glTranslatef (dx, dy, 0.0);
-+
-+ (* screen->paintTransformedScreen) (screen, sAttrib, mask);
-+
-+ glTranslatef (1.0, 0.0, 0.0);
-+
-+ moveScreenViewport (screen, -1, 0, FALSE);
-+
-+ (* screen->paintTransformedScreen) (screen, sAttrib, mask);
-+
-+ moveScreenViewport (screen, 1, 0, FALSE);
-+ }
-+
-+ glPopMatrix ();
-+#endif
-+
+ glPushMatrix ();
+
+ glTranslatef (dx, -dy, 0.0);
@@ -1609,6 +1574,10 @@
+
+ moveScreenViewport (screen, -vx, -vy, FALSE);
+ }
++ else
++ {
++ (* screen->paintTransformedScreen) (screen, sAttrib, mask);
++ }
+
+ WRAP (ps, screen, paintTransformedScreen, planePaintTransformedScreen);
+ glPopMatrix ();
@@ -2178,8 +2147,8 @@
+{
+ return &planeVTable;
+}
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c.plane 2006-09-05 13:55:04.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c 2006-09-05 13:55:04.000000000 -0400
+--- 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
@@ -741,7 +741,7 @@
case CUBE_SCREEN_OPTION_IN:
if (compSetBoolOption (o, value))
@@ -2361,8 +2330,8 @@
return FALSE;
if (cs->imgNFile)
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h.plane 2006-09-05 13:55:04.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h 2006-09-05 17:06:56.000000000 -0400
+--- 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
@@ -1055,7 +1055,8 @@
#define COMP_SCREEN_OPTION_OPACITY_STEP 4
#define COMP_SCREEN_OPTION_UNREDIRECT_FS 5
@@ -2425,8 +2394,8 @@
CompIcon *
getWindowIcon (CompWindow *w,
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c.plane 2006-09-05 13:55:04.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c 2006-09-05 13:55:04.000000000 -0400
+--- 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
@@ -1763,7 +1763,8 @@
if (!(w->state & CompWindowStateHiddenMask))
@@ -2437,8 +2406,8 @@
applyStartupProperties (w->screen, w);
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c.plane 2006-09-05 13:55:04.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c 2006-09-05 17:07:48.000000000 -0400
+--- 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
@@ -48,9 +48,13 @@
#define DETECT_REFRESH_RATE_DEFAULT TRUE
@@ -2742,8 +2711,8 @@
}
void
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c.plane 2006-09-05 13:55:04.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c 2006-09-05 13:55:04.000000000 -0400
+--- 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
@@ -1501,7 +1501,8 @@
w->shaded = FALSE;
w->hidden = FALSE;
- Previous message (by thread): rpms/libXfont/FC-5 .cvsignore, 1.6, 1.7 libXfont.spec, 1.14, 1.15 sources, 1.7, 1.8 fdo-7535.patch, 1.1, NONE
- Next message (by thread): rpms/compiz/devel compiz.spec,1.35,1.36 plane.patch,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list