rpms/compiz/devel compiz.spec,1.47,1.48 plane.patch,1.7,1.8

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Sep 19 16:27:22 UTC 2006 

Author: sandmann

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31490

Modified Files:
	compiz.spec plane.patch 
Log Message:
plane.patch: Fix background color, allow workspaces narrower than 4


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- compiz.spec	18 Sep 2006 23:14:25 -0000	1.47
+++ compiz.spec	19 Sep 2006 16:27:19 -0000	1.48
@@ -10,7 +10,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.26.%{snapshot}git%{?dist}
+Release:        0.27.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -171,6 +171,11 @@
 %{_includedir}/compiz
 
 %changelog
+* Tue Sep 19 2006 Soren Sandmann <sandmann at redhat.com> - 0.0.13-0.27.20060817git.fc6
+- Change .plane patch to 
+  (a) not set the background color to pink in the plane plugin. 
+  (b) allow workspaces with horizontal sizes less then 4.
+
 * Mon Sep 18 2006 Soren Sandmann <sandmann at redhat.com> - 0.0.13-0.26.20060817git.fc6
 - Change plane patch to correctly initialize the screen size to the
   defaults (bug 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           |  894 ++++++++++++++++++++++++++++++++++++++++++
 plugins/rotate.c          |   57 +-
 src/event.c               |    3 
 src/screen.c              |  180 +++++---
 src/window.c              |   72 ++-
 10 files changed, 2107 insertions(+), 165 deletions(-)

Index: plane.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/plane.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plane.patch	18 Sep 2006 23:13:57 -0000	1.7
+++ plane.patch	19 Sep 2006 16:27:19 -0000	1.8
@@ -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-18 18:57:25.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/Makefile.am	2006-09-19 12:09:50.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-18 18:57:25.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/compiz.schemas.in	2006-09-19 12:09:50.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-18 18:57:25.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/place.c	2006-09-19 12:09:50.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-18 18:57:25.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/rotate.c	2006-09-19 12:09:50.000000000 -0400
 @@ -419,15 +419,15 @@
  	    rs->xrot += rs->xVelocity * chunk;
  	    rs->yrot += rs->yVelocity * chunk;
@@ -1253,8 +1253,8 @@
  
  		    o[0].type    = CompOptionTypeInt;
  		    o[0].name    = "x";
---- /dev/null	2006-09-18 16:28:46.882919268 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/plane.c	2006-09-18 18:57:25.000000000 -0400
+--- /dev/null	2006-09-19 10:37:08.881658487 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/plane.c	2006-09-19 12:10:13.000000000 -0400
 @@ -0,0 +1,894 @@
 +/*
 + * Copyright © 2006 Red Hat, Inc.
@@ -1484,7 +1484,7 @@
 +	double dx, dy, tx, ty;
 +	int vx, vy;
 +
-+	glClearColor (1.0, 0.0, 1.0, 1.0);
++	glClearColor (0.0, 0.0, 0.0, 1.0);
 +	glClear (GL_COLOR_BUFFER_BIT);
 +    
 +	compute_translation (ps, &dx, &dy);
@@ -2150,8 +2150,8 @@
 +{
 +    return &planeVTable;
 +}
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c.plane	2006-09-18 18:57:25.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c	2006-09-18 18:57:25.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c.plane	2006-09-19 12:09:50.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/cube.c	2006-09-19 12:09:50.000000000 -0400
 @@ -741,7 +741,7 @@
      case CUBE_SCREEN_OPTION_IN:
  	if (compSetBoolOption (o, value))
@@ -2333,8 +2333,8 @@
  	return FALSE;
  
      if (cs->imgNFile)
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h.plane	2006-09-18 18:57:25.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h	2006-09-18 18:57:25.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h.plane	2006-09-19 12:09:50.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/include/compiz.h	2006-09-19 12:09:50.000000000 -0400
 @@ -1055,7 +1055,8 @@
  #define COMP_SCREEN_OPTION_OPACITY_STEP        4
  #define COMP_SCREEN_OPTION_UNREDIRECT_FS       5
@@ -2397,8 +2397,8 @@
  
  CompIcon *
  getWindowIcon (CompWindow *w,
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c.plane	2006-09-18 18:57:25.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c	2006-09-18 18:57:25.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c.plane	2006-09-19 12:09:50.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/event.c	2006-09-19 12:09:50.000000000 -0400
 @@ -1763,7 +1763,8 @@
  
  	    if (!(w->state & CompWindowStateHiddenMask))
@@ -2409,8 +2409,8 @@
  
  		applyStartupProperties (w->screen, w);
  
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c.plane	2006-09-18 18:57:25.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c	2006-09-18 18:58:17.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c.plane	2006-09-19 12:09:50.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/screen.c	2006-09-19 12:11:09.000000000 -0400
 @@ -48,9 +48,13 @@
  
  #define DETECT_REFRESH_RATE_DEFAULT TRUE
@@ -2419,7 +2419,7 @@
 -#define SCREEN_SIZE_MIN	    4
 -#define SCREEN_SIZE_MAX	    32
 +#define SCREEN_SIZE_DEFAULT  4
-+#define SCREEN_SIZE_MIN	     4
++#define SCREEN_SIZE_MIN	     1
 +#define SCREEN_SIZE_MAX	     32
 +
 +#define SCREEN_VSIZE_DEFAULT 1
@@ -2714,8 +2714,8 @@
  }
  
  void
---- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c.plane	2006-09-18 18:57:25.000000000 -0400
-+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c	2006-09-18 18:57:25.000000000 -0400
+--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c.plane	2006-09-19 12:09:50.000000000 -0400
++++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/window.c	2006-09-19 12:09:50.000000000 -0400
 @@ -1501,7 +1501,8 @@
      w->shaded		 = FALSE;
      w->hidden		 = FALSE;

More information about the fedora-cvs-commits mailing list