Get rid of unused code from dsimple.c.

2 files changed, 13 insertions, 339 deletions

diff --git a/dsimple.c b/dsimple.c
index 2dbdc72..cd6c843 100644
--- a/dsimple.c
+++ b/dsimple.c
@@ -30,13 +30,11 @@ from The Open Group.
 
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 
-#include <sys/types.h>
 #include <regex.h>
 /*
  * Other_stuff.h: Definitions of routines in other_stuff.
@@ -47,7 +45,7 @@ from The Open Group.
 #include "dsimple.h"
 
 /*
- * Just_display: A group of routines designed to make the writting of simple
+ * Just_display: A group of routines designed to make the writing of simple
  *               X11 applications which open a display but do not open
  *               any windows much faster and easier.  Unless a routine says
  *               otherwise, it may be assumed to require program_name, dpy,
@@ -62,42 +60,6 @@ char *program_name = "unknown_program";
 Display *dpy;
 int screen;
 
-static void _bitmap_error(int, char *);
-
-/*
- * Malloc: like malloc but handles out of memory using Fatal_Error.
- */
-char *Malloc(size)
-     unsigned size;
-{
-	char *data;
-
-	if (!(data = malloc(size)))
-	  Fatal_Error("Out of memory!");
-
-	return(data);
-}
-	
-
-/*
- * Realloc: like Malloc except for realloc, handles NULL using Malloc.
- */
-char *Realloc(ptr, size)
-        char *ptr;
-        int size;
-{
-	char *new_ptr;
-
-	if (!ptr)
-	  return(Malloc(size));
-
-	if (!(new_ptr = realloc(ptr, size)))
-	  Fatal_Error("Out of memory!");
-
-	return(new_ptr);
-}
-
-
 /*
  * Get_Display_Name (argc, argv) Look for -display, -d, or host:dpy (obselete)
  * If found, remove it from command line.  Don't go past a lone -.
@@ -170,157 +132,6 @@ char **argv;    /* MODIFIED */
 	screen = DefaultScreen(dpy);
 }
 
-
-/*
- * Open_Font: This routine opens a font with error handling.
- */
-XFontStruct *Open_Font(name)
-char *name;
-{
-	XFontStruct *font;
-
-	if (!(font=XLoadQueryFont(dpy, name)))
-	  Fatal_Error("Unable to open font %s!", name);
-
-	return(font);
-}
-
-
-/*
- * Beep: Routine to beep the display.
- */
-void Beep()
-{
-	XBell(dpy, 50);
-}
-
-
-/*
- * ReadBitmapFile: same as XReadBitmapFile except it returns the bitmap
- *                 directly and handles errors using Fatal_Error.
- */
-static void _bitmap_error(status, filename)
-     int status;
-     char *filename;
-{
-  if (status == BitmapOpenFailed)
-    Fatal_Error("Can't open file %s!", filename);
-  else if (status == BitmapFileInvalid)
-    Fatal_Error("file %s: Bad bitmap format.", filename);
-  else
-    Fatal_Error("Out of memory!");
-}
-
-Pixmap ReadBitmapFile(d, filename, width, height, x_hot, y_hot)
-     Drawable d;
-     char *filename;
-     int *width, *height, *x_hot, *y_hot;
-{
-  Pixmap bitmap;
-  int status;
-
-  status = XReadBitmapFile(dpy, RootWindow(dpy, screen), filename,
-			   (unsigned int *)width, (unsigned int *)height,
-			   &bitmap, x_hot, y_hot);
-  if (status != BitmapSuccess)
-    _bitmap_error(status, filename);
-
-  return(bitmap);
-}
-
-
-/*
- * WriteBitmapFile: same as XWriteBitmapFile except it handles errors
- *                  using Fatal_Error.
- */
-void WriteBitmapFile(filename, bitmap, width, height, x_hot, y_hot)
-     char *filename;
-     Pixmap bitmap;
-     int width, height, x_hot, y_hot;
-{
-  int status;
-
-  status= XWriteBitmapFile(dpy, filename, bitmap, width, height, x_hot,
-			   y_hot);
-  if (status != BitmapSuccess)
-    _bitmap_error(status, filename);
-}
-
-
-/*
- * Select_Window_Args: a rountine to provide a common interface for
- *                     applications that need to allow the user to select one
- *                     window on the screen for special consideration.
- *                     This routine implements the following command line
- *                     arguments:
- *
- *                       -root            Selects the root window.
- *                       -id <id>         Selects window with id <id>. <id> may
- *                                        be either in decimal or hex.
- *                       -name <name>     Selects the window with name <name>.
- *
- *                     Call as Select_Window_Args(&argc, argv) in main before
- *                     parsing any of your program's command line arguments.
- *                     Select_Window_Args will remove its arguments so that
- *                     your program does not have to worry about them.
- *                     The window returned is the window selected or 0 if
- *                     none of the above arguments was present.  If 0 is
- *                     returned, Select_Window should probably be called after
- *                     all command line arguments, and other setup is done.
- *                     For examples of usage, see xwininfo, xwd, or xprop.
- */
-Window Select_Window_Args(rargc, argv)
-     int *rargc;
-     char **argv;
-#define ARGC (*rargc)
-{
-	int nargc=1;
-	int argc;
-	char **nargv;
-	Window w=0;
-
-	nargv = argv+1; argc = ARGC;
-#define OPTION argv[0]
-#define NXTOPTP ++argv, --argc>0
-#define NXTOPT if (++argv, --argc==0) usage()
-#define COPYOPT nargv++[0]=OPTION, nargc++
-
-	while (NXTOPTP) {
-		if (!strcmp(OPTION, "-")) {
-			COPYOPT;
-			while (NXTOPTP)
-			  COPYOPT;
-			break;
-		}
-		if (!strcmp(OPTION, "-root")) {
-			w=RootWindow(dpy, screen);
-			continue;
-		}
-		if (!strcmp(OPTION, "-name")) {
-			NXTOPT;
-			w = Window_With_Name(dpy, RootWindow(dpy, screen),
-					     OPTION);
-			if (!w)
-			  Fatal_Error("No window with name %s exists!",OPTION);
-			continue;
-		}
-		if (!strcmp(OPTION, "-id")) {
-			NXTOPT;
-			w=0;
-			sscanf(OPTION, "0x%lx", &w);
-			if (!w)
-			  sscanf(OPTION, "%ld", &w);
-			if (!w)
-			  Fatal_Error("Invalid window id format: %s.", OPTION);
-			continue;
-		}
-		COPYOPT;
-	}
-	ARGC = nargc;
-	
-	return(w);
-}
-
 /*
  * Other_stuff: A group of routines which do common X11 tasks.
  *
@@ -328,84 +139,22 @@ Window Select_Window_Args(rargc, argv)
  */
 
 /*
- * Resolve_Color: This routine takes a color name and returns the pixel #
- *                that when used in the window w will be of color name.
- *                (WARNING:  The colormap of w MAY be modified! )
- *                If colors are run out of, only the first n colors will be
- *                as correct as the hardware can make them where n depends
- *                on the display.  This routine does not require wind to
- *                be defined.
- */
-unsigned long Resolve_Color(w, name)
-     Window w;
-     char *name;
-{
-	XColor c;
-	Colormap colormap;
-	XWindowAttributes wind_info;
-
-	/*
-	 * The following is a hack to insure machines without a rgb table
-	 * handle at least white & black right.
-	 */
-	if (!strcmp(name, "white"))
-	  name="#ffffffffffff";
-	if (!strcmp(name, "black"))
-	  name="#000000000000";
-
-	XGetWindowAttributes(dpy, w, &wind_info);
-	colormap = wind_info.colormap;
-
-	if (!XParseColor(dpy, colormap, name, &c))
-	  Fatal_Error("Bad color format '%s'.", name);
-
-	if (!XAllocColor(dpy, colormap, &c))
-	  Fatal_Error("XAllocColor failed!");
-
-	return(c.pixel);
-}
-
-
-/*
- * Bitmap_To_Pixmap: Convert a bitmap to a 2 colored pixmap.  The colors come
- *                   from the foreground and background colors of the gc.
- *                   Width and height are required solely for efficiency.
- *                   If needed, they can be obtained via. XGetGeometry.
- */
-Pixmap Bitmap_To_Pixmap(dpy, d, gc, bitmap, width, height)
-     Display *dpy;
-     Drawable d;
-     GC gc;
-     Pixmap bitmap;
-     int width, height;
-{
-  Pixmap pix;
-  int x;
-  unsigned int i, depth;
-  Drawable root;
-
-  if (!XGetGeometry(dpy, d, &root, &x, &x, &i, &i, &i, &depth))
-    return(0);
-
-  pix = XCreatePixmap(dpy, d, width, height, (int)depth);
-
-  XCopyPlane(dpy, bitmap, pix, gc, 0, 0, width, height, 0, 0, 1);
-
-  return(pix);
-}
-
-
-/*
- * blip: a debugging routine.  Prints Blip! on stderr with flushing. 
+ * Standard fatal error routine - call like printf but maximum of 7 arguments.
+ * Does not require dpy or screen defined.
  */
-void blip()
+void Fatal_Error(char *msg, ...)
 {
-    fflush(stdout);
-    fprintf(stderr, "blip!\n");
-    fflush(stderr);
+	va_list args;
+	fflush(stdout);
+	fflush(stderr);
+	fprintf(stderr, "%s: error: ", program_name);
+	va_start(args, msg);
+	vfprintf(stderr, msg, args);
+	va_end(args);
+	fprintf(stderr, "\n");
+	exit(1);
 }
 
-
 /*
  * Routine to let user select a window using the mouse
  */
@@ -583,39 +332,3 @@ Window Window_With_Name_Regex(dpy,top,name)
 		free(regexp_name);
 		return target_win;
 }
-
-/*
- * outl: a debugging routine.  Flushes stdout then prints a message on stderr
- *       and flushes stderr.  Used to print messages when past certain points
- *       in code so we can tell where we are.  Outl may be invoked like
- *       printf with up to 7 arguments.
- */
-void
-outl(char *msg, ...)
-{
-	va_list args;
-	fflush(stdout);
-	va_start(args, msg);
-	vfprintf(stderr, msg, args);
-	va_end(args);
-	fprintf(stderr, "\n");
-	fflush(stderr);
-}
-
-
-/*
- * Standard fatal error routine - call like printf but maximum of 7 arguments.
- * Does not require dpy or screen defined.
- */
-void Fatal_Error(char *msg, ...)
-{
-	va_list args;
-	fflush(stdout);
-	fflush(stderr);
-	fprintf(stderr, "%s: error: ", program_name);
-	va_start(args, msg);
-	vfprintf(stderr, msg, args);
-	va_end(args);
-	fprintf(stderr, "\n");
-	exit(1);
-}
diff --git a/dsimple.h b/dsimple.h
index 002dba6..1ff4573 100644
--- a/dsimple.h
+++ b/dsimple.h
@@ -40,7 +40,6 @@ from The Open Group.
  */
 
 #include <regex.h>
-    /* Global variables used by routines in just_display.c */
 
 extern char *program_name;                   /* Name of this program */
 extern Display *dpy;                         /* The current display */
@@ -49,33 +48,10 @@ extern int screen;                           /* The current screen */
 #define INIT_NAME program_name=argv[0]        /* use this in main to setup
                                                  program_name */
 
-    /* Declaritions for functions in just_display.c */
-
-#if NeedFunctionPrototypes
-char *Malloc(unsigned);
-char *Realloc(char *, int);
 char *Get_Display_Name(int *, char **);
 Display *Open_Display(char *);
 void Setup_Display_And_Screen(int *, char **);
-XFontStruct *Open_Font(char *);
-void Beep(void);
-Pixmap ReadBitmapFile(Drawable, char *, int *, int *, int *, int *);
-void WriteBitmapFile(char *, Pixmap, int, int, int, int);
-Window Select_Window_Args(int *, char **);
 void usage(void);
-#else
-char *Malloc();
-char *Realloc();
-char *Get_Display_Name();
-Display *Open_Display();
-void Setup_Display_And_Screen();
-XFontStruct *Open_Font();
-void Beep();
-Pixmap ReadBitmapFile();
-void WriteBitmapFile();
-Window Select_Window_Args();
-void usage();
-#endif
 
 #define X_USAGE "[host:display]"              /* X arguments handled by
 						 Get_Display_Name */
@@ -88,28 +64,13 @@ void usage();
  * Send bugs, etc. to chariot@athena.mit.edu.
  */
 
-#if NeedFunctionPrototypes
-unsigned long Resolve_Color(Window, char *);
-Pixmap Bitmap_To_Pixmap(Display *, Drawable, GC, Pixmap, int, int);
 Window Select_Window(Display *);
 Window Get_Window_Under_Cursor(Display *); /*added by Daniel Forchheimer for transset-df*/
-void blip(void);
 Window Window_With_Name(Display *, Window, char *);
 Window Window_With_Name_Regex(Display *, Window, char *); /*added by Daniel Forchheimer for transset-df*/
 Window Window_With_Name_Regex_Recurse(Display *, Window, regex_t *); /*added by Daniel Forchheimer for transset-df*/
-#else
-unsigned long Resolve_Color();
-Pixmap Bitmap_To_Pixmap();
-Window Select_Window();
-Window Get_Window_Under_Cursor(); /*added by Daniel Forchheimer for transset-df*/
-void blip();
-Window Window_With_Name();
-Window Window_With_Name_Regex(); /*added by Daniel Forchheimer for transset-df*/
-Window Window_With_Name_Regex_Recurse(); /*added by Daniel Forchheimer for transset-df*/
-#endif
 #ifdef __GNUC__
 void Fatal_Error(char *, ...) __attribute__((__noreturn__));
 #else
 void Fatal_Error(char *, ...);
 #endif
-void outl(char *, ...);