head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.10
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.8
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.6
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.4
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.2
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.1.0.4
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.2
	pkgsrc-2009Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2009.11.26.20.02.13;	author imil;	state dead;
branches;
next	1.1;

1.1
date	2009.04.17.16.14.56;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.2
log
@no need for patches anymore
@
text
@$NetBSD: patch-aa,v 1.1 2009/04/17 16:14:56 drochner Exp $

--- src/expo/expo.c.orig	2007-10-15 19:43:43.000000000 +0200
+++ src/expo/expo.c
@@@@ -1030,10 +1030,6 @@@@ expoDonePaintScreen (CompScreen * s)
 			continue;
 		}
 
-		if (!(w->type & (CompWindowTypeNormalMask |
-				 CompWindowTypeFullscreenMask)))
-		    continue;
-
 		xOffset = s->hsize * s->width;
 		yOffset = s->vsize * s->height;
 
@@@@ -1052,6 +1048,18 @@@@ expoDonePaintScreen (CompScreen * s)
 		if (!inWindow)
 		    continue;
 
+		/* make sure we never move windows we're not allowed to move */
+		if (!w->managed)
+		    w = NULL;
+		else if (!(w->actions & CompWindowActionMoveMask))
+		    w = NULL;
+		else if (w->type & (CompWindowTypeDockMask |
+				    CompWindowTypeDesktopMask))
+		    w = NULL;
+
+		if (!w)
+		    break;
+
 		es->dndState  = DnDDuring;
 		es->dndWindow = w;
 
@@@@ -1068,7 +1076,7 @@@@ expoDonePaintScreen (CompScreen * s)
 	    }
 	    else
 	    {
-		/* no window was hovered */
+		/* no (movable) window was hovered */
 		es->dndState = DnDNone;
 	    }
     
@


1.1
log
@add a patch from upstream CVS to fix a possible bypass of screensaver
lock (CVE-2008-6514), bump PKGREVISION
(compile-tested only)
@
text
@d1 1
a1 1
$NetBSD$
@