comparison src/xterm.c @ 27962:048184bb751e

(x_alloc_lighter_color, x_setup_relief_color): Use x_free_colors.

27961:c6664d216f5a

    {
      if (new.pixel == *pixel)
	{
	  /* If we end up with the same color as before, try adding
	     delta to the RGB values.  */
	  int class = FRAME_X_DISPLAY_INFO (f)->visual->class;
	  
	  /* If display has an immutable color map, freeing colors is
	     not necessary and some servers don't allow it.  So don't
	     do it.  */
	  if (class != StaticColor
	      && class != StaticGray
	      && class != TrueColor)
	    XFreeColors (display, cmap, &new.pixel, 1, 0);
	  
	  new.red = min (0xffff, delta + color.red);
	  new.green = min (0xffff, delta + color.green);
	  new.blue = min (0xffff, delta + color.blue);
	  success_p = x_alloc_nearest_color (f, cmap, &new);

  if (relief->gc
      && relief->allocated_p)
    {
      /* If display has an immutable color map, freeing colors is not
	 necessary and some servers don't allow it.  So don't do it.  */
      int class = dpyinfo->visual->class;
      if (class != StaticColor
	  && class != StaticGray
	  && class != TrueColor)
	XFreeColors (dpy, cmap, &relief->pixel, 1, 0);
      relief->allocated_p = 0;
    }

  /* Allocate new color.  */
  xgcv.foreground = default_pixel;

27962:048184bb751e

    {
      if (new.pixel == *pixel)
	{
	  /* If we end up with the same color as before, try adding
	     delta to the RGB values.  */
	  x_free_colors (f, &new.pixel, 1);
	  
	  new.red = min (0xffff, delta + color.red);
	  new.green = min (0xffff, delta + color.green);
	  new.blue = min (0xffff, delta + color.blue);
	  success_p = x_alloc_nearest_color (f, cmap, &new);

  if (relief->gc
      && relief->allocated_p)
    {
      /* If display has an immutable color map, freeing colors is not
	 necessary and some servers don't allow it.  So don't do it.  */
      x_free_colors (f, &relief->pixel, 1);
      relief->allocated_p = 0;
    }

  /* Allocate new color.  */
  xgcv.foreground = default_pixel;