*** clients/olwm/screen.c.orig Tue Jun 29 00:11:56 1993 --- clients/olwm/screen.c Mon Jan 25 22:33:08 1999 *************** *** 111,116 **** --- 111,122 ---- static XrmQuark stippledRubberBandsCQ; static XrmQuark stippledRubberBandsIQ; + static updateScreenWorkspaceColor(); + static updateScreenWindowColor(); + static updateScreenForegroundColor(); + static updateScreenBackgroundColor(); + static updateScreenBorderColor(); + static updateScreenGlyphFont(); /*------------------------------------------------------------------------- * Local Functions *************** *** 214,219 **** --- 220,226 ---- case PseudoColor: case GrayScale: case DirectColor: + case TrueColor: return True; /*NOTREACHED*/ break; *************** *** 460,466 **** * Construct bitmap search path as follows: * $OPENWINHOME/etc/workspace/patterns * $OPENWINHOME/include/X11/include/bitmaps ! * /usr/X11/include/X11/include/bitmaps * * REMIND: this should be cleaned up so that it doesn't use a fixed-size * array. --- 467,473 ---- * Construct bitmap search path as follows: * $OPENWINHOME/etc/workspace/patterns * $OPENWINHOME/include/X11/include/bitmaps ! * /usr/X11R6/include/X11/include/bitmaps * * REMIND: this should be cleaned up so that it doesn't use a fixed-size * array. *************** *** 483,489 **** (void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome); bitmapSearchPath[i++] = MemNewString(bmPath); ! bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps"); bitmapSearchPath[i] = (char *)NULL; } --- 490,496 ---- (void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome); bitmapSearchPath[i++] = MemNewString(bmPath); ! bitmapSearchPath[i++] = MemNewString("/usr/X11R6/include/X11/bitmaps"); bitmapSearchPath[i] = (char *)NULL; }