67 |
|
|
68 |
|
static Colormap ourmap = 0; /* our color map */ |
69 |
|
|
70 |
< |
extern char *malloc(); |
70 |
> |
extern char *malloc(), *getcombuf(); |
71 |
|
|
72 |
< |
int x11_close(), x11_clear(), x11_paintr(), x11_errout(), |
72 |
> |
static int x11_close(), x11_clear(), x11_paintr(), x11_errout(), |
73 |
|
x11_getcur(), x11_comout(), x11_comin(), x11_flush(); |
74 |
|
|
75 |
|
static struct driver x11_driver = { |
100 |
|
} else if (nplanes <= 12) { |
101 |
|
if (!XMatchVisualInfo(ourdisplay,ourscreen, |
102 |
|
nplanes,PseudoColor,&ourvinfo)) { |
103 |
< |
stderr_v("PseudoColor not supported\n"); |
103 |
> |
stderr_v("PseudoColor server required\n"); |
104 |
|
return(NULL); |
105 |
|
} |
106 |
|
} else if (!XMatchVisualInfo(ourdisplay,ourscreen, |
107 |
< |
nplanes,TrueColor,&ourvinfo)) { |
108 |
< |
stderr_v("TrueColor not supported\n"); |
107 |
> |
nplanes,TrueColor,&ourvinfo) && |
108 |
> |
/* kludge for DirectColor */ |
109 |
> |
!XMatchVisualInfo(ourdisplay,ourscreen, |
110 |
> |
nplanes,DirectColor,&ourvinfo)) { |
111 |
> |
stderr_v("TrueColor server required\n"); |
112 |
|
return(NULL); |
113 |
|
} |
114 |
|
ourvisual = ourvinfo.visual; |
228 |
|
|
229 |
|
if (ncolors > 0) |
230 |
|
pixel = pixval[get_pixel(col, xnewcolr)]; |
231 |
< |
else if (ourvisual->class == TrueColor) |
231 |
> |
else if (ourvisual->class != PseudoColor) |
232 |
|
pixel = true_pixel(col); |
233 |
|
else |
234 |
|
return; |
251 |
|
x11_comin(inp, prompt) /* read in a command line */ |
252 |
|
char *inp, *prompt; |
253 |
|
{ |
254 |
< |
int x11_getc(), x11_comout(); |
254 |
> |
extern int x11_getc(); |
255 |
|
|
256 |
|
if (prompt != NULL) |
257 |
|
if (fromcombuf(inp, &x11_driver)) |