apply fluxbox's 0.1.8 bugfix 2 patch

--
From: MAINTAINER

x11/fluxbox/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2002/04/28 16:58:30 brad Exp $
+# $OpenBSD: Makefile,v 1.7 2002/05/03 13:30:22 brad Exp $
 
 COMMENT=	"Blackbox-derived window manager with Gnome and KDE support"
 
 DISTNAME=		fluxbox-0.1.8
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 CATEGORIES=		x11
 NEED_VERSION=		1.522
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}

x11/fluxbox/patches/patch-src_Configmenu_cc

@@ -0,0 +1,42 @@
+$OpenBSD: patch-src_Configmenu_cc,v 1.1 2002/05/03 13:30:23 brad Exp $
+--- src/Configmenu.cc.orig	Fri Apr 12 17:14:09 2002
++++ src/Configmenu.cc	Fri May  3 12:27:19 2002
+@@ -195,6 +195,8 @@ void Configmenu::itemSelected(int button
+ 				break;
+ 
+ 			}
++			//save resources
++			Fluxbox::instance()->save_rc();
+ 		}
+ }
+ 
+@@ -290,6 +292,10 @@ void Configmenu::Focusmenu::itemSelected
+ 			break;
+ 			}
+ 
++			//save resources
++			Fluxbox::instance()->save_rc();
++			
++			//toggle options
+ 			setItemSelected(0, !(configmenu->screen->isSloppyFocus() || 
+ 							configmenu->screen->isSemiSloppyFocus()));
+ 			setItemSelected(1, configmenu->screen->isSloppyFocus());
+@@ -427,6 +433,8 @@ void Configmenu::Placementmenu::itemSele
+ 
+ 			break;
+ 			}
++			//save resources
++			Fluxbox::instance()->save_rc();
+ 		}
+ 	}
+ }
+@@ -638,7 +646,8 @@ void Configmenu::Tabmenu::itemSelected(i
+ 					configmenu->screen->saveTabRotateVertical(True);
+ 				break;
+ 			}
+-
++			//save resources
++			Fluxbox::instance()->save_rc();
+ 			Fluxbox::instance()->reconfigureTabs(); //TODO
+ 			setSelected();			
+ 	}

x11/fluxbox/patches/patch-src_Tab_cc

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_Tab_cc,v 1.1 2002/05/03 13:30:23 brad Exp $
+--- src/Tab.cc.orig	Mon Apr 15 00:27:57 2002
++++ src/Tab.cc	Fri May  3 12:27:19 2002
+@@ -63,7 +63,8 @@ Tab::Tab(FluxboxWindow *win, Tab *prev, 
+ 	
+ 	if ((m_win->getScreen()->getTabPlacement() == PLEFT ||
+ 			m_win->getScreen()->getTabPlacement() == PRIGHT) &&
+-			m_win->getScreen()->isTabRotateVertical()) {
++			m_win->getScreen()->isTabRotateVertical() &&
++			!m_win->isShaded()) {
+ 		m_size_w = m_win->getScreen()->getTabHeight();
+ 		m_size_h = m_win->getScreen()->getTabWidth();
+ 	} else {

x11/fluxbox/patches/patch-src_Window_cc

@@ -1,11 +1,14 @@
---- src/Window.cc.orig	Wed Apr 17 09:24:59 2002
-+++ src/Window.cc	Sat Apr 27 06:06:23 2002
-@@ -3348,7 +3348,7 @@ void FluxboxWindow::motionNotifyEvent(XM
- 					int cur_id = screen->getCurrentWorkspaceID();
- 					int new_id = cur_id;
- 					const int warpPad = screen->getEdgeSnapThreshold();
--					if (me->x_root >= int(screen->getWidth()) - warpPad &&
-+					if (me->x_root >= int(screen->getWidth()) - warpPad - 1 &&
- 							frame.x < int(me->x_root - frame.grab_x - screen->getBorderWidth())) {
- 						new_id = (cur_id + 1) % screen->getCount();
- 						dx = -me->x_root;
+--- src/Window.cc.orig	Fri May  3 12:26:27 2002
++++ src/Window.cc	Fri May  3 12:27:19 2002
+@@ -239,8 +239,9 @@ tab(0)
+ 
+ 	// adjust the window decorations based on transience and window sizes
+ 	if (transient) {
+-		decorations.maximize = decorations.handle =
+-			decorations.border = functions.maximize = false;
++		decorations.maximize =  functions.maximize = false;
++		//we can still use the handles to resize it
++		decorations.handle = decorations.border = true;
+ 	}	
+ 	
+ 	if ((client.normal_hint_flags & PMinSize) &&

x11/fluxbox/patches/patch-src_fluxbox_cc

@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_fluxbox_cc,v 1.1 2002/05/03 13:30:23 brad Exp $
+--- src/fluxbox.cc.orig	Sat Apr 20 12:10:48 2002
++++ src/fluxbox.cc	Fri May  3 12:27:19 2002
+@@ -1701,7 +1701,6 @@ void Fluxbox::shutdown(void) {
+ 
+ 	XSync(getXDisplay(), False);
+ 
+-	save_rc();
+ }
+ 
+ //------ save_rc --------

x11/fluxbox/patches/patch-src_fluxbox_hh

@@ -0,0 +1,19 @@
+$OpenBSD: patch-src_fluxbox_hh,v 1.1 2002/05/03 13:30:23 brad Exp $
+--- src/fluxbox.hh.orig	Fri Apr 12 15:02:12 2002
++++ src/fluxbox.hh	Fri May  3 12:27:19 2002
+@@ -135,6 +135,7 @@ public:
+ 	void saveToolbarSearch(Window, Toolbar *);
+ 	void saveTabSearch(Window, Tab *);
+ 	void saveGroupSearch(Window, FluxboxWindow *);	
++	void save_rc(void);
+ 	void removeMenuSearch(Window);
+ 	void removeWindowSearch(Window);
+ 	void removeToolbarSearch(Window);
+@@ -240,7 +241,6 @@ protected:
+ 	Fluxbox(int, char **, char * = 0, char * = 0);
+ 	char *getRcFilename();
+ 	void load_rc(void);
+-	void save_rc(void);
+ 	void reload_rc(void);
+ 	void real_rereadMenu(void);
+ 	void real_reconfigure(void);