emacs: src/macterm.c comparison

comparison src/macterm.c @ 60364:de784812b4d4

[TARGET_API_MAC_CARBON && !MAC_OSX]: Define USE_CARBON_EVENTS to 1. [__MRC__ && TARGET_API_MAC_CARBON]: Don't declare `qd'. (x_free_frame_resources): Call remove_window_handler for non-tooltip windows. [TARGET_API_MAC_CARBON]: Don't include headers that are included via Carbon.h. [TARGET_API_MAC_CARBON] (mac_do_track_dragUPP) (mac_do_receive_dragUPP): New variables. (mac_handle_service_event, init_service_handler): Put declarations and definitions in #ifdef MAC_OSX. (install_window_handler) [TARGET_API_MAC_CARBON]: Create UPPs for drag-and-drop handler functions and register them. (remove_window_handler): New function. (do_ae_open_documents, mac_do_receive_drag) [!MAC_OSX]: Use fsspec_to_posix_pathname. (main): Change #if !TARGET_API_MAC_CARBON to #ifdef MAC_OS8. (XTread_socket) [!MAC_OSX]: Don't pass keyboard events to TSM. [MAC_OS8] (make_mac_terminal_frame) [TARGET_API_MAC_CARBON]: Set default cursors. (mac_initialize) [USE_CARBON_EVENTS && !MAC_OSX] : Don't call init_service_handler or init_quit_char_handler. (mac_initialize) [!MAC_OSX]: Don't call MakeMeTheFrontProcess.

author	YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date	Fri, 04 Mar 2005 11:11:16 +0000
parents	96a18b943293
children	4536f307a219 1f334cdd7020 29e773288013

comparison

equal deleted inserted replaced

-:c4138f578114
+:de784812b4d4
 #ifndef MAC_OSX
 #include <alloca.h>
 #endif
-#ifdef MAC_OSX
+#if TARGET_API_MAC_CARBON
 /* USE_CARBON_EVENTS determines if the Carbon Event Manager is used to
 obtain events from the event queue.  If set to 0, WaitNextEvent is
 used instead.  */
 #define USE_CARBON_EVENTS 1
-#else /* not MAC_OSX */
+#else /* not TARGET_API_MAC_CARBON */
 #include <Quickdraw.h>
 #include <ToolUtils.h>
 #include <Sound.h>
 #include <Events.h>
 #include <Script.h>
 #endif
 #if __profile__
 #include <profiler.h>
 #endif
-#endif /* not MAC_OSX */
+#endif /* not TARGET_API_MAC_CARBON */
 #include "systty.h"
 #include "systime.h"
 #include "atimer.h"
 #include "keymap.h"
 extern XrmDatabase x_load_resources P_ ((Display *, char *, char *, char *));
 #endif
 extern int inhibit_window_system;
-#if __MRC__
+#if __MRC__ && !TARGET_API_MAC_CARBON
 QDGlobals qd;  /* QuickDraw global information structure.  */
 #endif
 struct frame * x_window_to_frame (struct mac_display_info *, WindowPtr);
 {
 struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f);
 WindowPtr wp = FRAME_MAC_WINDOW (f);
 BLOCK_INPUT;
+if (wp != tip_window)
+remove_window_handler (wp);
 DisposeWindow (wp);
 if (wp == tip_window)
 /* Neither WaitNextEvent nor ReceiveNextEvent receives `window
 closed' event.  So we reset tip_window here.  */
 /* The Mac Event loop code */
-#ifndef MAC_OSX
+#if !TARGET_API_MAC_CARBON
 #include <Events.h>
 #include <Quickdraw.h>
 #include <Balloons.h>
 #include <Devices.h>
 #include <Fonts.h>
 #include <Resources.h>
 #if __MWERKS__
 #include <unix.h>
 #endif
-#endif /* ! MAC_OSX */
+#endif /* ! TARGET_API_MAC_CARBON */
 #define M_APPLE 128
 #define I_ABOUT 1
 #define WINDOW_RESOURCE 128
 #if TARGET_API_MAC_CARBON
 /* Drag and Drop */
 static pascal OSErr mac_do_track_drag (DragTrackingMessage, WindowPtr, void*, DragReference);
 static pascal OSErr mac_do_receive_drag (WindowPtr, void*, DragReference);
+static DragTrackingHandlerUPP mac_do_track_dragUPP = NULL;
+static DragReceiveHandlerUPP mac_do_receive_dragUPP = NULL;
 #endif
 #if USE_CARBON_EVENTS
+#ifdef MAC_OSX
 /* Preliminary Support for the OSX Services Menu */
 static OSStatus mac_handle_service_event (EventHandlerCallRef,EventRef,void*);
 static void init_service_handler ();
+#endif
 /* Window Event Handler */
 static pascal OSStatus mac_handle_window_event (EventHandlerCallRef,
 						EventRef, void *);
 #endif
 OSErr install_window_handler (WindowPtr);
 if (err != noErr)
 abort ();
 }
 #if USE_CARBON_EVENTS
+#ifdef MAC_OSX
 void
 init_service_handler ()
 {
 EventTypeSpec specs[] = {{kEventClassService, kEventServiceGetTypes},
 			   {kEventClassService, kEventServiceCopy},
 */
 }
 }
 return err;
 }
+#endif
 static pascal OSStatus
 mac_handle_window_event (next_handler, event, data)
 EventHandlerCallRef next_handler;
 EventRef event;
 err = InstallWindowEventHandler (window, handle_window_event_UPP,
 				   GetEventTypeCount (specs), specs,
 				   NULL, NULL);
 #endif
 #if TARGET_API_MAC_CARBON
+if (mac_do_track_dragUPP == NULL)
+mac_do_track_dragUPP = NewDragTrackingHandlerUPP (mac_do_track_drag);
+if (mac_do_receive_dragUPP == NULL)
+mac_do_receive_dragUPP = NewDragReceiveHandlerUPP (mac_do_receive_drag);
 if (err == noErr)
-err = InstallTrackingHandler (mac_do_track_drag, window, NULL);
+err = InstallTrackingHandler (mac_do_track_dragUPP, window, NULL);
 if (err == noErr)
-err = InstallReceiveHandler (mac_do_receive_drag, window, NULL);
+err = InstallReceiveHandler (mac_do_receive_dragUPP, window, NULL);
 #endif
 return err;
 }
+void
+remove_window_handler (window)
+WindowPtr window;
+{
+#if TARGET_API_MAC_CARBON
+if (mac_do_track_dragUPP)
+RemoveTrackingHandler (mac_do_track_dragUPP, window);
+if (mac_do_receive_dragUPP)
+RemoveReceiveHandler (mac_do_receive_dragUPP, window);
+#endif
+}
 /* Open Application Apple Event */
 static pascal OSErr
 do_ae_open_application(const AppleEvent *pae, AppleEvent *preply, long prefcon)
 {
 int i;
 /* AE file list is one based so just use that for indexing here.  */
 for (i = 1; i <= num_files_to_open; i++)
 	  {
+	    char unix_path_name[MAXPATHLEN];
 #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)
 	    if (FSRefMakePath (&fref, unix_path_name, sizeof (unix_path_name))
 		== noErr)
 #else
 	    FSSpec fs;
-	    Str255 path_name, unix_path_name;
 	    err = AEGetNthPtr(&the_desc, i, typeFSS, &keyword, &actual_type,
 			      (Ptr) &fs, sizeof (fs), &actual_size);
 	    if (err != noErr) continue;
-	    if (path_from_vol_dir_name (path_name, 255, fs.vRefNum, fs.parID,
+	    if (fsspec_to_posix_pathname (&fs, unix_path_name,
-					fs.name) &&
+					  sizeof (unix_path_name) - 1) == noErr)
-		mac_to_posix_pathname (path_name, unix_path_name, 255))
 #endif
 	      /* x-dnd functions expect undecoded filenames.  */
 	      drag_and_drop_file_list =
 		Fcons (make_unibyte_string (unix_path_name,
 					    strlen (unix_path_name)),
 result = GetFlavorFlags (theDrag, theItem, flavorTypeHFS, &theFlags);
 if (result == noErr)
 	{
 #ifdef MAC_OSX
 	  FSRef fref;
+#endif
 	  char unix_path_name[MAXPATHLEN];
-#else
-	  Str255 path_name, unix_path_name;
-#endif
 	  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);
 	  if (! FSRefMakePath (&fref, unix_path_name, sizeof (unix_path_name)));
 #else
-	  if (path_from_vol_dir_name (path_name, 255, data.fileSpec.vRefNum,
+	  if (fsspec_to_posix_pathname (&data.fileSpec, unix_path_name,
-				      data.fileSpec.parID, data.fileSpec.name) &&
+					sizeof (unix_path_name) - 1) == noErr)
-	      mac_to_posix_pathname (path_name, unix_path_name, 255))
 #endif
 	    /* x-dnd functions expect undecoded filenames.  */
 drag_and_drop_file_list =
 	      Fcons (make_unibyte_string (unix_path_name,
 					  strlen (unix_path_name)),
 This makes the cursor jump back to its correct position after
 briefly jumping to that of the matching parenthesis, print useful
 hints and prompts in the minibuffer after the user stops typing for
 a wait, etc.  */
-#if !TARGET_API_MAC_CARBON
+#ifdef MAC_OS8
 #undef main
 int
 main (void)
 {
 #if __profile__  /* is the profiler on? */
 	case autoKey:
 	  {
 	    int keycode = (er.message & keyCodeMask) >> 8;
 	    int xkeysym;
-#if USE_CARBON_EVENTS
+#if USE_CARBON_EVENTS && defined (MAC_OSX)
 	    /* When using Carbon Events, we need to pass raw keyboard
 	       events to the TSM ourselves.  If TSM handles it, it
 	       will pass back noErr, otherwise it will pass back
 	       "eventNotHandledErr" and we can process it
 	       normally.  */
 f->output_data.mac->cursor_pixel = 0;
 f->output_data.mac->border_pixel = 0x00ff00;
 f->output_data.mac->mouse_pixel = 0xff00ff;
 f->output_data.mac->cursor_foreground_pixel = 0x0000ff;
+#if TARGET_API_MAC_CARBON
+f->output_data.mac->text_cursor = kThemeIBeamCursor;
+f->output_data.mac->nontext_cursor = kThemeArrowCursor;
+f->output_data.mac->modeline_cursor = kThemeArrowCursor;
+f->output_data.mac->hand_cursor = kThemePointingHandCursor;
+f->output_data.mac->hourglass_cursor = kThemeWatchCursor;
+f->output_data.mac->horizontal_drag_cursor = kThemeResizeLeftRightCursor;
+#else
 f->output_data.mac->text_cursor = GetCursor (iBeamCursor);
 f->output_data.mac->nontext_cursor = &arrow_cursor;
 f->output_data.mac->modeline_cursor = &arrow_cursor;
 f->output_data.mac->hand_cursor = &arrow_cursor;
 f->output_data.mac->hourglass_cursor = GetCursor (watchCursor);
 f->output_data.mac->horizontal_drag_cursor = &arrow_cursor;
+#endif
 FRAME_FONTSET (f) = -1;
 f->output_data.mac->explicit_parent = 0;
 f->left_pos = 8;
 f->top_pos = 32;
 BLOCK_INPUT;
 #if TARGET_API_MAC_CARBON
 init_required_apple_events ();
-#if USE_CARBON_EVENTS
+#if USE_CARBON_EVENTS && defined (MAC_OSX)
 init_service_handler ();
 init_quit_char_handler ();
 #endif
 DisableMenuCommand (NULL, kHICommandQuit);
+#ifdef MAC_OSX
 if (!inhibit_window_system)
 MakeMeTheFrontProcess ();
+#endif
 #endif
 UNBLOCK_INPUT;
 }

Mercurial > emacs

comparison src/macterm.c @ 60364:de784812b4d4