summaryrefslogtreecommitdiff
path: root/src/macmenu.c
AgeCommit message (Collapse)Author
2008-07-27Remove support for Mac Carbon.Dan Nicolaescu
* mactoolbox.c: * macterm.h: * macterm.c: * macselect.c: * macmenu.c: * macgui.h: * macfns.c: * mac.c: Remove file. * s/darwin.h: * m/intel386.h: * xfaces.c: * xdisp.c: * window.c: * tparam.c: * termhooks.h: * termcap.c: * term.c: * syssignal.h: * sysselect.h: * sysdep.c: * process.c: * lread.c: * lisp.h: * keyboard.c: * image.c: * fringe.c: * frame.h: * frame.c: * fontset.c: * font.h: * font.c: * fns.c: * fileio.c: * emacs.c: * dispnew.c: * dispextern.h: * config.in: * atimer.c: * Makefile.in: Remove code for Carbon * erc.el: Remove code for Carbon. Remove support for Mac Carbon. * term/mac-win.el: Remove file * international/mule-cmds.el: * version.el: * startup.el: * simple.el: * mwheel.el: * mouse.el: * loadup.el: * isearch.el: * info.el: * frame.el: * faces.el: * disp-table.el: * cus-start.el: * cus-face.el: * cus-edit.el: * Makefile.in: Remove code for Carbon. Remove support for Mac Carbon. * makefile.w32-in: * emacsclient.c: Remove code for Carbon. * PROBLEMS: * MACHINES: Remove mentions of Mac Carbon. * ns-emacs.texi: * faq.texi: Remove mentions of Mac Carbon. * os.texi: * frames.texi: * display.texi: Remove mentions of Mac Carbon. * xresources.texi: Remove mentions of Mac Carbon. * make-tarball.txt: * admin.el: * FOR-RELEASE: * CPP-DEFINES: Remove mentions of Mac Carbon. Remove support for Mac Carbon. * mac: Remove directory. * make-dist: * configure.in: * README: * Makefile.in: * INSTALL: Remove code for Carbon. * configure: Regenerate.
2008-05-14Switch to recommended form of GPLv3 permissions notice.Glenn Morris
2008-04-18Merge from emacs--rel--22Miles Bader
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1112
2008-04-06[!TARGET_API_MAC_CARBON]: Move includes to mactoolbox.c.YAMAMOTO Mitsuharu
(enum mac_menu_kind): Move enum to mactoolbox.c. (min_menu_id): Move variable to mactoolbox.c. (quit_dialog_event_loop) [TARGET_API_MAC_CARBON]: Likewise. (DIALOG_WINDOW_RESOURCE): Move define to mactoolbox.c. (DIALOG_BUTTON_COMMAND_ID_OFFSET, DIALOG_BUTTON_COMMAND_ID_P) (DIALOG_BUTTON_COMMAND_ID_VALUE, DIALOG_BUTTON_MAKE_COMMAND_ID) [TARGET_API_MAC_CARBON]: Likewise. (XtPointer): Move typedef to macgui.h. (enum button_type): Move enum to macgui.h. (widget_value): Move typedef to macgui.h. (DIALOG_LEFT_MARGIN, DIALOG_TOP_MARGIN, DIALOG_RIGHT_MARGIN) (DIALOG_BOTTOM_MARGIN, DIALOG_MIN_INNER_WIDTH, DIALOG_MAX_INNER_WIDTH) (DIALOG_BUTTON_BUTTON_HORIZONTAL_SPACE) (DIALOG_BUTTON_BUTTON_VERTICAL_SPACE, DIALOG_BUTTON_MIN_WIDTH) (DIALOG_TEXT_MIN_HEIGHT, DIALOG_TEXT_BUTTONS_VERTICAL_SPACE) (DIALOG_ICON_WIDTH, DIALOG_ICON_HEIGHT, DIALOG_ICON_LEFT_MARGIN) (DIALOG_ICON_TOP_MARGIN): Move defines to macgui.h. (popup_activated_flag): Make variable non-static. (x_activate_menubar, install_menu_quit_handler, pop_down_menu) (add_menu_item, fill_menu, dispose_menus): Move functions to mactoolbox.c. (restore_show_help_function, menu_target_item_handler) (install_menu_target_item_handler, mac_handle_dialog_event) (install_dialog_event_handler, pop_down_dialog, create_and_show_dialog) [TARGET_API_MAC_CARBON]: Likewise. (menu_quit_handler) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]: Likewise. (mac_dialog) [!TARGET_API_MAC_CARBON]: Likewise. (find_and_call_menu_selection, name_is_separator): Make function non-static. (Vshow_help_function, timer_check) [TARGET_API_MAC_CARBON]: Move extern to mactoolbox.c. (set_frame_menubar): Don't call install_menu_quit_handler. (menu_item_selection): New variable. (mac_menu_show): Use create_and_show_popup_menu. (create_and_show_dialog) [TARGET_API_MAC_CARBON]: Don't return selection but set variable menu_item_selection. All uses changed. (mac_fill_menubar): Rename from fill_menubar. All uses changed. Call install_menu_quit_handler. Move to mactoolbox.c.
2008-04-05Merge from emacs--rel--22Miles Bader
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1107
2008-03-29Replace MenuHandle and GetMenuHandle with MenuRef andYAMAMOTO Mitsuharu
GetMenuRef, respectively. Replace WindowPtr with WindowRef. Replace ControlHandle with ControlRef. [!TARGET_API_MAC_CARBON]: Include Quickdraw.h instead of QuickDraw.h. (install_menu_quit_handler): Rename arg MENU_HANDLE to ROOT_MENU. [TARGET_API_MAC_CARBON] (menu_target_item_handler): Don't call next handler. Return immediately unless popup is activated. [TARGET_API_MAC_CARBON] (install_menu_target_item_handler): Remove argument. Install handler to application. (set_frame_menubar): Don't change deep_p. (mac_menu_show): Use FRAME_OUTER_TO_INNER_DIFF_X and FRAME_OUTER_TO_INNER_DIFF_Y. (DIALOG_BUTTON_COMMAND_ID_OFFSET, DIALOG_BUTTON_COMMAND_ID_P) (DIALOG_BUTTON_COMMAND_ID_VALUE, DIALOG_BUTTON_MAKE_COMMAND_ID) [HAVE_DIALOGS]: New macros. [HAVE_DIALOGS] (mac_handle_dialog_event, create_and_show_dialog): Use them. (fill_menu) [TARGET_API_MAC_CARBON]: Use SetMenuItemHierarchicalMenu. (fill_menubar) [TARGET_API_MAC_CARBON]: Use CFString. (mac_dialog_modal_filter, Fx_popup_dialog) [MAC_OSX]: Put special treatment for Fmessage_box, Fyes_or_no_p, and Fy_or_n_p in #if 0 as it is not compatible with y-or-n-p-with-timeout. (timer_check) [TARGET_API_MAC_CARBON]: Add extern. [TARGET_API_MAC_CARBON] (mac_handle_dialog_event): Use QuitEventLoop instead of QuitAppModalLoopForWindow. Consolidate QuitEventLoop calls. (pop_down_dialog) [TARGET_API_MAC_CARBON]: New function. [TARGET_API_MAC_CARBON] (create_and_show_dialog): Use it for unwind. Run timers during dialog popup. (Fmenu_or_popup_active_p) [TARGET_API_MAC_CARBON]: Use popup_activated. (quit_dialog_event_loop) [TARGET_API_MAC_CARBON]: New variable. [TARGET_API_MAC_CARBON] (mac_handle_dialog_event): Set it if dialog event loop should be quit. [TARGET_API_MAC_CARBON] (create_and_show_dialog): Quit dialog event loop if quit_dialog_event_loop is set.
2008-01-08Merge from emacs--rel--22Miles Bader
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08Add 2008 to copyright years.Glenn Morris
2007-12-28Merge from emacs--rel--22Miles Bader
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-966
2007-12-23(fill_menubar) [MAC_OSX]: Add workaround for Mac OS X 10.5YAMAMOTO Mitsuharu
about not changing Help menu title.
2007-10-13(grow_menu_items): Use larger_vector.Eli Zaretskii
2007-08-13Merge from emacs--devo--0Miles Bader
Patches applied: * emacs--devo--0 (patch 846-851) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 88-92) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 242-244) - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
2007-08-06(quit_dialog_event_loop) [TARGET_API_MAC_CARBON]:YAMAMOTO Mitsuharu
New variable. [TARGET_API_MAC_CARBON] (mac_handle_dialog_event): Set it if dialog event loop should be quit. [TARGET_API_MAC_CARBON] (create_and_show_dialog) [!MAC_OSX]: Quit dialog event loop if quit_dialog_event_loop is set.
2007-07-31Merge from emacs--devo--0Miles Bader
Patches applied: * emacs--devo--0 (patch 824-838) - Update from CVS - Merge from emacs--rel--22 - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Fix void function definition error in cus-edit.el - Restore lisp/emacs-lisp/cl-loaddefs.el * emacs--rel--22 (patch 70-83) - Update from CVS - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Indicate that emacs--devo--0--patch-834 does not need to be applied - Merge from gnus--rel--5.10 - Restore lisp/emacs-lisp/cl-loaddefs.el * gnus--rel--5.10 (patch 239-241) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28
2007-07-26Merge from emacs--rel--22Miles Bader
Patches applied: * emacs--rel--22 (patch 70-73) - Update from CVS 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-25Switch license to GPLv3 or later.Glenn Morris
2007-07-15Merge from emacs--devo--0Miles Bader
Patches applied: * emacs--devo--0 (patch 803-813) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 51-58) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 233-236) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-25
2007-06-22(mac_dialog_modal_filter, Fx_popup_dialog) [MAC_OSX]:YAMAMOTO Mitsuharu
Put special treatment for Fmessage_box, Fyes_or_no_p, and Fy_or_n_p in #if 0 as it is not compatible with y-or-n-p-with-timeout. (timer_check) [TARGET_API_MAC_CARBON]: Add extern. [TARGET_API_MAC_CARBON] (mac_handle_dialog_event): Use QuitEventLoop instead of QuitAppModalLoopForWindow. Consolidate QuitEventLoop calls. (pop_down_dialog) [TARGET_API_MAC_CARBON]: New function. [TARGET_API_MAC_CARBON] (create_and_show_dialog): Use it for unwind. Run timers during dialog popup. (Fmenu_or_popup_active_p) [TARGET_API_MAC_CARBON]: Use popup_activated.
2007-06-16Merge from emacs--devo--0Miles Bader
Patches applied: * emacs--devo--0 (patch 793-802) - Update from CVS - Remove RCS keywords - Merge from emacs--rel--22 * emacs--rel--22 (patch 42-50) - Update from CVS - Merge from gnus--rel--5.10 - Gnus ChangeLog tweaks * gnus--rel--5.10 (patch 229-232) - Merge from emacs--devo--0, emacs--rel--22 - ChangeLog tweak - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-23
2007-06-14[TARGET_API_MAC_CARBON] (menu_target_item_handler):YAMAMOTO Mitsuharu
Return immediately unless popup is activated.
2007-06-11Merge from emacs--devo--0Miles Bader
Patches applied: * emacs--devo--0 (patch 781-792) - Update from CVS - Merge from gnus--rel--5.10 - Merge from emacs--rel--22 * emacs--rel--22 (patch 33-41) * gnus--rel--5.10 (patch 226-228) - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21
2007-06-07[TARGET_API_MAC_CARBON] (menu_target_item_handler):YAMAMOTO Mitsuharu
Don't call next handler. [TARGET_API_MAC_CARBON] (install_menu_target_item_handler): Remove argument. Install handler to application. (set_frame_menubar): Don't change deep_p. (mac_menu_show): Use FRAME_OUTER_TO_INNER_DIFF_X and FRAME_OUTER_TO_INNER_DIFF_Y. (DIALOG_BUTTON_COMMAND_ID_OFFSET, DIALOG_BUTTON_COMMAND_ID_P) (DIALOG_BUTTON_COMMAND_ID_VALUE, DIALOG_BUTTON_MAKE_COMMAND_ID) [HAVE_DIALOGS]: New macros. [HAVE_DIALOGS] (mac_handle_dialog_event, create_and_show_dialog): Use them. (fill_menubar) [TARGET_API_MAC_CARBON]: Use CFString.
2007-06-06Replace MenuHandle and GetMenuHandle with MenuRef andYAMAMOTO Mitsuharu
GetMenuRef, respectively. Replace WindowPtr with WindowRef. Replace ControlHandle with ControlRef. (install_menu_quit_handler): Rename arg MENU_HANDLE to ROOT_MENU.
2007-05-19* s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here.Dan Nicolaescu
* termhooks.h (union display_info): Add mac_display_info. * term.c (init_tty): Only use terminal->kboard when MULTI_KBOARD is defined. * macterm.h (struct mac_display_info): Add terminal. * w32term.c (w32_initialize): Make static. * macterm.c (XTset_terminal_modes): Add a terminal parameter. (XTreset_terminal_modes): Likewise. (x_clear_frame): Add a frame parameter. (note_mouse_movement): Get rif from the frame. (mac_term_init): Initialize the terminal. (mac_initialize): Make static and move terminal initialization ... (mac_create_terminal): ... in this new function. * macmenu.c: Reorder includes. (Fx_popup_menu): Use terminal specific mouse_position_hook. * macfns.c (x_set_mouse_color): Get rif from the frame. (x_set_tool_bar_lines): Don't use updating_frame. (mac_window): Add 2 new parameters for consistency with other systems. (Fx_create_frame): Fix doc string. Rename the parameter. (Fx_create_frame): Set the frame parameters following what is done in X11 and w32. (Fx_open_connection): Remove window-system check. (start_hourglass): Likewise. (x_create_tip_frame): Get the keyboard from the terminal. * w32fns.c (Fx_create_frame): Use kboard from the terminal. * term/mac-win.el: Provide mac-win. (mac-initialized): New variable. (mac-initialize-window-system): New function. Move global setup here. (handle-args-function-alist, frame-creation-function-alist): (window-system-initialization-alist): Add mac entries. * loadup.el: Load mac-win on a Mac.
2007-05-01(mac_dialog_show): Apply 2007-04-27 change for xmenu.c.YAMAMOTO Mitsuharu
(Fx_popup_dialog) [MAC_OSX]: Likewise.
2007-05-01(mac_dialog_show): Apply 2007-04-27 change for xmenu.c.YAMAMOTO Mitsuharu
(Fx_popup_dialog) [MAC_OSX]: Likewise.
2007-03-18(popup_activated_flag): New variable.YAMAMOTO Mitsuharu
(x_activate_menubar, mac_menu_show): Set it during menu tracking. (popup_activated): New function.
2007-02-23(mac_menu_show): Call unbind_to early. Use variableYAMAMOTO Mitsuharu
`menu_item_selection' as in W32 version. [TARGET_API_MAC_CARBON] (mac_handle_dialog_event): Add explicit braces to avoid ambiguous `else'.
2007-01-21Add 2007 to copyright years.Glenn Morris
2007-01-15[TARGET_API_MAC_CARBON] (create_and_show_dialog):YAMAMOTO Mitsuharu
Create movable modal window instead of movable alert window. [TARGET_API_MAC_CARBON] (create_and_show_dialog) [!MAC_OSX]: Use DeactivateControl instead of DisableControl.
2007-01-14[TARGET_API_MAC_CARBON] (create_and_show_dialog): UseYAMAMOTO Mitsuharu
DisableControl for disabled items. Set default button to first enabled one. Use icon of application in execution.
2007-01-12(HAVE_DIALOGS): Define if TARGET_API_MAC_CARBON.YAMAMOTO Mitsuharu
(mac_handle_dialog_event, install_dialog_event_handler) (create_and_show_dialog) [TARGET_API_MAC_CARBON]: New functions. (DIALOG_LEFT_MARGIN, DIALOG_TOP_MARGIN, DIALOG_RIGHT_MARGIN) (DIALOG_BOTTOM_MARGIN, DIALOG_MIN_INNER_WIDTH) (DIALOG_MAX_INNER_WIDTH, DIALOG_BUTTON_BUTTON_HORIZONTAL_SPACE) (DIALOG_BUTTON_BUTTON_VERTICAL_SPACE, DIALOG_BUTTON_MIN_WIDTH) (DIALOG_TEXT_MIN_HEIGHT, DIALOG_TEXT_BUTTONS_VERTICAL_SPACE) (DIALOG_ICON_WIDTH, DIALOG_ICON_HEIGHT, DIALOG_ICON_LEFT_MARGIN) (DIALOG_ICON_TOP_MARGIN) [TARGET_API_MAC_CARBON]: New macros. (mac_dialog) [TARGET_API_MAC_CARBON]: Remove function. (mac_dialog_show) [TARGET_API_MAC_CARBON]: Use create_and_show_dialog.
2007-01-09(mac_dialog_modal_filter) [MAC_OSX]: New function.YAMAMOTO Mitsuharu
(Fx_popup_dialog) [MAC_OSX]: Use standard alert if called from Fmessage_box, Fyes_or_no_p, or Fy_or_n_p. [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030] (menu_quit_handler): Use mac_quit_char_key_p.
2007-01-05(Vshow_help_function) [TARGET_API_MAC_CARBON]: Add extern.YAMAMOTO Mitsuharu
(restore_show_help_function, menu_target_item_handler) [TARGET_API_MAC_CARBON]: New functions. (install_menu_target_item_handler): New function. (add_menu_item) [TARGET_API_MAC_CARBON]: Set help string as menu item property.
2006-11-14(menu_quit_handler, install_menu_quit_handler):YAMAMOTO Mitsuharu
Replace `#ifdef HAVE_CANCELMENUTRACKING' with `#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030'. (install_menu_quit_handler) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030 && MAC_OS_X_VERSION_MIN_REQUIRED == 1020]: Check if CancelMenuTracking is available.
2006-11-06(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.Chong Yidong
2006-11-05(Fmenu_or_popup_active_p): New function.Eli Zaretskii
(syms_of_macmenu): Defsubr it.
2006-10-31(install_menu_quit_handler): Make variable `typesList'YAMAMOTO Mitsuharu
static const. (name_is_separator): Add const qualifier to arguments.
2006-09-19(enum mac_menu_kind, min_menu_id): New enumerator andYAMAMOTO Mitsuharu
menu ID for Apple menu. (menubar_selection_callback): Remove function. (find_and_call_menu_selection): New function from xmenu.c. (x_activate_menubar): Use it. (set_frame_menubar): Don't use f->output_data.mac->menubar_active.
2006-09-10* src/macmenu.c (Vmenu_updating_frame, syms_of_xmenu):YAMAMOTO Mitsuharu
* src/w32menu.c (Vmenu_updating_frame, syms_of_xmenu): Apply 2006-09-08 change for xmenu.c.
2006-05-05(restore_menu_items, cleanup_popup_menu): Return a value.YAMAMOTO Mitsuharu
2006-04-21(restore_menu_items, save_menu_items): New functions from xmenu.c.YAMAMOTO Mitsuharu
(set_frame_menubar, digest_single_submenu): Apply 2006-04-18 changes for xmenu.c.
2006-04-12(min_menu_id): Make element type explicit.YAMAMOTO Mitsuharu
2006-03-24(enum mac_menu_kind): New enum.YAMAMOTO Mitsuharu
(min_menu_id): New variable. (POPUP_SUBMENU_ID, MIN_POPUP_SUBMENU_ID, MIN_MENU_ID) (MIN_SUBMENU_ID): Remove defines. All uses are replaced with min_menu_id and enumerators in enum mac_menu_kind. (fill_menu, dispose_menus, install_menu_quit_handler): New arg KIND. All uses changed. Add range check for menu ID. (fill_menubar): Add range check for menu ID. [HAVE_CANCELMENUTRACKING] (menu_quit_handler): Check error code of GetEventParameter. (set_frame_menubar, mac_menu_show): Call install_menu_quit_handler for each menu kind.
2006-02-22(digest_single_submenu): Apply 2006-02-19 change for xmenu.c.YAMAMOTO Mitsuharu
2006-02-19(popup_activated_flag, submenu_id)YAMAMOTO Mitsuharu
(next_menubar_widget_id): Remove variables. (initialize_frame_menubar): Remove function. (pop_down_menu, mac_menu_show): Simplify save value. (dispose_menus): New function. (pop_down_menu, fill_menubar): Use it. (fill_submenu): Remove function. All uses changed to fill_menu. (add_menu_item): Remove args SUBMENU and FORCE_DISABLE. New arg POS. Don't call SetMenuItemHierarchicalID here. (fill_menu): Add arg SUBMENU_ID. Return submenu_id that is to be used next. Call SetMenuItemHierarchicalID here. (fill_menubar): Add arg DEEP_P. All uses changed. Clean up menu objects if needed. Reuse existing menu bar titles if possible. (set_frame_menubar): Don't clean up menu objects here.
2006-02-15(set_frame_menubar): Don't call DrawMenuBar.YAMAMOTO Mitsuharu
2006-02-06Update years in copyright notice; nfc.Thien-Thi Nguyen
2005-12-21(Qmac_apple_event): Add extern.YAMAMOTO Mitsuharu
(set_frame_menubar, mac_menu_show keymp_panes) (single_keymap_panes, list_of_panes, list_of_item) (single_menu_item): Add argument types to prototypes. (mac_dialog_show) [HAVE_DIALOGS]: Likewise. (struct skp): New struct (from xmenu.c). (single_keymap_panes, single_menu_item, list_of_panes) (list_of_item): Sync with xmenu.c. (Fx_popup_menu, Fx_popup_dialog): Likewise. Don't get window from POSITION if it is mac-apple-event event. (menubar_selection_callback): Don't use menu_command_in_progress. (set_frame_menubar): First parse all submenus, then make widget_value trees from them. Don't allocate any widget_value objects until we are done with the parsing. (parse_single_submenu, digest_single_submenu): New functions. (single_submenu): Function deleted, replaced by those two. (install_menu_quit_handler) [HAVE_CANCELMENUTRACKING]: Don't create or dispose of EventHandlerUPP. Install hander to all submenus. (mac_menu_show) [!HAVE_MULTILINGUAL_MENU]: Use ENCODE_MENU_STRING instead of ENCODE_SYSTEM. (free_frame_menubar, fill_submenu, fill_menu): Don't use NULL for integer values. [HAVE_DIALOGS] (mac_dialog_show): Sync with xdialog_show (in xmenu.c). (add_menu_item) [TARGET_API_MAC_CARBON]: Use CFString functions to format menu item string. Don't use NULL for integer value.
2005-12-20(Fx_popup_menu): Add `else' to set Vmenu_updating_frame to nilJuri Linkov
only if position is nil.
generated by cgit v1.3 (git 2.53.0) at 2026-07-12 17:22:05 +0000