emacs: src/macterm.c comparison

comparison src/macterm.c @ 59384:a1edc5959dcf

* macfns.c: Include sys/param.h. [TARGET_API_MAC_CARBON] (mac_nav_event_callback): New declaration and function. [TARGET_API_MAC_CARBON] (Fx_file_dialog): Use MAXPATHLEN for size of filename string. Set event callback function when creating dialog boxes. Add code conversions for filenames. Don't dispose apple event descriptor record if failed to create it. * macterm.c: Include sys/param.h. [USE_CARBON_EVENTS] (mac_handle_window_event): Add handler for kEventWindowUpdate. (install_window_handler) [USE_CARBON_EVENTS]: Register it. (do_ae_open_documents) [TARGET_API_MAC_CARBON]: Get FSRef instead of FSSpec from apple event descriptor record. (do_ae_open_documents) [TARGET_API_MAC_CARBON]: Use MAXPATHLEN for size of filename string. [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Likewise. [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Return error when a file dialog is in action. [TARGET_API_MAC_CARBON] (mac_do_track_drag): Likewise. Reject only when there are no filename items. Set background color before (un)highlighting the window below the dragged items. (XTread_socket) [!USE_CARBON_EVENTS]: Don't call do_window_update.

author	Steven Tamm <steventamm@mac.com>
date	Thu, 06 Jan 2005 02:53:39 +0000
parents	68eaccfa130a
children	b0b469611a56

comparison

equal deleted inserted replaced

-:b2ee40a51736
+:a1edc5959dcf
 #include <ctype.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 #include "keyboard.h"
 #include "frame.h"
 #include "dispextern.h"
 #include "fontset.h"
 GetEventParameter (event, kEventParamDirectObject, typeWindowRef,
 		     NULL, sizeof (WindowPtr), NULL, &wp);
 switch (GetEventKind (event))
 {
+case kEventWindowUpdate:
+result = CallNextEventHandler (next_handler, event);
+if (result != eventNotHandledErr)
+	return result;
+do_window_update (wp);
+break;
 case kEventWindowBoundsChanging:
 result = CallNextEventHandler (next_handler, event);
 if (result != eventNotHandledErr)
 	return result;
 install_window_handler (window)
 WindowPtr window;
 {
 OSErr err = noErr;
 #if USE_CARBON_EVENTS
-EventTypeSpec specs[] = {{kEventClassWindow, kEventWindowBoundsChanging}};
+EventTypeSpec specs[] = {{kEventClassWindow, kEventWindowUpdate},
+			   {kEventClassWindow, kEventWindowBoundsChanging}};
 static EventHandlerUPP handle_window_event_UPP = NULL;
 if (handle_window_event_UPP == NULL)
 handle_window_event_UPP = NewEventHandlerUPP (mac_handle_window_event);
 if (err == noErr)
 {
 int i;
 /* AE file list is one based so just use that for indexing here.  */
-for (i = 1; (err == noErr) && (i <= num_files_to_open); i++)
+for (i = 1; i <= num_files_to_open; i++)
 	  {
+#ifdef MAC_OSX
+	    FSRef fref;
+	    char unix_path_name[MAXPATHLEN];
+	    err = AEGetNthPtr (&the_desc, i, typeFSRef, &keyword,
+			       &actual_type, &fref, sizeof (FSRef),
+			       &actual_size);
+	    if (err != noErr || actual_type != typeFSRef)
+	      continue;
+	    if (FSRefMakePath (&fref, unix_path_name, sizeof (unix_path_name))
+		== noErr)
+#else
 	    FSSpec fs;
 	    Str255 path_name, unix_path_name;
-#ifdef MAC_OSX
-	    FSRef fref;
-#endif
 	    err = AEGetNthPtr(&the_desc, i, typeFSS, &keyword, &actual_type,
 			      (Ptr) &fs, sizeof (fs), &actual_size);
-	    if (err != noErr) break;
+	    if (err != noErr) continue;
-#ifdef MAC_OSX
-	    err = FSpMakeFSRef (&fs, &fref);
-	    if (err != noErr) break;
-	    if (FSRefMakePath (&fref, unix_path_name, 255) == noErr)
-#else
 	    if (path_from_vol_dir_name (path_name, 255, fs.vRefNum, fs.parID,
 					fs.name) &&
 		mac_to_posix_pathname (path_name, unix_path_name, 255))
 #endif
 	      /* x-dnd functions expect undecoded filenames.  */
 short index;
 ItemReference theItem;
 FlavorFlags theFlags;
 OSErr result;
+if (GetFrontWindowOfClass (kMovableModalWindowClass, false))
+return dragNotAcceptedErr;
 switch (message)
 {
 case kDragTrackingEnterHandler:
 CountDragItems (theDrag, &items);
-can_accept = 1;
+can_accept = 0;
 for (index = 1; index <= items; index++)
 	{
 	  GetDragItemReferenceNumber (theDrag, index, &theItem);
 	  result = GetFlavorFlags (theDrag, theItem, flavorTypeHFS, &theFlags);
-	  if (result != noErr)
+	  if (result == noErr)
 	    {
-	      can_accept = 0;
+	      can_accept = 1;
 	      break;
 	    }
 	}
 break;
 case kDragTrackingEnterWindow:
 if (can_accept)
 	{
 	  RgnHandle hilite_rgn = NewRgn ();
 	  Rect r;
+	  struct frame *f = mac_window_to_frame (window);
+	  mac_set_backcolor (FRAME_BACKGROUND_PIXEL (f));
 	  GetWindowPortBounds (window, &r);
 	  OffsetRect (&r, -r.left, -r.top);
 	  RectRgn (hilite_rgn, &r);
 	  ShowDragHilite (theDrag, hilite_rgn, true);
 	  DisposeRgn (hilite_rgn);
 break;
 case kDragTrackingLeaveWindow:
 if (can_accept)
 	{
+	  struct frame *f = mac_window_to_frame (window);
+	  mac_set_backcolor (FRAME_BACKGROUND_PIXEL (f));
 	  HideDragHilite (theDrag);
 	  SetThemeCursor (kThemeArrowCursor);
 	}
 break;
 FlavorFlags theFlags;
 Point mouse;
 OSErr result;
 ItemReference theItem;
 HFSFlavor data;
-FSRef fref;
 Size size = sizeof (HFSFlavor);
+if (GetFrontWindowOfClass (kMovableModalWindowClass, false))
+return dragNotAcceptedErr;
 drag_and_drop_file_list = Qnil;
 GetDragMouse (theDrag, &mouse, 0L);
 CountDragItems (theDrag, &items);
 for (index = 1; index <= items; index++)
 GetDragItemReferenceNumber (theDrag, index, &theItem);
 result = GetFlavorFlags (theDrag, theItem, flavorTypeHFS, &theFlags);
 if (result == noErr)
 	{
 #ifdef MAC_OSX
-	  FSRef frref;
+	  FSRef fref;
+	  char unix_path_name[MAXPATHLEN];
 #else
-	  Str255 path_name;
+	  Str255 path_name, unix_path_name;
 #endif
-	  Str255 unix_path_name;
 	  GetFlavorData (theDrag, theItem, flavorTypeHFS, &data, &size, 0L);
 #ifdef MAC_OSX
 	  /* Use Carbon routines, otherwise it converts the file name
 	     to /Macintosh HD/..., which is not correct. */
 	  FSpMakeFSRef (&data.fileSpec, &fref);
 drag_and_drop_file_list =
 	      Fcons (make_unibyte_string (unix_path_name,
 					  strlen (unix_path_name)),
 		     drag_and_drop_file_list);
 	}
-else
-	continue;
 }
 /* If there are items in the list, construct an event and post it to
 the queue like an interrupt using kbd_buffer_store_event.  */
 if (!NILP (drag_and_drop_file_list))
 {
 	case updateEvt:
 #if USE_CARBON_EVENTS
 	  if (SendEventToEventTarget (eventRef, toolbox_dispatcher)
 	      != eventNotHandledErr)
 	    break;
-#endif
+#else
 	  do_window_update ((WindowPtr) er.message);
+#endif
 	  break;
 	case osEvt:
 #if USE_CARBON_EVENTS
 	  if (SendEventToEventTarget (eventRef, toolbox_dispatcher)

Mercurial > emacs

comparison src/macterm.c @ 59384:a1edc5959dcf