comparison src/macfns.c @ 60361:bd59e53ab8e8

(install_window_handler): Move extern to macterm.h. (Fx_file_dialog): Check STRINGP (default_filename) to see it is valid. Don't check !NILP (dir) because it is already checked with CHECK_STRING. (Fx_file_dialog) [!MAC_OSX]: Use FSSpec instead of FSRef for specifying the default location and obtaining the selected filename.

60360:86edfe26d552

}


/* Create and set up the Mac window for frame F.  */

extern OSErr install_window_handler (WindowPtr);

static void
mac_window (f)
     struct frame *f;
{
  Rect r;

	/* This is a save dialog */
	options.optionFlags |= kNavDontConfirmReplacement;
	options.actionButtonLabel = CFSTR ("Ok");
	options.windowTitle = CFSTR ("Enter name");

	if (!NILP(default_filename))
	  {
	    Lisp_Object utf8 = ENCODE_UTF_8 (default_filename);
	    char *begPtr = SDATA(utf8);
	    char *filePtr = begPtr + SBYTES(utf8);
	    while (filePtr != begPtr && !IS_DIRECTORY_SEP(filePtr[-1]))

					   mac_nav_event_callbackUPP, NULL,
					   NULL, NULL, &dialogRef);
      }
    
    /* Set the default location and continue*/
    if (status == noErr) {
      if (!NILP(dir)) {
	FSRef defLoc;
	AEDesc defLocAed;
	status = FSPathMakeRef(SDATA(ENCODE_FILE(dir)), &defLoc, NULL);
	if (status == noErr) 
	  {
	    AECreateDesc(typeFSRef, &defLoc, sizeof(FSRef), &defLocAed);
	    NavCustomControl(dialogRef, kNavCtlSetLocation, (void*) &defLocAed);
	    AEDisposeDesc(&defLocAed);
	  }
      }

      status = NavDialogRun(dialogRef);
    }

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

    if (status == noErr) {

	case kNavUserActionChoose:
	case kNavUserActionSaveAs:
	  {
	    NavReplyRecord reply;
	    AEDesc aed;
	    FSRef fsRef;
	    status = NavDialogGetReply(dialogRef, &reply);
	    AECoerceDesc(&reply.selection, typeFSRef, &aed);
	    AEGetDescData(&aed, (void *) &fsRef, sizeof (FSRef));
	    FSRefMakePath(&fsRef, (UInt8 *) filename, sizeof (filename));
	    AEDisposeDesc(&aed);
	    if (reply.saveFileName)
	      {
		/* If it was a saved file, we need to add the file name */
		int len = strlen(filename);

60361:bd59e53ab8e8

}


/* Create and set up the Mac window for frame F.  */

static void
mac_window (f)
     struct frame *f;
{
  Rect r;

	/* This is a save dialog */
	options.optionFlags |= kNavDontConfirmReplacement;
	options.actionButtonLabel = CFSTR ("Ok");
	options.windowTitle = CFSTR ("Enter name");

	if (STRINGP (default_filename))
	  {
	    Lisp_Object utf8 = ENCODE_UTF_8 (default_filename);
	    char *begPtr = SDATA(utf8);
	    char *filePtr = begPtr + SBYTES(utf8);
	    while (filePtr != begPtr && !IS_DIRECTORY_SEP(filePtr[-1]))

					   mac_nav_event_callbackUPP, NULL,
					   NULL, NULL, &dialogRef);
      }
    
    /* Set the default location and continue*/
    if (status == noErr)
      {
	AEDesc defLocAed;
#ifdef MAC_OSX
	FSRef defLoc;
	status = FSPathMakeRef(SDATA(ENCODE_FILE(dir)), &defLoc, NULL);
#else
	FSSpec defLoc;
	status = posix_pathname_to_fsspec (SDATA (ENCODE_FILE (dir)), &defLoc);
#endif
	if (status == noErr) 
	  {
#ifdef MAC_OSX
	    AECreateDesc(typeFSRef, &defLoc, sizeof(FSRef), &defLocAed);
#else
	    AECreateDesc(typeFSS, &defLoc, sizeof(FSSpec), &defLocAed);
#endif
	    NavCustomControl(dialogRef, kNavCtlSetLocation, (void*) &defLocAed);
	    AEDisposeDesc(&defLocAed);
	  }
	status = NavDialogRun(dialogRef);
      }

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

    if (status == noErr) {

	case kNavUserActionChoose:
	case kNavUserActionSaveAs:
	  {
	    NavReplyRecord reply;
	    AEDesc aed;
#ifdef MAC_OSX
	    FSRef fsRef;
#else
	    FSSpec fs;
#endif
	    status = NavDialogGetReply(dialogRef, &reply);

#ifdef MAC_OSX
	    AECoerceDesc(&reply.selection, typeFSRef, &aed);
	    AEGetDescData(&aed, (void *) &fsRef, sizeof (FSRef));
	    FSRefMakePath(&fsRef, (UInt8 *) filename, sizeof (filename));
#else
	    AECoerceDesc (&reply.selection, typeFSS, &aed);
	    AEGetDescData (&aed, (void *) &fs, sizeof (FSSpec));
	    fsspec_to_posix_pathname (&fs, filename, sizeof (filename) - 1);
#endif
	    AEDisposeDesc(&aed);
	    if (reply.saveFileName)
	      {
		/* If it was a saved file, we need to add the file name */
		int len = strlen(filename);