comparison src/macfns.c @ 57425:0867872551d9

macterm.c (x_raise_frame): Add BLOCK_INPUT around SelectWindow (x_lower_frame): Add BLOCK_INPUT around SendBehind (make_mac_frame): Add BLOCK_INPUT around the making of a terminal frame (mac_initialize): Add BLOCK_INPUT around carbon initialization macgui.h (mktime): Use emacs_mktime macfns.c (Fx_file_dialog): Add BLOCK_INPUT around more code. Make a cancel file-open dialog be like C-g. mac.c (mktime): Use emacs_mktime (Fdo_applescript): Add BLOCK_INPUT around do_applescript (Fmac_paste_function): Add better error handling for carbon cut/paste

57424:b1ed4b950258

    NavDialogRef dialogRef;
    NavTypeListHandle fileTypes = NULL;
    NavUserAction userAction;
    CFStringRef message=NULL, client=NULL, saveName = NULL;
    
    /* No need for a callback function because we are modal */
    NavGetDefaultDialogCreationOptions(&options);
    options.modality = kWindowModalityAppModal;
    options.location.h = options.location.v = -1;
    options.optionFlags = kNavDefaultNavDlogOptions;

	    NavCustomControl(dialogRef, kNavCtlSetLocation, (void*) &defLocAed);
	  }
	AEDisposeDesc(&defLocAed);
      }

      BLOCK_INPUT;
      status = NavDialogRun(dialogRef);
      UNBLOCK_INPUT;
    }

    if (saveName) CFRelease(saveName);
    if (client) CFRelease(client);
    if (message) CFRelease(message);

      userAction = NavDialogGetUserAction(dialogRef);
      switch (userAction)
	{
	case kNavUserActionNone:
	case kNavUserActionCancel:
	  NavDialogDispose(dialogRef);
	  Fsignal (Qquit, Qnil);  /* Treat cancel like C-g */
	  return;
	case kNavUserActionOpen:
	case kNavUserActionChoose:
	case kNavUserActionSaveAs:
	  {
	    NavReplyRecord reply;

      /* Fall back on minibuffer if there was a problem */
      file = Fcompleting_read (prompt, intern ("read-file-name-internal"),
			       dir, mustmatch, dir, Qfile_name_history,
			       default_filename, Qnil);
    }
  }

  UNGCPRO;
  
  /* Make "Cancel" equivalent to C-g.  */

57425:0867872551d9

    NavDialogRef dialogRef;
    NavTypeListHandle fileTypes = NULL;
    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;
    options.location.h = options.location.v = -1;
    options.optionFlags = kNavDefaultNavDlogOptions;

	    NavCustomControl(dialogRef, kNavCtlSetLocation, (void*) &defLocAed);
	  }
	AEDisposeDesc(&defLocAed);
      }

      status = NavDialogRun(dialogRef);
    }

    if (saveName) CFRelease(saveName);
    if (client) CFRelease(client);
    if (message) CFRelease(message);

      userAction = NavDialogGetUserAction(dialogRef);
      switch (userAction)
	{
	case kNavUserActionNone:
	case kNavUserActionCancel:
	  break;		/* Treat cancel like C-g */
	case kNavUserActionOpen:
	case kNavUserActionChoose:
	case kNavUserActionSaveAs:
	  {
	    NavReplyRecord reply;

      /* Fall back on minibuffer if there was a problem */
      file = Fcompleting_read (prompt, intern ("read-file-name-internal"),
			       dir, mustmatch, dir, Qfile_name_history,
			       default_filename, Qnil);
    }
    UNBLOCK_INPUT;
  }

  UNGCPRO;
  
  /* Make "Cancel" equivalent to C-g.  */