rpms/compiz-fusion/devel compiz-fusion-0.7.6-winrules.patch, 1.2, 1.3 compiz-fusion.spec, 1.40, 1.41

[Adel Gadllah]

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27209

Modified Files:
	compiz-fusion.spec 
Added Files:
	compiz-fusion-0.7.6-winrules.patch 
Log Message:
readd winrules patch

compiz-fusion-0.7.6-winrules.patch:

Index: compiz-fusion-0.7.6-winrules.patch
===================================================================
RCS file: compiz-fusion-0.7.6-winrules.patch
diff -N compiz-fusion-0.7.6-winrules.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ compiz-fusion-0.7.6-winrules.patch	11 Dec 2008 15:57:55 -0000	1.3
@@ -0,0 +1,123 @@
+diff -upNr compiz-fusion-plugins-main-0.7.6.orign/src/winrules/winrules.c compiz-fusion-plugins-main-0.7.6/src/winrules/winrules.c
+--- compiz-fusion-plugins-main-0.7.6.orign/src/winrules/winrules.c	2008-05-29 23:26:23.000000000 +0200
++++ compiz-fusion-plugins-main-0.7.6/src/winrules/winrules.c	2008-10-24 11:58:46.000000000 +0200
+@@ -23,13 +23,6 @@
+ 
+ #include <X11/Xatom.h>
+ 
+-#define WINRULES_TARGET_WINDOWS (CompWindowTypeNormalMask |	\
+-				 CompWindowTypeDialogMask |	\
+-				 CompWindowTypeModalDialogMask |\
+-				 CompWindowTypeFullscreenMask |	\
+-				 CompWindowTypeUnknownMask)
+-
+-
+ #define WINRULES_SCREEN_OPTION_SKIPTASKBAR_MATCH  0
+ #define WINRULES_SCREEN_OPTION_SKIPPAGER_MATCH	  1
+ #define WINRULES_SCREEN_OPTION_ABOVE_MATCH	  2
+@@ -124,13 +117,15 @@ isWinrulesWindow (CompWindow *w)
+     if (w->attrib.override_redirect)
+ 	return FALSE;
+ 
+-    if (!(w->type & WINRULES_TARGET_WINDOWS))
++    if (w->wmType & (CompWindowTypeDockMask | CompWindowTypeDesktopMask))
+ 	return FALSE;
+ 
+     return TRUE;
+ }
+ 
+-/* FIXME? Directly set inputHint, not a problem for now */
++/* FIXME? Directly set inputHint, not a problem for now
++   --> better should wrap into focusWindow(), only problem is focus
++       on MapRequest */
+ static void
+ winrulesSetNoFocus (CompWindow *w,
+ 		    int        optNum)
+@@ -460,42 +455,6 @@ winrulesSetScreenOption (CompPlugin *plu
+     return FALSE;
+ }
+ 
+-static void
+-winrulesHandleEvent (CompDisplay *d,
+-                     XEvent      *event)
+-{
+-    CompWindow *w;
+-
+-    WINRULES_DISPLAY (d);
+-
+-    if (event->type == MapRequest)
+-    {
+-	w = findWindowAtDisplay (d, event->xmap.window);
+-	if (w)
+-	    winrulesSetNoFocus (w, WINRULES_SCREEN_OPTION_NOFOCUS_MATCH);
+-    }
+-
+-    UNWRAP (wd, d, handleEvent);
+-    (*d->handleEvent) (d, event);
+-    WRAP (wd, d, handleEvent, winrulesHandleEvent);
+-}
+-
+-static void
+-winrulesGetAllowedActionsForWindow (CompWindow   *w,
+-				    unsigned int *setActions,
+-				    unsigned int *clearActions)
+-{
+-    WINRULES_SCREEN (w->screen);
+-    WINRULES_WINDOW (w);
+-
+-    UNWRAP (ws, w->screen, getAllowedActionsForWindow);
+-    (*w->screen->getAllowedActionsForWindow) (w, setActions, clearActions);
+-    WRAP (ws, w->screen, getAllowedActionsForWindow,
+-          winrulesGetAllowedActionsForWindow);
+-
+-    *clearActions |= ~ww->allowedActions;
+-}
+-
+ static Bool
+ winrulesApplyRules (void *closure)
+ {
+@@ -555,6 +514,44 @@ winrulesApplyRules (void *closure)
+     return FALSE;
+ }
+ 
++static void
++winrulesHandleEvent (CompDisplay *d,
++                     XEvent      *event)
++{
++    CompWindow *w;
++
++    WINRULES_DISPLAY (d);
++
++    if (event->type == MapRequest)
++    {
++	w = findWindowAtDisplay (d, event->xmap.window);
++	if (w)
++	{
++	    winrulesSetNoFocus (w, WINRULES_SCREEN_OPTION_NOFOCUS_MATCH);
++	    winrulesApplyRules (w);
++	}
++    }
++
++    UNWRAP (wd, d, handleEvent);
++    (*d->handleEvent) (d, event);
++    WRAP (wd, d, handleEvent, winrulesHandleEvent);
++}
++
++static void
++winrulesGetAllowedActionsForWindow (CompWindow   *w,
++				    unsigned int *setActions,
++				    unsigned int *clearActions)
++{
++    WINRULES_SCREEN (w->screen);
++    WINRULES_WINDOW (w);
++
++    UNWRAP (ws, w->screen, getAllowedActionsForWindow);
++    (*w->screen->getAllowedActionsForWindow) (w, setActions, clearActions);
++    WRAP (ws, w->screen, getAllowedActionsForWindow,
++          winrulesGetAllowedActionsForWindow);
++
++    *clearActions |= ~ww->allowedActions;
++}
+ 
+ static void
+ winrulesMatchExpHandlerChanged (CompDisplay *d)


Index: compiz-fusion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/compiz-fusion.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- compiz-fusion.spec	8 Nov 2008 14:00:32 -0000	1.40
+++ compiz-fusion.spec	11 Dec 2008 15:57:56 -0000	1.41
@@ -2,7 +2,7 @@
 
 Name: compiz-fusion
 Version: 0.7.8       
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Collection of Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -10,7 +10,7 @@
 URL: http://compiz-fusion.org            
 Source0: http://releases.compiz-fusion.org/%{version}/%{name}-plugins-main-%{version}.tar.bz2  
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Patch1: compiz-fusion-0.7.6-winrules.patch
 # libdrm is not available on these arches
 ExcludeArch: s390 s390x
 
@@ -63,6 +63,7 @@
 
 %prep
 %setup -q -n %{name}-plugins-main-%{version}
+%patch1 -p1 .winrules
 
 %build
 %configure --enable-schemas
@@ -133,6 +134,9 @@
 
 
 %changelog
+* Thu Dec 11 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.7.8-4
+- Add winrules patch back, not upstream yet
+
 * Sat Nov 08 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.7.8-3
 - BR intltool