11 |
|
*/ |
12 |
|
|
13 |
|
#include <stdio.h> |
14 |
< |
|
14 |
> |
#include <math.h> |
15 |
|
#include <sys/ioctl.h> |
16 |
|
|
17 |
|
#include <X11/Xlib.h> |
23 |
|
#include "x11twind.h" |
24 |
|
#include "x11icon.h" |
25 |
|
|
26 |
< |
#define GAMMA 2.2 /* exponent for color correction */ |
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; |
89 |
|
{ |
90 |
+ |
extern char *getenv(); |
91 |
+ |
char *gv; |
92 |
|
int nplanes; |
93 |
|
XSetWindowAttributes ourwinattr; |
94 |
|
XWMHints ourxwmhints; |
124 |
|
ourblack = BlackPixel(ourdisplay,ourscreen); |
125 |
|
ourwhite = WhitePixel(ourdisplay,ourscreen); |
126 |
|
} |
127 |
< |
make_gmap(GAMMA); |
128 |
< |
/* open window */ |
127 |
> |
/* set gamma */ |
128 |
> |
if ((gv = XGetDefault(ourdisplay, "radiance", "gamma")) != NULL |
129 |
> |
|| (gv = getenv("GAMMA")) != NULL) |
130 |
> |
make_gmap(atof(gv)); |
131 |
> |
else |
132 |
> |
make_gmap(GAMMA); |
133 |
> |
/* open window */ |
134 |
|
ourwinattr.background_pixel = ourblack; |
135 |
|
ourwinattr.border_pixel = ourblack; |
136 |
|
/* this is stupid */ |
145 |
|
stderr_v("cannot create window\n"); |
146 |
|
return(NULL); |
147 |
|
} |
136 |
– |
XFreeColormap(ourdisplay, ourwinattr.colormap); |
148 |
|
XStoreName(ourdisplay, gwind, id); |
149 |
|
/* create a cursor */ |
150 |
|
pickcursor = XCreateFontCursor(ourdisplay, XC_diamond_cross); |
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 |
|
{ |
235 |
– |
extern int xnewcolr(); /* pixel assignment routine */ |
236 |
– |
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)]; |
241 |
– |
else if (ourvinfo.class == TrueColor || ourvinfo.class == DirectColor) |
242 |
– |
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); |
261 |
|
static |
262 |
|
x11_flush() /* flush output */ |
263 |
|
{ |
264 |
+ |
int n; |
265 |
+ |
register char *buf; |
266 |
+ |
|
267 |
|
XNoOp(ourdisplay); |
268 |
|
while (XPending(ourdisplay) > 0) |
269 |
|
getevent(); |
270 |
+ |
#ifdef FIONREAD |
271 |
+ |
if (ioctl(0, FIONREAD, &n) == 0 && n) { /* from stdin */ |
272 |
+ |
buf = getcombuf(&x11_driver); |
273 |
+ |
n = read(0, buf, n); |
274 |
+ |
buf[n] = '\0'; |
275 |
+ |
} |
276 |
+ |
#endif |
277 |
|
} |
278 |
|
|
279 |
|
|
281 |
|
x11_comin(inp, prompt) /* read in a command line */ |
282 |
|
char *inp, *prompt; |
283 |
|
{ |
284 |
< |
extern int x11_getc(); |
285 |
< |
|
266 |
< |
if (prompt != NULL) |
284 |
> |
if (prompt != NULL) { |
285 |
> |
x11_flush(); /* make sure we get everything */ |
286 |
|
if (fromcombuf(inp, &x11_driver)) |
287 |
|
return; |
288 |
< |
else |
289 |
< |
xt_puts(prompt, comline); |
288 |
> |
xt_puts(prompt, comline); |
289 |
> |
} |
290 |
|
xt_cursor(comline, TBLKCURS); |
291 |
|
editline(inp, x11_getc, x11_comout); |
292 |
|
xt_cursor(comline, TNOCURS); |
333 |
|
if (c_last > c_first) /* key pressed */ |
334 |
|
return(x11_getc()); |
335 |
|
/* button pressed */ |
336 |
< |
if (levptr(XButtonPressedEvent)->button & Button1) |
336 |
> |
if (levptr(XButtonPressedEvent)->button == Button1) |
337 |
|
return(MB1); |
338 |
< |
if (levptr(XButtonPressedEvent)->button & Button2) |
338 |
> |
if (levptr(XButtonPressedEvent)->button == Button2) |
339 |
|
return(MB2); |
340 |
< |
if (levptr(XButtonPressedEvent)->button & Button3) |
340 |
> |
if (levptr(XButtonPressedEvent)->button == Button3) |
341 |
|
return(MB3); |
323 |
– |
if (levptr(XButtonPressedEvent)->button & (Button4|Button5)) |
324 |
– |
return(MB1); |
342 |
|
return(ABORT); |
343 |
|
} |
344 |
|
|
381 |
|
pixval = (unsigned long *)malloc(ncolors*sizeof(unsigned long)); |
382 |
|
if (pixval == NULL) |
383 |
|
return(ncolors = 0); |
384 |
< |
if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0, |
368 |
< |
pixval,ncolors) != 0) |
384 |
> |
if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,pixval,ncolors)) |
385 |
|
break; |
386 |
|
free((char *)pixval); |
387 |
|
pixval = NULL; |
418 |
|
if (ncolors == 0) |
419 |
|
return; |
420 |
|
XFreeColors(ourdisplay,ourmap,pixval,ncolors,0L); |
421 |
+ |
free((char *)pixval); |
422 |
+ |
pixval = NULL; |
423 |
|
ncolors = 0; |
424 |
|
if (ourmap != DefaultColormap(ourdisplay,ourscreen)) |
425 |
|
XFreeColormap(ourdisplay, ourmap); |
463 |
|
resizewindow(levptr(XConfigureEvent)); |
464 |
|
break; |
465 |
|
case UnmapNotify: |
466 |
+ |
mapped = 0; |
467 |
|
freepixels(); |
468 |
|
break; |
469 |
|
case MapNotify: |
473 |
|
stderr_v("Cannot allocate colors\n"); |
474 |
|
else |
475 |
|
new_ctab(ncolors); |
476 |
+ |
mapped = 1; |
477 |
|
break; |
478 |
|
case Expose: |
479 |
|
fixwindow(levptr(XExposeEvent)); |