- cryst->blackpixel = MI_BLACK_PIXEL(mi);
- cryst->whitepixel = MI_WHITE_PIXEL(mi);
-
-#ifdef STANDALONE
- cryst->cmap = mi->xgwa.colormap;
-#else /* !STANDALONE */
- cryst->cmap = XCreateColormap(display, window,
- MI_VISUAL(mi), AllocNone);
- XSetWindowColormap(display, window, cryst->cmap);
-
- (void) XParseColor(display, cryst->cmap, "black", &color);
- (void) XAllocColor(display, cryst->cmap, &color);
- MI_BLACK_PIXEL(mi) = color.pixel;
- (void) XParseColor(display, cryst->cmap, "white", &color);
- (void) XAllocColor(display, cryst->cmap, &color);
- MI_WHITE_PIXEL(mi) = color.pixel;
-
- (void) XParseColor(display, cryst->cmap, background, &color);
- (void) XAllocColor(display, cryst->cmap, &color);
- MI_BG_PIXEL(mi) = color.pixel;
- (void) XParseColor(display, cryst->cmap, foreground, &color);
- (void) XAllocColor(display, cryst->cmap, &color);
- MI_FG_PIXEL(mi) = color.pixel;
-#endif /* !STANDALONE */
-
- cryst->colors = 0;
- cryst->ncolors = 0;
+ cryst->blackpixel = MI_BLACK_PIXEL(mi);
+ cryst->whitepixel = MI_WHITE_PIXEL(mi);
+#if 0 /* #### wrong! -jwz */
+ cryst->cmap = XCreateColormap(display, window,
+ MI_VISUAL(mi), AllocNone);
+ XSetWindowColormap(display, window, cryst->cmap);
+#else
+ cryst->cmap = mi->xgwa.colormap;
+#endif
+ (void) XParseColor(display, cryst->cmap, "black", &color);
+ (void) XAllocColor(display, cryst->cmap, &color);
+ MI_BLACK_PIXEL(mi) = color.pixel;
+ (void) XParseColor(display, cryst->cmap, "white", &color);
+ (void) XAllocColor(display, cryst->cmap, &color);
+ MI_WHITE_PIXEL(mi) = color.pixel;
+#ifndef STANDALONE
+ (void) XParseColor(display, cryst->cmap, background, &color);
+ (void) XAllocColor(display, cryst->cmap, &color);
+ MI_BG_PIXEL(mi) = color.pixel;
+ (void) XParseColor(display, cryst->cmap, foreground, &color);
+ (void) XAllocColor(display, cryst->cmap, &color);
+ MI_FG_PIXEL(mi) = color.pixel;
+#endif
+ cryst->colors = 0;
+ cryst->ncolors = 0;
+ }