[comp.windows.x] color fixes to clients/bitmap/bitmap.c

RWS@ZERMATT.LCS.MIT.EDU (Robert Scheifler) (09/19/87)

Various calls missing the display argument.

*** /tmp/,RCSt1011763	Sat Sep 19 10:03:55 1987
--- bitmap.c	Fri Sep 18 15:48:12 1987
***************
*** 1,5 ****
  #ifndef lint
! static char *rcsid_bitmap_c = "$Header: bitmap.c,v 1.12 87/09/11 23:19:52 sun Exp $";
  #endif
  
  #include <errno.h>
--- 1,5 ----
  #ifndef lint
! static char *rcsid_bitmap_c = "$Header: bitmap.c,v 1.13 87/09/18 15:47:29 newman Exp $";
  #endif
  
  #include <errno.h>
***************
*** 380,400 ****
        XAllocColorCells(d, cmap, FALSE, masks, high_color ? 2 : 1,
  	 &background, 1)) {
        bdef.pixel = background;
!       XStoreColor(&bdef);
        invertplane = masks[0];
        if (high_color) {
  	highlightplane = masks[1];
  	hdef.pixel = background | highlightplane;
! 	XStoreColor(&hdef);
  	hdef.pixel |= invertplane;
! 	XStoreColor(&hdef);
        } else
  	highlightplane = invertplane;
        fdef.pixel = foreground = background | invertplane;
!       XStoreColor(&fdef);
      }
      if (brdr_color && XParseColor(d, cmap, brdr_color, &bdef) &&
! 	XAllocColor(&bdef))
        border = bdef.pixel;
    }
  
--- 380,400 ----
        XAllocColorCells(d, cmap, FALSE, masks, high_color ? 2 : 1,
  	 &background, 1)) {
        bdef.pixel = background;
!       XStoreColor(d, &bdef);
        invertplane = masks[0];
        if (high_color) {
  	highlightplane = masks[1];
  	hdef.pixel = background | highlightplane;
! 	XStoreColor(d, &hdef);
  	hdef.pixel |= invertplane;
! 	XStoreColor(d, &hdef);
        } else
  	highlightplane = invertplane;
        fdef.pixel = foreground = background | invertplane;
!       XStoreColor(d, &fdef);
      }
      if (brdr_color && XParseColor(d, cmap, brdr_color, &bdef) &&
! 	XAllocColor(d, &bdef))
        border = bdef.pixel;
    }
  

RWS@ZERMATT.LCS.MIT.EDU (Robert Scheifler) (09/21/87)

Forget the diffs I sent out for this, they were supplied by someone with
oatmeal for brains that day.  A real fix will be resupplied when really
tested.  Sorry, I will apply greater scrutiny to avoid this happening
again.