revision bump, fixing #37079

4 files changed, 185 insertions, 0 deletions

diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.8-r3 b/x11-wm/fvwm/files/digest-fvwm-2.5.8-r3
new file mode 100644
index 000000000000..3ad7e1a9fea0
--- /dev/null
+++ b/x11-wm/fvwm/files/digest-fvwm-2.5.8-r3
@@ -0,0 +1,2 @@
+MD5 c702d873d124a475f95c45432b8bd7d7 fvwm-2.5.8.tar.bz2 1778920
+MD5 a714fc47fe53c079905aee4037653579 FvwmTabs-2.6.tar.gz 24345
diff --git a/x11-wm/fvwm/files/fvwm-2.5.8-taskbar-margins.diff b/x11-wm/fvwm/files/fvwm-2.5.8-taskbar-margins.diff
new file mode 100644
index 000000000000..449ebc446a68
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.5.8-taskbar-margins.diff
@@ -0,0 +1,55 @@
+--- fvwm-2.5.8/modules/FvwmTaskBar/Start.c	2003-09-03 14:52:36.000000000 +0100
++++ fvwm/modules/FvwmTaskBar/Start.c	2004-01-12 09:55:10.000000000 +0000
+@@ -42,6 +42,8 @@
+ int WindowButtonsLeftMargin = 4;    /* default value is 4 */
+ int WindowButtonsRightMargin = 2;   /* default value is 2 */
+ int StartButtonRightMargin = 0;     /* default value is 0 */
++int has_wb_left_margin = 0;
++int has_wb_right_margin = 0;
+ Bool StartButtonOpensAboveTaskBar = FALSE;
+ char *StartName     = NULL,
+      *StartCommand  = NULL,
+@@ -294,12 +296,14 @@
+ 		if(atoi(rest)>=0)
+ 		{
+ 			WindowButtonsLeftMargin = atoi(rest);
++			has_wb_left_margin = 1;
+ 		}
+ 		break;
+ 	case 7: /* WindowButtonsRightMargin */
+ 		if(atoi(rest)>=0)
+ 		{
+ 			WindowButtonsRightMargin = atoi(rest);
++			has_wb_right_margin = 1;
+ 		}
+ 		break;
+ 	case 8: /* StartButtonRightMargin */
+@@ -311,7 +315,6 @@
+ 	default:
+ 		/* unknown option */
+ 		return False;
+-		break;
+ 	} /* switch */
+ 
+ 	return True;
+@@ -455,10 +458,16 @@
+   }
+   else
+   {
+-	  StartAndLaunchButtonsWidth = 0;
+-	  StartButtonRightMargin = 0;
+-	  WindowButtonsLeftMargin = 0;
+-	  WindowButtonsRightMargin = 0;
++    StartAndLaunchButtonsWidth = 0;
++    StartButtonRightMargin = 0;
++    if (has_wb_left_margin == 0)
++    {
++      WindowButtonsLeftMargin = 0;
++    }
++    if (has_wb_right_margin == 0)
++    {
++      WindowButtonsRightMargin = 0;
++    }
+   }
+ }
+ 
diff --git a/x11-wm/fvwm/files/fvwm-2.5.8-undermouse.diff b/x11-wm/fvwm/files/fvwm-2.5.8-undermouse.diff
new file mode 100644
index 000000000000..be18ea4abda1
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.5.8-undermouse.diff
@@ -0,0 +1,73 @@
+diff -Naur fvwm-2.5.8/fvwm/fvwm.h fvwm/fvwm/fvwm.h
+--- fvwm-2.5.8/fvwm/fvwm.h	2003-09-24 11:15:20.000000000 +0200
++++ fvwm/fvwm/fvwm.h	2003-11-25 00:53:26.000000000 +0100
+@@ -467,8 +467,9 @@
+ #define PLACE_TILECASCADE       0x5
+ #define PLACE_CASCADE_B         0x6
+ #define PLACE_MINOVERLAP        0x7
+-#define PLACE_MASK              0x7
+-	unsigned placement_mode : 3;
++#define PLACE_UNDERMOUSE        0x8
++#define PLACE_MASK              0x8
++    unsigned placement_mode : 4;
+ 	unsigned ewmh_placement_mode : 2; /* see ewmh.h */
+ #define WS_CR_MOTION_METHOD_AUTO CR_MOTION_METHOD_AUTO
+ #define WS_CR_MOTION_METHOD_USE_GRAV CR_MOTION_METHOD_USE_GRAV
+diff -Naur fvwm-2.5.8/fvwm/placement.c fvwm/fvwm/placement.c
+--- fvwm-2.5.8/fvwm/placement.c	2003-07-08 00:22:20.000000000 +0200
++++ fvwm/fvwm/placement.c	2003-11-25 00:53:26.000000000 +0100
+@@ -1156,7 +1156,35 @@
+ 				fw, sflags, &screen_g, &xl, &yt, pdeltax,
+ 				pdeltay, 0);
+ 			flags.is_smartly_placed = True;
+-			break;
++
++	    case PLACE_UNDERMOUSE:
++    	   {
++	       int mx;
++           int my;
++          FQueryPointer(dpy, Scr.Root, &JunkRoot, &JunkChild,
++            &mx, &my, &JunkX, &JunkY, &JunkMask);
++          xl = mx - (fw->frame_g.width / 2);
++          yt = my - (fw->frame_g.height / 2);
++          if (xl + fw->frame_g.width > screen_g.x + screen_g.width)
++          {
++            xl = screen_g.x + screen_g.width - fw->frame_g.width;
++          }
++          if (yt + fw->frame_g.height > screen_g.y + screen_g.height)
++          {
++            yt = screen_g.y + screen_g.height - fw->frame_g.height;
++          }
++          if (xl < screen_g.x)
++          {
++            xl = screen_g.x;
++          }
++          if (yt < screen_g.y)
++          {
++          yt = screen_g.y;
++          }
++          attr_g->x = xl;
++          attr_g->y = yt;
++        }
++ 			break;
+ 		default:
+ 			/* can't happen */
+ 			break;
+diff -Naur fvwm-2.5.8/fvwm/style.c fvwm/fvwm/style.c
+--- fvwm-2.5.8/fvwm/style.c	2003-08-23 06:27:43.000000000 +0200
++++ fvwm/fvwm/style.c	2003-11-25 00:53:26.000000000 +0100
+@@ -3738,7 +3738,13 @@
+ 		break;
+ 
+ 	case 'u':
+-		if (StrEquals(token, "UsePPosition"))
++        if (StrEquals(token, "UnderMousePlacement"))
++        {
++            ps->flags.placement_mode = PLACE_UNDERMOUSE;
++            ps->flag_mask.placement_mode = PLACE_MASK;
++            ps->change_mask.placement_mode = PLACE_MASK;
++        }
++        else if (StrEquals(token, "UsePPosition"))
+ 		{
+ 			ps->flags.use_no_pposition = !on;
+ 			ps->flag_mask.use_no_pposition = 1;
diff --git a/x11-wm/fvwm/files/fvwm-iconman.diff b/x11-wm/fvwm/files/fvwm-iconman.diff
new file mode 100644
index 000000000000..150176222c25
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-iconman.diff
@@ -0,0 +1,55 @@
+diff -pru fvwm/modules/FvwmIconMan/FvwmIconMan.h fvwm.new/modules/FvwmIconMan/FvwmIconMan.h
+--- fvwm/modules/FvwmIconMan/FvwmIconMan.h	2003-04-26 19:37:06.000000000 +0200
++++ fvwm.new/modules/FvwmIconMan/FvwmIconMan.h	2003-05-20 11:46:26.000000000 +0200
+@@ -313,7 +313,7 @@ typedef struct win_manager {
+ 	WeightedSort *weighted_sorts;
+ 	int weighted_sorts_len, weighted_sorts_size;
+ 	char *AnimCommand;
+-	Uchar showonlyiconic;
++	int showonlyiconic;
+ 	Uchar showtransient;
+ 	rectangle managed_g;    /* dimensions of managed screen portion */
+ 
+Tylko w fvwm.new/modules/FvwmIconMan: FvwmIconMan.h~
+diff -pru fvwm/modules/FvwmIconMan/readconfig.c fvwm.new/modules/FvwmIconMan/readconfig.c
+--- fvwm/modules/FvwmIconMan/readconfig.c	2003-04-26 19:37:18.000000000 +0200
++++ fvwm.new/modules/FvwmIconMan/readconfig.c	2003-05-20 11:48:41.000000000 +0200
+@@ -1572,11 +1572,14 @@ void read_in_resources()
+ 	 ConsoleMessage("Need argument to showonlyicons\n");
+ 	 continue;
+        }
+-       if (!strcasecmp(p, "true")) {
++        if (!strcasecmp (p, "false")) {
++ 	 i = 0;
++        }
++ 	   else if (!strcasecmp (p, "true")) {
+ 	 i = 1;
+        }
+-       else if (!strcasecmp(p, "false")) {
+-	 i = 0;
++        else if (!strcasecmp (p, "never")) {
++ 	 i = 2;
+        }
+        else {
+ 	 ConsoleMessage("Bad line: %s\n", current_line);
+Tylko w fvwm.new/modules/FvwmIconMan: readconfig.c~
+diff -pru fvwm/modules/FvwmIconMan/xmanager.c fvwm.new/modules/FvwmIconMan/xmanager.c
+--- fvwm/modules/FvwmIconMan/xmanager.c	2003-04-26 19:37:23.000000000 +0200
++++ fvwm.new/modules/FvwmIconMan/xmanager.c	2003-05-20 11:49:39.000000000 +0200
+@@ -1415,9 +1415,12 @@ void check_in_window(WinData *win)
+ 
+   if (win->manager && win->complete) {
+     is_state_selected =
+-	    ((!win->manager->showonlyiconic || win->iconified) &&
+-	     (win->manager->showtransient || !IS_TRANSIENT(win)));
+-    in_viewport = win_in_viewport(win);
++ 	    (((!win->iconified&&(win->manager->showonlyiconic==2))||
++ 	    (win->manager->showonlyiconic==0)||
++ 	    ((win->iconified&&(win->manager->showonlyiconic==1))
++ 		))&&
++ 		 (win->manager->showtransient || !IS_TRANSIENT(win))); 
++	in_viewport = win_in_viewport(win);
+     if (win->manager->usewinlist && DO_SKIP_WINDOW_LIST(win))
+       in_viewport = 0;
+     if (win->button == NULL && in_viewport && is_state_selected) {
+Tylko w fvwm.new/modules/FvwmIconMan: xmanager.c~