[comp.windows.x] Patches for X11R3 driver for Magic

papa@pollux.usc.edu (Marco Papa) (12/20/88)

Here are the first two fixes to apply to the sources of the driver for
magic on the X1R3 tape.  They change X11helper.c and grX1.c.  Thanks
to all that pointed them out to me.

----- X11helper.c.diff

97c97,98
<     if (geometry) flags = XParseGeometry(geometry, 
---
>     if (geometry) {
> 	flags = XParseGeometry(geometry, 
99,121c100,121
<     if (XValue & flags) {
< 	if (XNegative & flags) {
< 		fprintf(stderr,"Invalid X coordinate: %n\n", displayXCoor);
< 		displayXCoor = 0;
< 	} else {
< 		xsh.flags |= USPosition;
< 		xsh.flags &= ~PPosition;
< 	}
< 
<     }
<     if (YValue & flags) {
< 	if (YNegative & flags) {
< 		fprintf(stderr,"Invalid Y coordinate: %n\n", displayYCoor);
< 		displayYCoor = 0;
< 	} else {
< 		xsh.flags |= USPosition;
< 		xsh.flags &= ~PPosition;
< 	}
<     }
< 
<     if ((WidthValue|HeightValue) & flags) {
< 	xsh.flags |= USSize;
< 	xsh.flags &= ~PSize;
---
> 	if (XValue & flags) {
> 		if (XNegative & flags) {
> 			fprintf(stderr,"Invalid X coordinate: %n\n", displayXCoor);
> 			displayXCoor = 0;
> 		} else {
> 	 		xsh.flags |= USPosition;
> 		 	xsh.flags &= ~PPosition;
> 		}
>     	}
> 	if (YValue & flags) {
> 		if (YNegative & flags) {
> 			fprintf(stderr,"Invalid Y coordinate: %n\n", displayYCoor);
> 			displayYCoor = 0;
> 		} else {
> 			xsh.flags |= USPosition;
> 			xsh.flags &= ~PPosition;
> 		}
>     	}
> 	if ((WidthValue|HeightValue) & flags) {
> 		xsh.flags |= USSize;
> 		xsh.flags &= ~PSize;
>     	}



------ grX1.c.diff

152c152
< 	       XSetLineAttributes(display, defGC, 0, LineonOffDash, CapNotLast, JoinMiter);
---
> 	       XSetLineAttributes(display, defGC, 0, LineOnOffDash, CapNotLast, JoinMiter);


Enjoy.

-- Marco Papa
   USC Advanced Computing Support Center
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
uucp:...!pollux!papa       BIX:papa       ARPAnet:pollux!papa@oberon.usc.edu
 "There's Alpha, Beta, Gamma and Diga!" -- Leo Schwab [quoting Rick Unland]
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=