comparison src/macfns.c @ 80388:2ae7357bc8f4

* macfns.c (mac_window): Replace WindowPtr with WindowRef. (mac_get_window_bounds): Move extern to macterm.h. (compute_tip_xy) [TARGET_API_MAC_CARBON]: Use GetGlobalMouse. (mac_window) [USE_MAC_TOOLBAR]: Set toolbar_win_gravity. (x_set_tool_bar_lines) [USE_MAC_TOOLBAR]: Set FRAME_EXTERNAL_TOOL_BAR.

80387:3fdc60eb4014

void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_explicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_title P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));

extern void mac_get_window_bounds P_ ((struct frame *, Rect *, Rect *));



/* Store the screen positions of frame F into XPTR and YPTR.
   These are the positions of the containing window manager window,
   not Emacs's own window.  */

    nlines = 0;

  /* Make sure we redisplay all windows in this frame.  */
  ++windows_or_buffers_changed;

  delta = nlines - FRAME_TOOL_BAR_LINES (f);

  /* Don't resize the tool-bar to more than we have room for.  */
  root_window = FRAME_ROOT_WINDOW (f);
  root_height = WINDOW_TOTAL_LINES (XWINDOW (root_window));

	{
	  DisposeWindow (FRAME_MAC_WINDOW (f));
	  FRAME_MAC_WINDOW (f) = NULL;
	}
    }
#else
  FRAME_MAC_WINDOW (f)
    = NewCWindow (NULL, &r, "\p", false, zoomDocProc,
		  (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 */

#ifndef MAC_OSX
  if (FRAME_MAC_WINDOW (f))

    }
#endif
  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

      size = CGDisplayScreenSize (kCGDirectMainDisplay);
      mm_per_pixel = size.height / CGDisplayPixelsHigh (kCGDirectMainDisplay);
      UNBLOCK_INPUT;
    }
#if MAC_OS_X_VERSION_MIN_REQUIRED == 1020
  else
#endif
#endif	/* MAC_OS_X_VERSION_MAX_ALLOWED >= 1030  */
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1030 || MAC_OS_X_VERSION_MIN_REQUIRED == 1020
    {
      /* This is an approximation.  */

      size = CGDisplayScreenSize (kCGDirectMainDisplay);
      mm_per_pixel = size.width / CGDisplayPixelsWide (kCGDirectMainDisplay);
      UNBLOCK_INPUT;
    }
#if MAC_OS_X_VERSION_MIN_REQUIRED == 1020
  else
#endif
#endif	/* MAC_OS_X_VERSION_MAX_ALLOWED >= 1030  */
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1030 || MAC_OS_X_VERSION_MIN_REQUIRED == 1020
    {
      /* This is an approximation.  */

  if (!INTEGERP (left) || !INTEGERP (top))
    {
      Point mouse_pos;

      BLOCK_INPUT;
      GetMouse (&mouse_pos);
      LocalToGlobal (&mouse_pos);
      *root_x = mouse_pos.h;
      *root_y = mouse_pos.v;
      UNBLOCK_INPUT;
    }

80388:2ae7357bc8f4

void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_explicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_title P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));


/* Store the screen positions of frame F into XPTR and YPTR.
   These are the positions of the containing window manager window,
   not Emacs's own window.  */

    nlines = 0;

  /* Make sure we redisplay all windows in this frame.  */
  ++windows_or_buffers_changed;

#if USE_MAC_TOOLBAR
  FRAME_TOOL_BAR_LINES (f) = 0;
  if (nlines)
    {
      FRAME_EXTERNAL_TOOL_BAR (f) = 1;
      if (FRAME_MAC_P (f) && !IsWindowToolbarVisible (FRAME_MAC_WINDOW (f)))
	/* Make sure next redisplay shows the tool bar.  */
	XWINDOW (FRAME_SELECTED_WINDOW (f))->update_mode_line = Qt;
    }
  else
    {
      if (FRAME_EXTERNAL_TOOL_BAR (f))
        free_frame_tool_bar (f);
      FRAME_EXTERNAL_TOOL_BAR (f) = 0;
    }

  return;
#endif

  delta = nlines - FRAME_TOOL_BAR_LINES (f);

  /* Don't resize the tool-bar to more than we have room for.  */
  root_window = FRAME_ROOT_WINDOW (f);
  root_height = WINDOW_TOTAL_LINES (XWINDOW (root_window));

	{
	  DisposeWindow (FRAME_MAC_WINDOW (f));
	  FRAME_MAC_WINDOW (f) = NULL;
	}
    }
#else  /* !TARGET_API_MAC_CARBON */
  FRAME_MAC_WINDOW (f)
    = NewCWindow (NULL, &r, "\p", false, zoomDocProc,
		  (WindowRef) -1, 1, (long) f->output_data.mac);
#endif  /* !TARGET_API_MAC_CARBON */
  /* so that update events can find this mac_output struct */
  f->output_data.mac->mFP = f;  /* point back to emacs frame */

#ifndef MAC_OSX
  if (FRAME_MAC_WINDOW (f))

    }
#endif
  if (FRAME_MAC_WINDOW (f))
    XSetWindowBackground (FRAME_MAC_DISPLAY(f), FRAME_MAC_WINDOW (f),
			  FRAME_BACKGROUND_PIXEL (f));

#if USE_MAC_TOOLBAR
  /* At the moment, the size of the tool bar is not yet known.  We
     record the gravity value of the newly created window and use it
     to adjust the position of the window (especially for a negative
     specification of its vertical position) when the tool bar is
     first redisplayed.  */
  if (FRAME_EXTERNAL_TOOL_BAR (f))
    f->output_data.mac->toolbar_win_gravity = f->win_gravity;
#endif

  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

      size = CGDisplayScreenSize (kCGDirectMainDisplay);
      mm_per_pixel = size.height / CGDisplayPixelsHigh (kCGDirectMainDisplay);
      UNBLOCK_INPUT;
    }
#if MAC_OS_X_VERSION_MIN_REQUIRED == 1020
  else				/* CGDisplayScreenSize == NULL */
#endif
#endif	/* MAC_OS_X_VERSION_MAX_ALLOWED >= 1030  */
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1030 || MAC_OS_X_VERSION_MIN_REQUIRED == 1020
    {
      /* This is an approximation.  */

      size = CGDisplayScreenSize (kCGDirectMainDisplay);
      mm_per_pixel = size.width / CGDisplayPixelsWide (kCGDirectMainDisplay);
      UNBLOCK_INPUT;
    }
#if MAC_OS_X_VERSION_MIN_REQUIRED == 1020
  else				/* CGDisplayScreenSize == NULL */
#endif
#endif	/* MAC_OS_X_VERSION_MAX_ALLOWED >= 1030  */
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1030 || MAC_OS_X_VERSION_MIN_REQUIRED == 1020
    {
      /* This is an approximation.  */

  if (!INTEGERP (left) || !INTEGERP (top))
    {
      Point mouse_pos;

      BLOCK_INPUT;
#if TARGET_API_MAC_CARBON
      GetGlobalMouse (&mouse_pos);
#else
      GetMouse (&mouse_pos);
      LocalToGlobal (&mouse_pos);
#endif
      *root_x = mouse_pos.h;
      *root_y = mouse_pos.v;
      UNBLOCK_INPUT;
    }