From 348ec7ac3ff4b646d617bdca3c54cc92e7c95fbe Mon Sep 17 00:00:00 2001
From: reed <reed@pkgsrc.org>
Date: Mon, 1 Aug 2005 17:10:32 +0000
Subject: Patch fspanel.c so the workspace switching buttons (like 1, 2 ,3)
 will work with blackbox. This is from Tero Koskinen on the blackbox list. It
 also works with xfwm4 and window maker; and the patch should work on all
 NetWM compliant window managers.

Tested and okayed by maintainer, Joel Carnat.

Bump PKGREVISION.
---
 x11/fspanel/Makefile         |  4 ++--
 x11/fspanel/distinfo         |  4 ++--
 x11/fspanel/patches/patch-ab | 21 +++++++++++++++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/x11/fspanel/Makefile b/x11/fspanel/Makefile
index de2f442d828..91ebf73bda1 100644
--- a/x11/fspanel/Makefile
+++ b/x11/fspanel/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/07/27 15:56:42 reed Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/01 17:10:32 reed Exp $
 #
 
 DISTNAME=	fspanel-0.8beta1
 PKGNAME=	${DISTNAME:C/beta/.0./}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://www.chatjunkies.org/fspanel/
 
diff --git a/x11/fspanel/distinfo b/x11/fspanel/distinfo
index f995a3151af..481c3e7b331 100644
--- a/x11/fspanel/distinfo
+++ b/x11/fspanel/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/07/27 15:56:42 reed Exp $
+$NetBSD: distinfo,v 1.7 2005/08/01 17:10:32 reed Exp $
 
 SHA1 (fspanel-0.8beta1.tar.gz) = 80225c1cd6984b458e487db3cbc04d8e3a4173d8
 RMD160 (fspanel-0.8beta1.tar.gz) = e892f182375e8a8541a01e6f3015f7fa4900c009
 Size (fspanel-0.8beta1.tar.gz) = 9703 bytes
 SHA1 (patch-aa) = 8a61200ff8ef1c05b78ed4bb1a9150c52a95b5e5
-SHA1 (patch-ab) = 705eaaf0730e3afc0b0285aa3d8c4c2705e02326
+SHA1 (patch-ab) = 4b425bf95bef52ca40f63f64ab03bb92799a8359
 SHA1 (patch-ac) = 139dd047f884cc0f1cb37bfae39e682cf4de0fd2
diff --git a/x11/fspanel/patches/patch-ab b/x11/fspanel/patches/patch-ab
index 66f18d58132..3a06f45aadb 100644
--- a/x11/fspanel/patches/patch-ab
+++ b/x11/fspanel/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/03/17 15:49:54 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2005/08/01 17:10:32 reed Exp $
 
---- fspanel.c.orig	2002-06-23 07:12:50.000000000 +0200
-+++ fspanel.c
-@@ -559,10 +559,10 @@ gui_draw_task (task *tk)
+--- fspanel.c.orig	2002-06-22 22:12:50.000000000 -0700
++++ fspanel.c	2005-07-28 11:28:40.000000000 -0700
+@@ -559,10 +559,10 @@
  
  		/* check how many chars can fit */
  		len = strlen (tk->name);
@@ -15,3 +15,16 @@ $NetBSD: patch-ab,v 1.1 2005/03/17 15:49:54 wiz Exp $
  				break;
  			len--;
  		}
+@@ -678,7 +678,11 @@
+ 	xev.message_type = atom__NET_CURRENT_DESKTOP;
+ 	xev.format = 32;
+ 	xev.data.l[0] = new_desk;
+-	XSendEvent (dd, root_win, False, SubstructureNotifyMask, (XEvent *) &xev);
++	xev.data.l[1] = 0;
++	xev.data.l[2] = 0;
++	xev.data.l[3] = 0;
++	xev.data.l[4] = 0;
++	XSendEvent (dd, root_win, False, SubstructureRedirectMask | SubstructureNotifyMask, (XEvent *) &xev);
+ }
+ 
+ void
-- 
cgit v1.2.3