diff -ur xdvi-22.09/events.c xdvi-22.10/events.c --- xdvi-22.09/events.c Fri May 28 14:01:04 1999 +++ xdvi-22.10/events.c Wed Jul 7 11:21:18 1999 @@ -512,9 +512,10 @@ * Make the GCs */ - foreGC = foreGC2 = ruleGC = NULL; + foreGC = foreGC2 = ruleGC = 0; + copyGC = MakeGC(GXcopy, fore_Pixel, back_Pixel); if (copy || (set_bits && clr_bits)) { - ruleGC = MakeGC(GXcopy, fore_Pixel, back_Pixel); + ruleGC = copyGC; if (!resource.thorough) copy = True; } if (copy) { @@ -531,6 +532,8 @@ clr_bits & ~fore_color_data.pixel, 0); if (!ruleGC) ruleGC = foreGC; } + + oldgamma = gamma; } if (mane.shrinkfactor == 1) return; @@ -631,9 +634,10 @@ } } - foreGC = ruleGC = MakeGC(copy ? GXcopy : GXor, - fore_Pixel, back_Pixel); - foreGC2 = NULL; + copyGC = MakeGC(GXcopy, fore_Pixel, back_Pixel); + foreGC = ruleGC = copy ? copyGC + : MakeGC(GXor, fore_Pixel, back_Pixel); + foreGC2 = 0; oldgamma = gamma; } @@ -1463,7 +1467,7 @@ _Xconst char *message; { get_xy(); - XDrawImageString(DISP, mane.win, foreGC, + XDrawImageString(DISP, mane.win, copyGC, 5 - window_x, 5 + X11HEIGHT - window_y, message, strlen(message)); } diff -ur xdvi-22.09/version.h xdvi-22.10/version.h --- xdvi-22.09/version.h Wed Jun 16 17:58:51 1999 +++ xdvi-22.10/version.h Wed Jul 7 11:16:15 1999 @@ -1 +1 @@ -#define VERSION "22.09" +#define VERSION "22.10" diff -ur xdvi-22.09/xdvi.c xdvi-22.10/xdvi.c --- xdvi-22.09/xdvi.c Thu Feb 4 18:41:53 1999 +++ xdvi-22.10/xdvi.c Wed Jul 7 11:21:27 1999 @@ -1752,7 +1752,6 @@ our_depth = DefaultDepthOfScreen(SCRN); our_visual = DefaultVisualOfScreen(SCRN); our_colormap = DefaultColormapOfScreen(SCRN); - copyGC = DefaultGCOfScreen(SCRN); if (resource.install != False && our_visual->class == PseudoColor) { /* look for a TrueColor visual with more bits */ @@ -1778,7 +1777,6 @@ our_colormap = XCreateColormap(DISP, RootWindowOfScreen(SCRN), our_visual, AllocNone); XInstallColormap(DISP, our_colormap); - copyGC = NULL; #ifdef TOOLKIT temp_args1[0].value = (XtArgVal) our_depth; temp_args1[1].value = (XtArgVal) our_visual; @@ -2295,8 +2293,9 @@ Pixel set_bits = (Pixel) (fore_Pixel & ~back_Pixel); Pixel clr_bits = (Pixel) (back_Pixel & ~fore_Pixel); + copyGC = MakeGC(GXcopy, fore_Pixel, back_Pixel); if (copy || (set_bits && clr_bits)) { - ruleGC = MakeGC(GXcopy, fore_Pixel, back_Pixel); + ruleGC = copyGC; if (!resource.thorough) copy = True; } if (copy) { @@ -2322,9 +2321,6 @@ || (!copy && our_visual != DefaultVisualOfScreen(SCRN)) #endif ) -#ifdef GREY - copyGC = -#endif highGC = MakeGC(GXcopy, hl_Pixel, back_Pixel); } diff -ur xdvi-22.09/xdvi.h xdvi-22.10/xdvi.h --- xdvi-22.09/xdvi.h Tue May 25 18:06:27 1999 +++ xdvi-22.10/xdvi.h Wed Jul 7 11:21:00 1999 @@ -628,16 +628,15 @@ EXTERN Visual *our_visual; EXTERN unsigned int our_depth; EXTERN Colormap our_colormap; -EXTERN GC copyGC; #else #define our_depth (unsigned int) DefaultDepthOfScreen(SCRN) #define our_visual DefaultVisualOfScreen(SCRN) #define our_colormap DefaultColormapOfScreen(SCRN) -#define copyGC DefaultGCOfScreen(SCRN) #endif EXTERN GC ruleGC; EXTERN GC foreGC, highGC; EXTERN GC foreGC2; +EXTERN GC copyGC; EXTERN Boolean copy; EXTERN Cursor redraw_cursor, ready_cursor;