78 |
|
x11_comout, x11_comin, x11_flush, 1.0 |
79 |
|
}; |
80 |
|
|
81 |
< |
static int getpixels(), xnewcolr(), freepixels(), |
82 |
< |
getevent(), getkey(), fixwindow(); |
81 |
> |
static int getpixels(), xnewcolr(), freepixels(), resizewindow(), |
82 |
> |
getevent(), getkey(), fixwindow(), x11_getc(); |
83 |
|
static unsigned long true_pixel(); |
84 |
|
|
85 |
|
|
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); |
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 |
< |
|
275 |
< |
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); |