11 |
|
*/ |
12 |
|
|
13 |
|
#include <stdio.h> |
14 |
< |
|
14 |
> |
#include <math.h> |
15 |
|
#include <sys/ioctl.h> |
16 |
|
|
17 |
|
#include <X11/Xlib.h> |
26 |
|
#define GAMMA 2.2 /* default exponent correction */ |
27 |
|
|
28 |
|
#define MINWIDTH (32*COMCW) /* minimum graphics window width */ |
29 |
< |
#define MINHEIGHT MINWIDTH /* minimum graphics window height */ |
29 |
> |
#define MINHEIGHT (MINWIDTH/2) /* minimum graphics window height */ |
30 |
|
|
31 |
|
#define BORWIDTH 5 /* border width */ |
32 |
|
#define COMHEIGHT (COMLH*COMCH) /* command line height (pixels) */ |
44 |
|
static XEvent currentevent; /* current event */ |
45 |
|
|
46 |
|
static int ncolors = 0; /* color table size */ |
47 |
+ |
static int mapped = 0; /* window is mapped? */ |
48 |
|
static unsigned long *pixval = NULL; /* allocated pixels */ |
49 |
|
static unsigned long ourblack=0, ourwhite=1; |
50 |
|
|
78 |
|
x11_comout, x11_comin, x11_flush, 1.0 |
79 |
|
}; |
80 |
|
|
81 |
+ |
static int getpixels(), xnewcolr(), freepixels(), resizewindow(), |
82 |
+ |
getevent(), getkey(), fixwindow(), x11_getc(); |
83 |
+ |
static unsigned long true_pixel(); |
84 |
|
|
85 |
+ |
|
86 |
|
struct driver * |
87 |
|
x11_init(name, id) /* initialize driver */ |
88 |
|
char *name, *id; |
125 |
|
ourwhite = WhitePixel(ourdisplay,ourscreen); |
126 |
|
} |
127 |
|
/* set gamma */ |
128 |
< |
if ((gv = getenv("GAMMA")) != NULL) |
128 |
> |
if ((gv = XGetDefault(ourdisplay, "radiance", "gamma")) != NULL |
129 |
> |
|| (gv = getenv("GAMMA")) != NULL) |
130 |
|
make_gmap(atof(gv)); |
131 |
|
else |
132 |
|
make_gmap(GAMMA); |
166 |
|
x11_driver.xsiz = gwidth < MINWIDTH ? MINWIDTH : gwidth; |
167 |
|
x11_driver.ysiz = gheight < MINHEIGHT ? MINHEIGHT : gheight; |
168 |
|
x11_driver.inpready = 0; |
169 |
+ |
mapped = 1; |
170 |
|
cmdvec = x11_comout; /* set error vectors */ |
171 |
|
if (wrnvec != NULL) |
172 |
|
wrnvec = x11_errout; |
244 |
|
COLOR col; |
245 |
|
int xmin, ymin, xmax, ymax; |
246 |
|
{ |
240 |
– |
extern int xnewcolr(); /* pixel assignment routine */ |
241 |
– |
extern unsigned long true_pixel(); |
247 |
|
unsigned long pixel; |
248 |
|
|
249 |
+ |
if (!mapped) |
250 |
+ |
return; |
251 |
|
if (ncolors > 0) |
252 |
|
pixel = pixval[get_pixel(col, xnewcolr)]; |
246 |
– |
else if (ourvinfo.class == TrueColor || ourvinfo.class == DirectColor) |
247 |
– |
pixel = true_pixel(col); |
253 |
|
else |
254 |
< |
return; |
254 |
> |
pixel = true_pixel(col); |
255 |
|
XSetForeground(ourdisplay, ourgc, pixel); |
256 |
|
XFillRectangle(ourdisplay, gwind, |
257 |
|
ourgc, xmin, gheight-ymax, xmax-xmin, ymax-ymin); |
271 |
|
x11_comin(inp, prompt) /* read in a command line */ |
272 |
|
char *inp, *prompt; |
273 |
|
{ |
269 |
– |
extern int x11_getc(); |
270 |
– |
|
274 |
|
if (prompt != NULL) |
275 |
|
if (fromcombuf(inp, &x11_driver)) |
276 |
|
return; |
322 |
|
if (c_last > c_first) /* key pressed */ |
323 |
|
return(x11_getc()); |
324 |
|
/* button pressed */ |
325 |
< |
if (levptr(XButtonPressedEvent)->button & Button1) |
325 |
> |
if (levptr(XButtonPressedEvent)->button == Button1) |
326 |
|
return(MB1); |
327 |
< |
if (levptr(XButtonPressedEvent)->button & Button2) |
327 |
> |
if (levptr(XButtonPressedEvent)->button == Button2) |
328 |
|
return(MB2); |
329 |
< |
if (levptr(XButtonPressedEvent)->button & Button3) |
329 |
> |
if (levptr(XButtonPressedEvent)->button == Button3) |
330 |
|
return(MB3); |
328 |
– |
if (levptr(XButtonPressedEvent)->button & (Button4|Button5)) |
329 |
– |
return(MB1); |
331 |
|
return(ABORT); |
332 |
|
} |
333 |
|
|
370 |
|
pixval = (unsigned long *)malloc(ncolors*sizeof(unsigned long)); |
371 |
|
if (pixval == NULL) |
372 |
|
return(ncolors = 0); |
373 |
< |
if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0, |
373 |
< |
pixval,ncolors) != 0) |
373 |
> |
if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,pixval,ncolors)) |
374 |
|
break; |
375 |
|
free((char *)pixval); |
376 |
|
pixval = NULL; |
452 |
|
resizewindow(levptr(XConfigureEvent)); |
453 |
|
break; |
454 |
|
case UnmapNotify: |
455 |
+ |
mapped = 0; |
456 |
|
freepixels(); |
457 |
|
break; |
458 |
|
case MapNotify: |
462 |
|
stderr_v("Cannot allocate colors\n"); |
463 |
|
else |
464 |
|
new_ctab(ncolors); |
465 |
+ |
mapped = 1; |
466 |
|
break; |
467 |
|
case Expose: |
468 |
|
fixwindow(levptr(XExposeEvent)); |