comparison src/macfns.c @ 59575:011a0c55c1f2

* macfns.c (x_set_foreground_color, x_set_background_color): Sync with xfns.c. (mac_window, x_create_tip_frame): Use XSetWindowBackground. * macterm.c (XSetBackground, XSetWindowBackground): New functions. * macterm.h (XSetBackground, XSetWindowBackground): Add externs.

59574:9ce057395159

void
x_set_foreground_color (f, arg, oldval)
     struct frame *f;
     Lisp_Object arg, oldval;
{
  unsigned long fg, old_fg;

  fg = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
  old_fg = FRAME_FOREGROUND_PIXEL (f);
  FRAME_FOREGROUND_PIXEL (f) = fg;

  if (FRAME_MAC_WINDOW (f) != 0)
    {
      update_face_from_frame_parameter (f, Qforeground_color, arg);
      if (FRAME_VISIBLE_P (f))
        redraw_frame (f);
    }
}

void
x_set_background_color (f, arg, oldval)
     struct frame *f;
     Lisp_Object arg, oldval;
{
  FRAME_BACKGROUND_PIXEL (f)
    = x_decode_color (f, arg, WHITE_PIX_DEFAULT (f));

  if (FRAME_MAC_WINDOW (f) != 0)
    {
      update_face_from_frame_parameter (f, Qbackground_color, arg);

      if (FRAME_VISIBLE_P (f))
        redraw_frame (f);
    }

		  (WindowPtr) -1, 1, (long) f->output_data.mac);
#endif
  /* so that update events can find this mac_output struct */
  f->output_data.mac->mFP = f;  /* point back to emacs frame */

  validate_x_resource_name ();

  /* x_set_name normally ignores requests to set the name if the
     requested name is the same as the current name.  This is the one
     place where that assumption isn't correct; f->name is set, but

    if (tip_window = NewCWindow (NULL, &r, "\p", false, plainDBox,
				 NULL, false, 0L))
#endif
      {
	FRAME_MAC_WINDOW (f) = tip_window;
	SetWRefCon (tip_window, (long) f->output_data.mac);
	/* so that update events can find this mac_output struct */
	f->output_data.mac->mFP = f;
      }
    UNBLOCK_INPUT;

59575:011a0c55c1f2

void
x_set_foreground_color (f, arg, oldval)
     struct frame *f;
     Lisp_Object arg, oldval;
{
  struct mac_output *mac = f->output_data.mac;
  unsigned long fg, old_fg;

  fg = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
  old_fg = FRAME_FOREGROUND_PIXEL (f);
  FRAME_FOREGROUND_PIXEL (f) = fg;

  if (FRAME_MAC_WINDOW (f) != 0)
    {
      Display *dpy = FRAME_MAC_DISPLAY (f);

      BLOCK_INPUT;
      XSetForeground (dpy, mac->normal_gc, fg);
      XSetBackground (dpy, mac->reverse_gc, fg);

      if (mac->cursor_pixel == old_fg)
	{
	  unload_color (f, mac->cursor_pixel);
	  mac->cursor_pixel = fg;
	  XSetBackground (dpy, mac->cursor_gc, mac->cursor_pixel);
	}

      UNBLOCK_INPUT;

      update_face_from_frame_parameter (f, Qforeground_color, arg);

      if (FRAME_VISIBLE_P (f))
        redraw_frame (f);
    }

  unload_color (f, old_fg);
}

void
x_set_background_color (f, arg, oldval)
     struct frame *f;
     Lisp_Object arg, oldval;
{
  struct mac_output *mac = f->output_data.mac;
  unsigned long bg;

  bg = x_decode_color (f, arg, WHITE_PIX_DEFAULT (f));
  unload_color (f, FRAME_BACKGROUND_PIXEL (f));
  FRAME_BACKGROUND_PIXEL (f) = bg;

  if (FRAME_MAC_WINDOW (f) != 0)
    {
      Display *dpy = FRAME_MAC_DISPLAY (f);

      BLOCK_INPUT;
      XSetBackground (dpy, mac->normal_gc, bg);
      XSetForeground (dpy, mac->reverse_gc, bg);
      XSetWindowBackground (dpy, FRAME_MAC_WINDOW (f), bg);
      XSetForeground (dpy, mac->cursor_gc, bg);

      UNBLOCK_INPUT;
      update_face_from_frame_parameter (f, Qbackground_color, arg);

      if (FRAME_VISIBLE_P (f))
        redraw_frame (f);
    }

		  (WindowPtr) -1, 1, (long) f->output_data.mac);
#endif
  /* so that update events can find this mac_output struct */
  f->output_data.mac->mFP = f;  /* point back to emacs frame */

  if (FRAME_MAC_WINDOW (f))
    XSetWindowBackground (FRAME_MAC_DISPLAY(f), FRAME_MAC_WINDOW (f),
			  FRAME_BACKGROUND_PIXEL (f));

  validate_x_resource_name ();

  /* x_set_name normally ignores requests to set the name if the
     requested name is the same as the current name.  This is the one
     place where that assumption isn't correct; f->name is set, but

    if (tip_window = NewCWindow (NULL, &r, "\p", false, plainDBox,
				 NULL, false, 0L))
#endif
      {
	FRAME_MAC_WINDOW (f) = tip_window;
	XSetWindowBackground (FRAME_MAC_DISPLAY(f), tip_window,
			      FRAME_BACKGROUND_PIXEL (f));
	SetWRefCon (tip_window, (long) f->output_data.mac);
	/* so that update events can find this mac_output struct */
	f->output_data.mac->mFP = f;
      }
    UNBLOCK_INPUT;