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

[Miles Bader]

Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.3.2.12 emacs/src/macfns.c:1.3.2.13
*** emacs/src/macfns.c:1.3.2.12 Sat Sep  4 09:28:15 2004
--- emacs/src/macfns.c  Mon Oct 25 04:19:36 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;
  }
  
  
***************
*** 4262,4267 ****
--- 4247,4253 ----
      NavUserAction userAction;
      CFStringRef message=NULL, client=NULL, saveName = NULL;
      
+     BLOCK_INPUT;
      /* No need for a callback function because we are modal */
      NavGetDefaultDialogCreationOptions(&options);
      options.modality = kWindowModalityAppModal;
***************
*** 4332,4340 ****
        AEDisposeDesc(&defLocAed);
        }
  
-       BLOCK_INPUT;
        status = NavDialogRun(dialogRef);
-       UNBLOCK_INPUT;
      }
  
      if (saveName) CFRelease(saveName);
--- 4318,4324 ----
***************
*** 4347,4355 ****
        {
        case kNavUserActionNone:
        case kNavUserActionCancel:
!         NavDialogDispose(dialogRef);
!         Fsignal (Qquit, Qnil);  /* Treat cancel like C-g */
!         return;
        case kNavUserActionOpen:
        case kNavUserActionChoose:
        case kNavUserActionSaveAs:
--- 4331,4337 ----
        {
        case kNavUserActionNone:
        case kNavUserActionCancel:
!         break;                /* Treat cancel like C-g */
        case kNavUserActionOpen:
        case kNavUserActionChoose:
        case kNavUserActionSaveAs:
***************
*** 4384,4389 ****
--- 4366,4372 ----
                               dir, mustmatch, dir, Qfile_name_history,
                               default_filename, Qnil);
      }
+     UNBLOCK_INPUT;
    }
  
    UNGCPRO;