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 |
|
|
83 |
|
x11_init(name, id) /* initialize driver */ |
84 |
|
char *name, *id; |
85 |
|
{ |
86 |
+ |
extern char *getenv(); |
87 |
+ |
char *gv; |
88 |
|
int nplanes; |
89 |
|
XSetWindowAttributes ourwinattr; |
90 |
|
XWMHints ourxwmhints; |
120 |
|
ourblack = BlackPixel(ourdisplay,ourscreen); |
121 |
|
ourwhite = WhitePixel(ourdisplay,ourscreen); |
122 |
|
} |
123 |
< |
make_gmap(GAMMA); |
124 |
< |
/* open window */ |
123 |
> |
/* set gamma */ |
124 |
> |
if ((gv = getenv("GAMMA")) != NULL) |
125 |
> |
make_gmap(atof(gv)); |
126 |
> |
else |
127 |
> |
make_gmap(GAMMA); |
128 |
> |
/* open window */ |
129 |
|
ourwinattr.background_pixel = ourblack; |
130 |
|
ourwinattr.border_pixel = ourblack; |
131 |
|
/* this is stupid */ |
140 |
|
stderr_v("cannot create window\n"); |
141 |
|
return(NULL); |
142 |
|
} |
136 |
– |
XFreeColormap(ourdisplay, ourwinattr.colormap); |
143 |
|
XStoreName(ourdisplay, gwind, id); |
144 |
|
/* create a cursor */ |
145 |
|
pickcursor = XCreateFontCursor(ourdisplay, XC_diamond_cross); |
161 |
|
x11_driver.xsiz = gwidth < MINWIDTH ? MINWIDTH : gwidth; |
162 |
|
x11_driver.ysiz = gheight < MINHEIGHT ? MINHEIGHT : gheight; |
163 |
|
x11_driver.inpready = 0; |
164 |
+ |
mapped = 1; |
165 |
|
cmdvec = x11_comout; /* set error vectors */ |
166 |
|
if (wrnvec != NULL) |
167 |
|
wrnvec = x11_errout; |
243 |
|
extern unsigned long true_pixel(); |
244 |
|
unsigned long pixel; |
245 |
|
|
246 |
+ |
if (!mapped) |
247 |
+ |
return; |
248 |
|
if (ncolors > 0) |
249 |
|
pixel = pixval[get_pixel(col, xnewcolr)]; |
241 |
– |
else if (ourvinfo.class == TrueColor || ourvinfo.class == DirectColor) |
242 |
– |
pixel = true_pixel(col); |
250 |
|
else |
251 |
< |
return; |
251 |
> |
pixel = true_pixel(col); |
252 |
|
XSetForeground(ourdisplay, ourgc, pixel); |
253 |
|
XFillRectangle(ourdisplay, gwind, |
254 |
|
ourgc, xmin, gheight-ymax, xmax-xmin, ymax-ymin); |
321 |
|
if (c_last > c_first) /* key pressed */ |
322 |
|
return(x11_getc()); |
323 |
|
/* button pressed */ |
324 |
< |
if (levptr(XButtonPressedEvent)->button & Button1) |
324 |
> |
if (levptr(XButtonPressedEvent)->button == Button1) |
325 |
|
return(MB1); |
326 |
< |
if (levptr(XButtonPressedEvent)->button & Button2) |
326 |
> |
if (levptr(XButtonPressedEvent)->button == Button2) |
327 |
|
return(MB2); |
328 |
< |
if (levptr(XButtonPressedEvent)->button & Button3) |
328 |
> |
if (levptr(XButtonPressedEvent)->button == Button3) |
329 |
|
return(MB3); |
323 |
– |
if (levptr(XButtonPressedEvent)->button & (Button4|Button5)) |
324 |
– |
return(MB1); |
330 |
|
return(ABORT); |
331 |
|
} |
332 |
|
|
369 |
|
pixval = (unsigned long *)malloc(ncolors*sizeof(unsigned long)); |
370 |
|
if (pixval == NULL) |
371 |
|
return(ncolors = 0); |
372 |
< |
if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0, |
368 |
< |
pixval,ncolors) != 0) |
372 |
> |
if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,pixval,ncolors)) |
373 |
|
break; |
374 |
|
free((char *)pixval); |
375 |
|
pixval = NULL; |
406 |
|
if (ncolors == 0) |
407 |
|
return; |
408 |
|
XFreeColors(ourdisplay,ourmap,pixval,ncolors,0L); |
409 |
+ |
free((char *)pixval); |
410 |
+ |
pixval = NULL; |
411 |
|
ncolors = 0; |
412 |
|
if (ourmap != DefaultColormap(ourdisplay,ourscreen)) |
413 |
|
XFreeColormap(ourdisplay, ourmap); |
451 |
|
resizewindow(levptr(XConfigureEvent)); |
452 |
|
break; |
453 |
|
case UnmapNotify: |
454 |
+ |
mapped = 0; |
455 |
|
freepixels(); |
456 |
|
break; |
457 |
|
case MapNotify: |
461 |
|
stderr_v("Cannot allocate colors\n"); |
462 |
|
else |
463 |
|
new_ctab(ncolors); |
464 |
+ |
mapped = 1; |
465 |
|
break; |
466 |
|
case Expose: |
467 |
|
fixwindow(levptr(XExposeEvent)); |