From bc21bf11c1770f87b8e6a2472bfcfbac4209076f Mon Sep 17 00:00:00 2001 From: Andrew Choi Date: Mon, 1 Jul 2002 20:02:33 +0000 Subject: [PATCH] In mac: 2002-07-01 Andrew Choi * Emacs.app/Contents/Resources/Emacs.icns: New file. * Emacs.app/Contents/Info.plist: Add CFBundleDocumentTypes and CFBundleIconFile entries. In src: 2002-07-01 Andrew Choi * macterm.c (do_ae_open_documents) [MAC_OSX]: Call FSpMakeFSRef and FSRefMakePath to convert FSSpec returned with Apple Event to Posix pathname. (mac_initialize) [TARGET_API_MAC_CARBON]: Call init_required_apple_events and disable the `Quit' menu item provided automatically by the Carbon Toolbox. --- mac/ChangeLog | 15 +++++-- mac/Emacs.app/Contents/Info.plist | 23 +++++++++- mac/Emacs.app/Contents/Resources/Emacs.icns | Bin 0 -> 51554 bytes src/ChangeLog | 11 ++++- src/macterm.c | 45 ++++++++++++++------ 5 files changed, 74 insertions(+), 20 deletions(-) create mode 100644 mac/Emacs.app/Contents/Resources/Emacs.icns diff --git a/mac/ChangeLog b/mac/ChangeLog index 186a8564289..a07fe67e25c 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -1,3 +1,10 @@ +2002-07-01 Andrew Choi + + * Emacs.app/Contents/Resources/Emacs.icns: New file. + + * Emacs.app/Contents/Info.plist: Add CFBundleDocumentTypes and + CFBundleIconFile entries. + 2002-04-13 Andrew Choi * Emacs.app/Contents/Info.plist: New file. @@ -137,7 +144,7 @@ cursor row is invisible. This can happen if cursor is on top line of a window, and we switch to a buffer with a header line. -2001-12-22 Pavel Jan,Bm(Bk +2001-12-22 Pavel Jan,Am(Bk * cw5-mcp.xml, cw6-mcp.xml, makefile.MPW: Remove mocklisp files. @@ -146,7 +153,7 @@ * src/macfns.c (x_report_frame_params): Make the scroll-bar-width frame parameter have a numeric value all the time. -2001-12-08 Pavel Jan,Bm(Bk +2001-12-08 Pavel Jan,Am(Bk * COPYING: New file. @@ -164,7 +171,7 @@ * src/macterm.c: Merged changes from xterm.c. * src/macfns.c: Merged changes from xfns.c. -2001-11-16 Pavel Jan,Bm(Bk +2001-11-16 Pavel Jan,Am(Bk * src/macterm.c (waiting_for_input): Remove unnecessary declaration. @@ -268,7 +275,7 @@ * inc/macterm.h (x_display_list): Declare extern. -2001-07-20 Pavel Jan,Bm(Bk +2001-07-20 Pavel Jan,Am(Bk * src/macterm.c (xim_open_dpy): Fix typo. diff --git a/mac/Emacs.app/Contents/Info.plist b/mac/Emacs.app/Contents/Info.plist index 4d51100f66b..774db36af76 100644 --- a/mac/Emacs.app/Contents/Info.plist +++ b/mac/Emacs.app/Contents/Info.plist @@ -4,8 +4,29 @@ CFBundleDevelopmentRegion English + CFBundleDocumentTypes + + + CFBundleTypeExtensions + + * + + CFBundleTypeName + All + CFBundleTypeOSTypes + + **** + + CFBundleTypeRole + Viewer + + CFBundleExecutable Emacs + CFBundleIconFile + Emacs.icns + CFBundleIdentifier + com.gnu.Emacs CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType @@ -13,6 +34,6 @@ CFBundleSignature ???? CFBundleVersion - 0.1 + 1.1 diff --git a/mac/Emacs.app/Contents/Resources/Emacs.icns b/mac/Emacs.app/Contents/Resources/Emacs.icns new file mode 100644 index 0000000000000000000000000000000000000000..25cc99fdd0e1742f9fa5b68c1526feb849c4c2a4 GIT binary patch literal 51554 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 literal 0 HcmV?d00001 diff --git a/src/ChangeLog b/src/ChangeLog index 12a056e92bb..f2ebcdd5b30 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2002-07-01 Andrew Choi + + * macterm.c (do_ae_open_documents) [MAC_OSX]: Call FSpMakeFSRef + and FSRefMakePath to convert FSSpec returned with Apple Event to + Posix pathname. + (mac_initialize) [TARGET_API_MAC_CARBON]: Call + init_required_apple_events and disable the `Quit' menu item + provided automatically by the Carbon Toolbox. + 2002-07-01 Dave Love * keyboard.c (kbd_buffer_store_event): Fix interrupt_signal decl @@ -135,7 +144,7 @@ * w32fns.c (file_dialog_callback): New function. (Fx_file_dialog): Allow selecting directories as well as files. -2002-06-21 Pavel Jan,Bm(Bk +2002-06-21 Pavel Jan,Am(Bk * m/pmax.h (START_FILES): Define START_FILES for NetBSD and OpenBSD. Add support for mipseb-*-netbsd* machines. diff --git a/src/macterm.c b/src/macterm.c index 41dfbc0c0ab..ae1d7389d19 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -12123,20 +12123,31 @@ do_ae_open_documents(AppleEvent *message, AppleEvent *reply, long refcon) 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++) { - 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) break; - - 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)) - drag_and_drop_file_list = Fcons (build_string (unix_path_name), - drag_and_drop_file_list); - } + for (i = 1; (err == noErr) && (i <= num_files_to_open); i++) + { + 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; + +#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 + drag_and_drop_file_list = Fcons (build_string (unix_path_name), + drag_and_drop_file_list); + } } } @@ -13142,6 +13153,12 @@ mac_initialize () #endif mac_initialize_display_info (); + +#if TARGET_API_MAC_CARBON + init_required_apple_events (); + + DisableMenuCommand (NULL, kHICommandQuit); +#endif } -- 2.39.5