- Fix two bugs (with code cleanup)

- Bump PORTREVISION

PR:		117042 (merged from nosedive)
Submitted by:	Nikos Ntarmos <ntarmos@ceid.upatras.gr> (maintainer)
Obtained from:	git reposiory

8 files changed, 50 insertions, 32 deletions

diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index 73d2c11abd8a..2f86be2ccdaf 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	awesome
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
 
diff --git a/x11-wm/awesome/files/extrapatch-warp b/x11-wm/awesome/files/extrapatch-warp
index ef27961d3af6..76aa663e042e 100644
--- a/x11-wm/awesome/files/extrapatch-warp
+++ b/x11-wm/awesome/files/extrapatch-warp
@@ -1,25 +1,11 @@
 --- layout.c.orig	2007-09-26 13:18:33.000000000 +0300
 +++ layout.c	2007-09-26 13:20:48.000000000 +0300
-@@ -114,6 +114,22 @@
+@@ -114,6 +114,8 @@
      Client *c;
      XEvent ev;
      XWindowChanges wc;
-+	 Window dummy, root;
-+	 int wex, wey, ex, ey, i;
-+	 unsigned int dmask;
-+
-+	 if(sel) {
-+		 ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar);
-+		 root = RootWindow(disp, awesomeconf->screen);
-+		 XQueryPointer(disp, sel->win, &dummy, &dummy, &i, &i, &wex, &wey, &dmask);
-+		 XTranslateCoordinates(disp, sel->win, root, wex, wey, &ex, &ey, &dummy);
-+		 /* I'm so sorry for this... Shame on me... */
-+		 if(ex > si[awesomeconf->screen].x_org && ex < si[awesomeconf->screen].width && ey > si[awesomeconf->screen].y_org && ey < si[awesomeconf->screen].height) {
-+			 XSelectInput(disp, root, SubstructureRedirectMask & EnterWindowMask);
++	 if(sel)
 +			 XWarpPointer(disp, None, sel->win, 0, 0, 0, 0, sel->w / 2, sel->h / 2);
-+			 XSelectInput(disp, root, SubstructureRedirectMask);
-+		 }
-+	 }
  
      drawstatusbar(disp, awesomeconf->screen, drawcontext, awesomeconf);
      if(!sel)
diff --git a/x11-wm/awesome/files/patch-config.c b/x11-wm/awesome/files/patch-config.c
new file mode 100644
index 000000000000..4e9fece82e4e
--- /dev/null
+++ b/x11-wm/awesome/files/patch-config.c
@@ -0,0 +1,11 @@
+--- config.c
++++ config.c
+@@ -400,7 +400,7 @@ parse_config(Display * disp, int scr, DC * drawcontext, const char *confpatharg,
+     awesomeconf->mwfact = f ? f : 0.6;
+ 
+     /* resize_hints */
+-    awesomeconf->resize_hints = config_lookup_float(&awesomelibconf, "awesome.resize_hints");
++    awesomeconf->resize_hints = config_lookup_bool(&awesomelibconf, "awesome.resize_hints");
+ 
+     /* colors */
+     tmp = config_lookup_string(&awesomelibconf, "awesome.normal_border_color");
diff --git a/x11-wm/awesome/files/patch-statusbar.c b/x11-wm/awesome/files/patch-statusbar.c
new file mode 100644
index 000000000000..055d6d637bfe
--- /dev/null
+++ b/x11-wm/awesome/files/patch-statusbar.c
@@ -0,0 +1,11 @@
+--- statusbar.c
++++ statusbar.c
+@@ -166,7 +166,7 @@ uicb_togglebar(Display *disp,
+                const char *arg __attribute__ ((unused)))
+ {
+     if(awesomeconf->statusbar.position == BarOff)
+-        awesomeconf->statusbar.position = (awesomeconf->statusbar.position == BarOff) ? BarTop : awesomeconf->statusbar_default_position;
++        awesomeconf->statusbar.position = (awesomeconf->statusbar_default_position == BarOff) ? BarTop : awesomeconf->statusbar_default_position;
+     else
+         awesomeconf->statusbar.position = BarOff;
+     updatebarpos(disp, awesomeconf->statusbar);
diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile
index 73d2c11abd8a..2f86be2ccdaf 100644
--- a/x11-wm/awesome2/Makefile
+++ b/x11-wm/awesome2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	awesome
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
 
diff --git a/x11-wm/awesome2/files/extrapatch-warp b/x11-wm/awesome2/files/extrapatch-warp
index ef27961d3af6..76aa663e042e 100644
--- a/x11-wm/awesome2/files/extrapatch-warp
+++ b/x11-wm/awesome2/files/extrapatch-warp
@@ -1,25 +1,11 @@
 --- layout.c.orig	2007-09-26 13:18:33.000000000 +0300
 +++ layout.c	2007-09-26 13:20:48.000000000 +0300
-@@ -114,6 +114,22 @@
+@@ -114,6 +114,8 @@
      Client *c;
      XEvent ev;
      XWindowChanges wc;
-+	 Window dummy, root;
-+	 int wex, wey, ex, ey, i;
-+	 unsigned int dmask;
-+
-+	 if(sel) {
-+		 ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar);
-+		 root = RootWindow(disp, awesomeconf->screen);
-+		 XQueryPointer(disp, sel->win, &dummy, &dummy, &i, &i, &wex, &wey, &dmask);
-+		 XTranslateCoordinates(disp, sel->win, root, wex, wey, &ex, &ey, &dummy);
-+		 /* I'm so sorry for this... Shame on me... */
-+		 if(ex > si[awesomeconf->screen].x_org && ex < si[awesomeconf->screen].width && ey > si[awesomeconf->screen].y_org && ey < si[awesomeconf->screen].height) {
-+			 XSelectInput(disp, root, SubstructureRedirectMask & EnterWindowMask);
++	 if(sel)
 +			 XWarpPointer(disp, None, sel->win, 0, 0, 0, 0, sel->w / 2, sel->h / 2);
-+			 XSelectInput(disp, root, SubstructureRedirectMask);
-+		 }
-+	 }
  
      drawstatusbar(disp, awesomeconf->screen, drawcontext, awesomeconf);
      if(!sel)
diff --git a/x11-wm/awesome2/files/patch-config.c b/x11-wm/awesome2/files/patch-config.c
new file mode 100644
index 000000000000..4e9fece82e4e
--- /dev/null
+++ b/x11-wm/awesome2/files/patch-config.c
@@ -0,0 +1,11 @@
+--- config.c
++++ config.c
+@@ -400,7 +400,7 @@ parse_config(Display * disp, int scr, DC * drawcontext, const char *confpatharg,
+     awesomeconf->mwfact = f ? f : 0.6;
+ 
+     /* resize_hints */
+-    awesomeconf->resize_hints = config_lookup_float(&awesomelibconf, "awesome.resize_hints");
++    awesomeconf->resize_hints = config_lookup_bool(&awesomelibconf, "awesome.resize_hints");
+ 
+     /* colors */
+     tmp = config_lookup_string(&awesomelibconf, "awesome.normal_border_color");
diff --git a/x11-wm/awesome2/files/patch-statusbar.c b/x11-wm/awesome2/files/patch-statusbar.c
new file mode 100644
index 000000000000..055d6d637bfe
--- /dev/null
+++ b/x11-wm/awesome2/files/patch-statusbar.c
@@ -0,0 +1,11 @@
+--- statusbar.c
++++ statusbar.c
+@@ -166,7 +166,7 @@ uicb_togglebar(Display *disp,
+                const char *arg __attribute__ ((unused)))
+ {
+     if(awesomeconf->statusbar.position == BarOff)
+-        awesomeconf->statusbar.position = (awesomeconf->statusbar.position == BarOff) ? BarTop : awesomeconf->statusbar_default_position;
++        awesomeconf->statusbar.position = (awesomeconf->statusbar_default_position == BarOff) ? BarTop : awesomeconf->statusbar_default_position;
+     else
+         awesomeconf->statusbar.position = BarOff;
+     updatebarpos(disp, awesomeconf->statusbar);