--- ray/src/rt/x11.c 1995/09/29 20:20:37 2.25 +++ ray/src/rt/x11.c 2003/07/21 22:30:19 2.31 @@ -1,19 +1,14 @@ -/* Copyright (c) 1995 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: x11.c,v 2.31 2003/07/21 22:30:19 schorsch Exp $"; #endif - /* * x11.c - driver for X-windows version 11 - * - * Jan 1990 */ -#include -#include +#include "copyright.h" + +#include "standard.h" #include -#include #ifdef sparc #include #include @@ -84,20 +79,21 @@ static Colormap ourmap = 0; /* our color map */ static int inpcheck; /* whence to check input */ -extern char *malloc(); +static int x11_getcur(); -static int x11_close(), x11_clear(), x11_paintr(), x11_errout(), - x11_getcur(), x11_comout(), x11_comin(), x11_flush(); +static void x11_close(), x11_clear(), x11_paintr(), x11_errout(), + x11_comout(), x11_comin(), x11_flush(); -static int std_comin(), std_comout(); +static void std_comin(), std_comout(); static struct driver x11_driver = { x11_close, x11_clear, x11_paintr, x11_getcur, NULL, NULL, x11_flush, 1.0 }; -static int getpixels(), xnewcolr(), freepixels(), resizewindow(), - getevent(), getkey(), fixwindow(), x11_getc(); +static int getpixels(), x11_getc(); +static void xnewcolr(), freepixels(), resizewindow(), + getevent(), getkey(), fixwindow(); static unsigned long true_pixel(); @@ -105,7 +101,6 @@ struct driver * x11_init(name, id) /* initialize driver */ char *name, *id; { - extern char *getenv(); char *gv; int nplanes; XSetWindowAttributes ourwinattr; @@ -114,29 +109,29 @@ char *name, *id; /* open display server */ ourdisplay = XOpenDisplay(NULL); if (ourdisplay == NULL) { - stderr_v("cannot open X-windows; DISPLAY variable set?\n"); + eputs("cannot open X-windows; DISPLAY variable set?\n"); return(NULL); } /* find a usable visual */ nplanes = DisplayPlanes(ourdisplay, ourscreen); if (XMatchVisualInfo(ourdisplay,ourscreen, - 24,TrueColor,&ourvinfo) || + nplanes>12?nplanes:24,TrueColor,&ourvinfo) || XMatchVisualInfo(ourdisplay,ourscreen, - 24,DirectColor,&ourvinfo)) { + nplanes>12?nplanes:24,DirectColor,&ourvinfo)) { ourblack = 0; ourwhite = ourvinfo.red_mask | ourvinfo.green_mask | ourvinfo.blue_mask ; } else { if (nplanes < 4) { - stderr_v("not enough colors\n"); + eputs("not enough colors\n"); return(NULL); } if (!XMatchVisualInfo(ourdisplay,ourscreen, nplanes,PseudoColor,&ourvinfo) && !XMatchVisualInfo(ourdisplay,ourscreen, nplanes,GrayScale,&ourvinfo)) { - stderr_v("unsupported visual type\n"); + eputs("unsupported visual type\n"); return(NULL); } ourblack = BlackPixel(ourdisplay,ourscreen); @@ -154,7 +149,7 @@ char *name, *id; else /* "x11d" */ { comheight = 0; #ifndef FNDELAY - stderr_v("warning: x11d driver not fully functional on this machine\n"); + eputs("warning: x11d driver not fully functional on this machine\n"); #endif } /* open window */ @@ -169,7 +164,7 @@ char *name, *id; BORWIDTH, ourvinfo.depth, InputOutput, ourvinfo.visual, CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr); if (gwind == 0) { - stderr_v("cannot create window\n"); + eputs("cannot create window\n"); return(NULL); } XStoreName(ourdisplay, gwind, id); @@ -198,26 +193,26 @@ char *name, *id; if (comheight) { x11_driver.comin = x11_comin; x11_driver.comout = x11_comout; - cmdvec = x11_comout; - if (wrnvec != NULL) - wrnvec = x11_errout; + erract[COMMAND].pf = x11_comout; + if (erract[WARNING].pf != NULL) + erract[WARNING].pf = x11_errout; inpcheck = IC_X11; } else { x11_driver.comin = std_comin; x11_driver.comout = std_comout; - cmdvec = std_comout; + erract[COMMAND].pf = std_comout; inpcheck = IC_IOCTL; } return(&x11_driver); } -static +static void x11_close() /* close our display */ { - cmdvec = NULL; /* reset error vectors */ - if (wrnvec != NULL) - wrnvec = stderr_v; + erract[COMMAND].pf = NULL; /* reset error vectors */ + if (erract[WARNING].pf != NULL) + erract[WARNING].pf = wputs; if (ourdisplay == NULL) return; if (comline != NULL) { @@ -235,7 +230,7 @@ x11_close() /* close our display */ } -static +static void x11_clear(xres, yres) /* clear our display */ int xres, yres; { @@ -256,11 +251,12 @@ int xres, yres; } XClearWindow(ourdisplay, gwind); /* reinitialize color table */ - if (ourvinfo.class == PseudoColor || ourvinfo.class == GrayScale) + if (ourvinfo.class == PseudoColor || ourvinfo.class == GrayScale) { if (getpixels() == 0) - stderr_v("cannot allocate colors\n"); + eputs("cannot allocate colors\n"); else new_ctab(ncolors); + } /* get new command line */ if (comline != NULL) xt_close(comline); @@ -268,7 +264,7 @@ int xres, yres; comline = xt_open(ourdisplay, gwind, 0, gheight, gwidth, comheight, 0, ourblack, ourwhite, COMFN); if (comline == NULL) { - stderr_v("cannot open command line window\n"); + eputs("cannot open command line window\n"); quit(1); } XSelectInput(ourdisplay, comline->w, ExposureMask); @@ -281,7 +277,7 @@ int xres, yres; } -static +static void x11_paintr(col, xmin, ymin, xmax, ymax) /* fill a rectangle */ COLOR col; int xmin, ymin, xmax, ymax; @@ -300,7 +296,7 @@ int xmin, ymin, xmax, ymax; } -static +static void x11_flush() /* flush output */ { char buf[256]; @@ -318,7 +314,7 @@ x11_flush() /* flush output */ if (1) { #endif if (fcntl(fileno(stdin), F_SETFL, FNDELAY) < 0) { - stderr_v("cannot change input mode\n"); + eputs("cannot change input mode\n"); quit(1); } inpcheck = IC_READ; @@ -336,7 +332,7 @@ x11_flush() /* flush output */ } -static +static void x11_comin(inp, prompt) /* read in a command line */ char *inp, *prompt; { @@ -352,11 +348,11 @@ char *inp, *prompt; } -static +static void x11_comout(outp) /* output a string to command line */ char *outp; { - if (comline == NULL) + if (comline == NULL || outp == NULL || !outp[0]) return; xt_puts(outp, comline); if (outp[strlen(outp)-1] == '\n') @@ -364,21 +360,19 @@ char *outp; } -static +static void x11_errout(msg) /* output an error message */ char *msg; { - stderr_v(msg); /* send to stderr also! */ + eputs(msg); /* send to stderr also! */ x11_comout(msg); } -static +static void std_comin(inp, prompt) /* read in command line from stdin */ char *inp, *prompt; { - extern char *gets(); - if (prompt != NULL) { if (fromcombuf(inp, &x11_driver)) return; @@ -388,7 +382,7 @@ char *inp, *prompt; #ifdef FNDELAY if (inpcheck == IC_READ) { /* turn off FNDELAY */ if (fcntl(fileno(stdin), F_SETFL, 0) < 0) { - stderr_v("cannot change input mode\n"); + eputs("cannot change input mode\n"); quit(1); } inpcheck = IC_IOCTL; @@ -404,7 +398,7 @@ char *inp, *prompt; } -static +static void std_comout(outp) /* write out string to stdout */ char *outp; { @@ -442,7 +436,7 @@ int *xp, *yp; } -static +static void xnewcolr(ndx, r, g, b) /* enter a color into hardware table */ int ndx; int r, g, b; @@ -482,7 +476,7 @@ loop: return(ncolors = 0); if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,pixval,ncolors)) break; - free((char *)pixval); + free((void *)pixval); pixval = NULL; } if (pixval == NULL) { @@ -511,13 +505,13 @@ loop: } -static +static void freepixels() /* free our pixels */ { if (ncolors == 0) return; XFreeColors(ourdisplay,ourmap,pixval,ncolors,0L); - free((char *)pixval); + free((void *)pixval); pixval = NULL; ncolors = 0; if (ourmap != DefaultColormap(ourdisplay,ourscreen)) @@ -553,7 +547,7 @@ x11_getc() /* get a command character */ } -static +static void getevent() /* get next event */ { XNextEvent(ourdisplay, levptr(XEvent)); @@ -567,11 +561,12 @@ getevent() /* get next event */ break; case MapNotify: if (ourvinfo.class == PseudoColor || - ourvinfo.class == GrayScale) + ourvinfo.class == GrayScale) { if (getpixels() == 0) - stderr_v("cannot allocate colors\n"); + eputs("cannot allocate colors\n"); else new_ctab(ncolors); + } mapped = 1; break; case Expose: @@ -586,7 +581,7 @@ getevent() /* get next event */ } -static +static void getkey(ekey) /* get input key */ register XKeyPressedEvent *ekey; { @@ -599,7 +594,7 @@ register XKeyPressedEvent *ekey; } -static +static void fixwindow(eexp) /* repair damage to window */ register XExposeEvent *eexp; { @@ -617,7 +612,7 @@ register XExposeEvent *eexp; } -static +static void resizewindow(ersz) /* resize window */ register XConfigureEvent *ersz; {