[Emacs-diffs] Changes to emacs/src/macfns.c

[Steven Tamm]

Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.39 emacs/src/macfns.c:1.40
*** emacs/src/macfns.c:1.39     Thu Sep  2 17:00:12 2004
--- emacs/src/macfns.c  Wed Oct  6 15:38:53 2004
***************
*** 312,317 ****
--- 312,320 ----
                                                             Lisp_Object,
                                                             char *, char *,
                                                             int));
+ 
+ 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.  */
***************
*** 321,353 ****
       FRAME_PTR f;
       int *xptr, *yptr;
  {
!   Point pt;
!   GrafPtr oldport;
  
!   GetPort (&oldport);
!   SetPortWindowPort (FRAME_MAC_WINDOW (f));
  
! #if TARGET_API_MAC_CARBON
!   {
!     Rect r;
! 
!     GetWindowPortBounds (FRAME_MAC_WINDOW (f), &r);
!     SetPt (&pt, r.left, r.top);
!   }
! #else /* not TARGET_API_MAC_CARBON */
!   SetPt (&pt,
!        FRAME_MAC_WINDOW (f)->portRect.left,
!        FRAME_MAC_WINDOW (f)->portRect.top);
! #endif /* not TARGET_API_MAC_CARBON */
!   LocalToGlobal (&pt);
!   SetPort (oldport);
! 
!   /* MAC has no frame pixel diff.  */
!   f->x_pixels_diff = 0;
!   f->y_pixels_diff = 0;
  
!   *xptr = pt.h;
!   *yptr = pt.v;
  }
  
  
--- 324,338 ----
       FRAME_PTR f;
       int *xptr, *yptr;
  {
!   Rect inner, outer;
  
!   mac_get_window_bounds (f, &inner, &outer);
  
!   f->x_pixels_diff = inner.left - outer.left;
!   f->y_pixels_diff = inner.top - outer.top;
  
!   *xptr = outer.left;
!   *yptr = outer.top;
  }