comparison src/macfns.c @ 57868:c955f6add62a

* fileio.c (Fread_file_name): Pass Qt as fifth parameter to Fx_file_dialog if only directories should be read. * lisp.h: Fx_file_dialog takes 5 parameters. * xfns.c (Fx_file_dialog): Both Motif and GTK version: Add parameter only_dir_p. In Motif version, don't put DEFAULT_FILENAME in filter part of the dialog, just text field part. Do not add DEFAULT_FILENAME to list of files if it isn't there. In GTK version, pass only_dir_p parameter to xg_get_file_name. * macfns.c (Fx_file_dialog): Add parameter only_dir_p. Check only_dir_p instead of comparing prompt to "Dired". When using a save dialog, add option kNavDontConfirmReplacement, change title to "Enter name", change text for save button to "Ok". * w32fns.c (Fx_file_dialog): Add parameter only_dir_p. Check only_dir_p instead of comparing prompt to "Dired". * gtkutil.c (xg_get_file_with_chooser) (xg_get_file_with_selection): New functions, only defined ifdef HAVE_GTK_FILE_CHOOSER_DIALOG_NEW and HAVE_GTK_FILE_SELECTION_NEW respectively. (xg_get_file_name): Add parameter only_dir_p. Call xg_get_file_with_chooser or xg_get_file_with_selection depending on HAVE_GTK_FILE* and the value of use_old_gtk_file_dialog. (xg_initialize): New DEFVAR_BOOL use_old_gtk_file_dialog. * gtkutil.h (xg_get_file_name): Add parameter only_dir_p.

57867:5a547995da89

   directory and whether or not we are going to choose a file.
 **/

extern Lisp_Object Qfile_name_history;

DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 4, 0,
       doc: /* Read file name, prompting with PROMPT in directory DIR.
Use a file selection dialog.
Select DEFAULT-FILENAME in the dialog's file selection box, if
specified.  Ensure that file exists if MUSTMATCH is non-nil.  */)
  (prompt, dir, default_filename, mustmatch)
     Lisp_Object prompt, dir, default_filename, mustmatch;
{
  struct frame *f = SELECTED_FRAME ();
  Lisp_Object file = Qnil;
  int count = SPECPDL_INDEX ();
  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
  char filename[1001];
  int default_filter_index = 1; /* 1: All Files, 2: Directories only  */

  GCPRO5 (prompt, dir, default_filename, mustmatch, file);
  CHECK_STRING (prompt);
  CHECK_STRING (dir);

  /* Create the dialog with PROMPT as title, using DIR as initial
     directory and using "*" as pattern.  */

    OSStatus status;
    NavDialogCreationOptions options;
    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;

    client = CFStringCreateWithCStringNoCopy(NULL, "Emacs", 
					     kCFStringEncodingMacRoman, NULL);
    options.clientName = client;
    */

    /* Do Dired hack copied from w32fns.c */ 
    if (!NILP(prompt) && strncmp (SDATA(prompt), "Dired", 5) == 0)
      status = NavCreateChooseFolderDialog(&options, NULL, NULL, NULL,
					   &dialogRef);
    else if (NILP (mustmatch)) 
      { 
	/* This is a save dialog */
	if (!NILP(default_filename))
	  {
	    saveName = CFStringCreateWithCString(NULL, SDATA(default_filename),
						 kCFStringEncodingUTF8);
	    options.saveFileName = saveName;
	    options.optionFlags |= kNavSelectDefaultLocation;
	  }
	/* MAC_TODO: Find a better way to determine if this is a save
	   or load dialog than comparing dir with default_filename */
	if (EQ(dir, default_filename)) 
	  {
	    status = NavCreateChooseFileDialog(&options, fileTypes,
					       NULL, NULL, NULL, NULL, 
					       &dialogRef);
	  }
	else {
	  status = NavCreatePutFileDialog(&options, 
					  'TEXT', kNavGenericSignature,
					  NULL, NULL, &dialogRef);
	}
      }
    else
      {
	/* This is an open dialog*/
	status = NavCreateChooseFileDialog(&options, fileTypes,
					   NULL, NULL, NULL, NULL, 

    }

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

    if (status == noErr) {
      userAction = NavDialogGetUserAction(dialogRef);
      switch (userAction)
	{

57868:c955f6add62a

   directory and whether or not we are going to choose a file.
 **/

extern Lisp_Object Qfile_name_history;

DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 5, 0,
       doc: /* Read file name, prompting with PROMPT in directory DIR.
Use a file selection dialog.
Select DEFAULT-FILENAME in the dialog's file selection box, if
specified.  Ensure that file exists if MUSTMATCH is non-nil.
If ONLY-DIR-P is non-nil, the user can only select directories.  */)
  (prompt, dir, default_filename, mustmatch, only_dir_p)
     Lisp_Object prompt, dir, default_filename, mustmatch, only_dir_p;
{
  struct frame *f = SELECTED_FRAME ();
  Lisp_Object file = Qnil;
  int count = SPECPDL_INDEX ();
  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
  char filename[1001];
  int default_filter_index = 1; /* 1: All Files, 2: Directories only  */

  GCPRO6 (prompt, dir, default_filename, mustmatch, file, only_dir_p);
  CHECK_STRING (prompt);
  CHECK_STRING (dir);

  /* Create the dialog with PROMPT as title, using DIR as initial
     directory and using "*" as pattern.  */

    OSStatus status;
    NavDialogCreationOptions options;
    NavDialogRef dialogRef;
    NavTypeListHandle fileTypes = NULL;
    NavUserAction userAction;
    CFStringRef message=NULL, client=NULL, saveName = NULL, ok = NULL;
    CFStringRef title = NULL;
    
    BLOCK_INPUT;
    /* No need for a callback function because we are modal */
    NavGetDefaultDialogCreationOptions(&options);
    options.modality = kWindowModalityAppModal;

    client = CFStringCreateWithCStringNoCopy(NULL, "Emacs", 
					     kCFStringEncodingMacRoman, NULL);
    options.clientName = client;
    */

    if (!NILP (only_dir_p))
      status = NavCreateChooseFolderDialog(&options, NULL, NULL, NULL,
					   &dialogRef);
    else if (NILP (mustmatch)) 
      { 
	/* This is a save dialog */
	ok = CFStringCreateWithCString (NULL, "Ok", kCFStringEncodingUTF8);
	title = CFStringCreateWithCString (NULL, "Enter name",
	                                   kCFStringEncodingUTF8);
	options.optionFlags |= kNavDontConfirmReplacement;
	options.actionButtonLabel = ok;
	options.windowTitle = title;

	if (!NILP(default_filename))
	  {
	    saveName = CFStringCreateWithCString(NULL, SDATA(default_filename),
						 kCFStringEncodingUTF8);
	    options.saveFileName = saveName;
	    options.optionFlags |= kNavSelectDefaultLocation;
	  }
	  status = NavCreatePutFileDialog(&options, 
					  'TEXT', kNavGenericSignature,
					  NULL, NULL, &dialogRef);
	}
    else
      {
	/* This is an open dialog*/
	status = NavCreateChooseFileDialog(&options, fileTypes,
					   NULL, NULL, NULL, NULL, 

    }

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

    if (status == noErr) {
      userAction = NavDialogGetUserAction(dialogRef);
      switch (userAction)
	{