From: Andrew Choi Date: Mon, 1 Jul 2002 20:02:33 +0000 (+0000) Subject: In mac: X-Git-Tag: ttn-vms-21-2-B4~14358 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc21bf11c1770f87b8e6a2472bfcfbac4209076f;p=emacs.git 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. --- 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 00000000000..25cc99fdd0e Binary files /dev/null and b/mac/Emacs.app/Contents/Resources/Emacs.icns differ 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 }