Add patches from Philipp Hartwig improving fullscreen mode; from the

notion-general mailing list.
Bump PKGREVISION.

5 files changed, 79 insertions, 2 deletions

diff --git a/wm/notion/Makefile b/wm/notion/Makefile
index f67758ced24..0ed3f2d7af8 100644
--- a/wm/notion/Makefile
+++ b/wm/notion/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2012/01/08 15:22:14 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2012/04/18 23:15:18 wiz Exp $
 #
 
 DISTNAME=	notion-3-2011102900-src
 PKGNAME=	${DISTNAME:S/3-/3./:S/-src//}
+PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=notion/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/notion/distinfo b/wm/notion/distinfo
index d1ec10a5933..965ab5cfced 100644
--- a/wm/notion/distinfo
+++ b/wm/notion/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/01/08 15:22:14 wiz Exp $
+$NetBSD: distinfo,v 1.2 2012/04/18 23:15:18 wiz Exp $
 
 SHA1 (notion-3-2011102900-src.tar.bz2) = e9f76cee087d8deb7cdef36be160ec830289331a
 RMD160 (notion-3-2011102900-src.tar.bz2) = afe2b0548a2651d8bb7333761d4842464f7bb2c9
 Size (notion-3-2011102900-src.tar.bz2) = 584767 bytes
 SHA1 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7
+SHA1 (patch-ioncore_manage.c) = d57e6118716989590b37e472f2d1f921cd16e049
+SHA1 (patch-ioncore_netwm.c) = ff665477c26c56eea4339484a2ad2255e5ddd7c8
+SHA1 (patch-ioncore_netwm.h) = d292d751e7c684d177d574ff2e7a7b346a55f5b9
 SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89
 SHA1 (patch-pwm_Makefile) = e614eb6aea7af2b526392e7b9c17d5be262bf569
 SHA1 (patch-system.mk) = fa439b406cf79b117118991095520380fb95a109
diff --git a/wm/notion/patches/patch-ioncore_manage.c b/wm/notion/patches/patch-ioncore_manage.c
new file mode 100644
index 00000000000..4c9a6763d57
--- /dev/null
+++ b/wm/notion/patches/patch-ioncore_manage.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-ioncore_manage.c,v 1.1 2012/04/18 23:15:19 wiz Exp $
+
+Fixes some fullscreen apps.
+From Philipp Hartwig <ph@phhart.de>
+on notion-general@lists.sourceforge.net
+
+--- ioncore/manage.c.orig	2011-10-29 18:19:21.000000000 +0000
++++ ioncore/manage.c
+@@ -151,8 +151,8 @@ static bool try_fullscreen(WClientWin *c
+         fs_scr=dflt;
+     }
+ 
+-    if(fs_scr==NULL)
+-        fs_scr=netwm_check_initial_fullscreen(cwin);
++    if(fs_scr==NULL && netwm_check_initial_fullscreen(cwin))
++        fs_scr=dflt;
+ 
+     if(fs_scr==NULL)
+         fs_scr=clientwin_fullscreen_chkrq(cwin, param->geom.w, param->geom.h);
diff --git a/wm/notion/patches/patch-ioncore_netwm.c b/wm/notion/patches/patch-ioncore_netwm.c
new file mode 100644
index 00000000000..53b8fba24c2
--- /dev/null
+++ b/wm/notion/patches/patch-ioncore_netwm.c
@@ -0,0 +1,37 @@
+$NetBSD: patch-ioncore_netwm.c,v 1.1 2012/04/18 23:15:19 wiz Exp $
+
+Fixes some fullscreen apps.
+From Philipp Hartwig <ph@phhart.de>
+on notion-general@lists.sourceforge.net
+
+--- ioncore/netwm.c.orig	2011-10-29 18:19:21.000000000 +0000
++++ ioncore/netwm.c
+@@ -95,7 +95,7 @@ void netwm_init_rootwin(WRootWin *rw)
+ /*{{{ _NET_WM_STATE */
+ 
+ 
+-WScreen *netwm_check_initial_fullscreen(WClientWin *cwin)
++bool netwm_check_initial_fullscreen(WClientWin *cwin)
+ {
+ 
+     int i, n;
+@@ -106,16 +106,16 @@ WScreen *netwm_check_initial_fullscreen(
+                    1, TRUE, (uchar**)&data);
+     
+     if(n<0)
+-        return NULL;
++        return FALSE;
+     
+     for(i=0; i<n; i++){
+         if(data[i]==(long)atom_net_wm_state_fullscreen)
+-            return region_screen_of((WRegion*)cwin);
++            return TRUE;
+     }
+     
+     XFree((void*)data);
+ 
+-    return NULL;
++    return FALSE;
+ }
+ 
+ 
diff --git a/wm/notion/patches/patch-ioncore_netwm.h b/wm/notion/patches/patch-ioncore_netwm.h
new file mode 100644
index 00000000000..4a122747459
--- /dev/null
+++ b/wm/notion/patches/patch-ioncore_netwm.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-ioncore_netwm.h,v 1.1 2012/04/18 23:15:19 wiz Exp $
+
+Fixes some fullscreen apps.
+From Philipp Hartwig <ph@phhart.de>
+on notion-general@lists.sourceforge.net
+
+--- ioncore/netwm.h.orig	2011-10-29 18:19:21.000000000 +0000
++++ ioncore/netwm.h
+@@ -20,7 +20,7 @@
+ extern void netwm_init();
+ extern void netwm_init_rootwin(WRootWin *rw);
+ 
+-extern WScreen *netwm_check_initial_fullscreen(WClientWin *cwin);
++extern bool netwm_check_initial_fullscreen(WClientWin *cwin);
+ extern void netwm_update_state(WClientWin *cwin);
+ extern void netwm_delete_state(WClientWin *cwin);
+ extern void netwm_set_active(WRegion *reg);