$NetBSD: patch-ab,v 1.1.1.1 2002/09/07 20:22:54 jschauma Exp $

--- Basewindow.cc.orig	Sun Aug 15 10:43:55 1999
+++ Basewindow.cc	Sat Sep  7 16:14:34 2002
@@ -23,6 +23,11 @@
 
 Basewindow::Basewindow(int argc,char **argv)
 {
+	dpy = NULL;
+	v = NULL;
+	image_control = NULL;
+	bbconfig_filename = NULL;
+
 	display_name=NULL;
 	config_filename=NULL;
 	position=NULL;
@@ -112,18 +117,6 @@
       if (bbconfig_filename||default_config) { Usage(); exit(2); };
 			config_filename=argv[i];
 		}
- 		else if ((!strcmp(argv[i],"-default"))|(!strcmp(argv[i],"-d")))
-		{
-      if (bbconfig_filename||config_filename) { Usage(); exit(2); };
-      { Usage(); exit(2); };
-      default_config=True;
-    }
- 		else if ((!strcmp(argv[i],"-mailbox"))|(!strcmp(argv[i],"-m")))
-		{
-			if(++i==argc)  { Usage(); exit(2); };
-			spooldir=argv[i];
-		}
-
     		else if ( (!strcmp(argv[i],"-v")) || (!strcmp(argv[i],"-version")))
 		{
 			fprintf(stderr," %s version %s\n",BBTOOL,BBTOOL_VERSION);
@@ -153,19 +146,19 @@
 void Basewindow::Usage()
 {
 	fprintf(stderr,"%s version %s \n\n",BBTOOL,BBTOOL_VERSION);
-	fprintf(stderr,"%s [-display <display name>] [-config <filename>]\n",BBTOOL);
-	fprintf(stderr,"       [-spooldir] [-version] [-help]\n");
-	fprintf(stderr,"       [[-position] | [-pos]] <position>\n\n");
-	fprintf(stderr,"-d[isplay] <display name>   X server to connect to\n");
-	fprintf(stderr,"-c[onfig] <filename>        Alternate config file\n");
+	fprintf(stderr,"%s [-bb[config] <filename>] [-config <filename>]\n",BBTOOL);
+	fprintf(stderr,"      [-d[isplay] <display>] [-h[elp]]\n");
+	fprintf(stderr,"      [-p[osition] <position>]\n");
+	fprintf(stderr,"      [-s[hape]] [-v[ersion]]\n");
+	fprintf(stderr,"      [-w[ithdrawn]]\n");
 	fprintf(stderr,"-bb[config] <filename>      Alternate Blackbox config file\n");
-	fprintf(stderr,"-def[ault]                  Fall back on default configuration\n");
-  fprintf(stderr,"-m[ailbox] <filename>       Filename of mailbox.\n");
-	fprintf(stderr,"-v[ersion]                  Display version number\n");
+	fprintf(stderr,"-c[onfig] <filename>        Alternate config file\n");
+	fprintf(stderr,"-d[isplay] <display>        Specify display\n");
 	fprintf(stderr,"-h[elp]                     Display this help\n");
 	fprintf(stderr,"-p[osition] <position>      Set position of window\n");
 	fprintf(stderr,"            <position> = [+]|[-]x[+]|[-]y\n");
-	fprintf(stderr,"-w[withdrawn]               Place tool in the Slit\n");
 	fprintf(stderr,"-s[hape]                    Don't display groundplate\n\n");	
+	fprintf(stderr,"-v[ersion]                  Display version number\n");
+	fprintf(stderr,"-w[withdrawn]               Place tool in the Slit\n");
 }