Upgrade to 0.0.2:

This version includes some of the local patches.
In addition, add patch provided by Anthony Mallet
(anthony dot malletu at seless-ficus dot net) in
pr PKG/19432 to prevent the application on XFree-current
from segfaulting.

11 files changed, 28 insertions, 224 deletions

diff --git a/misc/bbappconf/Makefile b/misc/bbappconf/Makefile
index a5edca72bfa..5049f301479 100644
--- a/misc/bbappconf/Makefile
+++ b/misc/bbappconf/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2002/09/24 10:20:29 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/12/18 04:34:42 jschauma Exp $
 #
 
-DISTNAME=	bbappconf-0.0.1-peak3
-PKGNAME=	bbappconf-0.0.1.0.3
-PKGREVISION=	1
+DISTNAME=	bbappconf-0.0.2
+PKGNAME=	bbappconf-0.0.2
 CATEGORIES=	misc x11 wm
-MASTER_SITES=	http://bbtools.windsofstorm.net/sources/devel/
+MASTER_SITES=	http://bbtools.windsofstorm.net/sources/
 
 MAINTAINER=	jschauma@netbsd.org
 HOMEPAGE=	http://bbtools.windsofstorm.net
diff --git a/misc/bbappconf/PLIST b/misc/bbappconf/PLIST
index 1e04e894156..8a9a9cc0971 100644
--- a/misc/bbappconf/PLIST
+++ b/misc/bbappconf/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/09 16:01:34 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/12/18 04:34:42 jschauma Exp $
 bin/bbappconf
+man/man1/bbappconf.1
+share/bbtools/README.bbappconf
 share/bbtools/bbappconf.bb
 share/bbtools/bbappconf.nobb
-share/bbtools/README.bbappconf
-man/man1/bbappconf.1
-@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || true
diff --git a/misc/bbappconf/distinfo b/misc/bbappconf/distinfo
index 567fda62c9d..d4133ff8e05 100644
--- a/misc/bbappconf/distinfo
+++ b/misc/bbappconf/distinfo
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.2 2002/08/05 21:42:33 jschauma Exp $
+$NetBSD: distinfo,v 1.3 2002/12/18 04:34:42 jschauma Exp $
 
-SHA1 (bbappconf-0.0.1-peak3.tar.gz) = 03698e9ec97872aa36df86c2ecd97922ef22907c
-Size (bbappconf-0.0.1-peak3.tar.gz) = 80193 bytes
+SHA1 (bbappconf-0.0.2.tar.gz) = 13b5746f7977eea1c1175ec39ceec66926151f18
+Size (bbappconf-0.0.2.tar.gz) = 80107 bytes
 SHA1 (patch-aa) = f730864931ec633ffa54e51a42b2d6dfbb127929
-SHA1 (patch-ab) = 2d45a53624945456a4ca3289ed241b21aee356c4
+SHA1 (patch-ab) = a8d8875d2454c54ac42796b326e494edf2ea9162
 SHA1 (patch-ac) = efdb5217518e3814910a85ecf37c66b45bda46d8
-SHA1 (patch-ba) = b4e1b15b170ea4ba3e787313cc9dbc68456fb1aa
-SHA1 (patch-bb) = fd20465664ae43a30487b547b0688e3253fb5f04
-SHA1 (patch-bc) = d47fb2abd28c7a5c0aa516e70da3c4f87554f592
-SHA1 (patch-bd) = adc0e81679f6e7fbe830b80e0efe3470c572c4bc
-SHA1 (patch-be) = 732f449cf865e2e9e1a97a098ccdbb2e6c3538e1
-SHA1 (patch-bf) = a47c1f6b242fecd06ee6102f4b0a7acf07ae252e
+SHA1 (patch-ad) = 64f1b680c8065e99d88c205635b105fde8e56284
diff --git a/misc/bbappconf/patches/patch-ab b/misc/bbappconf/patches/patch-ab
index 1868856b73c..a5617ff328c 100644
--- a/misc/bbappconf/patches/patch-ab
+++ b/misc/bbappconf/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/08/04 16:24:22 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2002/12/18 04:34:42 jschauma Exp $
 
---- data/bbappconf.bb.orig	Sun Aug  4 11:51:37 2002
-+++ data/bbappconf.bb	Sun Aug  4 11:51:49 2002
+--- data/bbappconf.bb.orig	Tue Dec 17 23:11:37 2002
++++ data/bbappconf.bb	Tue Dec 17 23:12:21 2002
 @@ -19,7 +19,7 @@
  !bbappconf.1.maxHoriz:  false
  !bbappconf.1.startOnWorkspace:	
diff --git a/misc/bbappconf/patches/patch-ad b/misc/bbappconf/patches/patch-ad
new file mode 100644
index 00000000000..9381062eaa6
--- /dev/null
+++ b/misc/bbappconf/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2002/12/18 04:34:42 jschauma Exp $
+
+--- resource.cc.orig	Tue Dec 17 23:18:55 2002
++++ resource.cc	Tue Dec 17 23:18:41 2002
+@@ -23,6 +23,7 @@
+ #include "blackboxstyle.hh"
+ 
+ Resource::Resource(ToolWindow *toolwindow): BaseResource(toolwindow) {
++  frame.font = NULL;
+   Load();
+ }
+ 
diff --git a/misc/bbappconf/patches/patch-ba b/misc/bbappconf/patches/patch-ba
deleted file mode 100644
index 898752f8747..00000000000
--- a/misc/bbappconf/patches/patch-ba
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2002/08/05 21:42:34 jschauma Exp $
-
---- appconf.hh.orig	Mon Aug  5 17:28:52 2002
-+++ appconf.hh	Mon Aug  5 17:30:01 2002
-@@ -38,6 +38,11 @@
-   bool getMaxHoriz(void) { return max_horiz;}
-   bool getMaxVert(void) {return max_vert;}
-   
-+  int getPositionX(void) {return position_x;}
-+  int getPositionY(void) {return position_y;}
-+  int getWidth(void) {return width;}
-+  int getHeight(void) {return height;}
-+  
-   char *getName(void) { return appname;}
-   char *getClass(void) { return appclass;}
- 
-@@ -47,6 +52,11 @@
-   void setMaxHoriz(bool _max_horiz) {max_horiz=_max_horiz;}
-   void setStartOnDesktop(unsigned int _start_on_desktop) 
-                        {start_on_desktop=_start_on_desktop;}
-+  void setPositionX(int _position_x) {position_x=_position_x;}
-+  void setPositionY(int _position_y) {position_y=_position_y;}
-+  void setWidth(int _width) {width=_width;}
-+  void setHeight(int _height) {height=_height;}
-+
- private:
-   
-   bool sticky;
-@@ -54,6 +64,8 @@
-   bool max_horiz;
-   bool max_vert;
-   unsigned int start_on_desktop;
-+	int position_x, position_y;
-+	int width, height;
-  	char *appname;
- 	char *appclass;
- };
diff --git a/misc/bbappconf/patches/patch-bb b/misc/bbappconf/patches/patch-bb
deleted file mode 100644
index 52c241fba8a..00000000000
--- a/misc/bbappconf/patches/patch-bb
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2002/08/05 21:42:34 jschauma Exp $
-
---- bbappconf.cc.orig	Mon Aug  5 16:52:13 2002
-+++ bbappconf.cc	Mon Aug  5 16:56:41 2002
-@@ -35,6 +35,8 @@
- 
-   config_db = XrmGetFileDatabase("config.bb");
- 
-+  iconic = options->iconic;
-+
-   desktop_nr=0;
-   current_desktop_nr=-1;
-   wm_init=False;
-@@ -245,6 +247,18 @@
-         getWMInterface()->sendWindowToDesktop(*win,
-                                 resource->getAppConf(i)->getStartOnDesktop()-1);
-       }
-+
-+      /* set window size */
-+      if (resource->getAppConf(i)->getWidth()>=0 &&
-+		      resource->getAppConf(i)->getHeight()>=0) {
-+	      getWMInterface()->resizeWindow(*win,resource->getAppConf(i)->getWidth(),resource->getAppConf(i)->getHeight());
-+      }
-+      /* set window position */
-+      if (resource->getAppConf(i)->getPositionX()!=-1111 &&
-+		      resource->getAppConf(i)->getPositionY()!=-1111) {
-+	      getWMInterface()->moveWindow(*win,resource->getAppConf(i)->getPositionX(),resource->getAppConf(i)->getPositionY());
-+      }
-+
-       if (resource->getAppConf(i)->getMaxHoriz() ||
-          resource->getAppConf(i)->getMaxVert()) {
-         if (XGetWindowProperty(getXDisplay(), *win, 
-@@ -413,12 +427,6 @@
-     XSetWindowBackgroundPixmap(getXDisplay(), framewin, pixmap.frame);
-   }
- 
--  if (!withdrawn && resource->report.auto_raise) {
--    XRaiseWindow(getXDisplay(),framewin);
--    lower=False;
--  }
--  else lower=True;
--
- 	if (!reconfigure) {
- 
- //		gcv.font = resource->menu.font->fid;
diff --git a/misc/bbappconf/patches/patch-bc b/misc/bbappconf/patches/patch-bc
deleted file mode 100644
index 2f85d741421..00000000000
--- a/misc/bbappconf/patches/patch-bc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2002/08/05 21:42:34 jschauma Exp $
-
---- bbappconf.hh.orig	Mon Aug  5 16:57:10 2002
-+++ bbappconf.hh	Mon Aug  5 17:01:50 2002
-@@ -97,10 +97,11 @@
-   
- private:
- 
--  bool lower;
-   bool wm_init;
-   int day,month,year;
-   int number_of_icons;
-+
-+  bool iconic;
- 
-   int current_desktop_nr;
-   PIXMAP  pixmap;
diff --git a/misc/bbappconf/patches/patch-bd b/misc/bbappconf/patches/patch-bd
deleted file mode 100644
index d2d2c010e97..00000000000
--- a/misc/bbappconf/patches/patch-bd
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2002/08/05 21:42:34 jschauma Exp $
-
---- resource.cc.orig	Mon Aug  5 17:02:17 2002
-+++ resource.cc	Mon Aug  5 17:04:39 2002
-@@ -61,6 +61,8 @@
-   int i;
-   char rclass[40];
-   char rname[40];
-+  int position_x, position_y;
-+  int width, height;
-   
-   if ((XrmGetResource(resource_db, "bbappconf.numberOf.configs",
-                        "Bbappconf.NumberOf.Configs",
-@@ -164,6 +166,47 @@
-       app_conf[i].setMaxHoriz(false);
-     }
- 
-+    sprintf(rclass, "Bbappconf.%d.Width",i+1);
-+    sprintf(rname,  "bbappconf.%d.width",i+1);
-+    if ((XrmGetResource(resource_db, rname,rclass,&value_type, &value))) {
-+	    if (sscanf(value.addr, "%u", &width) != 1) {
-+		    width = -1;
-+	    }
-+    } else
-+	    width=-1;
-+    app_conf[i].setWidth(width);
-+
-+    sprintf(rclass, "Bbappconf.%d.Height",i+1);
-+    sprintf(rname,  "bbappconf.%d.height",i+1);
-+    if ((XrmGetResource(resource_db, rname,rclass,&value_type, &value))) {
-+	    if (sscanf(value.addr, "%u", &height) != 1) {
-+		    height = -1;
-+	    }
-+    } else
-+	    height=-1;
-+    app_conf[i].setHeight(height);
-+
-+    sprintf(rclass, "Bbappconf.%d.PositionX",i+1);
-+    sprintf(rname,  "bbappconf.%d.positionX",i+1);
-+    if ((XrmGetResource(resource_db, rname,rclass,
-+				    &value_type, &value))) {
-+	    if (sscanf(value.addr, "%u", &position_x) != 1) {
-+		    position_x = -1111;
-+	    }
-+    } else
-+	    position_x=-1111;
-+    app_conf[i].setPositionX(position_x);
-+
-+    sprintf(rclass, "Bbappconf.%d.PositionY",i+1);
-+    sprintf(rname,  "bbappconf.%d.positionY",i+1);
-+    if ((XrmGetResource(resource_db, rname,rclass,
-+				    &value_type, &value))) {
-+	    if (sscanf(value.addr, "%u", &position_y) != 1) {
-+		    position_y = -1111;
-+	    }
-+    } else
-+	    position_y=-1111;
-+    app_conf[i].setPositionY(position_y);
-     
-   }
- }
diff --git a/misc/bbappconf/patches/patch-be b/misc/bbappconf/patches/patch-be
deleted file mode 100644
index 592a5c0b5f0..00000000000
--- a/misc/bbappconf/patches/patch-be
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-be,v 1.1 2002/08/05 21:42:34 jschauma Exp $
-
---- wminterface.cc.orig	Mon Aug  5 17:05:01 2002
-+++ wminterface.cc	Mon Aug  5 17:06:15 2002
-@@ -285,9 +285,9 @@
- 
- void WMInterface::NETNotifyStartup() {
-   bbtool->setNETInit(); //wm_init=True;
--  XClearWindow(bbtool->getXDisplay(), bbtool->framewin);
-+/*  XClearWindow(bbtool->getXDisplay(), bbtool->framewin); 
-   XMapWindow(bbtool->getXDisplay(), bbtool->framewin);
--  XMapSubwindows(bbtool->getXDisplay(), bbtool->framewin);
-+  XMapSubwindows(bbtool->getXDisplay(), bbtool->framewin); */
- }
- 
- void WMInterface::NETNotifyWindowAdd(Window win,int desktop_nr) {
-@@ -415,3 +415,12 @@
-   } else if (number_of_desktops<old_number_of_desktops)
-     bbtool->removeDesktopWindow();*/
- }
-+
-+void WMInterface::moveWindow(Window win, int x, int y) {
-+	XMoveWindow(bbtool->getXDisplay(), win, x, y);
-+}
-+
-+void WMInterface::resizeWindow(Window win, int width, int height) {
-+	XResizeWindow(bbtool->getXDisplay(), win, width, height);
-+}
-+
diff --git a/misc/bbappconf/patches/patch-bf b/misc/bbappconf/patches/patch-bf
deleted file mode 100644
index 7cbfada850e..00000000000
--- a/misc/bbappconf/patches/patch-bf
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2002/08/05 21:42:34 jschauma Exp $
-
---- wminterface.hh.orig	Mon Aug  5 17:06:39 2002
-+++ wminterface.hh	Mon Aug  5 17:07:13 2002
-@@ -53,6 +53,8 @@
-   int getAttributes(Window);
-   void changeIconState(Window);
-   void windowAttributeChange(Window);
-+  void moveWindow(Window,int,int);
-+  void resizeWindow(Window,int,int);
-   
-   int getNumberOfDesktops();
-   int getCurrentDesktop();