commit a2b14de8f7c952386a04042b1ef26c9330589c35
parent 3cb3f72a5c629284bbde8ecc1ac68419941866fe
Author: Kyle Milz <krwmilz@gmail.com>
Date: Sat, 21 Aug 2021 04:23:19 +0000
Unconditionally enable COLOR
Diffstat:
| M | dvi-draw.c | | | 15 | --------------- |
| M | dvi-init.c | | | 6 | ------ |
| M | events.c | | | 234 | ------------------------------------------------------------------------------- |
| M | special.c | | | 24 | ------------------------ |
| M | xdvi.c | | | 50 | -------------------------------------------------- |
| M | xdvi.h | | | 22 | ---------------------- |
6 files changed, 0 insertions(+), 351 deletions(-)
diff --git a/dvi-draw.c b/dvi-draw.c
@@ -45,7 +45,6 @@ static struct frame *scan_frame; /* head frame for scanning */
#endif
#define DVI_BUFFER_LEN 512
-
static ubyte dvi_buffer[DVI_BUFFER_LEN];
static struct frame *current_frame;
@@ -127,9 +126,7 @@ put_rule(x, y, w, h)
if (--event_counter == 0)
if (read_events(EV_NOWAIT) & EV_GE_MAG_GONE)
longjmp(canit_env, 1);
-#if COLOR
if (fg_active != fg_current) do_color_change();
-#endif
XFillRectangle(DISP, currwin.win, ruleGC,
x - currwin.base_x, y - currwin.base_y, w ? w : 1, h ? h : 1);
}
@@ -148,9 +145,7 @@ put_bitmap(bitmap, x, y)
if (--event_counter == 0)
if (read_events(EV_NOWAIT) & EV_GE_MAG_GONE)
longjmp(canit_env, 1);
-#if COLOR
if (fg_active != fg_current) do_color_change();
-#endif
image->width = bitmap->w;
image->height = bitmap->h;
image->data = bitmap->bits;
@@ -185,12 +180,10 @@ put_image(g, x, y)
if (read_events(EV_NOWAIT) & EV_GE_MAG_GONE)
longjmp(canit_env, 1);
-#if COLOR
if (g->fg != fg_current) /* if color change since last use */
shrink_glyph_grey(g);
else if (fg_active != fg_current) /* if GCs need updating */
do_color_change();
-#endif
XPutImage(DISP, currwin.win, foreGC, img,
0, 0,
x - currwin.base_x, y - currwin.base_y,
@@ -514,9 +507,7 @@ shrink_glyph_grey(g)
unsigned int size;
int rtmp;
-#if COLOR
if (fg_active != fg_current) do_color_change();
-#endif
/* These machinations ensure that the character is shrunk according to
its hot point, rather than its upper left-hand corner. */
@@ -590,9 +581,7 @@ shrink_glyph_grey(g)
}
g->y2 = g->y / shrink_factor;
-#if COLOR
g->fg = fg_current;
-#endif
}
#endif /* GREY */
@@ -847,12 +836,10 @@ prescan()
spcl_scan(scan_special);
++scanned_page;
-#if COLOR
if (scanned_page_color < scanned_page) {
scan_color_eop();
scanned_page_color = scanned_page;
}
-#endif
if (scanned_page >= current_page) break;
}
@@ -1465,7 +1452,6 @@ draw_page()
/* Check for changes in dvi file. */
if (!check_dvi_file()) return;
-#if COLOR
color_bottom = &fg_initial;
color_bot_size = 1;
if (page_colors != NULL && current_page > 0) {
@@ -1474,7 +1460,6 @@ draw_page()
}
rcs_top = NULL;
set_fg_color(&color_bottom[color_bot_size - 1]);
-#endif
/* draw border */
XDrawRectangle(DISP, currwin.win, highGC,
diff --git a/dvi-init.c b/dvi-init.c
@@ -115,15 +115,12 @@ reset_fonts()
g->pixmap2_t = NULL;
}
}
-#if COLOR
g->fg = NULL;
-#endif
#endif /* GREY */
}
}
-#if COLOR
/*
* Release all allocated pixels, and (in greyscale mode) invalidate
@@ -190,7 +187,6 @@ full_reset_colors()
reset_colors();
}
-#endif /* COLOR */
/*
@@ -956,9 +952,7 @@ reload_dvi_file()
if (page_info != NULL) {
free((char *) (page_info - 1));
page_info = NULL;
-#if COLOR
full_reset_colors();
-#endif /* COLOR */
}
if (dvi_popup != NULL) {
int i;
diff --git a/events.c b/events.c
@@ -93,9 +93,7 @@ static void xdvi_normal_exit();
# define CURSORWIN XtWindow(form_widget)
-#if COLOR
static XColor bg_Color;
-#endif
#define ACTION_DECL(name) \
@@ -139,9 +137,7 @@ static ACTION_DECL(Act_set_density);
#if GREY
static ACTION_DECL(Act_set_greyscaling);
#endif
-#if COLOR
static ACTION_DECL(Act_set_color);
-#endif
#if BUTTONS
static ACTION_DECL(Act_set_expert_mode);
#endif
@@ -187,9 +183,7 @@ XtActionsRec Actions[] = {
#if GREY
{"set-greyscaling", Act_set_greyscaling},
#endif
-#if COLOR
{"set-color", Act_set_color},
-#endif
#if BUTTONS
{"set-expert-mode", Act_set_expert_mode},
#endif
@@ -668,7 +662,6 @@ in the xdvi manual page for more details.");
#endif /* GREY */
-#if COLOR
/*
* Warn about overstrike characters.
@@ -1070,202 +1063,6 @@ do_color_change()
#undef SetGC
-#elif GREY /* endif COLOR */
-
-#define MakeGC(fcn, fg, bg) (values.function = fcn, \
- values.foreground=fg, values.background=bg, \
- XCreateGC(DISP, XtWindow(top_level), \
- GCFunction | GCForeground | GCBackground, &values))
-
-void
-init_pix()
-{
- static int shrink_allocated_for = 0;
- static float oldgamma = 0.0;
- static Pixel palette[17];
- XGCValues values;
- int i;
-
- if (our_visual->class == TrueColor) {
- /* This mirrors the non-grey code in xdvi.c */
- static int shift1_r, shift1_g, shift1_b;
- static int shift2_r, shift2_g, shift2_b;
- static Pixel set_bits;
- static Pixel clr_bits;
- unsigned int sf_squared;
-
- if (oldgamma == 0.0) {
- mask_shifts(our_visual->red_mask, &shift1_r, &shift2_r);
- mask_shifts(our_visual->green_mask, &shift1_g, &shift2_g);
- mask_shifts(our_visual->blue_mask, &shift1_b, &shift2_b);
-
- set_bits = fore_color_data.pixel & ~back_color_data.pixel;
- clr_bits = back_color_data.pixel & ~fore_color_data.pixel;
-
- if (set_bits & our_visual->red_mask)
- set_bits |= our_visual->red_mask;
- if (clr_bits & our_visual->red_mask)
- clr_bits |= our_visual->red_mask;
- if (set_bits & our_visual->green_mask)
- set_bits |= our_visual->green_mask;
- if (clr_bits & our_visual->green_mask)
- clr_bits |= our_visual->green_mask;
- if (set_bits & our_visual->blue_mask)
- set_bits |= our_visual->blue_mask;
- if (clr_bits & our_visual->blue_mask)
- clr_bits |= our_visual->blue_mask;
-
- /*
- * Make the GCs
- */
-
- foreGC = foreGC2 = ruleGC = 0;
- copyGC = MakeGC(GXcopy, fore_Pixel, back_Pixel);
- if (copy || (set_bits && clr_bits)) {
- ruleGC = copyGC;
- if (!resource.thorough) copy = True;
- }
- if (copy) {
- foreGC = ruleGC;
- if (!resource.copy)
- WARN(XmDIALOG_WARNING,
- "Overstrike characters may be incorrect");
- }
- else {
- if (set_bits)
- foreGC = MakeGC(GXor,
- set_bits & fore_color_data.pixel, 0);
- if (clr_bits || !set_bits)
- *(foreGC ? &foreGC2 : &foreGC) = MakeGC(GXandInverted,
- clr_bits & ~fore_color_data.pixel, 0);
- if (!ruleGC) ruleGC = foreGC;
- }
-
- oldgamma = gamma;
- }
-
- if (mane.shrinkfactor == 1) return;
- sf_squared = mane.shrinkfactor * mane.shrinkfactor;
-
- if (shrink_allocated_for < mane.shrinkfactor) {
- if (pixeltbl != NULL) {
- free((char *) pixeltbl);
- if (pixeltbl_t != NULL)
- free((char *) pixeltbl_t);
- }
- pixeltbl = xmalloc((sf_squared + 1) * sizeof(Pixel));
- if (foreGC2 != NULL)
- pixeltbl_t = xmalloc((sf_squared + 1) * sizeof(Pixel));
- shrink_allocated_for = mane.shrinkfactor;
- }
-
- /*
- * Compute pixel values directly.
- */
-
-#define SHIFTIFY(x, shift1, shift2) ((((Pixel)(x)) >> (shift1)) << (shift2))
-
- for (i = 0; i <= sf_squared; ++i) {
- double frac = gamma > 0
- ? pow((double) i / sf_squared, 1 / gamma)
- : 1 - pow((double) (sf_squared - i) / sf_squared, -gamma);
- unsigned int red, green, blue;
- Pixel pixel;
-
- red = frac
- * ((double) fore_color_data.red - back_color_data.red)
- + back_color_data.red;
- green = frac
- * ((double) fore_color_data.green - back_color_data.green)
- + back_color_data.green;
- blue = frac
- * ((double) fore_color_data.blue - back_color_data.blue)
- + back_color_data.blue;
-
- pixel = SHIFTIFY(red, shift1_r, shift2_r) |
- SHIFTIFY(green, shift1_g, shift2_g) |
- SHIFTIFY(blue, shift1_b, shift2_b);
-
- if (copy) pixeltbl[i] = pixel;
- else if (foreGC2 != NULL) { /* if thorough */
- pixeltbl[i] = pixel & ~back_color_data.pixel;
- pixeltbl_t[i] = ~pixel & back_color_data.pixel;
- }
- else
- pixeltbl[i] = set_bits ? pixel & set_bits
- : ~pixel & clr_bits;
- }
-
-#undef SHIFTIFY
-
- return;
- }
-
- /* if not TrueColor ... */
-
- if (gamma != oldgamma) {
- XColor color;
-
- for (i = 0; i < 16; ++i) {
- double frac = gamma > 0 ? pow((double) i / 15, 1 / gamma)
- : 1 - pow((double) (15 - i) / 15, -gamma);
-
- color.red = frac
- * ((double) fore_color_data.red - back_color_data.red)
- + back_color_data.red;
- color.green = frac
- * ((double) fore_color_data.green - back_color_data.green)
- + back_color_data.green;
- color.blue = frac
- * ((double) fore_color_data.blue - back_color_data.blue)
- + back_color_data.blue;
-
- color.pixel = back_Pixel;
- color.flags = DoRed | DoGreen | DoBlue;
-
- if (!copy) {
- if (i & 1) color.pixel |= plane_masks[0];
- if (i & 2) color.pixel |= plane_masks[1];
- if (i & 4) color.pixel |= plane_masks[2];
- if (i & 8) color.pixel |= plane_masks[3];
- XStoreColor(DISP, our_colormap, &color);
- palette[i] = color.pixel;
- }
- else {
- if (XAllocColor(DISP, our_colormap, &color))
- palette[i] = color.pixel;
- else
- palette[i] = (i * 100 >= density * 15)
- ? fore_Pixel : back_Pixel;
- }
- }
-
- copyGC = MakeGC(GXcopy, fore_Pixel, back_Pixel);
- foreGC = ruleGC = copy ? copyGC
- : MakeGC(GXor, fore_Pixel, back_Pixel);
- foreGC2 = NULL;
-
- oldgamma = gamma;
- }
-
- if (mane.shrinkfactor == 1) return;
-
- if (shrink_allocated_for < mane.shrinkfactor) {
- if (pixeltbl != NULL) free((char *) pixeltbl);
- pixeltbl = xmalloc((unsigned)
- (mane.shrinkfactor * mane.shrinkfactor + 1) * sizeof(Pixel));
- shrink_allocated_for = mane.shrinkfactor;
- }
-
- for (i = 0; i <= mane.shrinkfactor * mane.shrinkfactor; ++i)
- pixeltbl[i] =
- palette[(i * 30 + mane.shrinkfactor * mane.shrinkfactor)
- / (2 * mane.shrinkfactor * mane.shrinkfactor)];
-}
-
-#undef MakeGC
-
-#endif /* GREY */
/*
* Event-handling routines
@@ -1951,11 +1748,7 @@ ACTION(Act_set_shrink_factor)
if (arg != 1 && arg != bak_shrink) {
bak_shrink = arg;
#if GREY
-#if COLOR
if (use_grey) fg_active = NULL;
-#else
- if (use_grey) init_pix();
-#endif
#endif /* GREY */
reset_fonts();
}
@@ -1993,11 +1786,7 @@ ACTION(Act_shrink_to_dpi)
if (arg != 1 && arg != bak_shrink) {
bak_shrink = arg;
#if GREY
-#if COLOR
if (use_grey) fg_active = NULL;
-#else
- if (use_grey) init_pix();
-#endif
#endif /* GREY */
reset_fonts();
}
@@ -2029,15 +1818,8 @@ ACTION(Act_set_density)
if (newgamma == gamma)
return;
gamma = newgamma;
-#if COLOR
fg_active = NULL;
reset_colors();
-#else
- init_pix();
- if (our_visual->class != TrueColor)
- return;
- reset_fonts();
-#endif /* COLOR */
}
else
#endif /* GREY */
@@ -2068,11 +1850,7 @@ ACTION(Act_set_greyscaling)
if (use_grey) {
if (our_visual->class != TrueColor)
init_plane_masks();
-#if COLOR
fg_active = NULL;
-#else
- init_pix();
-#endif
}
reset_fonts();
ev_flags |= EV_NEWPAGE;
@@ -2081,7 +1859,6 @@ ACTION(Act_set_greyscaling)
#endif /* GREY */
-#if COLOR
static
ACTION(Act_set_color)
@@ -2100,7 +1877,6 @@ ACTION(Act_set_color)
ev_flags |= EV_NEWPAGE;
}
-#endif /* COLOR */
#if BUTTONS
@@ -2255,11 +2031,7 @@ ACTION(Act_magnifier)
alt.base_y = (mag_y + mane_base_y) * mane.shrinkfactor - alt.height/2;
attr.save_under = True;
attr.border_pixel = brdr_Pixel;
-#if COLOR
attr.background_pixel = bg_current->pixel;
-#else
- attr.background_pixel = back_Pixel;
-#endif
attr.override_redirect = True;
#ifdef GREY
attr.colormap = our_colormap;
@@ -2361,7 +2133,6 @@ ACTION(Act_drag)
else
drag_motion(event);
-#if COLOR
{
static Boolean curs_pix_set[3] = {False, False, False};
static Pixel cursor_pix[3];
@@ -2374,7 +2145,6 @@ ACTION(Act_drag)
curs_pix_set[drag_flags - 1] = True;
}
}
-#endif
XDefineCursor(DISP, CURSORWIN, drag_cursor[drag_flags - 1]);
XFlush(DISP);
@@ -3381,9 +3151,7 @@ redraw(windowrec)
static void
redraw_page()
{
-#if COLOR
const struct rgb *rgbp;
-#endif
if (debug & DBG_EVENT) Fputs("Redraw page: ", stdout);
@@ -3415,7 +3183,6 @@ redraw_page()
can_exposures(&mane);
}
-#if COLOR
rgbp = &bg_initial;
if (page_colors != NULL)
rgbp = &page_colors[current_page].bg;
@@ -3463,7 +3230,6 @@ redraw_page()
XRecolorCursor(DISP, ready_cursor, &cr_Color, &bg_Color);
XRecolorCursor(DISP, redraw_cursor, &cr_Color, &bg_Color);
}
-#endif /* COLOR */
dvi_file_ready = True;
diff --git a/special.c b/special.c
@@ -116,9 +116,7 @@ int fx, fy, tx, ty;
if ((fcx < max_x || tcx < max_x) && (fcx >= min_x || tcx >= min_x) &&
(fcy < max_y || tcy < max_y) && (fcy >= min_y || tcy >= min_y)) {
-#if COLOR
if (fg_active != fg_current) do_color_change();
-#endif
XDrawLine(DISP, currwin.win, ruleGC,
fcx - currwin.base_x, fcy - currwin.base_y,
tcx - currwin.base_x, tcy - currwin.base_y);
@@ -136,9 +134,7 @@ dot_at(x, y)
int cy = yconv(y);
if (cx < max_x && cx >= min_x && cy < max_y && cy >= min_y) {
-#if COLOR
if (fg_active != fg_current) do_color_change();
-#endif
XDrawPoint(DISP, currwin.win, ruleGC,
cx - currwin.base_x, cy - currwin.base_y);
}
@@ -498,9 +494,7 @@ draw_bbox()
if (bbox_valid) {
-#if COLOR
if (fg_active != fg_current) do_color_change();
-#endif
xcorner = PXL_H - currwin.base_x;
ycorner = PXL_V - currwin.base_y;
@@ -554,24 +548,16 @@ init_prescan()
{
scanned_page =
-#if COLOR
scanned_page_color =
-#endif
scanned_page_reset = resource.prescan ? -1 : total_pages + 1;
-#if COLOR
if (!use_color)
scanned_page_color = total_pages + 1;
-#endif
if (ignore_papersize_specials)
scanned_page =
-#if COLOR
scanned_page_color;
-#else
- total_pages + 1;
-#endif
}
@@ -739,7 +725,6 @@ quote_special(cp)
}
-#if COLOR
/*
* Table of dvips color names. Produced by passing the table in
@@ -1229,7 +1214,6 @@ color_special(cp)
}
}
-#endif /* COLOR */
static unsigned int
@@ -1365,12 +1349,10 @@ applicationDoSpecial(cp)
epsf_special(p);
return;
}
-#if COLOR
if (memicmp(cp, "color ", 6) == 0) {
color_special(cp + 6);
return;
}
-#endif
/* these should have been scanned */
@@ -1380,7 +1362,6 @@ applicationDoSpecial(cp)
}
if (memicmp(cp, "background ", 11) == 0) {
-#if COLOR
if (use_color && scanned_page_reset >= 0) {
/* turn on scanning and redraw the page */
scanned_page =
@@ -1388,7 +1369,6 @@ applicationDoSpecial(cp)
ev_flags |= EV_NEWPAGE; /* force a redraw */
longjmp(canit_env, 1);
}
-#endif /* COLOR */
return;
}
@@ -1396,9 +1376,7 @@ applicationDoSpecial(cp)
if (scanned_page_reset >= 0) {
/* turn on scanning and redraw the page */
scanned_page =
-#if COLOR
scanned_page_color =
-#endif
scanned_page_reset = -1;
ev_flags |= EV_NEWPAGE; /* force a redraw */
longjmp(canit_env, 1);
@@ -1453,7 +1431,6 @@ scan_special(cp)
}
-#if COLOR
{
if (memicmp(cp, "background ", 11) == 0) {
scan_bg_color(cp);
@@ -1464,7 +1441,6 @@ scan_special(cp)
return;
}
}
-#endif /* COLOR */
if (memcmp(cp, "papersize", 9) == 0
&& (p = endofcommand(cp + 9)) != NULL) {
diff --git a/xdvi.c b/xdvi.c
@@ -219,10 +219,8 @@ static XrmOptionDescRec options[] = {
{"-s", ".shrinkFactor", XrmoptionSepArg, (XPointer) NULL},
{"-S", ".densityPercent", XrmoptionSepArg, (XPointer) NULL},
{"-density", ".densityPercent", XrmoptionSepArg, (XPointer) NULL},
-#if COLOR
{"-nocolor", ".color", XrmoptionNoArg, (XPointer) "off"},
{"+nocolor", ".color", XrmoptionNoArg, (XPointer) "on"},
-#endif
#ifdef GREY
{"-nogrey", ".grey", XrmoptionNoArg, (XPointer) "off"},
{"+nogrey", ".grey", XrmoptionNoArg, (XPointer) "on"},
@@ -364,9 +362,7 @@ static const char base_translations[] = ""
#if GREY
"\"G\":set-greyscaling()\n"
#endif
-#if COLOR
"\"C\":set-color()\n"
-#endif
#if BUTTONS
"\"x\":set-expert-mode()\n"
#endif
@@ -529,10 +525,8 @@ static XtResource application_resources[] = {
offset(mg_arg[3]), XtRString, (XtPointer) NULL},
{"magnifierSize5", "MagnifierSize", XtRString, sizeof(char *),
offset(mg_arg[4]), XtRString, (XtPointer) NULL},
-#if COLOR
{"color", "Color", XtRBoolean, sizeof(Boolean),
offset(_use_color), XtRString, "true"},
-#endif
{"dvipsPath", "DvipsPath", XtRString, sizeof(char *),
offset(dvips_path), XtRString, (XtPointer) DEFAULT_DVIPS_PATH},
#ifdef GREY
@@ -1918,20 +1912,16 @@ argument is to override any papersize specials in the dvi file.\n\n", stderr);
copy = resource.copy;
-#if GREY || COLOR
fore_color_data.pixel = fore_Pixel;
back_color_data.pixel = back_Pixel;
XQueryColors(DISP, our_colormap, color_data, 2);
-#endif
-#if COLOR
fg_initial.r = fore_color_data.red;
fg_initial.g = fore_color_data.green;
fg_initial.b = fore_color_data.blue;
bg_initial.r = back_color_data.red;
bg_initial.g = back_color_data.green;
bg_initial.b = back_color_data.blue;
-#endif
#if GREY
if (our_depth == 1)
@@ -2227,48 +2217,12 @@ argument is to override any papersize specials in the dvi file.\n\n", stderr);
XCreateGC(DISP, XtWindow(top_level), \
GCFunction | GCForeground | GCBackground, &values))
-#if !COLOR
-
-#if GREY
- if (use_grey)
- init_pix();
- else
-#endif
- {
- XGCValues values;
- Pixel set_bits = (Pixel) (fore_Pixel & ~back_Pixel);
- Pixel clr_bits = (Pixel) (back_Pixel & ~fore_Pixel);
- Boolean copy_tmp = resource.copy;
-
- copyGC = MakeGC(GXcopy, fore_Pixel, back_Pixel);
- if (copy_tmp || (set_bits && clr_bits)) {
- ruleGC = copyGC;
- if (!resource.thorough) copy_tmp = True;
- }
- if (copy_tmp) {
- foreGC = ruleGC;
- if (!resource.copy)
- WARN(XmDIALOG_WARNING,
- "Overstrike characters may be incorrect");
- }
- else {
- if (set_bits) foreGC = MakeGC(GXor, set_bits, 0);
- if (clr_bits || !set_bits)
- *(foreGC ? &foreGC2 : &foreGC) =
- MakeGC(GXandInverted, clr_bits, 0);
- if (!ruleGC) ruleGC = foreGC;
- }
- }
-
-#endif /* !COLOR */
{
XGCValues values;
-#if COLOR
/* Not affected by color changes. */
copyGC = MakeGC(GXcopy, fore_Pixel, back_Pixel);
-#endif
highGC = MakeGC(GXcopy, hl_Pixel, back_Pixel);
}
@@ -2292,10 +2246,6 @@ argument is to override any papersize specials in the dvi file.\n\n", stderr);
XQueryColor(DISP, our_colormap, &bg_Color);
cr_Color.pixel = cr_Pixel;
XQueryColor(DISP, our_colormap, &cr_Color);
-#if !COLOR
- XRecolorCursor(DISP, ready_cursor, &cr_Color, &bg_Color);
- XRecolorCursor(DISP, redraw_cursor, &cr_Color, &bg_Color);
-#endif
arrow_pixmap = XCreateBitmapFromData(DISP, RootWindowOfScreen(SCRN),
(const char *) drag_vert_bits,
diff --git a/xdvi.h b/xdvi.h
@@ -215,11 +215,7 @@ int n_files_left = 32767; /* for LRU closing of fonts */
unsigned int page_w, page_h;
int scanned_page; /* last page prescanned */
-
-#if COLOR
int scanned_page_color; /* last page scanned for color spcls */
-#endif
-
int scanned_page_reset; /* number to reset the above to */
/*
@@ -286,9 +282,7 @@ struct glyph {
struct bitmap bitmap; /* bitmap for character */
short x2, y2; /* x and y offset in pixels (shrunken bitmap) */
#if GREY
-# if COLOR
struct fgrec *fg; /* fgrec for which these pixmaps are valid */
-# endif
XImage *image2;
char *pixmap2;
char *pixmap2_t;
@@ -439,9 +433,7 @@ extern struct _resource {
Dimension btn_border_width;
#endif
const char *mg_arg[5];
-#if COLOR
Boolean _use_color;
-#endif
#ifdef GREY
Boolean _use_grey;
Bool3 install;
@@ -460,9 +452,7 @@ extern struct _resource {
#define warn_spec resource._warn_spec
#define hush_chars resource._hush_chars
#define hush_chk resource._hush_chk
-#if COLOR
#define use_color resource._use_color
-#endif
#ifdef GREY
#define use_grey resource._use_grey
#endif
@@ -472,13 +462,10 @@ extern struct _resource {
Pixel plane_masks[4];
#endif
-#if GREY || COLOR
XColor color_data[2];
#define fore_color_data color_data[0]
#define back_color_data color_data[1]
-#endif
-#if COLOR
struct rgb {
unsigned short r, g, b;
@@ -546,7 +533,6 @@ Boolean color_warned = False;
/* Cursor color (for XRecolorCursor). */
extern XColor cr_Color;
-#endif /* COLOR */
extern struct mg_size_rec {
int w;
@@ -864,12 +850,8 @@ extern void set_button_panel_height(XtArgVal);
#if GREY
extern void init_plane_masks(void);
#endif
-#if COLOR
extern Pixel alloc_color(const struct rgb *, Pixel);
extern void do_color_change(void);
-#elif GREY
-extern void init_pix(void);
-#endif
extern void expose(struct WindowRec *, int, int, unsigned int,
unsigned int);
extern void home(wide_bool);
@@ -898,10 +880,8 @@ extern Widget warning_popup_long(const char *, const char *,
extern void Act_print(Widget, XEvent *, String *, Cardinal *);
extern void Act_open_dvi_file(Widget, XEvent *, String *, Cardinal *);
extern void reset_fonts(void);
-#if COLOR
extern void reset_colors(void);
extern void full_reset_colors(void);
-#endif
extern void realloc_font(struct font *, wide_ubyte);
extern void realloc_virtual_font(struct font *, wide_ubyte);
extern Boolean load_font(struct font *);
@@ -946,10 +926,8 @@ extern void read_encoding(struct avl_enc *);
extern void init_font_open(void);
extern Boolean font_open(struct font *, char **, int *);
extern void init_prescan(void);
-#if COLOR
extern void scan_color_eop(void);
extern void set_fg_color(const struct rgb *);
-#endif
extern void applicationDoSpecial(char *);
extern void scan_special(char *);
extern void geom_do_special(struct geom_info *, char *, double);
