emacs: src/macmenu.c annotate

author	Bill Wohler <wohler@newt.com>
date	Wed, 14 Dec 2005 18:47:38 +0000 (2005-12-14)
parents	a0d1312ede66
children	06f3a72bffb2 2d92f5c9d6ae

rev	line source
44890 01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	1 /* Menu support for GNU Emacs on the for Mac OS.
64770 a0d1312ede66 Update years in copyright notice; nfc. Thien-Thi Nguyen <ttn@gnuvola.org> parents: 64606 diff changeset	2 Copyright (C) 2000, 2001, 2002, 2003, 2004,
a0d1312ede66 Update years in copyright notice; nfc. Thien-Thi Nguyen <ttn@gnuvola.org> parents: 64606 diff changeset	3 2005 Free Software Foundation, Inc.
44890 01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	4
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	5 This file is part of GNU Emacs.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	6
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	7 GNU Emacs is free software; you can redistribute it and/or modify
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	8 it under the terms of the GNU General Public License as published by
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	9 the Free Software Foundation; either version 2, or (at your option)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	10 any later version.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	11
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	12 GNU Emacs is distributed in the hope that it will be useful,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	13 but WITHOUT ANY WARRANTY; without even the implied warranty of
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	15 GNU General Public License for more details.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	16
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	17 You should have received a copy of the GNU General Public License
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	18 along with GNU Emacs; see the file COPYING. If not, write to
64084 a8fa7c632ee4 Update FSF's address. Lute Kamstra <lute@gnu.org> parents: 63147 diff changeset	19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
a8fa7c632ee4 Update FSF's address. Lute Kamstra <lute@gnu.org> parents: 63147 diff changeset	20 Boston, MA 02110-1301, USA. */
44890 01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	21
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	22 /* Contributed by Andrew Choi (akochoi@mac.com). */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	23
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	24 #include <config.h>
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	25
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	26 #include <stdio.h>
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	27 #include "lisp.h"
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	28 #include "termhooks.h"
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	29 #include "keyboard.h"
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	30 #include "keymap.h"
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	31 #include "frame.h"
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	32 #include "window.h"
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	33 #include "blockinput.h"
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	34 #include "buffer.h"
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	35 #include "charset.h"
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	36 #include "coding.h"
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	37
60363 c4138f578114 [TARGET_API_MAC_CARBON]: Don't include headers that are included via YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> parents: 58752 diff changeset	38 #if !TARGET_API_MAC_CARBON
44890 01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	39 #include <MacTypes.h>
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	40 #include <Menus.h>
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	41 #include <QuickDraw.h>
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	42 #include <ToolUtils.h>
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	43 #include <Fonts.h>
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	44 #include <Controls.h>
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	45 #include <Windows.h>
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	46 #include <Events.h>
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	47 #if defined (__MRC__) \|\| (__MSL__ >= 0x6000)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	48 #include <ControlDefinitions.h>
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	49 #endif
60363 c4138f578114 [TARGET_API_MAC_CARBON]: Don't include headers that are included via YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> parents: 58752 diff changeset	50 #endif /* not TARGET_API_MAC_CARBON */
44890 01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	51
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	52 /* This may include sys/types.h, and that somehow loses
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	53 if this is not done before the other system files. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	54 #include "macterm.h"
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	55
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	56 /* Load sys/types.h if not already loaded.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	57 In some systems loading it twice is suicidal. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	58 #ifndef makedev
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	59 #include <sys/types.h>
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	60 #endif
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	61
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	62 #include "dispextern.h"
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	63
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	64 #define POPUP_SUBMENU_ID 235
48937 3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added Steven Tamm <steventamm@mac.com> parents: 48625 diff changeset	65 #define MIN_POPUP_SUBMENU_ID 512
44890 01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	66 #define MIN_MENU_ID 256
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	67 #define MIN_SUBMENU_ID 1
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	68
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	69 #define DIALOG_WINDOW_RESOURCE 130
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	70
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	71 #define HAVE_DIALOGS 1
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	72
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	73 #undef HAVE_MULTILINGUAL_MENU
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	74 #undef HAVE_DIALOGS /* TODO: Implement native dialogs. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	75
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	76 /******************************************************************/
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	77 /* Definitions copied from lwlib.h */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	78
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	79 typedef void * XtPointer;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	80
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	81 enum button_type
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	82 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	83 BUTTON_TYPE_NONE,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	84 BUTTON_TYPE_TOGGLE,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	85 BUTTON_TYPE_RADIO
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	86 };
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	87
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	88 /* This structure is based on the one in ../lwlib/lwlib.h, modified
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	89 for Mac OS. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	90 typedef struct _widget_value
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	91 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	92 /* name of widget */
56849 49d188f9179f * macmenu.c (_widget_value): Added lname and lkey. Jan Djärv <jan.h.d@swipnet.se> parents: 56842 diff changeset	93 Lisp_Object lname;
44890 01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	94 char* name;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	95 /* value (meaning depend on widget type) */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	96 char* value;
49600 23a1cea22d13 Trailing whitespace deleted. Juanma Barranquero <lekktu@gmail.com> parents: 48937 diff changeset	97 /* keyboard equivalent. no implications for XtTranslations */
56849 49d188f9179f * macmenu.c (_widget_value): Added lname and lkey. Jan Djärv <jan.h.d@swipnet.se> parents: 56842 diff changeset	98 Lisp_Object lkey;
44890 01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	99 char* key;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	100 /* Help string or nil if none.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	101 GC finds this string through the frame's menu_bar_vector
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	102 or through menu_items. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	103 Lisp_Object help;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	104 /* true if enabled */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	105 Boolean enabled;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	106 /* true if selected */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	107 Boolean selected;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	108 /* The type of a button. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	109 enum button_type button_type;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	110 /* true if menu title */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	111 Boolean title;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	112 #if 0
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	113 /* true if was edited (maintained by get_value) */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	114 Boolean edited;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	115 /* true if has changed (maintained by lw library) */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	116 change_type change;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	117 /* true if this widget itself has changed,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	118 but not counting the other widgets found in the `next' field. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	119 change_type this_one_change;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	120 #endif
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	121 /* Contents of the sub-widgets, also selected slot for checkbox */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	122 struct _widget_value* contents;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	123 /* data passed to callback */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	124 XtPointer call_data;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	125 /* next one in the list */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	126 struct _widget_value* next;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	127 #if 0
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	128 /* slot for the toolkit dependent part. Always initialize to NULL. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	129 void* toolkit_data;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	130 /* tell us if we should free the toolkit data slot when freeing the
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	131 widget_value itself. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	132 Boolean free_toolkit_data;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	133
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	134 /* we resource the widget_value structures; this points to the next
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	135 one on the free list if this one has been deallocated.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	136 */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	137 struct _widget_value *free_list;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	138 #endif
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	139 } widget_value;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	140
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	141 /* Assumed by other routines to zero area returned. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	142 #define malloc_widget_value() (void *)memset (xmalloc (sizeof (widget_value)),\
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	143 0, (sizeof (widget_value)))
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	144 #define free_widget_value(wv) xfree (wv)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	145
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	146 /******************************************************************/
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	147
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	148 #ifndef TRUE
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	149 #define TRUE 1
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	150 #define FALSE 0
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	151 #endif /* no TRUE */
49600 23a1cea22d13 Trailing whitespace deleted. Juanma Barranquero <lekktu@gmail.com> parents: 48937 diff changeset	152
44890 01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	153 Lisp_Object Vmenu_updating_frame;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	154
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	155 Lisp_Object Qdebug_on_next_call;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	156
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	157 extern Lisp_Object Qmenu_bar;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	158
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	159 extern Lisp_Object QCtoggle, QCradio;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	160
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	161 extern Lisp_Object Voverriding_local_map;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	162 extern Lisp_Object Voverriding_local_map_menu_flag;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	163
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	164 extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	165
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	166 extern Lisp_Object Qmenu_bar_update_hook;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	167
56799 d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte Steven Tamm <steventamm@mac.com> parents: 55851 diff changeset	168 #if TARGET_API_MAC_CARBON
d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte Steven Tamm <steventamm@mac.com> parents: 55851 diff changeset	169 #define ENCODE_MENU_STRING(str) ENCODE_UTF_8 (str)
d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte Steven Tamm <steventamm@mac.com> parents: 55851 diff changeset	170 #else
d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte Steven Tamm <steventamm@mac.com> parents: 55851 diff changeset	171 #define ENCODE_MENU_STRING(str) ENCODE_SYSTEM (str)
d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte Steven Tamm <steventamm@mac.com> parents: 55851 diff changeset	172 #endif
d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte Steven Tamm <steventamm@mac.com> parents: 55851 diff changeset	173
44890 01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	174 void set_frame_menubar ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	175
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	176 static void push_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	177 Lisp_Object, Lisp_Object, Lisp_Object,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	178 Lisp_Object, Lisp_Object));
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	179 #ifdef HAVE_DIALOGS
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	180 static Lisp_Object mac_dialog_show ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	181 #endif
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	182 static Lisp_Object mac_menu_show ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	183
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	184 static void keymap_panes ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	185 static void single_keymap_panes ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	186 static void single_menu_item ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	187 static void list_of_panes ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	188 static void list_of_items ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	189
48937 3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added Steven Tamm <steventamm@mac.com> parents: 48625 diff changeset	190 static void fill_submenu (MenuHandle, widget_value *);
44890 01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	191 static void fill_menubar (widget_value *);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	192
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	193
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	194 /* This holds a Lisp vector that holds the results of decoding
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	195 the keymaps or alist-of-alists that specify a menu.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	196
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	197 It describes the panes and items within the panes.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	198
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	199 Each pane is described by 3 elements in the vector:
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	200 t, the pane name, the pane's prefix key.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	201 Then follow the pane's items, with 5 elements per item:
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	202 the item string, the enable flag, the item's value,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	203 the definition, and the equivalent keyboard key's description string.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	204
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	205 In some cases, multiple levels of menus may be described.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	206 A single vector slot containing nil indicates the start of a submenu.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	207 A single vector slot containing lambda indicates the end of a submenu.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	208 The submenu follows a menu item which is the way to reach the submenu.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	209
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	210 A single vector slot containing quote indicates that the
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	211 following items should appear on the right of a dialog box.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	212
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	213 Using a Lisp vector to hold this information while we decode it
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	214 takes care of protecting all the data from GC. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	215
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	216 #define MENU_ITEMS_PANE_NAME 1
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	217 #define MENU_ITEMS_PANE_PREFIX 2
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	218 #define MENU_ITEMS_PANE_LENGTH 3
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	219
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	220 enum menu_item_idx
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	221 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	222 MENU_ITEMS_ITEM_NAME = 0,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	223 MENU_ITEMS_ITEM_ENABLE,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	224 MENU_ITEMS_ITEM_VALUE,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	225 MENU_ITEMS_ITEM_EQUIV_KEY,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	226 MENU_ITEMS_ITEM_DEFINITION,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	227 MENU_ITEMS_ITEM_TYPE,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	228 MENU_ITEMS_ITEM_SELECTED,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	229 MENU_ITEMS_ITEM_HELP,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	230 MENU_ITEMS_ITEM_LENGTH
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	231 };
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	232
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	233 static Lisp_Object menu_items;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	234
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	235 /* Number of slots currently allocated in menu_items. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	236 static int menu_items_allocated;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	237
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	238 /* This is the index in menu_items of the first empty slot. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	239 static int menu_items_used;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	240
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	241 /* The number of panes currently recorded in menu_items,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	242 excluding those within submenus. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	243 static int menu_items_n_panes;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	244
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	245 /* Current depth within submenus. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	246 static int menu_items_submenu_depth;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	247
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	248 /* Flag which when set indicates a dialog or menu has been posted by
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	249 Xt on behalf of one of the widget sets. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	250 static int popup_activated_flag;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	251
48937 3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added Steven Tamm <steventamm@mac.com> parents: 48625 diff changeset	252 /* Index of the next submenu */
3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added Steven Tamm <steventamm@mac.com> parents: 48625 diff changeset	253 static int submenu_id;
3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added Steven Tamm <steventamm@mac.com> parents: 48625 diff changeset	254
44890 01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	255 static int next_menubar_widget_id;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	256
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	257 /* This is set nonzero after the user activates the menu bar, and set
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	258 to zero again after the menu bars are redisplayed by prepare_menu_bar.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	259 While it is nonzero, all calls to set_frame_menubar go deep.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	260
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	261 I don't understand why this is needed, but it does seem to be
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	262 needed on Motif, according to Marcus Daniels <marcus@sysc.pdx.edu>. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	263
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	264 int pending_menu_activation;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	265
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	266 /* Initialize the menu_items structure if we haven't already done so.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	267 Also mark it as currently empty. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	268
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	269 static void
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	270 init_menu_items ()
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	271 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	272 if (NILP (menu_items))
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	273 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	274 menu_items_allocated = 60;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	275 menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	276 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	277
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	278 menu_items_used = 0;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	279 menu_items_n_panes = 0;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	280 menu_items_submenu_depth = 0;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	281 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	282
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	283 /* Call at the end of generating the data in menu_items.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	284 This fills in the number of items in the last pane. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	285
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	286 static void
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	287 finish_menu_items ()
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	288 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	289 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	290
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	291 /* Call when finished using the data for the current menu
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	292 in menu_items. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	293
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	294 static void
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	295 discard_menu_items ()
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	296 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	297 /* Free the structure if it is especially large.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	298 Otherwise, hold on to it, to save time. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	299 if (menu_items_allocated > 200)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	300 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	301 menu_items = Qnil;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	302 menu_items_allocated = 0;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	303 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	304 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	305
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	306 /* Make the menu_items vector twice as large. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	307
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	308 static void
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	309 grow_menu_items ()
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	310 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	311 Lisp_Object old;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	312 int old_size = menu_items_allocated;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	313 old = menu_items;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	314
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	315 menu_items_allocated *= 2;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	316 menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	317 bcopy (XVECTOR (old)->contents, XVECTOR (menu_items)->contents,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	318 old_size * sizeof (Lisp_Object));
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	319 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	320
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	321 /* Begin a submenu. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	322
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	323 static void
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	324 push_submenu_start ()
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	325 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	326 if (menu_items_used + 1 > menu_items_allocated)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	327 grow_menu_items ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	328
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	329 XVECTOR (menu_items)->contents[menu_items_used++] = Qnil;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	330 menu_items_submenu_depth++;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	331 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	332
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	333 /* End a submenu. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	334
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	335 static void
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	336 push_submenu_end ()
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	337 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	338 if (menu_items_used + 1 > menu_items_allocated)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	339 grow_menu_items ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	340
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	341 XVECTOR (menu_items)->contents[menu_items_used++] = Qlambda;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	342 menu_items_submenu_depth--;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	343 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	344
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	345 /* Indicate boundary between left and right. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	346
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	347 static void
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	348 push_left_right_boundary ()
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	349 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	350 if (menu_items_used + 1 > menu_items_allocated)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	351 grow_menu_items ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	352
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	353 XVECTOR (menu_items)->contents[menu_items_used++] = Qquote;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	354 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	355
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	356 /* Start a new menu pane in menu_items.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	357 NAME is the pane name. PREFIX_VEC is a prefix key for this pane. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	358
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	359 static void
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	360 push_menu_pane (name, prefix_vec)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	361 Lisp_Object name, prefix_vec;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	362 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	363 if (menu_items_used + MENU_ITEMS_PANE_LENGTH > menu_items_allocated)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	364 grow_menu_items ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	365
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	366 if (menu_items_submenu_depth == 0)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	367 menu_items_n_panes++;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	368 XVECTOR (menu_items)->contents[menu_items_used++] = Qt;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	369 XVECTOR (menu_items)->contents[menu_items_used++] = name;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	370 XVECTOR (menu_items)->contents[menu_items_used++] = prefix_vec;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	371 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	372
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	373 /* Push one menu item into the current pane. NAME is the string to
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	374 display. ENABLE if non-nil means this item can be selected. KEY
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	375 is the key generated by choosing this item, or nil if this item
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	376 doesn't really have a definition. DEF is the definition of this
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	377 item. EQUIV is the textual description of the keyboard equivalent
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	378 for this item (or nil if none). TYPE is the type of this menu
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	379 item, one of nil, `toggle' or `radio'. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	380
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	381 static void
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	382 push_menu_item (name, enable, key, def, equiv, type, selected, help)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	383 Lisp_Object name, enable, key, def, equiv, type, selected, help;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	384 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	385 if (menu_items_used + MENU_ITEMS_ITEM_LENGTH > menu_items_allocated)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	386 grow_menu_items ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	387
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	388 XVECTOR (menu_items)->contents[menu_items_used++] = name;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	389 XVECTOR (menu_items)->contents[menu_items_used++] = enable;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	390 XVECTOR (menu_items)->contents[menu_items_used++] = key;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	391 XVECTOR (menu_items)->contents[menu_items_used++] = equiv;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	392 XVECTOR (menu_items)->contents[menu_items_used++] = def;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	393 XVECTOR (menu_items)->contents[menu_items_used++] = type;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	394 XVECTOR (menu_items)->contents[menu_items_used++] = selected;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	395 XVECTOR (menu_items)->contents[menu_items_used++] = help;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	396 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	397
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	398 /* Look through KEYMAPS, a vector of keymaps that is NMAPS long,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	399 and generate menu panes for them in menu_items.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	400 If NOTREAL is nonzero,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	401 don't bother really computing whether an item is enabled. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	402
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	403 static void
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	404 keymap_panes (keymaps, nmaps, notreal)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	405 Lisp_Object *keymaps;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	406 int nmaps;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	407 int notreal;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	408 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	409 int mapno;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	410
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	411 init_menu_items ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	412
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	413 /* Loop over the given keymaps, making a pane for each map.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	414 But don't make a pane that is empty--ignore that map instead.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	415 P is the number of panes we have made so far. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	416 for (mapno = 0; mapno < nmaps; mapno++)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	417 single_keymap_panes (keymaps[mapno],
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	418 Fkeymap_prompt (keymaps[mapno]), Qnil, notreal, 10);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	419
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	420 finish_menu_items ();
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	421 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	422
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	423 /* This is a recursive subroutine of keymap_panes.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	424 It handles one keymap, KEYMAP.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	425 The other arguments are passed along
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	426 or point to local variables of the previous function.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	427 If NOTREAL is nonzero, only check for equivalent key bindings, don't
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	428 evaluate expressions in menu items and don't make any menu.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	429
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	430 If we encounter submenus deeper than MAXDEPTH levels, ignore them. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	431
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	432 static void
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	433 single_keymap_panes (keymap, pane_name, prefix, notreal, maxdepth)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	434 Lisp_Object keymap;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	435 Lisp_Object pane_name;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	436 Lisp_Object prefix;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	437 int notreal;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	438 int maxdepth;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	439 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	440 Lisp_Object pending_maps = Qnil;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	441 Lisp_Object tail, item;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	442 struct gcpro gcpro1, gcpro2;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	443
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	444 if (maxdepth <= 0)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	445 return;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	446
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	447 push_menu_pane (pane_name, prefix);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	448
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	449 for (tail = keymap; CONSP (tail); tail = XCDR (tail))
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	450 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	451 GCPRO2 (keymap, pending_maps);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	452 /* Look at each key binding, and if it is a menu item add it
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	453 to this menu. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	454 item = XCAR (tail);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	455 if (CONSP (item))
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	456 single_menu_item (XCAR (item), XCDR (item),
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	457 &pending_maps, notreal, maxdepth);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	458 else if (VECTORP (item))
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	459 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	460 /* Loop over the char values represented in the vector. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	461 int len = XVECTOR (item)->size;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	462 int c;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	463 for (c = 0; c < len; c++)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	464 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	465 Lisp_Object character;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	466 XSETFASTINT (character, c);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	467 single_menu_item (character, XVECTOR (item)->contents[c],
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	468 &pending_maps, notreal, maxdepth);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	469 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	470 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	471 UNGCPRO;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	472 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	473
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	474 /* Process now any submenus which want to be panes at this level. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	475 while (!NILP (pending_maps))
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	476 {
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	477 Lisp_Object elt, eltcdr, string;
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	478 elt = Fcar (pending_maps);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	479 eltcdr = XCDR (elt);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	480 string = XCAR (eltcdr);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	481 /* We no longer discard the @ from the beginning of the string here.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	482 Instead, we do this in mac_menu_show. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	483 single_keymap_panes (Fcar (elt), string,
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	484 XCDR (eltcdr), notreal, maxdepth - 1);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	485 pending_maps = Fcdr (pending_maps);
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	486 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	487 }
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	488
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	489 /* This is a subroutine of single_keymap_panes that handles one
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	490 keymap entry.
49600 23a1cea22d13 Trailing whitespace deleted. Juanma Barranquero <lekktu@gmail.com> parents: 48937 diff changeset	491 KEY is a key in a keymap and ITEM is its binding.
44890 01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	492 PENDING_MAPS_PTR points to a list of keymaps waiting to be made into
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	493 separate panes.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	494 If NOTREAL is nonzero, only check for equivalent key bindings, don't
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	495 evaluate expressions in menu items and don't make any menu.
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	496 If we encounter submenus deeper than MAXDEPTH levels, ignore them. */
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	497
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	498 static void
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	499 single_menu_item (key, item, pending_maps_ptr, notreal, maxdepth)
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog, Andrew Choi <akochoi@shaw.ca> parents: diff changeset	500 Lisp_Object key, item;

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1 /* Menu support for GNU Emacs on the for Mac OS.

64770

a0d1312ede66 Update years in copyright notice; nfc.

Thien-Thi Nguyen <ttn@gnuvola.org>

parents: 64606

diff changeset

a0d1312ede66 Update years in copyright notice; nfc.

Thien-Thi Nguyen <ttn@gnuvola.org>

parents: 64606

diff changeset

3 2005 Free Software Foundation, Inc.

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

4

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

5 This file is part of GNU Emacs.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

6

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

7 GNU Emacs is free software; you can redistribute it and/or modify

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

8 it under the terms of the GNU General Public License as published by

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

9 the Free Software Foundation; either version 2, or (at your option)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

10 any later version.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

11

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

12 GNU Emacs is distributed in the hope that it will be useful,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

13 but WITHOUT ANY WARRANTY; without even the implied warranty of

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

15 GNU General Public License for more details.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

16

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

17 You should have received a copy of the GNU General Public License

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

18 along with GNU Emacs; see the file COPYING. If not, write to

64084

a8fa7c632ee4 Update FSF's address.

Lute Kamstra <lute@gnu.org>

parents: 63147

diff changeset

19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

a8fa7c632ee4 Update FSF's address.

Lute Kamstra <lute@gnu.org>

parents: 63147

diff changeset

20 Boston, MA 02110-1301, USA. */

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

21

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

22 /* Contributed by Andrew Choi (akochoi@mac.com). */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

23

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

24 #include <config.h>

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

25

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

26 #include <stdio.h>

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

27 #include "lisp.h"

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

28 #include "termhooks.h"

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

29 #include "keyboard.h"

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

30 #include "keymap.h"

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

31 #include "frame.h"

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

32 #include "window.h"

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

33 #include "blockinput.h"

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

34 #include "buffer.h"

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

35 #include "charset.h"

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

36 #include "coding.h"

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

37

60363

c4138f578114 [TARGET_API_MAC_CARBON]: Don't include headers that are included via

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 58752

diff changeset

38 #if !TARGET_API_MAC_CARBON

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

39 #include <MacTypes.h>

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

40 #include <Menus.h>

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

41 #include <QuickDraw.h>

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

42 #include <ToolUtils.h>

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

43 #include <Fonts.h>

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

44 #include <Controls.h>

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

45 #include <Windows.h>

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

46 #include <Events.h>

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

47 #if defined (__MRC__) || (__MSL__ >= 0x6000)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

48 #include <ControlDefinitions.h>

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

49 #endif

60363

c4138f578114 [TARGET_API_MAC_CARBON]: Don't include headers that are included via

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 58752

diff changeset

50 #endif /* not TARGET_API_MAC_CARBON */

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

51

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

52 /* This may include sys/types.h, and that somehow loses

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

53 if this is not done before the other system files. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

54 #include "macterm.h"

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

55

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

56 /* Load sys/types.h if not already loaded.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

57 In some systems loading it twice is suicidal. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

58 #ifndef makedev

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

59 #include <sys/types.h>

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

60 #endif

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

61

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

62 #include "dispextern.h"

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

63

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

64 #define POPUP_SUBMENU_ID 235

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

65 #define MIN_POPUP_SUBMENU_ID 512

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

66 #define MIN_MENU_ID 256

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

67 #define MIN_SUBMENU_ID 1

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

68

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

69 #define DIALOG_WINDOW_RESOURCE 130

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

70

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

71 #define HAVE_DIALOGS 1

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

72

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

73 #undef HAVE_MULTILINGUAL_MENU

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

74 #undef HAVE_DIALOGS /* TODO: Implement native dialogs. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

75

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

76 /******************************************************************/

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

77 /* Definitions copied from lwlib.h */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

78

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

79 typedef void * XtPointer;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

80

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

81 enum button_type

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

82 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

83 BUTTON_TYPE_NONE,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

84 BUTTON_TYPE_TOGGLE,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

85 BUTTON_TYPE_RADIO

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

86 };

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

87

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

88 /* This structure is based on the one in ../lwlib/lwlib.h, modified

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

89 for Mac OS. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

90 typedef struct _widget_value

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

91 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

92 /* name of widget */

56849

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

93 Lisp_Object lname;

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

94 char* name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

95 /* value (meaning depend on widget type) */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

96 char* value;

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

97 /* keyboard equivalent. no implications for XtTranslations */

56849

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

98 Lisp_Object lkey;

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

99 char* key;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

100 /* Help string or nil if none.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

101 GC finds this string through the frame's menu_bar_vector

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

102 or through menu_items. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

103 Lisp_Object help;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

104 /* true if enabled */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

105 Boolean enabled;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

106 /* true if selected */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

107 Boolean selected;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

108 /* The type of a button. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

109 enum button_type button_type;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

110 /* true if menu title */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

111 Boolean title;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

112 #if 0

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

113 /* true if was edited (maintained by get_value) */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

114 Boolean edited;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

115 /* true if has changed (maintained by lw library) */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

116 change_type change;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

117 /* true if this widget itself has changed,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

118 but not counting the other widgets found in the `next' field. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

119 change_type this_one_change;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

120 #endif

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

121 /* Contents of the sub-widgets, also selected slot for checkbox */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

122 struct _widget_value* contents;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

123 /* data passed to callback */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

124 XtPointer call_data;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

125 /* next one in the list */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

126 struct _widget_value* next;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

127 #if 0

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

128 /* slot for the toolkit dependent part. Always initialize to NULL. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

129 void* toolkit_data;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

130 /* tell us if we should free the toolkit data slot when freeing the

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

131 widget_value itself. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

132 Boolean free_toolkit_data;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

133

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

134 /* we resource the widget_value structures; this points to the next

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

135 one on the free list if this one has been deallocated.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

136 */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

137 struct _widget_value *free_list;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

138 #endif

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

139 } widget_value;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

140

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

141 /* Assumed by other routines to zero area returned. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

142 #define malloc_widget_value() (void *)memset (xmalloc (sizeof (widget_value)),\

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

143 0, (sizeof (widget_value)))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

144 #define free_widget_value(wv) xfree (wv)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

145

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

146 /******************************************************************/

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

147

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

148 #ifndef TRUE

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

149 #define TRUE 1

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

150 #define FALSE 0

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

151 #endif /* no TRUE */

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

152

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

153 Lisp_Object Vmenu_updating_frame;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

154

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

155 Lisp_Object Qdebug_on_next_call;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

156

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

157 extern Lisp_Object Qmenu_bar;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

158

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

159 extern Lisp_Object QCtoggle, QCradio;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

160

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

161 extern Lisp_Object Voverriding_local_map;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

162 extern Lisp_Object Voverriding_local_map_menu_flag;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

163

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

164 extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

165

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

166 extern Lisp_Object Qmenu_bar_update_hook;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

167

56799

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

168 #if TARGET_API_MAC_CARBON

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

169 #define ENCODE_MENU_STRING(str) ENCODE_UTF_8 (str)

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

170 #else

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

171 #define ENCODE_MENU_STRING(str) ENCODE_SYSTEM (str)

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

172 #endif

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

173

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

174 void set_frame_menubar ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

175

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

176 static void push_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

177 Lisp_Object, Lisp_Object, Lisp_Object,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

178 Lisp_Object, Lisp_Object));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

179 #ifdef HAVE_DIALOGS

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

180 static Lisp_Object mac_dialog_show ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

181 #endif

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

182 static Lisp_Object mac_menu_show ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

183

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

184 static void keymap_panes ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

185 static void single_keymap_panes ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

186 static void single_menu_item ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

187 static void list_of_panes ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

188 static void list_of_items ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

189

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

190 static void fill_submenu (MenuHandle, widget_value *);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

191 static void fill_menubar (widget_value *);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

192

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

193

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

194 /* This holds a Lisp vector that holds the results of decoding

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

195 the keymaps or alist-of-alists that specify a menu.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

196

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

197 It describes the panes and items within the panes.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

198

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

199 Each pane is described by 3 elements in the vector:

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

200 t, the pane name, the pane's prefix key.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

201 Then follow the pane's items, with 5 elements per item:

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

202 the item string, the enable flag, the item's value,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

203 the definition, and the equivalent keyboard key's description string.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

204

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

205 In some cases, multiple levels of menus may be described.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

206 A single vector slot containing nil indicates the start of a submenu.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

207 A single vector slot containing lambda indicates the end of a submenu.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

208 The submenu follows a menu item which is the way to reach the submenu.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

209

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

210 A single vector slot containing quote indicates that the

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

211 following items should appear on the right of a dialog box.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

212

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

213 Using a Lisp vector to hold this information while we decode it

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

214 takes care of protecting all the data from GC. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

215

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

216 #define MENU_ITEMS_PANE_NAME 1

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

217 #define MENU_ITEMS_PANE_PREFIX 2

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

218 #define MENU_ITEMS_PANE_LENGTH 3

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

219

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

220 enum menu_item_idx

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

221 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

222 MENU_ITEMS_ITEM_NAME = 0,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

223 MENU_ITEMS_ITEM_ENABLE,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

224 MENU_ITEMS_ITEM_VALUE,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

225 MENU_ITEMS_ITEM_EQUIV_KEY,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

226 MENU_ITEMS_ITEM_DEFINITION,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

227 MENU_ITEMS_ITEM_TYPE,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

228 MENU_ITEMS_ITEM_SELECTED,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

229 MENU_ITEMS_ITEM_HELP,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

230 MENU_ITEMS_ITEM_LENGTH

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

231 };

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

232

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

233 static Lisp_Object menu_items;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

234

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

235 /* Number of slots currently allocated in menu_items. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

236 static int menu_items_allocated;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

237

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

238 /* This is the index in menu_items of the first empty slot. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

239 static int menu_items_used;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

240

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

241 /* The number of panes currently recorded in menu_items,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

242 excluding those within submenus. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

243 static int menu_items_n_panes;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

244

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

245 /* Current depth within submenus. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

246 static int menu_items_submenu_depth;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

247

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

248 /* Flag which when set indicates a dialog or menu has been posted by

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

249 Xt on behalf of one of the widget sets. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

250 static int popup_activated_flag;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

251

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

252 /* Index of the next submenu */

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

253 static int submenu_id;

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

254

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

255 static int next_menubar_widget_id;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

256

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

257 /* This is set nonzero after the user activates the menu bar, and set

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

258 to zero again after the menu bars are redisplayed by prepare_menu_bar.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

259 While it is nonzero, all calls to set_frame_menubar go deep.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

260

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

261 I don't understand why this is needed, but it does seem to be

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

262 needed on Motif, according to Marcus Daniels <marcus@sysc.pdx.edu>. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

263

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

264 int pending_menu_activation;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

265

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

266 /* Initialize the menu_items structure if we haven't already done so.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

267 Also mark it as currently empty. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

268

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

269 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

270 init_menu_items ()

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

271 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

272 if (NILP (menu_items))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

273 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

274 menu_items_allocated = 60;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

275 menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

276 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

277

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

278 menu_items_used = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

279 menu_items_n_panes = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

280 menu_items_submenu_depth = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

281 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

282

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

283 /* Call at the end of generating the data in menu_items.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

284 This fills in the number of items in the last pane. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

285

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

286 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

287 finish_menu_items ()

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

288 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

289 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

290

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

291 /* Call when finished using the data for the current menu

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

292 in menu_items. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

293

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

294 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

295 discard_menu_items ()

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

296 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

297 /* Free the structure if it is especially large.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

298 Otherwise, hold on to it, to save time. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

299 if (menu_items_allocated > 200)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

300 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

301 menu_items = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

302 menu_items_allocated = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

303 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

304 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

305

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

306 /* Make the menu_items vector twice as large. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

307

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

308 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

309 grow_menu_items ()

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

310 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

311 Lisp_Object old;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

312 int old_size = menu_items_allocated;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

313 old = menu_items;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

314

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

315 menu_items_allocated *= 2;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

316 menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

317 bcopy (XVECTOR (old)->contents, XVECTOR (menu_items)->contents,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

318 old_size * sizeof (Lisp_Object));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

319 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

320

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

321 /* Begin a submenu. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

322

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

323 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

324 push_submenu_start ()

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

325 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

326 if (menu_items_used + 1 > menu_items_allocated)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

327 grow_menu_items ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

328

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

329 XVECTOR (menu_items)->contents[menu_items_used++] = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

330 menu_items_submenu_depth++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

331 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

332

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

333 /* End a submenu. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

334

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

335 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

336 push_submenu_end ()

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

337 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

338 if (menu_items_used + 1 > menu_items_allocated)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

339 grow_menu_items ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

340

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

341 XVECTOR (menu_items)->contents[menu_items_used++] = Qlambda;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

342 menu_items_submenu_depth--;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

343 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

344

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

345 /* Indicate boundary between left and right. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

346

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

347 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

348 push_left_right_boundary ()

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

349 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

350 if (menu_items_used + 1 > menu_items_allocated)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

351 grow_menu_items ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

352

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

353 XVECTOR (menu_items)->contents[menu_items_used++] = Qquote;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

354 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

355

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

356 /* Start a new menu pane in menu_items.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

357 NAME is the pane name. PREFIX_VEC is a prefix key for this pane. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

358

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

359 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

360 push_menu_pane (name, prefix_vec)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

361 Lisp_Object name, prefix_vec;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

362 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

363 if (menu_items_used + MENU_ITEMS_PANE_LENGTH > menu_items_allocated)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

364 grow_menu_items ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

365

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

366 if (menu_items_submenu_depth == 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

367 menu_items_n_panes++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

368 XVECTOR (menu_items)->contents[menu_items_used++] = Qt;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

369 XVECTOR (menu_items)->contents[menu_items_used++] = name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

370 XVECTOR (menu_items)->contents[menu_items_used++] = prefix_vec;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

371 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

372

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

373 /* Push one menu item into the current pane. NAME is the string to

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

374 display. ENABLE if non-nil means this item can be selected. KEY

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

375 is the key generated by choosing this item, or nil if this item

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

376 doesn't really have a definition. DEF is the definition of this

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

377 item. EQUIV is the textual description of the keyboard equivalent

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

378 for this item (or nil if none). TYPE is the type of this menu

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

379 item, one of nil, `toggle' or `radio'. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

380

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

381 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

382 push_menu_item (name, enable, key, def, equiv, type, selected, help)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

383 Lisp_Object name, enable, key, def, equiv, type, selected, help;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

384 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

385 if (menu_items_used + MENU_ITEMS_ITEM_LENGTH > menu_items_allocated)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

386 grow_menu_items ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

387

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

388 XVECTOR (menu_items)->contents[menu_items_used++] = name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

389 XVECTOR (menu_items)->contents[menu_items_used++] = enable;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

390 XVECTOR (menu_items)->contents[menu_items_used++] = key;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

391 XVECTOR (menu_items)->contents[menu_items_used++] = equiv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

392 XVECTOR (menu_items)->contents[menu_items_used++] = def;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

393 XVECTOR (menu_items)->contents[menu_items_used++] = type;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

394 XVECTOR (menu_items)->contents[menu_items_used++] = selected;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

395 XVECTOR (menu_items)->contents[menu_items_used++] = help;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

396 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

397

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

398 /* Look through KEYMAPS, a vector of keymaps that is NMAPS long,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

399 and generate menu panes for them in menu_items.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

400 If NOTREAL is nonzero,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

401 don't bother really computing whether an item is enabled. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

402

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

403 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

404 keymap_panes (keymaps, nmaps, notreal)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

405 Lisp_Object *keymaps;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

406 int nmaps;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

407 int notreal;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

408 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

409 int mapno;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

410

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

411 init_menu_items ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

412

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

413 /* Loop over the given keymaps, making a pane for each map.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

414 But don't make a pane that is empty--ignore that map instead.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

415 P is the number of panes we have made so far. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

416 for (mapno = 0; mapno < nmaps; mapno++)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

417 single_keymap_panes (keymaps[mapno],

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

418 Fkeymap_prompt (keymaps[mapno]), Qnil, notreal, 10);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

419

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

420 finish_menu_items ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

421 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

422

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

423 /* This is a recursive subroutine of keymap_panes.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

424 It handles one keymap, KEYMAP.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

425 The other arguments are passed along

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

426 or point to local variables of the previous function.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

427 If NOTREAL is nonzero, only check for equivalent key bindings, don't

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

428 evaluate expressions in menu items and don't make any menu.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

429

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

430 If we encounter submenus deeper than MAXDEPTH levels, ignore them. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

431

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

432 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

433 single_keymap_panes (keymap, pane_name, prefix, notreal, maxdepth)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

434 Lisp_Object keymap;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

435 Lisp_Object pane_name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

436 Lisp_Object prefix;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

437 int notreal;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

438 int maxdepth;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

439 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

440 Lisp_Object pending_maps = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

441 Lisp_Object tail, item;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

442 struct gcpro gcpro1, gcpro2;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

443

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

444 if (maxdepth <= 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

445 return;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

446

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

447 push_menu_pane (pane_name, prefix);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

448

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

449 for (tail = keymap; CONSP (tail); tail = XCDR (tail))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

450 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

451 GCPRO2 (keymap, pending_maps);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

452 /* Look at each key binding, and if it is a menu item add it

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

453 to this menu. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

454 item = XCAR (tail);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

455 if (CONSP (item))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

456 single_menu_item (XCAR (item), XCDR (item),

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

457 &pending_maps, notreal, maxdepth);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

458 else if (VECTORP (item))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

459 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

460 /* Loop over the char values represented in the vector. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

461 int len = XVECTOR (item)->size;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

462 int c;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

463 for (c = 0; c < len; c++)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

464 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

465 Lisp_Object character;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

466 XSETFASTINT (character, c);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

467 single_menu_item (character, XVECTOR (item)->contents[c],

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

468 &pending_maps, notreal, maxdepth);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

469 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

470 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

471 UNGCPRO;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

472 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

473

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

474 /* Process now any submenus which want to be panes at this level. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

475 while (!NILP (pending_maps))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

476 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

477 Lisp_Object elt, eltcdr, string;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

478 elt = Fcar (pending_maps);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

479 eltcdr = XCDR (elt);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

480 string = XCAR (eltcdr);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

481 /* We no longer discard the @ from the beginning of the string here.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

482 Instead, we do this in mac_menu_show. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

483 single_keymap_panes (Fcar (elt), string,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

484 XCDR (eltcdr), notreal, maxdepth - 1);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

485 pending_maps = Fcdr (pending_maps);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

486 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

487 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

488

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

489 /* This is a subroutine of single_keymap_panes that handles one

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

490 keymap entry.

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

491 KEY is a key in a keymap and ITEM is its binding.

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

492 PENDING_MAPS_PTR points to a list of keymaps waiting to be made into

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

493 separate panes.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

494 If NOTREAL is nonzero, only check for equivalent key bindings, don't

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

495 evaluate expressions in menu items and don't make any menu.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

496 If we encounter submenus deeper than MAXDEPTH levels, ignore them. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

497

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

498 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

499 single_menu_item (key, item, pending_maps_ptr, notreal, maxdepth)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

500 Lisp_Object key, item;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

501 Lisp_Object *pending_maps_ptr;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

502 int maxdepth, notreal;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

503 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

504 Lisp_Object map, item_string, enabled;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

505 struct gcpro gcpro1, gcpro2;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

506 int res;

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

507

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

508 /* Parse the menu item and leave the result in item_properties. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

509 GCPRO2 (key, item);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

510 res = parse_menu_item (item, notreal, 0);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

511 UNGCPRO;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

512 if (!res)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

513 return; /* Not a menu item. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

514

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

515 map = XVECTOR (item_properties)->contents[ITEM_PROPERTY_MAP];

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

516

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

517 if (notreal)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

518 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

519 /* We don't want to make a menu, just traverse the keymaps to

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

520 precompute equivalent key bindings. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

521 if (!NILP (map))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

522 single_keymap_panes (map, Qnil, key, 1, maxdepth - 1);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

523 return;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

524 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

525

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

526 enabled = XVECTOR (item_properties)->contents[ITEM_PROPERTY_ENABLE];

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

527 item_string = XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME];

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

528

46370

40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

diff changeset

529 if (!NILP (map) && SREF (item_string, 0) == '@')

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

530 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

531 if (!NILP (enabled))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

532 /* An enabled separate pane. Remember this to handle it later. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

533 *pending_maps_ptr = Fcons (Fcons (map, Fcons (item_string, key)),

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

534 *pending_maps_ptr);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

535 return;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

536 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

537

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

538 push_menu_item (item_string, enabled, key,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

539 XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF],

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

540 XVECTOR (item_properties)->contents[ITEM_PROPERTY_KEYEQ],

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

541 XVECTOR (item_properties)->contents[ITEM_PROPERTY_TYPE],

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

542 XVECTOR (item_properties)->contents[ITEM_PROPERTY_SELECTED],

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

543 XVECTOR (item_properties)->contents[ITEM_PROPERTY_HELP]);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

544

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

545 /* Display a submenu using the toolkit. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

546 if (! (NILP (map) || NILP (enabled)))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

547 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

548 push_submenu_start ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

549 single_keymap_panes (map, Qnil, key, 0, maxdepth - 1);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

550 push_submenu_end ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

551 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

552 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

553

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

554 /* Push all the panes and items of a menu described by the

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

555 alist-of-alists MENU.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

556 This handles old-fashioned calls to x-popup-menu. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

557

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

558 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

559 list_of_panes (menu)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

560 Lisp_Object menu;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

561 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

562 Lisp_Object tail;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

563

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

564 init_menu_items ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

565

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

566 for (tail = menu; !NILP (tail); tail = Fcdr (tail))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

567 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

568 Lisp_Object elt, pane_name, pane_data;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

569 elt = Fcar (tail);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

570 pane_name = Fcar (elt);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

571 CHECK_STRING (pane_name);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

572 push_menu_pane (pane_name, Qnil);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

573 pane_data = Fcdr (elt);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

574 CHECK_CONS (pane_data);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

575 list_of_items (pane_data);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

576 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

577

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

578 finish_menu_items ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

579 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

580

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

581 /* Push the items in a single pane defined by the alist PANE. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

582

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

583 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

584 list_of_items (pane)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

585 Lisp_Object pane;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

586 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

587 Lisp_Object tail, item, item1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

588

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

589 for (tail = pane; !NILP (tail); tail = Fcdr (tail))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

590 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

591 item = Fcar (tail);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

592 if (STRINGP (item))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

593 push_menu_item (item, Qnil, Qnil, Qt, Qnil, Qnil, Qnil, Qnil);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

594 else if (NILP (item))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

595 push_left_right_boundary ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

596 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

597 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

598 CHECK_CONS (item);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

599 item1 = Fcar (item);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

600 CHECK_STRING (item1);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

601 push_menu_item (item1, Qt, Fcdr (item), Qt, Qnil, Qnil, Qnil, Qnil);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

602 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

603 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

604 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

605

62988

3ca414a25103 * macmenu.c (cleanup_popup_menu): New function.

Jan Djärv <jan.h.d@swipnet.se>

parents: 62670

diff changeset

606 static Lisp_Object

3ca414a25103 * macmenu.c (cleanup_popup_menu): New function.

Jan Djärv <jan.h.d@swipnet.se>

parents: 62670

diff changeset

607 cleanup_popup_menu (arg)

3ca414a25103 * macmenu.c (cleanup_popup_menu): New function.

Jan Djärv <jan.h.d@swipnet.se>

parents: 62670

diff changeset

608 Lisp_Object arg;

3ca414a25103 * macmenu.c (cleanup_popup_menu): New function.

Jan Djärv <jan.h.d@swipnet.se>

parents: 62670

diff changeset

609 {

3ca414a25103 * macmenu.c (cleanup_popup_menu): New function.

Jan Djärv <jan.h.d@swipnet.se>

parents: 62670

diff changeset

610 discard_menu_items ();

3ca414a25103 * macmenu.c (cleanup_popup_menu): New function.

Jan Djärv <jan.h.d@swipnet.se>

parents: 62670

diff changeset

611 }

3ca414a25103 * macmenu.c (cleanup_popup_menu): New function.

Jan Djärv <jan.h.d@swipnet.se>

parents: 62670

diff changeset

612

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

613 DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

614 doc: /* Pop up a deck-of-cards menu and return user's selection.

64606

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

615 POSITION is a position specification. This is either a mouse button event

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

616 or a list ((XOFFSET YOFFSET) WINDOW)

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

617 where XOFFSET and YOFFSET are positions in pixels from the top left

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

618 corner of WINDOW. (WINDOW may be a window or a frame object.)

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

619 This controls the position of the top left of the menu as a whole.

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

620 If POSITION is t, it means to use the current mouse position.

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

621

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

622 MENU is a specifier for a menu. For the simplest case, MENU is a keymap.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

623 The menu items come from key bindings that have a menu string as well as

64606

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

624 a definition; actually, the "definition" in such a key binding looks like

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

625 \(STRING . REAL-DEFINITION). To give the menu a title, put a string into

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

626 the keymap as a top-level element.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

627

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

628 If REAL-DEFINITION is nil, that puts a nonselectable string in the menu.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

629 Otherwise, REAL-DEFINITION should be a valid key binding definition.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

630

64606

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

631 You can also use a list of keymaps as MENU.

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

632 Then each keymap makes a separate pane.

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

633

64606

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

634 When MENU is a keymap or a list of keymaps, the return value is the

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

635 list of events corresponding to the user's choice. Note that

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

636 `x-popup-menu' does not actually execute the command bound to that

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

637 sequence of events.

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

638

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

639 Alternatively, you can specify a menu of multiple panes

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

640 with a list of the form (TITLE PANE1 PANE2...),

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

641 where each pane is a list of form (TITLE ITEM1 ITEM2...).

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

642 Each ITEM is normally a cons cell (STRING . VALUE);

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

643 but a string can appear as an item--that makes a nonselectable line

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

644 in the menu.

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

645 With this form of menu, the return value is VALUE from the chosen item.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

646

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

647 If POSITION is nil, don't display the menu at all, just precalculate the

64606

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

648 cached information about equivalent key sequences.

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

649

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

650 If the user gets rid of the menu without making a valid choice, for

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

651 instance by clicking the mouse away from a valid choice or by typing

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

652 keyboard input, then this normally results in a quit and

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

653 `x-popup-menu' does not return. But if POSITION is a mouse button

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

654 event (indicating that the user invoked the menu with the mouse) then

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

655 no quit occurs and `x-popup-menu' returns nil. */)

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

656 (position, menu)

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

657 Lisp_Object position, menu;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

658 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

659 Lisp_Object keymap, tem;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

660 int xpos = 0, ypos = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

661 Lisp_Object title;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

662 char *error_name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

663 Lisp_Object selection;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

664 FRAME_PTR f = NULL;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

665 Lisp_Object x, y, window;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

666 int keymaps = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

667 int for_click = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

668 struct gcpro gcpro1;

62988

3ca414a25103 * macmenu.c (cleanup_popup_menu): New function.

Jan Djärv <jan.h.d@swipnet.se>

parents: 62670

diff changeset

669 int specpdl_count = SPECPDL_INDEX ();

3ca414a25103 * macmenu.c (cleanup_popup_menu): New function.

Jan Djärv <jan.h.d@swipnet.se>

parents: 62670

diff changeset

670

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

671

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

672 #ifdef HAVE_MENUS

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

673 if (! NILP (position))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

674 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

675 check_mac ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

676

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

677 /* Decode the first argument: find the window and the coordinates. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

678 if (EQ (position, Qt)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

679 || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

680 || EQ (XCAR (position), Qtool_bar))))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

681 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

682 /* Use the mouse's current position. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

683 FRAME_PTR new_f = SELECTED_FRAME ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

684 Lisp_Object bar_window;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

685 enum scroll_bar_part part;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

686 unsigned long time;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

687

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

688 if (mouse_position_hook)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

689 (*mouse_position_hook) (&new_f, 1, &bar_window,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

690 &part, &x, &y, &time);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

691 if (new_f != 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

692 XSETFRAME (window, new_f);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

693 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

694 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

695 window = selected_window;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

696 XSETFASTINT (x, 0);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

697 XSETFASTINT (y, 0);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

698 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

699 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

700 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

701 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

702 tem = Fcar (position);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

703 if (CONSP (tem))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

704 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

705 window = Fcar (Fcdr (position));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

706 x = Fcar (tem);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

707 y = Fcar (Fcdr (tem));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

708 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

709 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

710 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

711 for_click = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

712 tem = Fcar (Fcdr (position)); /* EVENT_START (position) */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

713 window = Fcar (tem); /* POSN_WINDOW (tem) */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

714 tem = Fcar (Fcdr (Fcdr (tem))); /* POSN_WINDOW_POSN (tem) */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

715 x = Fcar (tem);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

716 y = Fcdr (tem);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

717 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

718 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

719

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

720 CHECK_NUMBER (x);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

721 CHECK_NUMBER (y);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

722

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

723 /* Decode where to put the menu. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

724

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

725 if (FRAMEP (window))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

726 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

727 f = XFRAME (window);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

728 xpos = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

729 ypos = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

730 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

731 else if (WINDOWP (window))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

732 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

733 CHECK_LIVE_WINDOW (window);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

734 f = XFRAME (WINDOW_FRAME (XWINDOW (window)));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

735

51206

22a5614b558f Make (few) trivial substitutions for renamed and

Kim F. Storm <storm@cua.dk>

parents: 49600

diff changeset

736 xpos = WINDOW_LEFT_EDGE_X (XWINDOW (window));

22a5614b558f Make (few) trivial substitutions for renamed and

Kim F. Storm <storm@cua.dk>

parents: 49600

diff changeset

737 ypos = WINDOW_TOP_EDGE_Y (XWINDOW (window));

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

738 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

739 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

740 /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

741 but I don't want to make one now. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

742 CHECK_WINDOW (window);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

743

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

744 xpos += XINT (x);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

745 ypos += XINT (y);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

746

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

747 XSETFRAME (Vmenu_updating_frame, f);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

748 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

749 Vmenu_updating_frame = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

750 #endif /* HAVE_MENUS */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

751

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

752 title = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

753 GCPRO1 (title);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

754

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

755 /* Decode the menu items from what was specified. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

756

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

757 keymap = get_keymap (menu, 0, 0);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

758 if (CONSP (keymap))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

759 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

760 /* We were given a keymap. Extract menu info from the keymap. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

761 Lisp_Object prompt;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

762

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

763 /* Extract the detailed info to make one pane. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

764 keymap_panes (&menu, 1, NILP (position));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

765

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

766 /* Search for a string appearing directly as an element of the keymap.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

767 That string is the title of the menu. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

768 prompt = Fkeymap_prompt (keymap);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

769 if (NILP (title) && !NILP (prompt))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

770 title = prompt;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

771

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

772 /* Make that be the pane title of the first pane. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

773 if (!NILP (prompt) && menu_items_n_panes >= 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

774 XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME] = prompt;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

775

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

776 keymaps = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

777 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

778 else if (CONSP (menu) && KEYMAPP (XCAR (menu)))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

779 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

780 /* We were given a list of keymaps. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

781 int nmaps = XFASTINT (Flength (menu));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

782 Lisp_Object *maps

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

783 = (Lisp_Object *) alloca (nmaps * sizeof (Lisp_Object));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

784 int i;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

785

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

786 title = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

787

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

788 /* The first keymap that has a prompt string

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

789 supplies the menu title. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

790 for (tem = menu, i = 0; CONSP (tem); tem = Fcdr (tem))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

791 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

792 Lisp_Object prompt;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

793

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

794 maps[i++] = keymap = get_keymap (Fcar (tem), 1, 0);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

795

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

796 prompt = Fkeymap_prompt (keymap);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

797 if (NILP (title) && !NILP (prompt))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

798 title = prompt;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

799 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

800

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

801 /* Extract the detailed info to make one pane. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

802 keymap_panes (maps, nmaps, NILP (position));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

803

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

804 /* Make the title be the pane title of the first pane. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

805 if (!NILP (title) && menu_items_n_panes >= 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

806 XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME] = title;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

807

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

808 keymaps = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

809 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

810 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

811 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

812 /* We were given an old-fashioned menu. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

813 title = Fcar (menu);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

814 CHECK_STRING (title);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

815

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

816 list_of_panes (Fcdr (menu));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

817

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

818 keymaps = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

819 }

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

820

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

821 if (NILP (position))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

822 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

823 discard_menu_items ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

824 UNGCPRO;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

825 return Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

826 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

827

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

828 #ifdef HAVE_MENUS

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

829 /* Display them in a menu. */

62988

3ca414a25103 * macmenu.c (cleanup_popup_menu): New function.

Jan Djärv <jan.h.d@swipnet.se>

parents: 62670

diff changeset

830 record_unwind_protect (cleanup_popup_menu, Qnil);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

831 BLOCK_INPUT;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

832

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

833 selection = mac_menu_show (f, xpos, ypos, for_click,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

834 keymaps, title, &error_name);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

835 UNBLOCK_INPUT;

62988

3ca414a25103 * macmenu.c (cleanup_popup_menu): New function.

Jan Djärv <jan.h.d@swipnet.se>

parents: 62670

diff changeset

836 unbind_to (specpdl_count, Qnil);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

837

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

838 UNGCPRO;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

839 #endif /* HAVE_MENUS */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

840

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

841 if (error_name) error (error_name);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

842 return selection;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

843 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

844

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

845 #ifdef HAVE_MENUS

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

846

62670

5ba03d610746 (Fx_popup_dialog): Allow 3rd optional argument.

Nick Roberts <nickrob@snap.net.nz>

parents: 62669

diff changeset

847 DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

848 doc: /* Pop up a dialog box and return user's selection.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

849 POSITION specifies which frame to use.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

850 This is normally a mouse button event or a window or frame.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

851 If POSITION is t, it means to use the frame the mouse is on.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

852 The dialog box appears in the middle of the specified frame.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

853

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

854 CONTENTS specifies the alternatives to display in the dialog box.

64606

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

855 It is a list of the form (DIALOG ITEM1 ITEM2...).

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

856 Each ITEM is a cons cell (STRING . VALUE).

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

857 The return value is VALUE from the chosen item.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

858

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

859 An ITEM may also be just a string--that makes a nonselectable item.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

860 An ITEM may also be nil--that means to put all preceding items

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

861 on the left of the dialog box and all following items on the right.

62669

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

862 \(By default, approximately half appear on each side.)

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

863

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

864 If HEADER is non-nil, the frame title for the box is "Information",

64606

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

865 otherwise it is "Question".

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

866

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

867 If the user gets rid of the dialog box without making a valid choice,

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

868 for instance using the window manager, then this produces a quit and

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

869 `x-popup-dialog' does not return. */)

ceb2de3f0f69 (Fx_popup_menu, Fx_popup_menu): Doc fixes.

YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

parents: 64084

diff changeset

870 (position, contents, header)

62669

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

871 Lisp_Object position, contents, header;

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

872 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

873 FRAME_PTR f = NULL;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

874 Lisp_Object window;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

875

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

876 check_mac ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

877

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

878 /* Decode the first argument: find the window or frame to use. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

879 if (EQ (position, Qt)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

880 || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

881 || EQ (XCAR (position), Qtool_bar))))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

882 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

883 #if 0 /* Using the frame the mouse is on may not be right. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

884 /* Use the mouse's current position. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

885 FRAME_PTR new_f = SELECTED_FRAME ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

886 Lisp_Object bar_window;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

887 enum scroll_bar_part part;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

888 unsigned long time;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

889 Lisp_Object x, y;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

891 (*mouse_position_hook) (&new_f, 1, &bar_window, &part, &x, &y, &time);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

892

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

893 if (new_f != 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

894 XSETFRAME (window, new_f);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

895 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

896 window = selected_window;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

897 #endif

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

898 window = selected_window;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

899 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

900 else if (CONSP (position))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

901 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

902 Lisp_Object tem;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

903 tem = Fcar (position);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

904 if (CONSP (tem))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

905 window = Fcar (Fcdr (position));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

906 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

907 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

908 tem = Fcar (Fcdr (position)); /* EVENT_START (position) */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

909 window = Fcar (tem); /* POSN_WINDOW (tem) */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

910 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

911 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

912 else if (WINDOWP (position) || FRAMEP (position))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

913 window = position;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

914 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

915 window = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

916

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

917 /* Decode where to put the menu. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

918

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

919 if (FRAMEP (window))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

920 f = XFRAME (window);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

921 else if (WINDOWP (window))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

922 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

923 CHECK_LIVE_WINDOW (window);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

924 f = XFRAME (WINDOW_FRAME (XWINDOW (window)));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

925 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

926 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

927 /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

928 but I don't want to make one now. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

929 CHECK_WINDOW (window);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

930

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

931 #ifndef HAVE_DIALOGS

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

932 /* Display a menu with these alternatives

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

933 in the middle of frame F. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

934 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

935 Lisp_Object x, y, frame, newpos;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

936 XSETFRAME (frame, f);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

937 XSETINT (x, x_pixel_width (f) / 2);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

938 XSETINT (y, x_pixel_height (f) / 2);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

939 newpos = Fcons (Fcons (x, Fcons (y, Qnil)), Fcons (frame, Qnil));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

940

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

941 return Fx_popup_menu (newpos,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

942 Fcons (Fcar (contents), Fcons (contents, Qnil)));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

943 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

944 #else /* HAVE_DIALOGS */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

945 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

946 Lisp_Object title;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

947 char *error_name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

948 Lisp_Object selection;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

949

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

950 /* Decode the dialog items from what was specified. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

951 title = Fcar (contents);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

952 CHECK_STRING (title);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

953

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

954 list_of_panes (Fcons (contents, Qnil));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

955

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

956 /* Display them in a dialog box. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

957 BLOCK_INPUT;

62669

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

958 selection = mac_dialog_show (f, 0, title, header, &error_name);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

959 UNBLOCK_INPUT;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

960

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

961 discard_menu_items ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

962

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

963 if (error_name) error (error_name);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

964 return selection;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

965 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

966 #endif /* HAVE_DIALOGS */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

967 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

968

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

969 /* Activate the menu bar of frame F.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

970 This is called from keyboard.c when it gets the

45791

4b23b784713d Remove declaration of Qmouse_click and Qevent_kind.

Pavel Janík <Pavel@Janik.cz>

parents: 44890

diff changeset

971 MENU_BAR_ACTIVATE_EVENT out of the Emacs event queue.

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

972

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

973 To activate the menu bar, we signal to the input thread that it can

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

974 return from the WM_INITMENU message, allowing the normal Windows

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

975 processing of the menus.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

976

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

977 But first we recompute the menu bar contents (the whole tree).

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

978

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

979 This way we can safely execute Lisp code. */

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

980

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

981 void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

982 x_activate_menubar (f)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

983 FRAME_PTR f;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

984 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

985 SInt32 menu_choice;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

986 extern Point saved_menu_event_location;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

987

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

988 set_frame_menubar (f, 0, 1);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

989 BLOCK_INPUT;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

990

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

991 menu_choice = MenuSelect (saved_menu_event_location);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

992 do_menu_choice (menu_choice);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

993

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

994 UNBLOCK_INPUT;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

995 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

996

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

997 /* This callback is called from the menu bar pulldown menu

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

998 when the user makes a selection.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

999 Figure out what the user chose

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1000 and put the appropriate events into the keyboard buffer. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1001

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1002 void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1003 menubar_selection_callback (FRAME_PTR f, int client_data)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1004 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1005 Lisp_Object prefix, entry;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1006 Lisp_Object vector;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1007 Lisp_Object *subprefix_stack;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1008 int submenu_depth = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1009 int i;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1010

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1011 if (!f)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1012 return;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1013 entry = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1014 subprefix_stack = (Lisp_Object *) alloca (f->menu_bar_items_used * sizeof (Lisp_Object));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1015 vector = f->menu_bar_vector;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1016 prefix = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1017 i = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1018 while (i < f->menu_bar_items_used)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1019 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1020 if (EQ (XVECTOR (vector)->contents[i], Qnil))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1021 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1022 subprefix_stack[submenu_depth++] = prefix;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1023 prefix = entry;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1024 i++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1025 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1026 else if (EQ (XVECTOR (vector)->contents[i], Qlambda))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1027 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1028 prefix = subprefix_stack[--submenu_depth];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1029 i++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1030 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1031 else if (EQ (XVECTOR (vector)->contents[i], Qt))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1032 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1033 prefix = XVECTOR (vector)->contents[i + MENU_ITEMS_PANE_PREFIX];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1034 i += MENU_ITEMS_PANE_LENGTH;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1035 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1036 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1037 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1038 entry = XVECTOR (vector)->contents[i + MENU_ITEMS_ITEM_VALUE];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1039 /* The EMACS_INT cast avoids a warning. There's no problem

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1040 as long as pointers have enough bits to hold small integers. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1041 if ((int) (EMACS_INT) client_data == i)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1042 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1043 int j;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1044 struct input_event buf;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1045 Lisp_Object frame;

51573

861a49cd70cf (menubar_selection_callback): Don't pass uninitialized

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 51206

diff changeset

1046 EVENT_INIT (buf);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1047

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1048 XSETFRAME (frame, f);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1049 buf.kind = MENU_BAR_EVENT;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1050 buf.frame_or_window = frame;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1051 buf.arg = frame;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1052 kbd_buffer_store_event (&buf);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1053

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1054 for (j = 0; j < submenu_depth; j++)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1055 if (!NILP (subprefix_stack[j]))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1056 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1057 buf.kind = MENU_BAR_EVENT;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1058 buf.frame_or_window = frame;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1059 buf.arg = subprefix_stack[j];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1060 kbd_buffer_store_event (&buf);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1061 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1062

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1063 if (!NILP (prefix))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1064 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1065 buf.kind = MENU_BAR_EVENT;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1066 buf.frame_or_window = frame;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1067 buf.arg = prefix;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1068 kbd_buffer_store_event (&buf);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1069 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1070

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1071 buf.kind = MENU_BAR_EVENT;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1072 buf.frame_or_window = frame;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1073 buf.arg = entry;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1074 kbd_buffer_store_event (&buf);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1075

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1076 f->output_data.mac->menu_command_in_progress = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1077 f->output_data.mac->menubar_active = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1078 return;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1079 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1080 i += MENU_ITEMS_ITEM_LENGTH;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1081 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1082 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1083 f->output_data.mac->menu_command_in_progress = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1084 f->output_data.mac->menubar_active = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1085 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1086

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1087 /* Allocate a widget_value, blocking input. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1088

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1089 widget_value *

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1090 xmalloc_widget_value ()

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1091 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1092 widget_value *value;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1093

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1094 BLOCK_INPUT;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1095 value = malloc_widget_value ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1096 UNBLOCK_INPUT;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1097

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1098 return value;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1099 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1100

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1101 /* This recursively calls free_widget_value on the tree of widgets.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1102 It must free all data that was malloc'ed for these widget_values.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1103 In Emacs, many slots are pointers into the data of Lisp_Strings, and

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1104 must be left alone. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1105

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1106 void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1107 free_menubar_widget_value_tree (wv)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1108 widget_value *wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1109 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1110 if (! wv) return;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1111

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1112 wv->name = wv->value = wv->key = (char *) 0xDEADBEEF;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1113

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1114 if (wv->contents && (wv->contents != (widget_value*)1))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1115 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1116 free_menubar_widget_value_tree (wv->contents);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1117 wv->contents = (widget_value *) 0xDEADBEEF;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1118 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1119 if (wv->next)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1120 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1121 free_menubar_widget_value_tree (wv->next);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1122 wv->next = (widget_value *) 0xDEADBEEF;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1123 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1124 BLOCK_INPUT;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1125 free_widget_value (wv);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1126 UNBLOCK_INPUT;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1127 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1128

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1129 /* Return a tree of widget_value structures for a menu bar item

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1130 whose event type is ITEM_KEY (with string ITEM_NAME)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1131 and whose contents come from the list of keymaps MAPS. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1132

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1133 static widget_value *

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1134 single_submenu (item_key, item_name, maps)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1135 Lisp_Object item_key, item_name, maps;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1136 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1137 widget_value *wv, *prev_wv, *save_wv, *first_wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1138 int i;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1139 int submenu_depth = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1140 Lisp_Object length;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1141 int len;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1142 Lisp_Object *mapvec;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1143 widget_value **submenu_stack;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1144 int previous_items = menu_items_used;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1145 int top_level_items = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1146

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1147 length = Flength (maps);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1148 len = XINT (length);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1149

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1150 /* Convert the list MAPS into a vector MAPVEC. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1151 mapvec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1152 for (i = 0; i < len; i++)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1153 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1154 mapvec[i] = Fcar (maps);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1155 maps = Fcdr (maps);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1156 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1157

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1158 menu_items_n_panes = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1159

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1160 /* Loop over the given keymaps, making a pane for each map.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1161 But don't make a pane that is empty--ignore that map instead. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1162 for (i = 0; i < len; i++)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1163 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1164 if (SYMBOLP (mapvec[i])

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1165 || (CONSP (mapvec[i]) && !KEYMAPP (mapvec[i])))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1166 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1167 /* Here we have a command at top level in the menu bar

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1168 as opposed to a submenu. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1169 top_level_items = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1170 push_menu_pane (Qnil, Qnil);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1171 push_menu_item (item_name, Qt, item_key, mapvec[i],

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1172 Qnil, Qnil, Qnil, Qnil);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1173 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1174 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1175 single_keymap_panes (mapvec[i], item_name, item_key, 0, 10);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1176 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1177

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1178 /* Create a tree of widget_value objects

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1179 representing the panes and their items. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1180

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1181 submenu_stack

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1182 = (widget_value **) alloca (menu_items_used * sizeof (widget_value *));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1183 wv = xmalloc_widget_value ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1184 wv->name = "menu";

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1185 wv->value = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1186 wv->enabled = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1187 wv->button_type = BUTTON_TYPE_NONE;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1188 wv->help = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1189 first_wv = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1190 save_wv = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1191 prev_wv = 0;

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

1192

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1193 /* Loop over all panes and items made during this call

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1194 and construct a tree of widget_value objects.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1195 Ignore the panes and items made by previous calls to

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1196 single_submenu, even though those are also in menu_items. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1197 i = previous_items;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1198 while (i < menu_items_used)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1199 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1200 if (EQ (XVECTOR (menu_items)->contents[i], Qnil))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1201 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1202 submenu_stack[submenu_depth++] = save_wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1203 save_wv = prev_wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1204 prev_wv = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1205 i++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1206 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1207 else if (EQ (XVECTOR (menu_items)->contents[i], Qlambda))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1208 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1209 prev_wv = save_wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1210 save_wv = submenu_stack[--submenu_depth];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1211 i++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1212 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1213 else if (EQ (XVECTOR (menu_items)->contents[i], Qt)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1214 && submenu_depth != 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1215 i += MENU_ITEMS_PANE_LENGTH;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1216 /* Ignore a nil in the item list.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1217 It's meaningful only for dialog boxes. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1218 else if (EQ (XVECTOR (menu_items)->contents[i], Qquote))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1219 i += 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1220 else if (EQ (XVECTOR (menu_items)->contents[i], Qt))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1221 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1222 /* Create a new pane. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1223 Lisp_Object pane_name, prefix;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1224 char *pane_string;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1225

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1226 pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1227 prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1228

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1229 #ifndef HAVE_MULTILINGUAL_MENU

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1230 if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1231 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1232 pane_name = ENCODE_SYSTEM (pane_name);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1233 AREF (menu_items, i + MENU_ITEMS_PANE_NAME) = pane_name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1234 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1235 #endif

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1236 pane_string = (NILP (pane_name)

46370

40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

diff changeset

1237 ? "" : (char *) SDATA (pane_name));

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1238 /* If there is just one top-level pane, put all its items directly

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1239 under the top-level menu. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1240 if (menu_items_n_panes == 1)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1241 pane_string = "";

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1242

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1243 /* If the pane has a meaningful name,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1244 make the pane a top-level menu item

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1245 with its items as a submenu beneath it. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1246 if (strcmp (pane_string, ""))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1247 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1248 wv = xmalloc_widget_value ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1249 if (save_wv)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1250 save_wv->next = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1251 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1252 first_wv->contents = wv;

56849

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1253 wv->lname = pane_name;

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1254 /* Set value to 1 so update_submenu_strings can handle '@' */

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1255 wv->value = (char *)1;

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1256 wv->enabled = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1257 wv->button_type = BUTTON_TYPE_NONE;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1258 wv->help = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1259 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1260 save_wv = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1261 prev_wv = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1262 i += MENU_ITEMS_PANE_LENGTH;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1263 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1264 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1265 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1266 /* Create a new item within current pane. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1267 Lisp_Object item_name, enable, descrip, def, type, selected;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1268 Lisp_Object help;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1269

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1270 item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1271 enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1272 descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1273 def = AREF (menu_items, i + MENU_ITEMS_ITEM_DEFINITION);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1274 type = AREF (menu_items, i + MENU_ITEMS_ITEM_TYPE);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1275 selected = AREF (menu_items, i + MENU_ITEMS_ITEM_SELECTED);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1276 help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1277

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1278 #ifndef HAVE_MULTILINGUAL_MENU

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1279 if (STRING_MULTIBYTE (item_name))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1280 {

56799

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

1281 item_name = ENCODE_MENU_STRING (item_name);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1282 AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1283 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1284

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1285 if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1286 {

56799

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

1287 descrip = ENCODE_MENU_STRING (descrip);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1288 AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1289 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1290 #endif /* not HAVE_MULTILINGUAL_MENU */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1291

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1292 wv = xmalloc_widget_value ();

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

1293 if (prev_wv)

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1294 prev_wv->next = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1295 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1296 save_wv->contents = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1297

56849

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1298 wv->lname = item_name;

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1299 if (!NILP (descrip))

56849

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1300 wv->lkey = descrip;

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1301 wv->value = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1302 /* The EMACS_INT cast avoids a warning. There's no problem

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1303 as long as pointers have enough bits to hold small integers. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1304 wv->call_data = (!NILP (def) ? (void *) (EMACS_INT) i : 0);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1305 wv->enabled = !NILP (enable);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1306

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1307 if (NILP (type))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1308 wv->button_type = BUTTON_TYPE_NONE;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1309 else if (EQ (type, QCradio))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1310 wv->button_type = BUTTON_TYPE_RADIO;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1311 else if (EQ (type, QCtoggle))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1312 wv->button_type = BUTTON_TYPE_TOGGLE;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1313 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1314 abort ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1315

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1316 wv->selected = !NILP (selected);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1317 if (!STRINGP (help))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1318 help = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1319

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1320 wv->help = help;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1321

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1322 prev_wv = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1323

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1324 i += MENU_ITEMS_ITEM_LENGTH;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1325 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1326 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1327

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1328 /* If we have just one "menu item"

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1329 that was originally a button, return it by itself. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1330 if (top_level_items && first_wv->contents && first_wv->contents->next == 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1331 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1332 wv = first_wv->contents;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1333 free_widget_value (first_wv);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1334 return wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1335 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1336

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1337 return first_wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1338 }

56849

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1339 /* Walk through the widget_value tree starting at FIRST_WV and update

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1340 the char * pointers from the corresponding lisp values.

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1341 We do this after building the whole tree, since GC may happen while the

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1342 tree is constructed, and small strings are relocated. So we must wait

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1343 until no GC can happen before storing pointers into lisp values. */

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1344 static void

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1345 update_submenu_strings (first_wv)

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1346 widget_value *first_wv;

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1347 {

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1348 widget_value *wv;

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1349

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1350 for (wv = first_wv; wv; wv = wv->next)

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1351 {

57357

05fe2d3ca439 macfns.c (mac_get_window_bounds): Add extern.

Steven Tamm <steventamm@mac.com>

parents: 56889

diff changeset

1352 if (STRINGP (wv->lname))

56849

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1353 {

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1354 wv->name = SDATA (wv->lname);

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1355

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1356 /* Ignore the @ that means "separate pane".

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1357 This is a kludge, but this isn't worth more time. */

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1358 if (wv->value == (char *)1)

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1359 {

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1360 if (wv->name[0] == '@')

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1361 wv->name++;

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1362 wv->value = 0;

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1363 }

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1364 }

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1365

57357

05fe2d3ca439 macfns.c (mac_get_window_bounds): Add extern.

Steven Tamm <steventamm@mac.com>

parents: 56889

diff changeset

1366 if (STRINGP (wv->lkey))

56849

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1367 wv->key = SDATA (wv->lkey);

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1368

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1369 if (wv->contents)

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1370 update_submenu_strings (wv->contents);

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1371 }

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1372 }

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1373

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1374

63099

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1375 /* Event handler function that pops down a menu on C-g. We can only pop

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1376 down menus if CancelMenuTracking is present (OSX 10.3 or later). */

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1377

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1378 #ifdef HAVE_CANCELMENUTRACKING

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1379 static pascal OSStatus

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1380 menu_quit_handler (nextHandler, theEvent, userData)

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1381 EventHandlerCallRef nextHandler;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1382 EventRef theEvent;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1383 void* userData;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1384 {

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1385 UInt32 keyCode;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1386 UInt32 keyModifiers;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1387 extern int mac_quit_char_modifiers;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1388 extern int mac_quit_char_keycode;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1389

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1390 GetEventParameter (theEvent, kEventParamKeyCode,

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1391 typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1392

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1393 GetEventParameter (theEvent, kEventParamKeyModifiers,

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1394 typeUInt32, NULL, sizeof(UInt32),

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1395 NULL, &keyModifiers);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1396

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1397 if (keyCode == mac_quit_char_keycode

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1398 && keyModifiers == mac_quit_char_modifiers)

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1399 {

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1400 MenuRef menu = userData != 0

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1401 ? (MenuRef)userData : AcquireRootMenu ();

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1402

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1403 CancelMenuTracking (menu, true, 0);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1404 if (!userData) ReleaseMenu (menu);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1405 return noErr;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1406 }

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1407

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1408 return CallNextEventHandler (nextHandler, theEvent);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1409 }

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1410 #endif /* HAVE_CANCELMENUTRACKING */

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1411

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1412 /* Add event handler for MENU_HANDLE so we can detect C-g.

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1413 If MENU_HANDLE is NULL, install handler for all menus in the menu bar.

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1414 If CancelMenuTracking isn't available, do nothing. */

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1415

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1416 static void

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1417 install_menu_quit_handler (MenuHandle menu_handle)

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1418 {

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1419 #ifdef HAVE_CANCELMENUTRACKING

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1420 EventHandlerUPP handler = NewEventHandlerUPP(menu_quit_handler);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1421 UInt32 numTypes = 1;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1422 EventTypeSpec typesList[] = { { kEventClassKeyboard, kEventRawKeyDown } };

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1423 int i = MIN_MENU_ID;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1424 MenuHandle menu = menu_handle ? menu_handle : GetMenuHandle (i);

63147

9bde03db5726 * composite.c (compose_chars_in_text):

Kim F. Storm <storm@cua.dk>

parents: 63099

diff changeset

1425

63099

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1426 while (menu != NULL)

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1427 {

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1428 InstallMenuEventHandler (menu, handler, GetEventTypeCount (typesList),

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1429 typesList, menu_handle, NULL);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1430 if (menu_handle) break;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1431 menu = GetMenuHandle (++i);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1432 }

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1433 DisposeEventHandlerUPP (handler);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1434 #endif /* HAVE_CANCELMENUTRACKING */

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1435 }

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1436

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1437 /* Set the contents of the menubar widgets of frame F.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1438 The argument FIRST_TIME is currently ignored;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1439 it is set the first time this is called, from initialize_frame_menubar. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1440

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1441 void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1442 set_frame_menubar (f, first_time, deep_p)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1443 FRAME_PTR f;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1444 int first_time;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1445 int deep_p;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1446 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1447 int menubar_widget = f->output_data.mac->menubar_widget;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1448 Lisp_Object items;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1449 widget_value *wv, *first_wv, *prev_wv = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1450 int i;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1451

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1452 /* We must not change the menubar when actually in use. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1453 if (f->output_data.mac->menubar_active)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1454 return;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1455

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1456 XSETFRAME (Vmenu_updating_frame, f);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1457

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1458 if (! menubar_widget)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1459 deep_p = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1460 else if (pending_menu_activation && !deep_p)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1461 deep_p = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1462

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1463 wv = xmalloc_widget_value ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1464 wv->name = "menubar";

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1465 wv->value = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1466 wv->enabled = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1467 wv->button_type = BUTTON_TYPE_NONE;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1468 wv->help = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1469 first_wv = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1470

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1471 if (deep_p)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1472 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1473 /* Make a widget-value tree representing the entire menu trees. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1474

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1475 struct buffer *prev = current_buffer;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1476 Lisp_Object buffer;

46293

1fb8f75062c6 Use macro SPECPDL_INDEX.

Juanma Barranquero <lekktu@gmail.com>

parents: 45848

diff changeset

1477 int specpdl_count = SPECPDL_INDEX ();

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1478 int previous_menu_items_used = f->menu_bar_items_used;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1479 Lisp_Object *previous_items

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1480 = (Lisp_Object *) alloca (previous_menu_items_used

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1481 * sizeof (Lisp_Object));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1482

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1483 /* If we are making a new widget, its contents are empty,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1484 do always reinitialize them. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1485 if (! menubar_widget)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1486 previous_menu_items_used = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1487

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1488 buffer = XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1489 specbind (Qinhibit_quit, Qt);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1490 /* Don't let the debugger step into this code

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1491 because it is not reentrant. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1492 specbind (Qdebug_on_next_call, Qnil);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1493

63147

9bde03db5726 * composite.c (compose_chars_in_text):

Kim F. Storm <storm@cua.dk>

parents: 63099

diff changeset

1494 record_unwind_save_match_data ();

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1495 if (NILP (Voverriding_local_map_menu_flag))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1496 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1497 specbind (Qoverriding_terminal_local_map, Qnil);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1498 specbind (Qoverriding_local_map, Qnil);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1499 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1500

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1501 set_buffer_internal_1 (XBUFFER (buffer));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1502

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1503 /* Run the Lucid hook. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1504 safe_run_hooks (Qactivate_menubar_hook);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1505 /* If it has changed current-menubar from previous value,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1506 really recompute the menubar from the value. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1507 if (! NILP (Vlucid_menu_bar_dirty_flag))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1508 call0 (Qrecompute_lucid_menubar);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1509 safe_run_hooks (Qmenu_bar_update_hook);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1510 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1511

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1512 items = FRAME_MENU_BAR_ITEMS (f);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1513

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1514 /* Save the frame's previous menu bar contents data. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1515 if (previous_menu_items_used)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1516 bcopy (XVECTOR (f->menu_bar_vector)->contents, previous_items,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1517 previous_menu_items_used * sizeof (Lisp_Object));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1518

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1519 /* Fill in the current menu bar contents. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1520 menu_items = f->menu_bar_vector;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1521 menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1522 init_menu_items ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1523 for (i = 0; i < XVECTOR (items)->size; i += 4)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1524 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1525 Lisp_Object key, string, maps;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1526

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1527 key = XVECTOR (items)->contents[i];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1528 string = XVECTOR (items)->contents[i + 1];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1529 maps = XVECTOR (items)->contents[i + 2];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1530 if (NILP (string))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1531 break;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1532

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1533 wv = single_submenu (key, string, maps);

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

1534 if (prev_wv)

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1535 prev_wv->next = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1536 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1537 first_wv->contents = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1538 /* Don't set wv->name here; GC during the loop might relocate it. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1539 wv->enabled = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1540 wv->button_type = BUTTON_TYPE_NONE;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1541 prev_wv = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1542 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1543

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1544 finish_menu_items ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1545

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1546 set_buffer_internal_1 (prev);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1547 unbind_to (specpdl_count, Qnil);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1548

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1549 /* If there has been no change in the Lisp-level contents

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1550 of the menu bar, skip redisplaying it. Just exit. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1551

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1552 for (i = 0; i < previous_menu_items_used; i++)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1553 if (menu_items_used == i

55583

21f88361795c Various fixes to support USE_LSB_TAG with carbon emacs. Mostly fixing

Steven Tamm <steventamm@mac.com>

parents: 54150

diff changeset

1554 || (NILP (Fequal (previous_items[i],

21f88361795c Various fixes to support USE_LSB_TAG with carbon emacs. Mostly fixing

Steven Tamm <steventamm@mac.com>

parents: 54150

diff changeset

1555 XVECTOR (menu_items)->contents[i]))))

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1556 break;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1557 if (i == menu_items_used && i == previous_menu_items_used && i != 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1558 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1559 free_menubar_widget_value_tree (first_wv);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1560 menu_items = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1561

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1562 return;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1563 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1564

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1565 /* Now GC cannot happen during the lifetime of the widget_value,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1566 so it's safe to store data from a Lisp_String, as long as

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1567 local copies are made when the actual menu is created.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1568 Windows takes care of this for normal string items, but

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1569 not for owner-drawn items or additional item-info. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1570 wv = first_wv->contents;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1571 for (i = 0; i < XVECTOR (items)->size; i += 4)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1572 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1573 Lisp_Object string;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1574 string = XVECTOR (items)->contents[i + 1];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1575 if (NILP (string))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1576 break;

46370

40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

diff changeset

1577 wv->name = (char *) SDATA (string);

56849

49d188f9179f * macmenu.c (_widget_value): Added lname and lkey.

Jan Djärv <jan.h.d@swipnet.se>

parents: 56842

diff changeset

1578 update_submenu_strings (wv->contents);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1579 wv = wv->next;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1580 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1581

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1582 f->menu_bar_vector = menu_items;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1583 f->menu_bar_items_used = menu_items_used;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1584 menu_items = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1585 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1586 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1587 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1588 /* Make a widget-value tree containing

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1589 just the top level menu bar strings. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1590

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1591 items = FRAME_MENU_BAR_ITEMS (f);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1592 for (i = 0; i < XVECTOR (items)->size; i += 4)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1593 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1594 Lisp_Object string;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1595

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1596 string = XVECTOR (items)->contents[i + 1];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1597 if (NILP (string))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1598 break;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1599

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1600 wv = xmalloc_widget_value ();

46370

40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

diff changeset

1601 wv->name = (char *) SDATA (string);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1602 wv->value = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1603 wv->enabled = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1604 wv->button_type = BUTTON_TYPE_NONE;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1605 wv->help = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1606 /* This prevents lwlib from assuming this

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1607 menu item is really supposed to be empty. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1608 /* The EMACS_INT cast avoids a warning.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1609 This value just has to be different from small integers. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1610 wv->call_data = (void *) (EMACS_INT) (-1);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1611

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

1612 if (prev_wv)

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1613 prev_wv->next = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1614 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1615 first_wv->contents = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1616 prev_wv = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1617 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1618

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1619 /* Forget what we thought we knew about what is in the

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1620 detailed contents of the menu bar menus.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1621 Changing the top level always destroys the contents. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1622 f->menu_bar_items_used = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1623 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1624

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1625 /* Create or update the menu bar widget. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1626

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1627 BLOCK_INPUT;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1628

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1629 /* Non-null value to indicate menubar has already been "created". */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1630 f->output_data.mac->menubar_widget = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1631

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1632 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1633 int i = MIN_MENU_ID;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1634 MenuHandle menu = GetMenuHandle (i);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1635 while (menu != NULL)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1636 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1637 DeleteMenu (i);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1638 DisposeMenu (menu);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1639 menu = GetMenuHandle (++i);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1640 }

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

1641

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1642 i = MIN_SUBMENU_ID;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1643 menu = GetMenuHandle (i);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1644 while (menu != NULL)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1645 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1646 DeleteMenu (i);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1647 DisposeMenu (menu);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1648 menu = GetMenuHandle (++i);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1649 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1650 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1651

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1652 fill_menubar (first_wv->contents);

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

1653

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1654 DrawMenuBar ();

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

1655

63099

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1656 /* Add event handler so we can detect C-g. */

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1657 install_menu_quit_handler (NULL);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1658 free_menubar_widget_value_tree (first_wv);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1659

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1660 UNBLOCK_INPUT;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1661 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1662

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1663 /* Called from Fx_create_frame to create the initial menubar of a frame

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1664 before it is mapped, so that the window is mapped with the menubar already

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1665 there instead of us tacking it on later and thrashing the window after it

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1666 is visible. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1667

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1668 void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1669 initialize_frame_menubar (f)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1670 FRAME_PTR f;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1671 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1672 /* This function is called before the first chance to redisplay

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1673 the frame. It has to be, so the frame will have the right size. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1674 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1675 set_frame_menubar (f, 1, 1);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1676 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1677

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1678 /* Get rid of the menu bar of frame F, and free its storage.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1679 This is used when deleting a frame, and when turning off the menu bar. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1680

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1681 void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1682 free_frame_menubar (f)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1683 FRAME_PTR f;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1684 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1685 f->output_data.mac->menubar_widget = NULL;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1686 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1687

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1688

63099

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1689 static Lisp_Object

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1690 pop_down_menu (arg)

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1691 Lisp_Object arg;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1692 {

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1693 struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg));

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1694 struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg));

63147

9bde03db5726 * composite.c (compose_chars_in_text):

Kim F. Storm <storm@cua.dk>

parents: 63099

diff changeset

1695

63099

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1696 FRAME_PTR f = p1->pointer;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1697 MenuHandle *menu = p2->pointer;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1698

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1699 BLOCK_INPUT;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1700

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1701 /* Must reset this manually because the button release event is not

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1702 passed to Emacs event loop. */

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1703 FRAME_MAC_DISPLAY_INFO (f)->grabbed = 0;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1704

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1705 /* delete all menus */

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1706 {

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1707 int i = MIN_POPUP_SUBMENU_ID;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1708 MenuHandle submenu = GetMenuHandle (i);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1709 while (submenu != NULL)

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1710 {

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1711 DeleteMenu (i);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1712 DisposeMenu (submenu);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1713 submenu = GetMenuHandle (++i);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1714 }

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1715 }

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1716

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1717 DeleteMenu (POPUP_SUBMENU_ID);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1718 DisposeMenu (*menu);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1719

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1720 UNBLOCK_INPUT;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1721

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1722 return Qnil;

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1723 }

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1724

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1725 /* Mac_menu_show actually displays a menu using the panes and items in

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1726 menu_items and returns the value selected from it; we assume input

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1727 is blocked by the caller. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1728

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1729 /* F is the frame the menu is for.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1730 X and Y are the frame-relative specified position,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1731 relative to the inside upper left corner of the frame F.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1732 FOR_CLICK is nonzero if this menu was invoked for a mouse click.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1733 KEYMAPS is 1 if this menu was specified with keymaps;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1734 in that case, we return a list containing the chosen item's value

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1735 and perhaps also the pane's prefix.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1736 TITLE is the specified menu title.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1737 ERROR is a place to store an error message string in case of failure.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1738 (We return nil on failure, but the value doesn't actually matter.) */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1739

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1740 static Lisp_Object

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1741 mac_menu_show (f, x, y, for_click, keymaps, title, error)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1742 FRAME_PTR f;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1743 int x;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1744 int y;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1745 int for_click;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1746 int keymaps;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1747 Lisp_Object title;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1748 char **error;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1749 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1750 int i;

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

1751 UInt32 refcon;

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

1752 int menu_item_choice;

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1753 int menu_item_selection;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1754 MenuHandle menu;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1755 Point pos;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1756 widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1757 widget_value **submenu_stack

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1758 = (widget_value **) alloca (menu_items_used * sizeof (widget_value *));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1759 Lisp_Object *subprefix_stack

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1760 = (Lisp_Object *) alloca (menu_items_used * sizeof (Lisp_Object));

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1761 int submenu_depth = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1762 int first_pane;

63099

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1763 int specpdl_count = SPECPDL_INDEX ();

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1764

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1765 *error = NULL;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1766

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1767 if (menu_items_used <= MENU_ITEMS_PANE_LENGTH)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1768 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1769 *error = "Empty menu";

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1770 return Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1771 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1772

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1773 /* Create a tree of widget_value objects

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1774 representing the panes and their items. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1775 wv = xmalloc_widget_value ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1776 wv->name = "menu";

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1777 wv->value = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1778 wv->enabled = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1779 wv->button_type = BUTTON_TYPE_NONE;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1780 wv->help = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1781 first_wv = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1782 first_pane = 1;

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

1783

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1784 /* Loop over all panes and items, filling in the tree. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1785 i = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1786 while (i < menu_items_used)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1787 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1788 if (EQ (XVECTOR (menu_items)->contents[i], Qnil))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1789 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1790 submenu_stack[submenu_depth++] = save_wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1791 save_wv = prev_wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1792 prev_wv = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1793 first_pane = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1794 i++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1795 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1796 else if (EQ (XVECTOR (menu_items)->contents[i], Qlambda))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1797 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1798 prev_wv = save_wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1799 save_wv = submenu_stack[--submenu_depth];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1800 first_pane = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1801 i++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1802 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1803 else if (EQ (XVECTOR (menu_items)->contents[i], Qt)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1804 && submenu_depth != 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1805 i += MENU_ITEMS_PANE_LENGTH;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1806 /* Ignore a nil in the item list.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1807 It's meaningful only for dialog boxes. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1808 else if (EQ (XVECTOR (menu_items)->contents[i], Qquote))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1809 i += 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1810 else if (EQ (XVECTOR (menu_items)->contents[i], Qt))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1811 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1812 /* Create a new pane. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1813 Lisp_Object pane_name, prefix;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1814 char *pane_string;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1815 pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1816 prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1817 #ifndef HAVE_MULTILINGUAL_MENU

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1818 if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1819 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1820 pane_name = ENCODE_SYSTEM (pane_name);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1821 AREF (menu_items, i + MENU_ITEMS_PANE_NAME) = pane_name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1822 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1823 #endif

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1824 pane_string = (NILP (pane_name)

46370

40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

diff changeset

1825 ? "" : (char *) SDATA (pane_name));

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1826 /* If there is just one top-level pane, put all its items directly

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1827 under the top-level menu. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1828 if (menu_items_n_panes == 1)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1829 pane_string = "";

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1830

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1831 /* If the pane has a meaningful name,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1832 make the pane a top-level menu item

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1833 with its items as a submenu beneath it. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1834 if (!keymaps && strcmp (pane_string, ""))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1835 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1836 wv = xmalloc_widget_value ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1837 if (save_wv)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1838 save_wv->next = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1839 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1840 first_wv->contents = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1841 wv->name = pane_string;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1842 if (keymaps && !NILP (prefix))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1843 wv->name++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1844 wv->value = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1845 wv->enabled = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1846 wv->button_type = BUTTON_TYPE_NONE;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1847 wv->help = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1848 save_wv = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1849 prev_wv = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1850 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1851 else if (first_pane)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1852 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1853 save_wv = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1854 prev_wv = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1855 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1856 first_pane = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1857 i += MENU_ITEMS_PANE_LENGTH;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1858 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1859 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1860 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1861 /* Create a new item within current pane. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1862 Lisp_Object item_name, enable, descrip, def, type, selected, help;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1863

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1864 item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1865 enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1866 descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1867 def = AREF (menu_items, i + MENU_ITEMS_ITEM_DEFINITION);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1868 type = AREF (menu_items, i + MENU_ITEMS_ITEM_TYPE);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1869 selected = AREF (menu_items, i + MENU_ITEMS_ITEM_SELECTED);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1870 help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1871

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1872 #ifndef HAVE_MULTILINGUAL_MENU

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1873 if (STRINGP (item_name) && STRING_MULTIBYTE (item_name))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1874 {

56799

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

1875 item_name = ENCODE_MENU_STRING (item_name);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1876 AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1877 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1878 if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1879 {

56799

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

1880 descrip = ENCODE_MENU_STRING (descrip);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1881 AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1882 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1883 #endif /* not HAVE_MULTILINGUAL_MENU */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1884

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1885 wv = xmalloc_widget_value ();

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

1886 if (prev_wv)

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1887 prev_wv->next = wv;

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

1888 else

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1889 save_wv->contents = wv;

46370

40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

diff changeset

1890 wv->name = (char *) SDATA (item_name);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1891 if (!NILP (descrip))

46370

40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

diff changeset

1892 wv->key = (char *) SDATA (descrip);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1893 wv->value = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1894 /* Use the contents index as call_data, since we are

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1895 restricted to 16-bits. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1896 wv->call_data = !NILP (def) ? (void *) (EMACS_INT) i : 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1897 wv->enabled = !NILP (enable);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1898

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1899 if (NILP (type))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1900 wv->button_type = BUTTON_TYPE_NONE;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1901 else if (EQ (type, QCtoggle))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1902 wv->button_type = BUTTON_TYPE_TOGGLE;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1903 else if (EQ (type, QCradio))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1904 wv->button_type = BUTTON_TYPE_RADIO;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1905 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1906 abort ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1907

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1908 wv->selected = !NILP (selected);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1909 if (!STRINGP (help))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1910 help = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1911

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1912 wv->help = help;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1913

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1914 prev_wv = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1915

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1916 i += MENU_ITEMS_ITEM_LENGTH;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1917 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1918 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1919

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1920 /* Deal with the title, if it is non-nil. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1921 if (!NILP (title))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1922 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1923 widget_value *wv_title = xmalloc_widget_value ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1924 widget_value *wv_sep = xmalloc_widget_value ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1925

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1926 /* Maybe replace this separator with a bitmap or owner-draw item

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1927 so that it looks better. Having two separators looks odd. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1928 wv_sep->name = "--";

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1929 wv_sep->next = first_wv->contents;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1930 wv_sep->help = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1931

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1932 #ifndef HAVE_MULTILINGUAL_MENU

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1933 if (STRING_MULTIBYTE (title))

56799

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

1934 title = ENCODE_MENU_STRING (title);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1935 #endif

46370

40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

diff changeset

1936 wv_title->name = (char *) SDATA (title);

63099

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1937 wv_title->enabled = FALSE;

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1938 wv_title->title = TRUE;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1939 wv_title->button_type = BUTTON_TYPE_NONE;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1940 wv_title->help = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1941 wv_title->next = wv_sep;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1942 first_wv->contents = wv_title;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1943 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1944

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1945 /* Actually create the menu. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1946 menu = NewMenu (POPUP_SUBMENU_ID, "\p");

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

1947 submenu_id = MIN_POPUP_SUBMENU_ID;

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

1948 fill_submenu (menu, first_wv->contents);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1949

63099

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1950 /* Free the widget_value objects we used to specify the

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1951 contents. */

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1952 free_menubar_widget_value_tree (first_wv);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1953

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1954 /* Adjust coordinates to be root-window-relative. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1955 pos.h = x;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1956 pos.v = y;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1957

55851

f1d6a507dcfd Support Tooltips with the Carbon emacs port.

Steven Tamm <steventamm@mac.com>

parents: 55583

diff changeset

1958 SetPortWindowPort (FRAME_MAC_WINDOW (f));

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1959

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1960 LocalToGlobal (&pos);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1961

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1962 /* No selection has been chosen yet. */

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

1963 menu_item_choice = 0;

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1964 menu_item_selection = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1965

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1966 InsertMenu (menu, -1);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1967

63099

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1968 record_unwind_protect (pop_down_menu,

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1969 Fcons (make_save_value (f, 0),

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1970 make_save_value (&menu, 0)));

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1971

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1972 /* Add event handler so we can detect C-g. */

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1973 install_menu_quit_handler (menu);

63147

9bde03db5726 * composite.c (compose_chars_in_text):

Kim F. Storm <storm@cua.dk>

parents: 63099

diff changeset

1974

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1975 /* Display the menu. */

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

1976 menu_item_choice = PopUpMenuSelect (menu, pos.v, pos.h, 0);

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

1977 menu_item_selection = LoWord (menu_item_choice);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1978

63099

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1979 /* Get the refcon to find the correct item */

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

1980 if (menu_item_selection)

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

1981 {

56842

6bd9ebab1440 macmenu.c (mac_menu_show): Remove shadowing of menu variable

Steven Tamm <steventamm@mac.com>

parents: 56799

diff changeset

1982 MenuHandle sel_menu = GetMenuHandle (HiWord (menu_item_choice));

6bd9ebab1440 macmenu.c (mac_menu_show): Remove shadowing of menu variable

Steven Tamm <steventamm@mac.com>

parents: 56799

diff changeset

1983 if (sel_menu) {

6bd9ebab1440 macmenu.c (mac_menu_show): Remove shadowing of menu variable

Steven Tamm <steventamm@mac.com>

parents: 56799

diff changeset

1984 GetMenuItemRefCon (sel_menu, menu_item_selection, &refcon);

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

1985 }

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

1986 }

63099

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1987 else if (! for_click)

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1988 /* Make "Cancel" equivalent to C-g unless this menu was popped up by

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1989 a mouse press. */

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

1990 Fsignal (Qquit, Qnil);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1991

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1992 /* Find the selected item, and its pane, to return

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1993 the proper value. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1994 if (menu_item_selection != 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1995 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1996 Lisp_Object prefix, entry;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1997

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1998 prefix = entry = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

1999 i = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2000 while (i < menu_items_used)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2001 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2002 if (EQ (XVECTOR (menu_items)->contents[i], Qnil))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2003 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2004 subprefix_stack[submenu_depth++] = prefix;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2005 prefix = entry;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2006 i++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2007 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2008 else if (EQ (XVECTOR (menu_items)->contents[i], Qlambda))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2009 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2010 prefix = subprefix_stack[--submenu_depth];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2011 i++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2012 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2013 else if (EQ (XVECTOR (menu_items)->contents[i], Qt))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2014 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2015 prefix

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2016 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2017 i += MENU_ITEMS_PANE_LENGTH;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2018 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2019 /* Ignore a nil in the item list.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2020 It's meaningful only for dialog boxes. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2021 else if (EQ (XVECTOR (menu_items)->contents[i], Qquote))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2022 i += 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2023 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2024 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2025 entry

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2026 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE];

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

2027 if ((int) (EMACS_INT) refcon == i)

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2028 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2029 if (keymaps != 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2030 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2031 int j;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2032

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2033 entry = Fcons (entry, Qnil);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2034 if (!NILP (prefix))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2035 entry = Fcons (prefix, entry);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2036 for (j = submenu_depth - 1; j >= 0; j--)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2037 if (!NILP (subprefix_stack[j]))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2038 entry = Fcons (subprefix_stack[j], entry);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2039 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2040 return entry;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2041 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2042 i += MENU_ITEMS_ITEM_LENGTH;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2043 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2044 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2045 }

62988

3ca414a25103 * macmenu.c (cleanup_popup_menu): New function.

Jan Djärv <jan.h.d@swipnet.se>

parents: 62670

diff changeset

2046 else if (!for_click)

3ca414a25103 * macmenu.c (cleanup_popup_menu): New function.

Jan Djärv <jan.h.d@swipnet.se>

parents: 62670

diff changeset

2047 /* Make "Cancel" equivalent to C-g. */

3ca414a25103 * macmenu.c (cleanup_popup_menu): New function.

Jan Djärv <jan.h.d@swipnet.se>

parents: 62670

diff changeset

2048 Fsignal (Qquit, Qnil);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2049

63099

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

2050 unbind_to (specpdl_count, Qnil);

a817e29f8ce0 * macmenu.c (menu_quit_handler, install_menu_quit_handler): New

Jan Djärv <jan.h.d@swipnet.se>

parents: 62988

diff changeset

2051

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2052 return Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2053 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2054

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2055

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2056 #ifdef HAVE_DIALOGS

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2057 /* Construct native Mac OS menubar based on widget_value tree. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2058

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2059 static int

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2060 mac_dialog (widget_value *wv)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2061 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2062 char *dialog_name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2063 char *prompt;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2064 char **button_labels;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2065 UInt32 *ref_cons;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2066 int nb_buttons;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2067 int left_count;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2068 int i;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2069 int dialog_width;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2070 Rect rect;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2071 WindowPtr window_ptr;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2072 ControlHandle ch;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2073 int left;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2074 EventRecord event_record;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2075 SInt16 part_code;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2076 int control_part_code;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2077 Point mouse;

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

2078

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2079 dialog_name = wv->name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2080 nb_buttons = dialog_name[1] - '0';

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2081 left_count = nb_buttons - (dialog_name[4] - '0');

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2082 button_labels = (char **) alloca (sizeof (char *) * nb_buttons);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2083 ref_cons = (UInt32 *) alloca (sizeof (UInt32) * nb_buttons);

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

2084

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2085 wv = wv->contents;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2086 prompt = (char *) alloca (strlen (wv->value) + 1);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2087 strcpy (prompt, wv->value);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2088 c2pstr (prompt);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2089

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2090 wv = wv->next;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2091 for (i = 0; i < nb_buttons; i++)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2092 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2093 button_labels[i] = wv->value;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2094 button_labels[i] = (char *) alloca (strlen (wv->value) + 1);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2095 strcpy (button_labels[i], wv->value);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2096 c2pstr (button_labels[i]);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2097 ref_cons[i] = (UInt32) wv->call_data;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2098 wv = wv->next;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2099 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2100

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2101 window_ptr = GetNewCWindow (DIALOG_WINDOW_RESOURCE, NULL, (WindowPtr) -1);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2102

55851

f1d6a507dcfd Support Tooltips with the Carbon emacs port.

Steven Tamm <steventamm@mac.com>

parents: 55583

diff changeset

2103 SetPortWindowPort (window_ptr);

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

2104

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2105 TextFont (0);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2106 /* Left and right margins in the dialog are 13 pixels each.*/

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2107 dialog_width = 14;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2108 /* Calculate width of dialog box: 8 pixels on each side of the text

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2109 label in each button, 12 pixels between buttons. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2110 for (i = 0; i < nb_buttons; i++)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2111 dialog_width += StringWidth (button_labels[i]) + 16 + 12;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2112

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2113 if (left_count != 0 && nb_buttons - left_count != 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2114 dialog_width += 12;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2115

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2116 dialog_width = max (dialog_width, StringWidth (prompt) + 26);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2117

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2118 SizeWindow (window_ptr, dialog_width, 78, 0);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2119 ShowWindow (window_ptr);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2120

55851

f1d6a507dcfd Support Tooltips with the Carbon emacs port.

Steven Tamm <steventamm@mac.com>

parents: 55583

diff changeset

2121 SetPortWindowPort (window_ptr);

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

2122

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2123 TextFont (0);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2124

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2125 MoveTo (13, 29);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2126 DrawString (prompt);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2127

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2128 left = 13;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2129 for (i = 0; i < nb_buttons; i++)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2130 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2131 int button_width = StringWidth (button_labels[i]) + 16;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2132 SetRect (&rect, left, 45, left + button_width, 65);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2133 ch = NewControl (window_ptr, &rect, button_labels[i], 1, 0, 0, 0,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2134 kControlPushButtonProc, ref_cons[i]);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2135 left += button_width + 12;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2136 if (i == left_count - 1)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2137 left += 12;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2138 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2139

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2140 i = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2141 while (!i)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2142 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2143 if (WaitNextEvent (mDownMask, &event_record, 10, NULL))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2144 if (event_record.what == mouseDown)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2145 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2146 part_code = FindWindow (event_record.where, &window_ptr);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2147 if (part_code == inContent)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2148 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2149 mouse = event_record.where;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2150 GlobalToLocal (&mouse);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2151 control_part_code = FindControl (mouse, window_ptr, &ch);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2152 if (control_part_code == kControlButtonPart)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2153 if (TrackControl (ch, mouse, NULL))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2154 i = GetControlReference (ch);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2155 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2156 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2157 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2158

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2159 DisposeWindow (window_ptr);

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

2160

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2161 return i;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2162 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2163

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2164 static char * button_names [] = {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2165 "button1", "button2", "button3", "button4", "button5",

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2166 "button6", "button7", "button8", "button9", "button10" };

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2167

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2168 static Lisp_Object

62669

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

2169 mac_dialog_show (f, keymaps, title, header, error)

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2170 FRAME_PTR f;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2171 int keymaps;

62669

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

2172 Lisp_Object title, header;

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2173 char **error;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2174 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2175 int i, nb_buttons=0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2176 char dialog_name[6];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2177 int menu_item_selection;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2178

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2179 widget_value *wv, *first_wv = 0, *prev_wv = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2180

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2181 /* Number of elements seen so far, before boundary. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2182 int left_count = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2183 /* 1 means we've seen the boundary between left-hand elts and right-hand. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2184 int boundary_seen = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2185

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2186 *error = NULL;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2187

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2188 if (menu_items_n_panes > 1)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2189 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2190 *error = "Multiple panes in dialog box";

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2191 return Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2192 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2193

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2194 /* Create a tree of widget_value objects

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2195 representing the text label and buttons. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2196 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2197 Lisp_Object pane_name, prefix;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2198 char *pane_string;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2199 pane_name = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2200 prefix = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_PREFIX];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2201 pane_string = (NILP (pane_name)

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

2202 ? "" : (char *) SDATA (pane_name));

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2203 prev_wv = xmalloc_widget_value ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2204 prev_wv->value = pane_string;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2205 if (keymaps && !NILP (prefix))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2206 prev_wv->name++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2207 prev_wv->enabled = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2208 prev_wv->name = "message";

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2209 prev_wv->help = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2210 first_wv = prev_wv;

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

2211

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2212 /* Loop over all panes and items, filling in the tree. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2213 i = MENU_ITEMS_PANE_LENGTH;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2214 while (i < menu_items_used)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2215 {

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

2216

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2217 /* Create a new item within current pane. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2218 Lisp_Object item_name, enable, descrip, help;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2219

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2220 item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2221 enable = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_ENABLE];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2222 descrip

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2223 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2224 help = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_HELP];

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

2225

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2226 if (NILP (item_name))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2227 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2228 free_menubar_widget_value_tree (first_wv);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2229 *error = "Submenu in dialog items";

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2230 return Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2231 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2232 if (EQ (item_name, Qquote))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2233 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2234 /* This is the boundary between left-side elts

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2235 and right-side elts. Stop incrementing right_count. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2236 boundary_seen = 1;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2237 i++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2238 continue;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2239 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2240 if (nb_buttons >= 9)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2241 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2242 free_menubar_widget_value_tree (first_wv);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2243 *error = "Too many dialog items";

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2244 return Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2245 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2246

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2247 wv = xmalloc_widget_value ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2248 prev_wv->next = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2249 wv->name = (char *) button_names[nb_buttons];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2250 if (!NILP (descrip))

46370

40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

diff changeset

2251 wv->key = (char *) SDATA (descrip);

40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

diff changeset

2252 wv->value = (char *) SDATA (item_name);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2253 wv->call_data = (void *) i;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2254 /* menu item is identified by its index in menu_items table */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2255 wv->enabled = !NILP (enable);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2256 wv->help = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2257 prev_wv = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2258

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2259 if (! boundary_seen)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2260 left_count++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2261

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2262 nb_buttons++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2263 i += MENU_ITEMS_ITEM_LENGTH;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2264 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2265

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2266 /* If the boundary was not specified,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2267 by default put half on the left and half on the right. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2268 if (! boundary_seen)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2269 left_count = nb_buttons - nb_buttons / 2;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2270

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2271 wv = xmalloc_widget_value ();

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2272 wv->name = dialog_name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2273 wv->help = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2274

62669

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

2275 /* Frame title: 'Q' = Question, 'I' = Information.

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

2276 Can also have 'E' = Error if, one day, we want

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

2277 a popup for errors. */

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

2278 if (NILP(header))

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

2279 dialog_name[0] = 'Q';

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

2280 else

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

2281 dialog_name[0] = 'I';

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

2282

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2283 /* Dialog boxes use a really stupid name encoding

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2284 which specifies how many buttons to use

62669

befffaf3d1cf (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 62282

diff changeset

2285 and how many buttons are on the right. */

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2286 dialog_name[1] = '0' + nb_buttons;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2287 dialog_name[2] = 'B';

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2288 dialog_name[3] = 'R';

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2289 /* Number of buttons to put on the right. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2290 dialog_name[4] = '0' + nb_buttons - left_count;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2291 dialog_name[5] = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2292 wv->contents = first_wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2293 first_wv = wv;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2294 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2295

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2296 /* Actually create the dialog. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2297 #ifdef HAVE_DIALOGS

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2298 menu_item_selection = mac_dialog (first_wv);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2299 #else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2300 menu_item_selection = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2301 #endif

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2302

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2303 /* Free the widget_value objects we used to specify the contents. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2304 free_menubar_widget_value_tree (first_wv);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2305

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2306 /* Find the selected item, and its pane, to return the proper

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2307 value. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2308 if (menu_item_selection != 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2309 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2310 Lisp_Object prefix;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2311

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2312 prefix = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2313 i = 0;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2314 while (i < menu_items_used)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2315 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2316 Lisp_Object entry;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2317

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2318 if (EQ (XVECTOR (menu_items)->contents[i], Qt))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2319 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2320 prefix

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2321 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2322 i += MENU_ITEMS_PANE_LENGTH;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2323 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2324 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2325 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2326 entry

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2327 = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE];

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2328 if (menu_item_selection == i)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2329 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2330 if (keymaps != 0)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2331 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2332 entry = Fcons (entry, Qnil);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2333 if (!NILP (prefix))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2334 entry = Fcons (prefix, entry);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2335 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2336 return entry;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2337 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2338 i += MENU_ITEMS_ITEM_LENGTH;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2339 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2340 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2341 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2342

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2343 return Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2344 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2345 #endif /* HAVE_DIALOGS */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2346

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2347

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2348 /* Is this item a separator? */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2349 static int

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2350 name_is_separator (name)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2351 char *name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2352 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2353 char *start = name;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2354

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2355 /* Check if name string consists of only dashes ('-'). */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2356 while (*name == '-') name++;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2357 /* Separators can also be of the form "--:TripleSuperMegaEtched"

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2358 or "--deep-shadow". We don't implement them yet, se we just treat

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2359 them like normal separators. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2360 return (*name == '\0' || start + 2 == name);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2361 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2362

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2363 static void

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

2364 add_menu_item (MenuHandle menu, widget_value *wv, int submenu,

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2365 int force_disable)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2366 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2367 Str255 item_name;

56889

ca08ff660c73 (add_menu_item): Remove unused variable `i'. Don't

Steven Tamm <steventamm@mac.com>

parents: 56849

diff changeset

2368 int pos;

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2369

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2370 if (name_is_separator (wv->name))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2371 AppendMenu (menu, "\p-");

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

2372 else

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2373 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2374 AppendMenu (menu, "\pX");

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

2375

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2376 #if TARGET_API_MAC_CARBON

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2377 pos = CountMenuItems (menu);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2378 #else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2379 pos = CountMItems (menu);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2380 #endif

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2381

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2382 strcpy (item_name, "");

48625

b696e2bae8da 2002-12-02 Andrew Choi <akochoi@shaw.ca>

Andrew Choi <akochoi@shaw.ca>

parents: 47778

diff changeset

2383 strncat (item_name, wv->name, 255);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2384 if (wv->key != NULL)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2385 {

48625

b696e2bae8da 2002-12-02 Andrew Choi <akochoi@shaw.ca>

Andrew Choi <akochoi@shaw.ca>

parents: 47778

diff changeset

2386 strncat (item_name, " ", 255);

b696e2bae8da 2002-12-02 Andrew Choi <akochoi@shaw.ca>

Andrew Choi <akochoi@shaw.ca>

parents: 47778

diff changeset

2387 strncat (item_name, wv->key, 255);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2388 }

48625

b696e2bae8da 2002-12-02 Andrew Choi <akochoi@shaw.ca>

Andrew Choi <akochoi@shaw.ca>

parents: 47778

diff changeset

2389 item_name[255] = 0;

56799

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

2390 #if TARGET_API_MAC_CARBON

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

2391 {

58752

4ad0594e1ac4 * macterm.h (cfstring_create_with_utf8_cstring): Added prototype.

Steven Tamm <steventamm@mac.com>

parents: 58708

diff changeset

2392 CFStringRef string = cfstring_create_with_utf8_cstring (item_name);

56799

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

2393

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

2394 SetMenuItemTextWithCFString (menu, pos, string);

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

2395 CFRelease (string);

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

2396 }

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

2397 #else

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2398 c2pstr (item_name);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2399 SetMenuItemText (menu, pos, item_name);

56799

d2348e1fa995 macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte

Steven Tamm <steventamm@mac.com>

parents: 55851

diff changeset

2400 #endif

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2401

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2402 if (wv->enabled && !force_disable)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2403 #if TARGET_API_MAC_CARBON

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2404 EnableMenuItem (menu, pos);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2405 #else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2406 EnableItem (menu, pos);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2407 #endif

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2408 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2409 #if TARGET_API_MAC_CARBON

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2410 DisableMenuItem (menu, pos);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2411 #else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2412 DisableItem (menu, pos);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2413 #endif

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2414

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2415 /* Draw radio buttons and tickboxes. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2416 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2417 if (wv->selected && (wv->button_type == BUTTON_TYPE_TOGGLE ||

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2418 wv->button_type == BUTTON_TYPE_RADIO))

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2419 SetItemMark (menu, pos, checkMark);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2420 else

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2421 SetItemMark (menu, pos, noMark);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2422 }

56889

ca08ff660c73 (add_menu_item): Remove unused variable `i'. Don't

Steven Tamm <steventamm@mac.com>

parents: 56849

diff changeset

2423

ca08ff660c73 (add_menu_item): Remove unused variable `i'. Don't

Steven Tamm <steventamm@mac.com>

parents: 56849

diff changeset

2424 SetMenuItemRefCon (menu, pos, (UInt32) wv->call_data);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2425 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2426

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2427 if (submenu != NULL)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2428 SetMenuItemHierarchicalID (menu, pos, submenu);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2429 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2430

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2431 /* Construct native Mac OS menubar based on widget_value tree. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2432

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2433 static void

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

2434 fill_submenu (MenuHandle menu, widget_value *wv)

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2435 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2436 for ( ; wv != NULL; wv = wv->next)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2437 if (wv->contents)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2438 {

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

2439 int cur_submenu = submenu_id++;

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

2440 MenuHandle submenu = NewMenu (cur_submenu, "\pX");

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

2441 fill_submenu (submenu, wv->contents);

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

2442 InsertMenu (submenu, -1);

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

2443 add_menu_item (menu, wv, cur_submenu, 0);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2444 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2445 else

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

2446 add_menu_item (menu, wv, NULL, 0);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2447 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2448

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2449

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2450 /* Construct native Mac OS menu based on widget_value tree. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2451

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2452 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2453 fill_menu (MenuHandle menu, widget_value *wv)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2454 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2455 for ( ; wv != NULL; wv = wv->next)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2456 if (wv->contents)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2457 {

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

2458 int cur_submenu = submenu_id++;

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

2459 MenuHandle submenu = NewMenu (cur_submenu, "\pX");

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

2460 fill_submenu (submenu, wv->contents);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2461 InsertMenu (submenu, -1);

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

2462 add_menu_item (menu, wv, cur_submenu, 0);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2463 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2464 else

48937

3cabed8b65b7 * macmenu.c (MIN_POPUP_SUBMENU_ID): Added

Steven Tamm <steventamm@mac.com>

parents: 48625

diff changeset

2465 add_menu_item (menu, wv, NULL, 0);

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2466 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2467

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2468 /* Construct native Mac OS menubar based on widget_value tree. */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2469

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2470 static void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2471 fill_menubar (widget_value *wv)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2472 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2473 int id;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2474

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2475 submenu_id = MIN_SUBMENU_ID;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2476

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2477 for (id = MIN_MENU_ID; wv != NULL; wv = wv->next, id++)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2478 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2479 MenuHandle menu;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2480 Str255 title;

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

2481

48625

b696e2bae8da 2002-12-02 Andrew Choi <akochoi@shaw.ca>

Andrew Choi <akochoi@shaw.ca>

parents: 47778

diff changeset

2482 strncpy (title, wv->name, 255);

b696e2bae8da 2002-12-02 Andrew Choi <akochoi@shaw.ca>

Andrew Choi <akochoi@shaw.ca>

parents: 47778

diff changeset

2483 title[255] = 0;

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2484 c2pstr (title);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2485 menu = NewMenu (id, title);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2486

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2487 if (wv->contents)

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2488 fill_menu (menu, wv->contents);

49600

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 48937

diff changeset

2489

44890

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2490 InsertMenu (menu, 0);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2491 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2492 }

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2493

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2494 #endif /* HAVE_MENUS */

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2495

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2496

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2497 void

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2498 syms_of_macmenu ()

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2499 {

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2500 staticpro (&menu_items);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2501 menu_items = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2502

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2503 Qdebug_on_next_call = intern ("debug-on-next-call");

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2504 staticpro (&Qdebug_on_next_call);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2505

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2506 DEFVAR_LISP ("menu-updating-frame", &Vmenu_updating_frame,

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2507 doc: /* Frame for which we are updating a menu.

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2508 The enable predicate for a menu command should check this variable. */);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2509 Vmenu_updating_frame = Qnil;

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2510

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2511 defsubr (&Sx_popup_menu);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2512 #ifdef HAVE_MENUS

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2513 defsubr (&Sx_popup_dialog);

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2514 #endif

01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

Andrew Choi <akochoi@shaw.ca>

parents:

diff changeset

2515 }

52401

695cf19ef79e Add arch taglines

Miles Bader <miles@gnu.org>

parents: 51573

diff changeset

2516

695cf19ef79e Add arch taglines

Miles Bader <miles@gnu.org>

parents: 51573

diff changeset

2517 /* arch-tag: 40b2c6c7-b8a9-4a49-b930-1b2707184cce

695cf19ef79e Add arch taglines

Miles Bader <miles@gnu.org>

parents: 51573

diff changeset

2518 (do not change this comment) */

Mercurial > emacs

annotate src/macmenu.c @ 67577:125832ddcd6b