emacs: src/w32menu.c annotate

1 /* Menu support for GNU Emacs on the Microsoft W32 API.

75227

e90d04cd455a Update copyright for years from Emacs 21 to present (mainly adding

Glenn Morris <rgm@gnu.org>

parents: 73788

100951

e038c1a8307c Add 2009 to copyright years.

Glenn Morris <rgm@gnu.org>

parents: 97947

3 2003, 2004, 2005, 2006, 2007, 2008, 2009

79759

fc2bcd2a8aad Add 2008 to copyright years.

Glenn Morris <rgm@gnu.org>

parents: 78260

4 Free Software Foundation, Inc.

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

5

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

6 This file is part of GNU Emacs.

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

7

94963

8971ddf55736 Switch to recommended form of GPLv3 permissions notice.

Glenn Morris <rgm@gnu.org>

parents: 93979

8 GNU Emacs is free software: you can redistribute it and/or modify

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

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

94963

8971ddf55736 Switch to recommended form of GPLv3 permissions notice.

Glenn Morris <rgm@gnu.org>

parents: 93979

10 the Free Software Foundation, either version 3 of the License, or

8971ddf55736 Switch to recommended form of GPLv3 permissions notice.

Glenn Morris <rgm@gnu.org>

parents: 93979

11 (at your option) any later version.

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

12

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

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

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

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

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

16 GNU General Public License for more details.

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

17

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

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

94963

8971ddf55736 Switch to recommended form of GPLv3 permissions notice.

Glenn Morris <rgm@gnu.org>

parents: 93979

19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

20

26088

b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.

Paul Eggert <eggert@twinsun.com>

parents: 25646

21 #include <config.h>

244d6216c056 (Fx_popup_menu): Use terminal specific mouse_position_hook.

Jason Rumney <jasonr@gnu.org>

parents: 76086

22

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

23 #include <signal.h>

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

24 #include <stdio.h>

cf89ff54912e (add_menu_item): Escape `&' characters in menu items and their keybindings.

Eli Zaretskii <eliz@gnu.org>

parents: 76086

25 #include <mbstring.h>

244d6216c056 (Fx_popup_menu): Use terminal specific mouse_position_hook.

Jason Rumney <jasonr@gnu.org>

parents: 76086

26

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

27 #include "lisp.h"

31114

cd392fdf0e9f Include keyboard.h before frame.h. Fix compile

Andrew Innes <andrewi@gnu.org>

parents: 30989

28 #include "keyboard.h"

39690

38c1890338cc (keymap_panes, Fx_popup_menu): Use Fkeymap_prompt.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 39682

29 #include "keymap.h"

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

30 #include "frame.h"

244d6216c056 (Fx_popup_menu): Use terminal specific mouse_position_hook.

Jason Rumney <jasonr@gnu.org>

parents: 76086

31 #include "termhooks.h"

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

32 #include "window.h"

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

33 #include "blockinput.h"

07341673efa6 Include buffer.h.

Richard M. Stallman <rms@gnu.org>

parents: 15110

34 #include "buffer.h"

29320

33aa00975055 (single_submenu, w32_menu_show): Call ENCODE_SYSTEM on menu strings.

Jason Rumney <jasonr@gnu.org>

parents: 28275

35 #include "charset.h"

90928

14fbdb070a2f Include character.h

Jason Rumney <jasonr@gnu.org>

parents: 90920

36 #include "character.h"

29320

33aa00975055 (single_submenu, w32_menu_show): Call ENCODE_SYSTEM on menu strings.

Jason Rumney <jasonr@gnu.org>

parents: 28275

37 #include "coding.h"

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

38

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

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

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

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

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

41 #include "w32term.h"

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

42

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

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

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

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

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

45 #ifndef makedev

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

46 #include <sys/types.h>

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

47 #endif

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

48

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

49 #include "dispextern.h"

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

50

33971

c33b80a45f6a (add_menu_item): Reset menu item text when changing type to radio button.

Jason Rumney <jasonr@gnu.org>

parents: 32988

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

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

52

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

53 #ifndef TRUE

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

54 #define TRUE 1

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

55 #define FALSE 0

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

56 #endif /* no TRUE */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

57

76074

5978a80d504e (current_popup_menu): Make available globally.

Jason Rumney <jasonr@gnu.org>

parents: 75227

58 HMENU current_popup_menu;

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

59

4d7b83cc03aa Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.

Ben Key <bkey1@tampabay.rr.com>

parents: 46815

60 void syms_of_w32menu ();

48888

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

61 void globals_of_w32menu ();

4d7b83cc03aa Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.

Ben Key <bkey1@tampabay.rr.com>

parents: 46815

62

4d7b83cc03aa Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.

Ben Key <bkey1@tampabay.rr.com>

parents: 46815

63 typedef BOOL (WINAPI * GetMenuItemInfoA_Proc) (

4d7b83cc03aa Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.

Ben Key <bkey1@tampabay.rr.com>

parents: 46815

64 IN HMENU,

4d7b83cc03aa Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.

Ben Key <bkey1@tampabay.rr.com>

parents: 46815

65 IN UINT,

4d7b83cc03aa Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.

Ben Key <bkey1@tampabay.rr.com>

parents: 46815

66 IN BOOL,

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

67 IN OUT LPMENUITEMINFOA);

4d7b83cc03aa Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.

Ben Key <bkey1@tampabay.rr.com>

parents: 46815

68 typedef BOOL (WINAPI * SetMenuItemInfoA_Proc) (

4d7b83cc03aa Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.

Ben Key <bkey1@tampabay.rr.com>

parents: 46815

69 IN HMENU,

4d7b83cc03aa Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.

Ben Key <bkey1@tampabay.rr.com>

parents: 46815

70 IN UINT,

4d7b83cc03aa Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.

Ben Key <bkey1@tampabay.rr.com>

parents: 46815

71 IN BOOL,

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

72 IN LPCMENUITEMINFOA);

4d7b83cc03aa Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.

Ben Key <bkey1@tampabay.rr.com>

parents: 46815

73

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

74 GetMenuItemInfoA_Proc get_menu_item_info = NULL;

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

75 SetMenuItemInfoA_Proc set_menu_item_info = NULL;

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

76 AppendMenuW_Proc unicode_append_menu = NULL;

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

77

72773

15d914de92fd * src/macmenu.c (Vmenu_updating_frame, syms_of_xmenu):

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

parents: 72260

78 Lisp_Object Qdebug_on_next_call;

24a01af0cd38 (Vmenu_updating_frame): New variable.

Geoff Voelker <voelker@cs.washington.edu>

parents: 21450

79

72773

15d914de92fd * src/macmenu.c (Vmenu_updating_frame, syms_of_xmenu):

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

parents: 72260

80 extern Lisp_Object Vmenu_updating_frame;

07341673efa6 Include buffer.h.

Richard M. Stallman <rms@gnu.org>

parents: 15110

81

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

82 extern Lisp_Object Qmenu_bar;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

83

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

84 extern Lisp_Object QCtoggle, QCradio;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

85

07341673efa6 Include buffer.h.

Richard M. Stallman <rms@gnu.org>

parents: 15110

86 extern Lisp_Object Voverriding_local_map;

07341673efa6 Include buffer.h.

Richard M. Stallman <rms@gnu.org>

parents: 15110

87 extern Lisp_Object Voverriding_local_map_menu_flag;

07341673efa6 Include buffer.h.

Richard M. Stallman <rms@gnu.org>

parents: 15110

88

07341673efa6 Include buffer.h.

Richard M. Stallman <rms@gnu.org>

parents: 15110

89 extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;

07341673efa6 Include buffer.h.

Richard M. Stallman <rms@gnu.org>

parents: 15110

90

07341673efa6 Include buffer.h.

Richard M. Stallman <rms@gnu.org>

parents: 15110

91 extern Lisp_Object Qmenu_bar_update_hook;

07341673efa6 Include buffer.h.

Richard M. Stallman <rms@gnu.org>

parents: 15110

92

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

93 void set_frame_menubar P_ ((FRAME_PTR, int, int));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

94

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

95 #ifdef HAVE_DIALOGS

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

96 static Lisp_Object w32_dialog_show P_ ((FRAME_PTR, int, Lisp_Object, char**));

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

97 #else

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

98 static int is_simple_dialog P_ ((Lisp_Object));

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

99 static Lisp_Object simple_dialog_show P_ ((FRAME_PTR, Lisp_Object, Lisp_Object));

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

100 #endif

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

101 static Lisp_Object w32_menu_show P_ ((FRAME_PTR, int, int, int, int,

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

102 Lisp_Object, char **));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

103

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

104 void w32_free_menu_strings P_((HWND));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

105

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

106

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

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

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

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

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

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

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

110

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

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

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

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

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

113

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

114 int pending_menu_activation;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

115

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

116

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

117 /* Return the frame whose ->output_data.w32->menubar_widget equals

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

118 ID, or 0 if none. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

119

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

120 static struct frame *

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

121 menubar_id_to_frame (id)

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

122 HMENU id;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

123 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

124 Lisp_Object tail, frame;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

125 FRAME_PTR f;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

126

90970

3371fc48749b Replace uses of GC_* macros with the non-GC_ versions.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 90951

127 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

128 {

25646

9154af188477 Use XCAR and XCDR instead of explicit member references.

Ken Raeburn <raeburn@raeburn.org>

parents: 22750

129 frame = XCAR (tail);

90970

3371fc48749b Replace uses of GC_* macros with the non-GC_ versions.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 90951

130 if (!FRAMEP (frame))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

131 continue;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

132 f = XFRAME (frame);

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

133 if (!FRAME_WINDOW_P (f))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

134 continue;

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

135 if (f->output_data.w32->menubar_widget == id)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

136 return f;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

137 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

138 return 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

139 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

140

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

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

40962

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

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

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

143 POSITION is a position specification. This is either a mouse button

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

144 event or a list ((XOFFSET YOFFSET) WINDOW) where XOFFSET and YOFFSET

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

145 are positions in pixels from the top left corner of WINDOW's frame

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

146 \(WINDOW may be a frame object instead of a window). This controls the

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

147 position of the center of the first line in the first pane of the

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

148 menu, not the top left of the menu as a whole. If POSITION is t, it

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

149 means to use the current mouse position.

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

150

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

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

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

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

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

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

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

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

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

155 the keymap as a top-level element.

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

156

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

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

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

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

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

159

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

160 You can also use a list of keymaps as MENU. Then each keymap makes a

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

161 separate pane. When MENU is a keymap or a list of keymaps, the return

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

162 value is a list of events.

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

163

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

164 Alternatively, you can specify a menu of multiple panes with a list of

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

165 the form (TITLE PANE1 PANE2...), where each pane is a list of

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

166 form (TITLE ITEM1 ITEM2...).

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

167 Each ITEM is normally a cons cell (STRING . VALUE); but a string can

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

168 appear as an item--that makes a nonselectable line in the menu.

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

169 With this form of menu, the return value is VALUE from the chosen item.

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

170

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

171 If POSITION is nil, don't display the menu at all, just precalculate the

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

172 cached information about equivalent key sequences. */)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

173 (position, menu)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

174 Lisp_Object position, menu;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

175 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

176 Lisp_Object keymap, tem;

40476

18b1b133e5c1 (Fx_popup_menu): Explicitly init f, xpos, and ypos.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 40119

177 int xpos = 0, ypos = 0;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

178 Lisp_Object title;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

179 char *error_name;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

180 Lisp_Object selection;

40476

18b1b133e5c1 (Fx_popup_menu): Explicitly init f, xpos, and ypos.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 40119

181 FRAME_PTR f = NULL;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

182 Lisp_Object x, y, window;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

183 int keymaps = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

184 int for_click = 0;

95723

7be18a029363 (Fx_popup_menu): Unwind protect while building menu.

Jason Rumney <jasonr@gnu.org>

parents: 95715

185 int specpdl_count = SPECPDL_INDEX ();

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

186 struct gcpro gcpro1;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

187

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

188 #ifdef HAVE_MENUS

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

189 if (! NILP (position))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

190 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

191 check_w32 ();

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

192

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

193 /* Decode the first argument: find the window and the coordinates. */

16860

247f0b107588 (x-popup-menu): Pass in insist flag to mouse_position_hook.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16729

194 if (EQ (position, Qt)

32671

bbd3be4db5f2 (add_menu_item): Do not use MF_OWNERDRAW for titles, as it has stopped working.

Jason Rumney <jasonr@gnu.org>

parents: 31114

195 || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)

bbd3be4db5f2 (add_menu_item): Do not use MF_OWNERDRAW for titles, as it has stopped working.

Jason Rumney <jasonr@gnu.org>

parents: 31114

196 || EQ (XCAR (position), Qtool_bar))))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

197 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

198 /* Use the mouse's current position. */

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

199 FRAME_PTR new_f = SELECTED_FRAME ();

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

200 Lisp_Object bar_window;

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

201 enum scroll_bar_part part;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

202 unsigned long time;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

203

244d6216c056 (Fx_popup_menu): Use terminal specific mouse_position_hook.

Jason Rumney <jasonr@gnu.org>

parents: 76086

204 if (FRAME_TERMINAL (new_f)->mouse_position_hook)

244d6216c056 (Fx_popup_menu): Use terminal specific mouse_position_hook.

Jason Rumney <jasonr@gnu.org>

parents: 76086

205 (*FRAME_TERMINAL (new_f)->mouse_position_hook) (&new_f, 1, &bar_window,

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

206 &part, &x, &y, &time);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

207 if (new_f != 0)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

208 XSETFRAME (window, new_f);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

209 else

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

210 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

211 window = selected_window;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

212 XSETFASTINT (x, 0);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

213 XSETFASTINT (y, 0);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

214 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

215 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

216 else

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

217 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

218 tem = Fcar (position);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

219 if (CONSP (tem))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

220 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

221 window = Fcar (Fcdr (position));

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

222 x = Fcar (tem);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

223 y = Fcar (Fcdr (tem));

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

224 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

225 else

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

226 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

227 for_click = 1;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

228 tem = Fcar (Fcdr (position)); /* EVENT_START (position) */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

229 window = Fcar (tem); /* POSN_WINDOW (tem) */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

230 tem = Fcar (Fcdr (Fcdr (tem))); /* POSN_WINDOW_POSN (tem) */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

231 x = Fcar (tem);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

232 y = Fcdr (tem);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

233 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

234 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

235

cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).

Pavel Janík <Pavel@Janik.cz>

parents: 40476

236 CHECK_NUMBER (x);

cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).

Pavel Janík <Pavel@Janik.cz>

parents: 40476

237 CHECK_NUMBER (y);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

238

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

239 /* Decode where to put the menu. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

240

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

241 if (FRAMEP (window))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

242 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

243 f = XFRAME (window);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

244 xpos = 0;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

245 ypos = 0;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

246 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

247 else if (WINDOWP (window))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

248 {

cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).

Pavel Janík <Pavel@Janik.cz>

parents: 40476

249 CHECK_LIVE_WINDOW (window);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

250 f = XFRAME (WINDOW_FRAME (XWINDOW (window)));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

251

51206

22a5614b558f Make (few) trivial substitutions for renamed and

Kim F. Storm <storm@cua.dk>

parents: 49600

252 xpos = WINDOW_LEFT_EDGE_X (XWINDOW (window));

22a5614b558f Make (few) trivial substitutions for renamed and

Kim F. Storm <storm@cua.dk>

parents: 49600

253 ypos = WINDOW_TOP_EDGE_Y (XWINDOW (window));

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

254 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

255 else

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

256 /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

257 but I don't want to make one now. */

cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).

Pavel Janík <Pavel@Janik.cz>

parents: 40476

258 CHECK_WINDOW (window);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

259

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

260 xpos += XINT (x);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

261 ypos += XINT (y);

24a01af0cd38 (Vmenu_updating_frame): New variable.

Geoff Voelker <voelker@cs.washington.edu>

parents: 21450

262

24a01af0cd38 (Vmenu_updating_frame): New variable.

Geoff Voelker <voelker@cs.washington.edu>

parents: 21450

263 XSETFRAME (Vmenu_updating_frame, f);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

264 }

67704

06f3a72bffb2 (Fx_popup_menu): Add `else' to set Vmenu_updating_frame to nil

Juri Linkov <juri@jurta.org>

parents: 65301

265 else

06f3a72bffb2 (Fx_popup_menu): Add `else' to set Vmenu_updating_frame to nil

Juri Linkov <juri@jurta.org>

parents: 65301

266 Vmenu_updating_frame = Qnil;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

267 #endif /* HAVE_MENUS */

24a01af0cd38 (Vmenu_updating_frame): New variable.

Geoff Voelker <voelker@cs.washington.edu>

parents: 21450

268

95723

7be18a029363 (Fx_popup_menu): Unwind protect while building menu.

Jason Rumney <jasonr@gnu.org>

parents: 95715

269 record_unwind_protect (unuse_menu_items, Qnil);

7be18a029363 (Fx_popup_menu): Unwind protect while building menu.

Jason Rumney <jasonr@gnu.org>

parents: 95715

270

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

271 title = Qnil;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

272 GCPRO1 (title);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

273

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

274 /* Decode the menu items from what was specified. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

275

c3435dc00ed7 * lisp.h (KEYMAPP): New macro.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 32671

276 keymap = get_keymap (menu, 0, 0);

c3435dc00ed7 * lisp.h (KEYMAPP): New macro.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 32671

277 if (CONSP (keymap))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

278 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

279 /* We were given a keymap. Extract menu info from the keymap. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

280 Lisp_Object prompt;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

281

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

282 /* Extract the detailed info to make one pane. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

283 keymap_panes (&menu, 1, NILP (position));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

284

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

285 /* Search for a string appearing directly as an element of the keymap.

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

286 That string is the title of the menu. */

39690

38c1890338cc (keymap_panes, Fx_popup_menu): Use Fkeymap_prompt.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 39682

287 prompt = Fkeymap_prompt (keymap);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

288 if (NILP (title) && !NILP (prompt))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

289 title = prompt;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

290

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

291 /* Make that be the pane title of the first pane. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

292 if (!NILP (prompt) && menu_items_n_panes >= 0)

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

293 ASET (menu_items, MENU_ITEMS_PANE_NAME, prompt);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

294

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

295 keymaps = 1;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

296 }

c3435dc00ed7 * lisp.h (KEYMAPP): New macro.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 32671

297 else if (CONSP (menu) && KEYMAPP (XCAR (menu)))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

298 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

299 /* We were given a list of keymaps. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

300 int nmaps = XFASTINT (Flength (menu));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

301 Lisp_Object *maps

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

302 = (Lisp_Object *) alloca (nmaps * sizeof (Lisp_Object));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

303 int i;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

304

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

305 title = Qnil;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

306

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

307 /* The first keymap that has a prompt string

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

308 supplies the menu title. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

309 for (tem = menu, i = 0; CONSP (tem); tem = Fcdr (tem))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

310 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

311 Lisp_Object prompt;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

312

c3435dc00ed7 * lisp.h (KEYMAPP): New macro.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 32671

313 maps[i++] = keymap = get_keymap (Fcar (tem), 1, 0);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

314

39690

38c1890338cc (keymap_panes, Fx_popup_menu): Use Fkeymap_prompt.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 39682

315 prompt = Fkeymap_prompt (keymap);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

316 if (NILP (title) && !NILP (prompt))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

317 title = prompt;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

318 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

319

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

320 /* Extract the detailed info to make one pane. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

321 keymap_panes (maps, nmaps, NILP (position));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

322

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

323 /* Make the title be the pane title of the first pane. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

324 if (!NILP (title) && menu_items_n_panes >= 0)

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

325 ASET (menu_items, MENU_ITEMS_PANE_NAME, title);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

326

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

327 keymaps = 1;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

328 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

329 else

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

330 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

331 /* We were given an old-fashioned menu. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

332 title = Fcar (menu);

cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).

Pavel Janík <Pavel@Janik.cz>

parents: 40476

333 CHECK_STRING (title);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

334

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

335 list_of_panes (Fcdr (menu));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

336

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

337 keymaps = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

338 }

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

339

95723

7be18a029363 (Fx_popup_menu): Unwind protect while building menu.

Jason Rumney <jasonr@gnu.org>

parents: 95715

340 unbind_to (specpdl_count, Qnil);

7be18a029363 (Fx_popup_menu): Unwind protect while building menu.

Jason Rumney <jasonr@gnu.org>

parents: 95715

341

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

342 if (NILP (position))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

343 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

344 discard_menu_items ();

c3bd08b7c78d (Fx_popup_menu, Fx_popup_dialog, w32_menu_show): Ensure mouse is not

Jason Rumney <jasonr@gnu.org>

parents: 79759

345 FRAME_X_DISPLAY_INFO (f)->grabbed = 0;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

346 UNGCPRO;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

347 return Qnil;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

348 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

349

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

350 #ifdef HAVE_MENUS

69443

c5278c858018 (Fx_popup_menu): Call w32_free_menu_strings when

Jason Rumney <jasonr@gnu.org>

parents: 68651

351 /* If resources from a previous popup menu still exist, does nothing

c5278c858018 (Fx_popup_menu): Call w32_free_menu_strings when

Jason Rumney <jasonr@gnu.org>

parents: 68651

352 until the `menu_free_timer' has freed them (see w32fns.c). This

c5278c858018 (Fx_popup_menu): Call w32_free_menu_strings when

Jason Rumney <jasonr@gnu.org>

parents: 68651

353 can occur if you press ESC or click outside a menu without selecting

c5278c858018 (Fx_popup_menu): Call w32_free_menu_strings when

Jason Rumney <jasonr@gnu.org>

parents: 68651

354 a menu item.

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

355 */

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

356 if (current_popup_menu)

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

357 {

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

358 discard_menu_items ();

c3bd08b7c78d (Fx_popup_menu, Fx_popup_dialog, w32_menu_show): Ensure mouse is not

Jason Rumney <jasonr@gnu.org>

parents: 79759

359 FRAME_X_DISPLAY_INFO (f)->grabbed = 0;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

360 UNGCPRO;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

361 return Qnil;

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

362 }

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

363

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

364 /* Display them in a menu. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

365 BLOCK_INPUT;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

366

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

367 selection = w32_menu_show (f, xpos, ypos, for_click,

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

368 keymaps, title, &error_name);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

369 UNBLOCK_INPUT;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

370

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

371 discard_menu_items ();

c3bd08b7c78d (Fx_popup_menu, Fx_popup_dialog, w32_menu_show): Ensure mouse is not

Jason Rumney <jasonr@gnu.org>

parents: 79759

372 FRAME_X_DISPLAY_INFO (f)->grabbed = 0;

69443

c5278c858018 (Fx_popup_menu): Call w32_free_menu_strings when

Jason Rumney <jasonr@gnu.org>

parents: 68651

373

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

374 #endif /* HAVE_MENUS */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

375

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

376 UNGCPRO;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

377

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

378 if (error_name) error (error_name);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

379 return selection;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

380 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

381

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

382 #ifdef HAVE_MENUS

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

383

62670

5ba03d610746 (Fx_popup_dialog): Allow 3rd optional argument.

Nick Roberts <nickrob@snap.net.nz>

parents: 62668

384 DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,

40962

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

385 doc: /* Pop up a dialog box and return user's selection.

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

386 POSITION specifies which frame to use.

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

387 This is normally a mouse button event or a window or frame.

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

388 If POSITION is t, it means to use the frame the mouse is on.

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

389 The dialog box appears in the middle of the specified frame.

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

390

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

391 CONTENTS specifies the alternatives to display in the dialog box.

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

392 It is a list of the form (TITLE ITEM1 ITEM2...).

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

393 Each ITEM is a cons cell (STRING . VALUE).

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

394 The return value is VALUE from the chosen item.

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

395

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

396 An ITEM may also be just a string--that makes a nonselectable item.

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

397 An ITEM may also be nil--that means to put all preceding items

f66d09d1bb2f Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 40656

398 on the left of the dialog box and all following items on the right.

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

399 \(By default, approximately half appear on each side.)

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

400

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

401 If HEADER is non-nil, the frame title for the box is "Information",

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

402 otherwise it is "Question". */)

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

403 (position, contents, header)

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

404 Lisp_Object position, contents, header;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

405 {

40476

18b1b133e5c1 (Fx_popup_menu): Explicitly init f, xpos, and ypos.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 40119

406 FRAME_PTR f = NULL;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

407 Lisp_Object window;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

408

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

409 check_w32 ();

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

410

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

411 /* Decode the first argument: find the window or frame to use. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

412 if (EQ (position, Qt)

32671

bbd3be4db5f2 (add_menu_item): Do not use MF_OWNERDRAW for titles, as it has stopped working.

Jason Rumney <jasonr@gnu.org>

parents: 31114

413 || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)

bbd3be4db5f2 (add_menu_item): Do not use MF_OWNERDRAW for titles, as it has stopped working.

Jason Rumney <jasonr@gnu.org>

parents: 31114

414 || EQ (XCAR (position), Qtool_bar))))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

415 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

416 #if 0 /* Using the frame the mouse is on may not be right. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

417 /* Use the mouse's current position. */

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

418 FRAME_PTR new_f = SELECTED_FRAME ();

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

419 Lisp_Object bar_window;

31114

cd392fdf0e9f Include keyboard.h before frame.h. Fix compile

Andrew Innes <andrewi@gnu.org>

parents: 30989

420 enum scroll_bar_part part;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

421 unsigned long time;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

422 Lisp_Object x, y;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

423

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

424 (*mouse_position_hook) (&new_f, 1, &bar_window, &part, &x, &y, &time);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

425

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

426 if (new_f != 0)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

427 XSETFRAME (window, new_f);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

428 else

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

429 window = selected_window;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

430 #endif

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

431 window = selected_window;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

432 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

433 else if (CONSP (position))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

434 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

435 Lisp_Object tem;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

436 tem = Fcar (position);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

437 if (CONSP (tem))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

438 window = Fcar (Fcdr (position));

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

439 else

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

440 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

441 tem = Fcar (Fcdr (position)); /* EVENT_START (position) */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

442 window = Fcar (tem); /* POSN_WINDOW (tem) */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

443 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

444 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

445 else if (WINDOWP (position) || FRAMEP (position))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

446 window = position;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

447 else

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

448 window = Qnil;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

449

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

450 /* Decode where to put the menu. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

451

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

452 if (FRAMEP (window))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

453 f = XFRAME (window);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

454 else if (WINDOWP (window))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

455 {

cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).

Pavel Janík <Pavel@Janik.cz>

parents: 40476

456 CHECK_LIVE_WINDOW (window);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

457 f = XFRAME (WINDOW_FRAME (XWINDOW (window)));

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

458 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

459 else

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

460 /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

461 but I don't want to make one now. */

cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).

Pavel Janík <Pavel@Janik.cz>

parents: 40476

462 CHECK_WINDOW (window);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

463

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

464 #ifndef HAVE_DIALOGS

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

465

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

466 {

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

467 /* Handle simple Yes/No choices as MessageBox popups. */

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

468 if (is_simple_dialog (contents))

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

469 return simple_dialog_show (f, contents, header);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

470 else

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

471 {

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

472 /* Display a menu with these alternatives

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

473 in the middle of frame F. */

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

474 Lisp_Object x, y, frame, newpos;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

475 XSETFRAME (frame, f);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

476 XSETINT (x, x_pixel_width (f) / 2);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

477 XSETINT (y, x_pixel_height (f) / 2);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

478 newpos = Fcons (Fcons (x, Fcons (y, Qnil)), Fcons (frame, Qnil));

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

479 return Fx_popup_menu (newpos,

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

480 Fcons (Fcar (contents), Fcons (contents, Qnil)));

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

481 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

482 }

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

483 #else /* HAVE_DIALOGS */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

484 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

485 Lisp_Object title;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

486 char *error_name;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

487 Lisp_Object selection;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

488

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

489 /* Decode the dialog items from what was specified. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

490 title = Fcar (contents);

cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).

Pavel Janík <Pavel@Janik.cz>

parents: 40476

491 CHECK_STRING (title);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

492

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

493 list_of_panes (Fcons (contents, Qnil));

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

494

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

495 /* Display them in a dialog box. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

496 BLOCK_INPUT;

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

497 selection = w32_dialog_show (f, 0, title, header, &error_name);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

498 UNBLOCK_INPUT;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

499

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

500 discard_menu_items ();

c3bd08b7c78d (Fx_popup_menu, Fx_popup_dialog, w32_menu_show): Ensure mouse is not

Jason Rumney <jasonr@gnu.org>

parents: 79759

501 FRAME_X_DISPLAY_INFO (f)->grabbed = 0;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

502

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

503 if (error_name) error (error_name);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

504 return selection;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

505 }

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

506 #endif /* HAVE_DIALOGS */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

507 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

508

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

509 /* Activate the menu bar of frame F.

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

510 This is called from keyboard.c when it gets the

45803

9484de301252 Rename enum event_kind items.

Pavel Janík <Pavel@Janik.cz>

parents: 43471

511 MENU_BAR_ACTIVATE_EVENT out of the Emacs event queue.

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

512

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

513 To activate the menu bar, we signal to the input thread that it can

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

514 return from the WM_INITMENU message, allowing the normal Windows

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

515 processing of the menus.

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

516

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

517 But first we recompute the menu bar contents (the whole tree).

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

518

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

519 This way we can safely execute Lisp code. */

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

520

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

521 void

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

522 x_activate_menubar (f)

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

523 FRAME_PTR f;

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

524 {

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

525 set_frame_menubar (f, 0, 1);

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

526

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

527 /* Lock out further menubar changes while active. */

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

528 f->output_data.w32->menubar_active = 1;

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

529

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

530 /* Signal input thread to return from WM_INITMENU. */

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

531 complete_deferred_msg (FRAME_W32_WINDOW (f), WM_INITMENU, 0);

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

532 }

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

533

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

534 /* This callback is called from the menu bar pulldown menu

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

535 when the user makes a selection.

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

536 Figure out what the user chose

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

537 and put the appropriate events into the keyboard buffer. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

538

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

539 void

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

540 menubar_selection_callback (FRAME_PTR f, void * client_data)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

541 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

542 Lisp_Object prefix, entry;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

543 Lisp_Object vector;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

544 Lisp_Object *subprefix_stack;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

545 int submenu_depth = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

546 int i;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

547

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

548 if (!f)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

549 return;

eb915f0b1d6e (menubar_selection_callback, w32_menu_show): Initialize `entry' to nil.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 36677

550 entry = Qnil;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

551 subprefix_stack = (Lisp_Object *) alloca (f->menu_bar_items_used * sizeof (Lisp_Object));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

552 vector = f->menu_bar_vector;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

553 prefix = Qnil;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

554 i = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

555 while (i < f->menu_bar_items_used)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

556 {

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

557 if (EQ (AREF (vector, i), Qnil))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

558 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

559 subprefix_stack[submenu_depth++] = prefix;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

560 prefix = entry;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

561 i++;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

562 }

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

563 else if (EQ (AREF (vector, i), Qlambda))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

564 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

565 prefix = subprefix_stack[--submenu_depth];

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

566 i++;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

567 }

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

568 else if (EQ (AREF (vector, i), Qt))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

569 {

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

570 prefix = AREF (vector, i + MENU_ITEMS_PANE_PREFIX);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

571 i += MENU_ITEMS_PANE_LENGTH;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

572 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

573 else

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

574 {

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

575 entry = AREF (vector, i + MENU_ITEMS_ITEM_VALUE);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

576 /* The EMACS_INT cast avoids a warning. There's no problem

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

577 as long as pointers have enough bits to hold small integers. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

578 if ((int) (EMACS_INT) client_data == i)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

579 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

580 int j;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

581 struct input_event buf;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

582 Lisp_Object frame;

51573

861a49cd70cf (menubar_selection_callback): Don't pass uninitialized

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 51206

583 EVENT_INIT (buf);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

584

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

585 XSETFRAME (frame, f);

6d045b9631ad (menubar_selection_callback): Use the `arg' slot of

Gerd Moellmann <gerd@gnu.org>

parents: 30145

586 buf.kind = MENU_BAR_EVENT;

6d045b9631ad (menubar_selection_callback): Use the `arg' slot of

Gerd Moellmann <gerd@gnu.org>

parents: 30145

587 buf.frame_or_window = frame;

6d045b9631ad (menubar_selection_callback): Use the `arg' slot of

Gerd Moellmann <gerd@gnu.org>

parents: 30145

588 buf.arg = frame;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

589 kbd_buffer_store_event (&buf);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

590

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

591 for (j = 0; j < submenu_depth; j++)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

592 if (!NILP (subprefix_stack[j]))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

593 {

6d045b9631ad (menubar_selection_callback): Use the `arg' slot of

Gerd Moellmann <gerd@gnu.org>

parents: 30145

594 buf.kind = MENU_BAR_EVENT;

6d045b9631ad (menubar_selection_callback): Use the `arg' slot of

Gerd Moellmann <gerd@gnu.org>

parents: 30145

595 buf.frame_or_window = frame;

6d045b9631ad (menubar_selection_callback): Use the `arg' slot of

Gerd Moellmann <gerd@gnu.org>

parents: 30145

596 buf.arg = subprefix_stack[j];

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

597 kbd_buffer_store_event (&buf);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

598 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

599

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

600 if (!NILP (prefix))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

601 {

6d045b9631ad (menubar_selection_callback): Use the `arg' slot of

Gerd Moellmann <gerd@gnu.org>

parents: 30145

602 buf.kind = MENU_BAR_EVENT;

6d045b9631ad (menubar_selection_callback): Use the `arg' slot of

Gerd Moellmann <gerd@gnu.org>

parents: 30145

603 buf.frame_or_window = frame;

6d045b9631ad (menubar_selection_callback): Use the `arg' slot of

Gerd Moellmann <gerd@gnu.org>

parents: 30145

604 buf.arg = prefix;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

605 kbd_buffer_store_event (&buf);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

606 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

607

6d045b9631ad (menubar_selection_callback): Use the `arg' slot of

Gerd Moellmann <gerd@gnu.org>

parents: 30145

608 buf.kind = MENU_BAR_EVENT;

6d045b9631ad (menubar_selection_callback): Use the `arg' slot of

Gerd Moellmann <gerd@gnu.org>

parents: 30145

609 buf.frame_or_window = frame;

6d045b9631ad (menubar_selection_callback): Use the `arg' slot of

Gerd Moellmann <gerd@gnu.org>

parents: 30145

610 buf.arg = entry;

76074

5978a80d504e (current_popup_menu): Make available globally.

Jason Rumney <jasonr@gnu.org>

parents: 75227

611 /* Free memory used by owner-drawn and help-echo strings. */

5978a80d504e (current_popup_menu): Make available globally.

Jason Rumney <jasonr@gnu.org>

parents: 75227

612 w32_free_menu_strings (FRAME_W32_WINDOW (f));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

613 kbd_buffer_store_event (&buf);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

614

43471

20574c51c791 (menubar_selection_callback): Free the menu and

Jason Rumney <jasonr@gnu.org>

parents: 42613

615 f->output_data.w32->menubar_active = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

616 return;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

617 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

618 i += MENU_ITEMS_ITEM_LENGTH;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

619 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

620 }

43471

20574c51c791 (menubar_selection_callback): Free the menu and

Jason Rumney <jasonr@gnu.org>

parents: 42613

621 /* Free memory used by owner-drawn and help-echo strings. */

20574c51c791 (menubar_selection_callback): Free the menu and

Jason Rumney <jasonr@gnu.org>

parents: 42613

622 w32_free_menu_strings (FRAME_W32_WINDOW (f));

20574c51c791 (menubar_selection_callback): Free the menu and

Jason Rumney <jasonr@gnu.org>

parents: 42613

623 f->output_data.w32->menubar_active = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

624 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

625

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

626

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

627 /* Set the contents of the menubar widgets of frame F.

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

628 The argument FIRST_TIME is currently ignored;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

629 it is set the first time this is called, from initialize_frame_menubar. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

630

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

631 void

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

632 set_frame_menubar (f, first_time, deep_p)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

633 FRAME_PTR f;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

634 int first_time;

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

635 int deep_p;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

636 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

637 HMENU menubar_widget = f->output_data.w32->menubar_widget;

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

638 Lisp_Object items;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

639 widget_value *wv, *first_wv, *prev_wv = 0;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

640 int i, last_i;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

641 int *submenu_start, *submenu_end;

08ac5c346b16 (digest_single_submenu): Declare all args.

Jason Rumney <jasonr@gnu.org>

parents: 48888

642 int *submenu_top_level_items, *submenu_n_panes;

24a01af0cd38 (Vmenu_updating_frame): New variable.

Geoff Voelker <voelker@cs.washington.edu>

parents: 21450

643

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

644 /* We must not change the menubar when actually in use. */

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

645 if (f->output_data.w32->menubar_active)

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

646 return;

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

647

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

648 XSETFRAME (Vmenu_updating_frame, f);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

649

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

650 if (! menubar_widget)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

651 deep_p = 1;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

652 else if (pending_menu_activation && !deep_p)

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

653 deep_p = 1;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

654

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

655 if (deep_p)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

656 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

657 /* Make a widget-value tree representing the entire menu trees. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

658

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

659 struct buffer *prev = current_buffer;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

660 Lisp_Object buffer;

46293

1fb8f75062c6 Use macro SPECPDL_INDEX.

Juanma Barranquero <lekktu@gmail.com>

parents: 45803

661 int specpdl_count = SPECPDL_INDEX ();

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

662 int previous_menu_items_used = f->menu_bar_items_used;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

663 Lisp_Object *previous_items

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

664 = (Lisp_Object *) alloca (previous_menu_items_used

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

665 * sizeof (Lisp_Object));

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

666

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

667 /* If we are making a new widget, its contents are empty,

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

668 do always reinitialize them. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

669 if (! menubar_widget)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

670 previous_menu_items_used = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

671

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

672 buffer = XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

673 specbind (Qinhibit_quit, Qt);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

674 /* Don't let the debugger step into this code

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

675 because it is not reentrant. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

676 specbind (Qdebug_on_next_call, Qnil);

07341673efa6 Include buffer.h.

Richard M. Stallman <rms@gnu.org>

parents: 15110

677

63147

9bde03db5726 * composite.c (compose_chars_in_text):

Kim F. Storm <storm@cua.dk>

parents: 62670

678 record_unwind_save_match_data ();

9bde03db5726 * composite.c (compose_chars_in_text):

Kim F. Storm <storm@cua.dk>

parents: 62670

679

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

680 if (NILP (Voverriding_local_map_menu_flag))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

681 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

682 specbind (Qoverriding_terminal_local_map, Qnil);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

683 specbind (Qoverriding_local_map, Qnil);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

684 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

685

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

686 set_buffer_internal_1 (XBUFFER (buffer));

07341673efa6 Include buffer.h.

Richard M. Stallman <rms@gnu.org>

parents: 15110

687

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

688 /* Run the Lucid hook. */

36313

77093a87f2de * w32menu.c (set_frame_menubar): Run activate-menu-bar-hook with

Jason Rumney <jasonr@gnu.org>

parents: 33971

689 safe_run_hooks (Qactivate_menubar_hook);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

690 /* If it has changed current-menubar from previous value,

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

691 really recompute the menubar from the value. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

692 if (! NILP (Vlucid_menu_bar_dirty_flag))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

693 call0 (Qrecompute_lucid_menubar);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

694 safe_run_hooks (Qmenu_bar_update_hook);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

695 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

696

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

697 items = FRAME_MENU_BAR_ITEMS (f);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

698

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

699 /* Save the frame's previous menu bar contents data. */

39507

24530f82048e (set_frame_menubar): Take into account that

Andrew Innes <andrewi@gnu.org>

parents: 38371

700 if (previous_menu_items_used)

24530f82048e (set_frame_menubar): Take into account that

Andrew Innes <andrewi@gnu.org>

parents: 38371

701 bcopy (XVECTOR (f->menu_bar_vector)->contents, previous_items,

24530f82048e (set_frame_menubar): Take into account that

Andrew Innes <andrewi@gnu.org>

parents: 38371

702 previous_menu_items_used * sizeof (Lisp_Object));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

703

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

704 /* Fill in menu_items with the current menu bar contents.

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

705 This can evaluate Lisp code. */

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

706 save_menu_items ();

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

707

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

708 menu_items = f->menu_bar_vector;

39507

24530f82048e (set_frame_menubar): Take into account that

Andrew Innes <andrewi@gnu.org>

parents: 38371

709 menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

710 submenu_start = (int *) alloca (XVECTOR (items)->size * sizeof (int *));

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

711 submenu_end = (int *) alloca (XVECTOR (items)->size * sizeof (int *));

08ac5c346b16 (digest_single_submenu): Declare all args.

Jason Rumney <jasonr@gnu.org>

parents: 48888

712 submenu_n_panes = (int *) alloca (XVECTOR (items)->size * sizeof (int));

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

713 submenu_top_level_items

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

714 = (int *) alloca (XVECTOR (items)->size * sizeof (int *));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

715 init_menu_items ();

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

716 for (i = 0; i < ASIZE (items); i += 4)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

717 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

718 Lisp_Object key, string, maps;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

719

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

720 last_i = i;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

721

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

722 key = AREF (items, i);

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

723 string = AREF (items, i + 1);

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

724 maps = AREF (items, i + 2);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

725 if (NILP (string))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

726 break;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

727

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

728 submenu_start[i] = menu_items_used;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

729

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

730 menu_items_n_panes = 0;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

731 submenu_top_level_items[i]

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

732 = parse_single_submenu (key, string, maps);

08ac5c346b16 (digest_single_submenu): Declare all args.

Jason Rumney <jasonr@gnu.org>

parents: 48888

733 submenu_n_panes[i] = menu_items_n_panes;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

734

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

735 submenu_end[i] = menu_items_used;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

736 }

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

737

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

738 finish_menu_items ();

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

739

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

740 /* Convert menu_items into widget_value trees

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

741 to display the menu. This cannot evaluate Lisp code. */

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

742

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

743 wv = xmalloc_widget_value ();

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

744 wv->name = "menubar";

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

745 wv->value = 0;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

746 wv->enabled = 1;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

747 wv->button_type = BUTTON_TYPE_NONE;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

748 wv->help = Qnil;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

749 first_wv = wv;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

750

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

751 for (i = 0; i < last_i; i += 4)

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

752 {

08ac5c346b16 (digest_single_submenu): Declare all args.

Jason Rumney <jasonr@gnu.org>

parents: 48888

753 menu_items_n_panes = submenu_n_panes[i];

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

754 wv = digest_single_submenu (submenu_start[i], submenu_end[i],

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

755 submenu_top_level_items[i]);

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

756 if (prev_wv)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

757 prev_wv->next = wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

758 else

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

759 first_wv->contents = wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

760 /* Don't set wv->name here; GC during the loop might relocate it. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

761 wv->enabled = 1;

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

762 wv->button_type = BUTTON_TYPE_NONE;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

763 prev_wv = wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

764 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

765

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

766 set_buffer_internal_1 (prev);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

767

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

768 /* If there has been no change in the Lisp-level contents

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

769 of the menu bar, skip redisplaying it. Just exit. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

770

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

771 for (i = 0; i < previous_menu_items_used; i++)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

772 if (menu_items_used == i

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

773 || (!EQ (previous_items[i], AREF (menu_items, i))))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

774 break;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

775 if (i == menu_items_used && i == previous_menu_items_used && i != 0)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

776 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

777 free_menubar_widget_value_tree (first_wv);

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

778 discard_menu_items ();

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

779 unbind_to (specpdl_count, Qnil);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

780 return;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

781 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

782

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

783 f->menu_bar_vector = menu_items;

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

784 f->menu_bar_items_used = menu_items_used;

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

785

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

786 /* This undoes save_menu_items. */

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

787 unbind_to (specpdl_count, Qnil);

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

788

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

789 /* Now GC cannot happen during the lifetime of the widget_value,

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

790 so it's safe to store data from a Lisp_String, as long as

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

791 local copies are made when the actual menu is created.

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

792 Windows takes care of this for normal string items, but

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

793 not for owner-drawn items or additional item-info. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

794 wv = first_wv->contents;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

795 for (i = 0; i < ASIZE (items); i += 4)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

796 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

797 Lisp_Object string;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

798 string = AREF (items, i + 1);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

799 if (NILP (string))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

800 break;

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

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

801 wv->name = (char *) SDATA (string);

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

802 update_submenu_strings (wv->contents);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

803 wv = wv->next;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

804 }

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

805 }

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

806 else

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

807 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

808 /* Make a widget-value tree containing

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

809 just the top level menu bar strings. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

810

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

811 wv = xmalloc_widget_value ();

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

812 wv->name = "menubar";

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

813 wv->value = 0;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

814 wv->enabled = 1;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

815 wv->button_type = BUTTON_TYPE_NONE;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

816 wv->help = Qnil;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

817 first_wv = wv;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

818

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

819 items = FRAME_MENU_BAR_ITEMS (f);

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

820 for (i = 0; i < ASIZE (items); i += 4)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

821 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

822 Lisp_Object string;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

823

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

824 string = AREF (items, i + 1);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

825 if (NILP (string))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

826 break;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

827

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

828 wv = xmalloc_widget_value ();

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

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

829 wv->name = (char *) SDATA (string);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

830 wv->value = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

831 wv->enabled = 1;

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

832 wv->button_type = BUTTON_TYPE_NONE;

ac09ecabe088 (single_submenu, set_frame_menubar, w32_menu_show):

Jason Rumney <jasonr@gnu.org>

parents: 42584

833 wv->help = Qnil;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

834 /* This prevents lwlib from assuming this

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

835 menu item is really supposed to be empty. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

836 /* The EMACS_INT cast avoids a warning.

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

837 This value just has to be different from small integers. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

838 wv->call_data = (void *) (EMACS_INT) (-1);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

839

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

840 if (prev_wv)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

841 prev_wv->next = wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

842 else

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

843 first_wv->contents = wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

844 prev_wv = wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

845 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

846

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

847 /* Forget what we thought we knew about what is in the

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

848 detailed contents of the menu bar menus.

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

849 Changing the top level always destroys the contents. */

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

850 f->menu_bar_items_used = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

851 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

852

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

853 /* Create or update the menu bar widget. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

854

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

855 BLOCK_INPUT;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

856

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

857 if (menubar_widget)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

858 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

859 /* Empty current menubar, rather than creating a fresh one. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

860 while (DeleteMenu (menubar_widget, 0, MF_BYPOSITION))

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

861 ;

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

862 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

863 else

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

864 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

865 menubar_widget = CreateMenu ();

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

866 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

867 fill_in_menu (menubar_widget, first_wv->contents);

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

868

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

869 free_menubar_widget_value_tree (first_wv);

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

870

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

871 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

872 HMENU old_widget = f->output_data.w32->menubar_widget;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

873

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

874 f->output_data.w32->menubar_widget = menubar_widget;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

875 SetMenu (FRAME_W32_WINDOW (f), f->output_data.w32->menubar_widget);

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

876 /* Causes flicker when menu bar is updated

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

877 DrawMenuBar (FRAME_W32_WINDOW (f)); */

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

878

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

879 /* Force the window size to be recomputed so that the frame's text

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

880 area remains the same, if menubar has just been created. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

881 if (old_widget == NULL)

51206

22a5614b558f Make (few) trivial substitutions for renamed and

Kim F. Storm <storm@cua.dk>

parents: 49600

882 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

883 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

884

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

885 UNBLOCK_INPUT;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

886 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

887

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

888 /* Called from Fx_create_frame to create the initial menubar of a frame

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

889 before it is mapped, so that the window is mapped with the menubar already

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

890 there instead of us tacking it on later and thrashing the window after it

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

891 is visible. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

892

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

893 void

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

894 initialize_frame_menubar (f)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

895 FRAME_PTR f;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

896 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

897 /* This function is called before the first chance to redisplay

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

898 the frame. It has to be, so the frame will have the right size. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

899 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

900 set_frame_menubar (f, 1, 1);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

901 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

902

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

903 /* Get rid of the menu bar of frame F, and free its storage.

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

904 This is used when deleting a frame, and when turning off the menu bar. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

905

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

906 void

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

907 free_frame_menubar (f)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

908 FRAME_PTR f;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

909 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

910 BLOCK_INPUT;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

911

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

912 {

16588

481b7874a1e9 Change identifiers of the form win32* to w32*.

Geoff Voelker <voelker@cs.washington.edu>

parents: 15276

913 HMENU old = GetMenu (FRAME_W32_WINDOW (f));

481b7874a1e9 Change identifiers of the form win32* to w32*.

Geoff Voelker <voelker@cs.washington.edu>

parents: 15276

914 SetMenu (FRAME_W32_WINDOW (f), NULL);

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

915 f->output_data.w32->menubar_widget = NULL;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

916 DestroyMenu (old);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

917 }

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

918

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

919 UNBLOCK_INPUT;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

920 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

921

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

922

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

923 /* w32_menu_show actually displays a menu using the panes and items in

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

924 menu_items and returns the value selected from it; we assume input

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

925 is blocked by the caller. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

926

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

927 /* F is the frame the menu is for.

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

928 X and Y are the frame-relative specified position,

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

929 relative to the inside upper left corner of the frame F.

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

930 FOR_CLICK is nonzero if this menu was invoked for a mouse click.

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

931 KEYMAPS is 1 if this menu was specified with keymaps;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

932 in that case, we return a list containing the chosen item's value

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

933 and perhaps also the pane's prefix.

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

934 TITLE is the specified menu title.

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

935 ERROR is a place to store an error message string in case of failure.

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

936 (We return nil on failure, but the value doesn't actually matter.) */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

937

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

938 static Lisp_Object

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

939 w32_menu_show (f, x, y, for_click, keymaps, title, error)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

940 FRAME_PTR f;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

941 int x;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

942 int y;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

943 int for_click;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

944 int keymaps;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

945 Lisp_Object title;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

946 char **error;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

947 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

948 int i;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

949 int menu_item_selection;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

950 HMENU menu;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

951 POINT pos;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

952 widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

953 widget_value **submenu_stack

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

954 = (widget_value **) alloca (menu_items_used * sizeof (widget_value *));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

955 Lisp_Object *subprefix_stack

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

956 = (Lisp_Object *) alloca (menu_items_used * sizeof (Lisp_Object));

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

957 int submenu_depth = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

958 int first_pane;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

959

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

960 *error = NULL;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

961

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

962 if (menu_items_n_panes == 0)

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

963 return Qnil;

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

964

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

965 if (menu_items_used <= MENU_ITEMS_PANE_LENGTH)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

966 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

967 *error = "Empty menu";

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

968 return Qnil;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

969 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

970

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

971 /* Create a tree of widget_value objects

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

972 representing the panes and their items. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

973 wv = xmalloc_widget_value ();

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

974 wv->name = "menu";

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

975 wv->value = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

976 wv->enabled = 1;

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

977 wv->button_type = BUTTON_TYPE_NONE;

42613

a5eb47b53761 Fix typo in last checkin

Jason Rumney <jasonr@gnu.org>

parents: 42589

978 wv->help = Qnil;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

979 first_wv = wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

980 first_pane = 1;

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

981

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

982 /* Loop over all panes and items, filling in the tree. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

983 i = 0;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

984 while (i < menu_items_used)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

985 {

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

986 if (EQ (AREF (menu_items, i), Qnil))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

987 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

988 submenu_stack[submenu_depth++] = save_wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

989 save_wv = prev_wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

990 prev_wv = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

991 first_pane = 1;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

992 i++;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

993 }

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

994 else if (EQ (AREF (menu_items, i), Qlambda))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

995 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

996 prev_wv = save_wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

997 save_wv = submenu_stack[--submenu_depth];

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

998 first_pane = 0;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

999 i++;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1000 }

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1001 else if (EQ (AREF (menu_items, i), Qt)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1002 && submenu_depth != 0)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1003 i += MENU_ITEMS_PANE_LENGTH;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1004 /* Ignore a nil in the item list.

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1005 It's meaningful only for dialog boxes. */

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1006 else if (EQ (AREF (menu_items, i), Qquote))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1007 i += 1;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1008 else if (EQ (AREF (menu_items, i), Qt))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1009 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1010 /* Create a new pane. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1011 Lisp_Object pane_name, prefix;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1012 char *pane_string;

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1013 pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME);

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1014 prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1015

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1016 if (STRINGP (pane_name))

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1017 {

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1018 if (unicode_append_menu)

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1019 pane_name = ENCODE_UTF_8 (pane_name);

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1020 else if (STRING_MULTIBYTE (pane_name))

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1021 pane_name = ENCODE_SYSTEM (pane_name);

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1022

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1023 ASET (menu_items, i + MENU_ITEMS_PANE_NAME, pane_name);

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1024 }

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1025

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1026 pane_string = (NILP (pane_name)

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

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

1027 ? "" : (char *) SDATA (pane_name));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1028 /* If there is just one top-level pane, put all its items directly

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1029 under the top-level menu. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1030 if (menu_items_n_panes == 1)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1031 pane_string = "";

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1032

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1033 /* If the pane has a meaningful name,

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1034 make the pane a top-level menu item

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1035 with its items as a submenu beneath it. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1036 if (!keymaps && strcmp (pane_string, ""))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1037 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1038 wv = xmalloc_widget_value ();

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1039 if (save_wv)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1040 save_wv->next = wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1041 else

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1042 first_wv->contents = wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1043 wv->name = pane_string;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1044 if (keymaps && !NILP (prefix))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1045 wv->name++;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1046 wv->value = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1047 wv->enabled = 1;

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1048 wv->button_type = BUTTON_TYPE_NONE;

ac09ecabe088 (single_submenu, set_frame_menubar, w32_menu_show):

Jason Rumney <jasonr@gnu.org>

parents: 42584

1049 wv->help = Qnil;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1050 save_wv = wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1051 prev_wv = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1052 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1053 else if (first_pane)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1054 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1055 save_wv = wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1056 prev_wv = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1057 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1058 first_pane = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1059 i += MENU_ITEMS_PANE_LENGTH;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1060 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1061 else

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1062 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1063 /* Create a new item within current pane. */

27896

75f296b1a872 (single_submenu): Set up help string.

Jason Rumney <jasonr@gnu.org>

parents: 27400

1064 Lisp_Object item_name, enable, descrip, def, type, selected, help;

75f296b1a872 (single_submenu): Set up help string.

Jason Rumney <jasonr@gnu.org>

parents: 27400

1065

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1066 item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME);

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1067 enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE);

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1068 descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY);

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1069 def = AREF (menu_items, i + MENU_ITEMS_ITEM_DEFINITION);

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1070 type = AREF (menu_items, i + MENU_ITEMS_ITEM_TYPE);

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1071 selected = AREF (menu_items, i + MENU_ITEMS_ITEM_SELECTED);

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1072 help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP);

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1073

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1074 if (STRINGP (item_name))

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1075 {

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1076 if (unicode_append_menu)

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1077 item_name = ENCODE_UTF_8 (item_name);

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1078 else if (STRING_MULTIBYTE (item_name))

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1079 item_name = ENCODE_SYSTEM (item_name);

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1080

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1081 ASET (menu_items, i + MENU_ITEMS_ITEM_NAME, item_name);

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1082 }

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1083

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1084 if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1085 {

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1086 descrip = ENCODE_SYSTEM (descrip);

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1087 ASET (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY, descrip);

bf81460680f2 (single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]:

Jason Rumney <jasonr@gnu.org>

parents: 39690

1088 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1089

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1090 wv = xmalloc_widget_value ();

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

1091 if (prev_wv)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1092 prev_wv->next = wv;

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

1093 else

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1094 save_wv->contents = wv;

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

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

1095 wv->name = (char *) SDATA (item_name);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1096 if (!NILP (descrip))

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

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

1097 wv->key = (char *) SDATA (descrip);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1098 wv->value = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1099 /* Use the contents index as call_data, since we are

41251

e6612d08452f (w32_menu_show, push_menu_pane): Doc fixes.

Jason Rumney <jasonr@gnu.org>

parents: 41108

1100 restricted to 16-bits. */

22737

41e01b5de7cc (w32_menu_show): Set widget call_data to 0 if definition is nil.

Andrew Innes <andrewi@gnu.org>

parents: 21741

1101 wv->call_data = !NILP (def) ? (void *) (EMACS_INT) i : 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1102 wv->enabled = !NILP (enable);

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1103

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1104 if (NILP (type))

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1105 wv->button_type = BUTTON_TYPE_NONE;

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1106 else if (EQ (type, QCtoggle))

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1107 wv->button_type = BUTTON_TYPE_TOGGLE;

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1108 else if (EQ (type, QCradio))

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1109 wv->button_type = BUTTON_TYPE_RADIO;

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1110 else

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1111 abort ();

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1112

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1113 wv->selected = !NILP (selected);

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

1114

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1115 if (!STRINGP (help))

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1116 help = Qnil;

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1117

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1118 wv->help = help;

2c8492145fc8 (single_submenu): Set help string to NULL if none.

Jason Rumney <jasonr@gnu.org>

parents: 27932

1119

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1120 prev_wv = wv;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1121

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1122 i += MENU_ITEMS_ITEM_LENGTH;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1123 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1124 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1125

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1126 /* Deal with the title, if it is non-nil. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1127 if (!NILP (title))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1128 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1129 widget_value *wv_title = xmalloc_widget_value ();

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1130 widget_value *wv_sep = xmalloc_widget_value ();

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1131

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1132 /* Maybe replace this separator with a bitmap or owner-draw item

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1133 so that it looks better. Having two separators looks odd. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1134 wv_sep->name = "--";

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1135 wv_sep->next = first_wv->contents;

ac09ecabe088 (single_submenu, set_frame_menubar, w32_menu_show):

Jason Rumney <jasonr@gnu.org>

parents: 42584

1136 wv_sep->help = Qnil;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1137

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1138 if (unicode_append_menu)

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1139 title = ENCODE_UTF_8 (title);

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1140 else if (STRING_MULTIBYTE (title))

29320

33aa00975055 (single_submenu, w32_menu_show): Call ENCODE_SYSTEM on menu strings.

Jason Rumney <jasonr@gnu.org>

parents: 28275

1141 title = ENCODE_SYSTEM (title);

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1142

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

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

1143 wv_title->name = (char *) SDATA (title);

c3435dc00ed7 * lisp.h (KEYMAPP): New macro.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 32671

1144 wv_title->enabled = TRUE;

c3435dc00ed7 * lisp.h (KEYMAPP): New macro.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 32671

1145 wv_title->title = TRUE;

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1146 wv_title->button_type = BUTTON_TYPE_NONE;

ac09ecabe088 (single_submenu, set_frame_menubar, w32_menu_show):

Jason Rumney <jasonr@gnu.org>

parents: 42584

1147 wv_title->help = Qnil;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1148 wv_title->next = wv_sep;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1149 first_wv->contents = wv_title;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1150 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1151

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

1152 /* No selection has been chosen yet. */

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

1153 menu_item_selection = 0;

6488b258c0aa (set_frame_menubar): Sync with version in xmenu.c.

Jason Rumney <jasonr@gnu.org>

parents: 95728

1154

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1155 /* Actually create the menu. */

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1156 current_popup_menu = menu = CreatePopupMenu ();

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1157 fill_in_menu (menu, first_wv->contents);

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1158

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1159 /* Adjust coordinates to be root-window-relative. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1160 pos.x = x;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1161 pos.y = y;

16588

481b7874a1e9 Change identifiers of the form win32* to w32*.

Geoff Voelker <voelker@cs.washington.edu>

parents: 15276

1162 ClientToScreen (FRAME_W32_WINDOW (f), &pos);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1163

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1164 /* Display the menu. */

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

1165 menu_item_selection = SendMessage (FRAME_W32_WINDOW (f),

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1166 WM_EMACS_TRACKPOPUPMENU,

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1167 (WPARAM)menu, (LPARAM)&pos);

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

1168

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

1169 /* Clean up extraneous mouse events which might have been generated

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

1170 during the call. */

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

1171 discard_mouse_events ();

c3bd08b7c78d (Fx_popup_menu, Fx_popup_dialog, w32_menu_show): Ensure mouse is not

Jason Rumney <jasonr@gnu.org>

parents: 79759

1172 FRAME_X_DISPLAY_INFO (f)->grabbed = 0;

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

1173

30238

4a3b87cc6f04 (w32_menu_show): Call free_menubar_widget_value_tree after menu is

Jason Rumney <jasonr@gnu.org>

parents: 30178

1174 /* Free the widget_value objects we used to specify the contents. */

4a3b87cc6f04 (w32_menu_show): Call free_menubar_widget_value_tree after menu is

Jason Rumney <jasonr@gnu.org>

parents: 30178

1175 free_menubar_widget_value_tree (first_wv);

4a3b87cc6f04 (w32_menu_show): Call free_menubar_widget_value_tree after menu is

Jason Rumney <jasonr@gnu.org>

parents: 30178

1176

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1177 DestroyMenu (menu);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1178

76080

077c9ec8eca6 * w32menu.c (Fx_popup_menu): Don't free menu strings here.

Jason Rumney <jasonr@gnu.org>

parents: 76074

1179 /* Free the owner-drawn and help-echo menu strings. */

077c9ec8eca6 * w32menu.c (Fx_popup_menu): Don't free menu strings here.

Jason Rumney <jasonr@gnu.org>

parents: 76074

1180 w32_free_menu_strings (FRAME_W32_WINDOW (f));

76086

da9b24e47b34 (w32_menu_show): Mark the frame's menu as inactive when popup menu

Jason Rumney <jasonr@gnu.org>

parents: 76080

1181 f->output_data.w32->menubar_active = 0;

76080

077c9ec8eca6 * w32menu.c (Fx_popup_menu): Don't free menu strings here.

Jason Rumney <jasonr@gnu.org>

parents: 76074

1182

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1183 /* Find the selected item, and its pane, to return

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1184 the proper value. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1185 if (menu_item_selection != 0)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1186 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1187 Lisp_Object prefix, entry;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1188

eb915f0b1d6e (menubar_selection_callback, w32_menu_show): Initialize `entry' to nil.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 36677

1189 prefix = entry = Qnil;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1190 i = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1191 while (i < menu_items_used)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1192 {

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1193 if (EQ (AREF (menu_items, i), Qnil))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1194 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1195 subprefix_stack[submenu_depth++] = prefix;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1196 prefix = entry;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1197 i++;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1198 }

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1199 else if (EQ (AREF (menu_items, i), Qlambda))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1200 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1201 prefix = subprefix_stack[--submenu_depth];

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1202 i++;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1203 }

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1204 else if (EQ (AREF (menu_items, i), Qt))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1205 {

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1206 prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1207 i += MENU_ITEMS_PANE_LENGTH;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1208 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1209 /* Ignore a nil in the item list.

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1210 It's meaningful only for dialog boxes. */

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1211 else if (EQ (AREF (menu_items, i), Qquote))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1212 i += 1;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1213 else

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1214 {

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1215 entry = AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1216 if (menu_item_selection == i)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1217 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1218 if (keymaps != 0)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1219 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1220 int j;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1221

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1222 entry = Fcons (entry, Qnil);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1223 if (!NILP (prefix))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1224 entry = Fcons (prefix, entry);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1225 for (j = submenu_depth - 1; j >= 0; j--)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1226 if (!NILP (subprefix_stack[j]))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1227 entry = Fcons (subprefix_stack[j], entry);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1228 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1229 return entry;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1230 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1231 i += MENU_ITEMS_ITEM_LENGTH;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1232 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1233 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1234 }

72260

6e63f47b8977 (w32_menu_show, w32_dialog_show): Call Fsignal to quit

Jason Rumney <jasonr@gnu.org>

parents: 69443

1235 else if (!for_click)

6e63f47b8977 (w32_menu_show, w32_dialog_show): Call Fsignal to quit

Jason Rumney <jasonr@gnu.org>

parents: 69443

1236 /* Make "Cancel" equivalent to C-g. */

6e63f47b8977 (w32_menu_show, w32_dialog_show): Call Fsignal to quit

Jason Rumney <jasonr@gnu.org>

parents: 69443

1237 Fsignal (Qquit, Qnil);

dc9694ee3f70 (init_menu_items): Disable code.

Geoff Voelker <voelker@cs.washington.edu>

parents: 16884

1238

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1239 return Qnil;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1240 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1241

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1242

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1243 #ifdef HAVE_DIALOGS

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1244 /* TODO: On Windows, there are two ways of defining a dialog.

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1245

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1246 1. Create a predefined dialog resource and include it in nt/emacs.rc.

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1247 Using this method, we could then set the titles and make unneeded

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1248 buttons invisible before displaying the dialog. Everything would

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1249 be a fixed size though, so there is a risk that text does not

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1250 fit on a button.

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1251 2. Create the dialog template in memory on the fly. This allows us

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1252 to size the dialog and buttons dynamically, probably giving more

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1253 natural looking results for dialogs with few buttons, and eliminating

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1254 the problem of text overflowing the buttons. But the API for this is

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1255 quite complex - structures have to be allocated in particular ways,

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1256 text content is tacked onto the end of structures in variable length

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1257 arrays with further structures tacked on after these, there are

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1258 certain alignment requirements for all this, and we have to

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1259 measure all the text and convert to "dialog coordinates" to figure

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1260 out how big to make everything.

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1261

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1262 For now, we'll just stick with menus for dialogs that are more

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1263 complicated than simple yes/no type questions for which we can use

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1264 the MessageBox function.

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1265 */

95735

bc8db28659e5 (digest_single_submenu): Declare extern.

Juanma Barranquero <lekktu@gmail.com>

parents: 95732

1266

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1267 static char * button_names [] = {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1268 "button1", "button2", "button3", "button4", "button5",

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1269 "button6", "button7", "button8", "button9", "button10" };

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1270

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1271 static Lisp_Object

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

1272 w32_dialog_show (f, keymaps, title, header, error)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1273 FRAME_PTR f;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1274 int keymaps;

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

1275 Lisp_Object title, header;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1276 char **error;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1277 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1278 int i, nb_buttons=0;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1279 char dialog_name[6];

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1280 int menu_item_selection;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1281

eb915f0b1d6e (menubar_selection_callback, w32_menu_show): Initialize `entry' to nil.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 36677

1282 widget_value *wv, *first_wv = 0, *prev_wv = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1283

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1284 /* Number of elements seen so far, before boundary. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1285 int left_count = 0;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1286 /* 1 means we've seen the boundary between left-hand elts and right-hand. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1287 int boundary_seen = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1288

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1289 *error = NULL;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1290

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1291 if (menu_items_n_panes > 1)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1292 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1293 *error = "Multiple panes in dialog box";

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1294 return Qnil;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1295 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1296

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1297 /* Create a tree of widget_value objects

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1298 representing the text label and buttons. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1299 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1300 Lisp_Object pane_name, prefix;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1301 char *pane_string;

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1302 pane_name = AREF (menu_items, MENU_ITEMS_PANE_NAME);

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1303 prefix = AREF (menu_items, MENU_ITEMS_PANE_PREFIX);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1304 pane_string = (NILP (pane_name)

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

1305 ? "" : (char *) SDATA (pane_name));

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1306 prev_wv = xmalloc_widget_value ();

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1307 prev_wv->value = pane_string;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1308 if (keymaps && !NILP (prefix))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1309 prev_wv->name++;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1310 prev_wv->enabled = 1;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1311 prev_wv->name = "message";

ac09ecabe088 (single_submenu, set_frame_menubar, w32_menu_show):

Jason Rumney <jasonr@gnu.org>

parents: 42584

1312 prev_wv->help = Qnil;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1313 first_wv = prev_wv;

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

1314

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1315 /* Loop over all panes and items, filling in the tree. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1316 i = MENU_ITEMS_PANE_LENGTH;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1317 while (i < menu_items_used)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1318 {

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

1319

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1320 /* Create a new item within current pane. */

27896

75f296b1a872 (single_submenu): Set up help string.

Jason Rumney <jasonr@gnu.org>

parents: 27400

1321 Lisp_Object item_name, enable, descrip, help;

75f296b1a872 (single_submenu): Set up help string.

Jason Rumney <jasonr@gnu.org>

parents: 27400

1322

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1323 item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME);

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1324 enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE);

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1325 descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY);

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1326 help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP);

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

1327

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1328 if (NILP (item_name))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1329 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1330 free_menubar_widget_value_tree (first_wv);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1331 *error = "Submenu in dialog items";

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1332 return Qnil;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1333 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1334 if (EQ (item_name, Qquote))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1335 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1336 /* This is the boundary between left-side elts

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1337 and right-side elts. Stop incrementing right_count. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1338 boundary_seen = 1;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1339 i++;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1340 continue;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1341 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1342 if (nb_buttons >= 9)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1343 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1344 free_menubar_widget_value_tree (first_wv);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1345 *error = "Too many dialog items";

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1346 return Qnil;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1347 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1348

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1349 wv = xmalloc_widget_value ();

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1350 prev_wv->next = wv;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1351 wv->name = (char *) button_names[nb_buttons];

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1352 if (!NILP (descrip))

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

Ken Raeburn <raeburn@raeburn.org>

parents: 46293

1353 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

1354 wv->value = (char *) SDATA (item_name);

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1355 wv->call_data = (void *) &AREF (menu_items, i);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1356 wv->enabled = !NILP (enable);

ac09ecabe088 (single_submenu, set_frame_menubar, w32_menu_show):

Jason Rumney <jasonr@gnu.org>

parents: 42584

1357 wv->help = Qnil;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1358 prev_wv = wv;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1359

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1360 if (! boundary_seen)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1361 left_count++;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1362

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1363 nb_buttons++;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1364 i += MENU_ITEMS_ITEM_LENGTH;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1365 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1366

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1367 /* If the boundary was not specified,

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1368 by default put half on the left and half on the right. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1369 if (! boundary_seen)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1370 left_count = nb_buttons - nb_buttons / 2;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1371

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1372 wv = xmalloc_widget_value ();

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1373 wv->name = dialog_name;

ac09ecabe088 (single_submenu, set_frame_menubar, w32_menu_show):

Jason Rumney <jasonr@gnu.org>

parents: 42584

1374 wv->help = Qnil;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1375

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

1376 /* Frame title: 'Q' = Question, 'I' = Information.

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

1377 Can also have 'E' = Error if, one day, we want

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

1378 a popup for errors. */

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

1379 if (NILP(header))

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

1380 dialog_name[0] = 'Q';

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

1381 else

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

1382 dialog_name[0] = 'I';

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

1383

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1384 /* Dialog boxes use a really stupid name encoding

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1385 which specifies how many buttons to use

d126643d7af1 (Fx_popup_dialog): Add a third boolean argument to select frame title

Nick Roberts <nickrob@snap.net.nz>

parents: 56973

1386 and how many buttons are on the right. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1387 dialog_name[1] = '0' + nb_buttons;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1388 dialog_name[2] = 'B';

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1389 dialog_name[3] = 'R';

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1390 /* Number of buttons to put on the right. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1391 dialog_name[4] = '0' + nb_buttons - left_count;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1392 dialog_name[5] = 0;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1393 wv->contents = first_wv;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1394 first_wv = wv;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1395 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1396

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1397 /* Actually create the dialog. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1398 dialog_id = widget_id_tick++;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1399 menu = lw_create_widget (first_wv->name, "dialog", dialog_id, first_wv,

16588

481b7874a1e9 Change identifiers of the form win32* to w32*.

Geoff Voelker <voelker@cs.washington.edu>

parents: 15276

1400 f->output_data.w32->widget, 1, 0,

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1401 dialog_selection_callback, 0);

c3435dc00ed7 * lisp.h (KEYMAPP): New macro.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 32671

1402 lw_modify_all_widgets (dialog_id, first_wv->contents, TRUE);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1403

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1404 /* Free the widget_value objects we used to specify the contents. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1405 free_menubar_widget_value_tree (first_wv);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1406

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1407 /* No selection has been chosen yet. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1408 menu_item_selection = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1409

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1410 /* Display the menu. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1411 lw_pop_up_all_widgets (dialog_id);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1412

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1413 /* Process events that apply to the menu. */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1414 popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), dialog_id);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1415

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

1416 lw_destroy_all_widgets (dialog_id);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1417

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1418 /* Find the selected item, and its pane, to return

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1419 the proper value. */

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1420 if (menu_item_selection != 0)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1421 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1422 Lisp_Object prefix;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1423

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1424 prefix = Qnil;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1425 i = 0;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1426 while (i < menu_items_used)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1427 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1428 Lisp_Object entry;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1429

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1430 if (EQ (AREF (menu_items, i), Qt))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1431 {

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1432 prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1433 i += MENU_ITEMS_PANE_LENGTH;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1434 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1435 else

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1436 {

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1437 entry = AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1438 if (menu_item_selection == i)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1439 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1440 if (keymaps != 0)

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1441 {

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1442 entry = Fcons (entry, Qnil);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1443 if (!NILP (prefix))

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1444 entry = Fcons (prefix, entry);

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1445 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1446 return entry;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1447 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1448 i += MENU_ITEMS_ITEM_LENGTH;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1449 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1450 }

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1451 }

72260

6e63f47b8977 (w32_menu_show, w32_dialog_show): Call Fsignal to quit

Jason Rumney <jasonr@gnu.org>

parents: 69443

1452 else

6e63f47b8977 (w32_menu_show, w32_dialog_show): Call Fsignal to quit

Jason Rumney <jasonr@gnu.org>

parents: 69443

1453 /* Make "Cancel" equivalent to C-g. */

6e63f47b8977 (w32_menu_show, w32_dialog_show): Call Fsignal to quit

Jason Rumney <jasonr@gnu.org>

parents: 69443

1454 Fsignal (Qquit, Qnil);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1455

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1456 return Qnil;

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1457 }

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1458 #else /* !HAVE_DIALOGS */

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1459

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1460 /* Currently we only handle Yes No dialogs (y-or-n-p and yes-or-no-p) as

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1461 simple dialogs. We could handle a few more, but I'm not aware of

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1462 anywhere in Emacs that uses the other specific dialog choices that

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1463 MessageBox provides. */

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1464

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1465 static int is_simple_dialog (contents)

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1466 Lisp_Object contents;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1467 {

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1468 Lisp_Object options = XCDR (contents);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1469 Lisp_Object name, yes, no, other;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1470

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1471 yes = build_string ("Yes");

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1472 no = build_string ("No");

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1473

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1474 if (!CONSP (options))

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1475 return 0;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1476

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1477 name = XCAR (XCAR (options));

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1478 if (!CONSP (options))

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1479 return 0;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1480

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1481 if (!NILP (Fstring_equal (name, yes)))

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1482 other = no;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1483 else if (!NILP (Fstring_equal (name, no)))

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1484 other = yes;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1485 else

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1486 return 0;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1487

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1488 options = XCDR (options);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1489 if (!CONSP (options))

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1490 return 0;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1491

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1492 name = XCAR (XCAR (options));

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1493 if (NILP (Fstring_equal (name, other)))

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1494 return 0;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1495

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1496 /* Check there are no more options. */

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1497 options = XCDR (options);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1498 return !(CONSP (options));

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1499 }

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1500

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1501 static Lisp_Object simple_dialog_show (f, contents, header)

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1502 FRAME_PTR f;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1503 Lisp_Object contents, header;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1504 {

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1505 int answer;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1506 UINT type;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1507 char *text, *title;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1508 Lisp_Object lispy_answer = Qnil, temp = XCAR (contents);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1509

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1510 if (STRINGP (temp))

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1511 text = SDATA (temp);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1512 else

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1513 text = "";

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1514

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1515 if (NILP (header))

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1516 {

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1517 title = "Question";

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1518 type = MB_ICONQUESTION;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1519 }

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1520 else

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1521 {

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1522 title = "Information";

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1523 type = MB_ICONINFORMATION;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1524 }

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1525 type |= MB_YESNO;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1526

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1527 /* Since we only handle Yes/No dialogs, and we already checked

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1528 is_simple_dialog, we don't need to worry about checking contents

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1529 to see what type of dialog to use. */

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1530 answer = MessageBox (FRAME_W32_WINDOW (f), text, title, type);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1531

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1532 if (answer == IDYES)

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1533 lispy_answer = build_string ("Yes");

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1534 else if (answer == IDNO)

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1535 lispy_answer = build_string ("No");

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1536 else

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1537 Fsignal (Qquit, Qnil);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1538

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1539 for (temp = XCDR (contents); CONSP (temp); temp = XCDR (temp))

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1540 {

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1541 Lisp_Object item, name, value;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1542 item = XCAR (temp);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1543 if (CONSP (item))

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1544 {

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1545 name = XCAR (item);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1546 value = XCDR (item);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1547 }

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1548 else

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1549 {

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1550 name = item;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1551 value = Qnil;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1552 }

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1553

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1554 if (!NILP (Fstring_equal (name, lispy_answer)))

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1555 {

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1556 return value;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1557 }

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1558 }

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1559 Fsignal (Qquit, Qnil);

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1560 return Qnil;

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1561 }

b8d983c8a6d0 (is_simple_dialog, simple_dialog_show): New functions.

Jason Rumney <jasonr@gnu.org>

parents: 91773

1562 #endif /* !HAVE_DIALOGS */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1563

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1564

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1565 /* Is this item a separator? */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1566 static int

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1567 name_is_separator (name)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1568 char *name;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1569 {

eb915f0b1d6e (menubar_selection_callback, w32_menu_show): Initialize `entry' to nil.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 36677

1570 char *start = name;

eb915f0b1d6e (menubar_selection_callback, w32_menu_show): Initialize `entry' to nil.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 36677

1571

eb915f0b1d6e (menubar_selection_callback, w32_menu_show): Initialize `entry' to nil.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 36677

1572 /* Check if name string consists of only dashes ('-'). */

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1573 while (*name == '-') name++;

eb915f0b1d6e (menubar_selection_callback, w32_menu_show): Initialize `entry' to nil.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 36677

1574 /* Separators can also be of the form "--:TripleSuperMegaEtched"

eb915f0b1d6e (menubar_selection_callback, w32_menu_show): Initialize `entry' to nil.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 36677

1575 or "--deep-shadow". We don't implement them yet, se we just treat

eb915f0b1d6e (menubar_selection_callback, w32_menu_show): Initialize `entry' to nil.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 36677

1576 them like normal separators. */

eb915f0b1d6e (menubar_selection_callback, w32_menu_show): Initialize `entry' to nil.

Stefan Monnier <monnier@iro.umontreal.ca>

parents: 36677

1577 return (*name == '\0' || start + 2 == name);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1578 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1579

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1580

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

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

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1582 static int

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1583 add_left_right_boundary (HMENU menu)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1584 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1585 return AppendMenu (menu, MF_MENUBARBREAK, 0, NULL);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1586 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1587

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1588 /* UTF8: 0xxxxxxx, 110xxxxx 10xxxxxx, 1110xxxx, 10xxxxxx, 10xxxxxx */

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1589 static void

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1590 utf8to16 (unsigned char * src, int len, WCHAR * dest)

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1591 {

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1592 while (len > 0)

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1593 {

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1594 int utf16;

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1595 if (*src < 0x80)

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1596 {

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1597 *dest = (WCHAR) *src;

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1598 dest++; src++; len--;

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1599 }

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1600 /* Since we might get >3 byte sequences which we don't handle, ignore the extra parts. */

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1601 else if (*src < 0xC0)

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1602 {

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1603 src++; len--;

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1604 }

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1605 /* 2 char UTF-8 sequence. */

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1606 else if (*src < 0xE0)

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1607 {

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1608 *dest = (WCHAR) (((*src & 0x1f) << 6)

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1609 | (*(src + 1) & 0x3f));

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1610 src += 2; len -= 2; dest++;

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1611 }

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1612 else if (*src < 0xF0)

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1613 {

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1614 *dest = (WCHAR) (((*src & 0x0f) << 12)

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1615 | ((*(src + 1) & 0x3f) << 6)

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1616 | (*(src + 2) & 0x3f));

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1617 src += 3; len -= 3; dest++;

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1618 }

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1619 else /* Not encodable. Insert Unicode Substitution char. */

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1620 {

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1621 *dest = (WCHAR) 0xfffd;

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1622 src++; len--; dest++;

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1623 }

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1624 }

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1625 *dest = 0;

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1626 }

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1627

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1628 static int

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1629 add_menu_item (HMENU menu, widget_value *wv, HMENU item)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1630 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1631 UINT fuFlags;

cf89ff54912e (add_menu_item): Escape `&' characters in menu items and their keybindings.

Eli Zaretskii <eliz@gnu.org>

parents: 76086

1632 char *out_string, *p, *q;

a590f8d0dbd2 [HAVE_BOXES]: Remove #undef.

Jason Rumney <jasonr@gnu.org>

parents: 27896

1633 int return_value;

cf89ff54912e (add_menu_item): Escape `&' characters in menu items and their keybindings.

Eli Zaretskii <eliz@gnu.org>

parents: 76086

1634 size_t nlen, orig_len;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1635

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1636 if (name_is_separator (wv->name))

33971

c33b80a45f6a (add_menu_item): Reset menu item text when changing type to radio button.

Jason Rumney <jasonr@gnu.org>

parents: 32988

1637 {

c33b80a45f6a (add_menu_item): Reset menu item text when changing type to radio button.

Jason Rumney <jasonr@gnu.org>

parents: 32988

1638 fuFlags = MF_SEPARATOR;

c33b80a45f6a (add_menu_item): Reset menu item text when changing type to radio button.

Jason Rumney <jasonr@gnu.org>

parents: 32988

1639 out_string = NULL;

c33b80a45f6a (add_menu_item): Reset menu item text when changing type to radio button.

Jason Rumney <jasonr@gnu.org>

parents: 32988

1640 }

23a1cea22d13 Trailing whitespace deleted.

Juanma Barranquero <lekktu@gmail.com>

parents: 49348

1641 else

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1642 {

22750

b38cb406ed80 (add_menu_item): Draw menu items like titles if call_data is 0.

Andrew Innes <andrewi@gnu.org>

parents: 22737

1643 if (wv->enabled)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1644 fuFlags = MF_STRING;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1645 else

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1646 fuFlags = MF_STRING | MF_GRAYED;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1647

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1648 if (wv->key != NULL)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1649 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1650 out_string = alloca (strlen (wv->name) + strlen (wv->key) + 2);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1651 strcpy (out_string, wv->name);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1652 strcat (out_string, "\t");

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1653 strcat (out_string, wv->key);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1654 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1655 else

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1656 out_string = wv->name;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1657

cf89ff54912e (add_menu_item): Escape `&' characters in menu items and their keybindings.

Eli Zaretskii <eliz@gnu.org>

parents: 76086

1658 /* Quote any special characters within the menu item's text and

cf89ff54912e (add_menu_item): Escape `&' characters in menu items and their keybindings.

Eli Zaretskii <eliz@gnu.org>

parents: 76086

1659 key binding. */

cf89ff54912e (add_menu_item): Escape `&' characters in menu items and their keybindings.

Eli Zaretskii <eliz@gnu.org>

parents: 76086

1660 nlen = orig_len = strlen (out_string);

78022

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1661 if (unicode_append_menu)

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1662 {

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1663 /* With UTF-8, & cannot be part of a multibyte character. */

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1664 for (p = out_string; *p; p++)

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1665 {

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1666 if (*p == '&')

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1667 nlen++;

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1668 }

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1669 }

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1670 else

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1671 {

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1672 /* If encoded with the system codepage, use multibyte string

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1673 functions in case of multibyte characters that contain '&'. */

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1674 for (p = out_string; *p; p = _mbsinc (p))

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1675 {

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1676 if (_mbsnextc (p) == '&')

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1677 nlen++;

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1678 }

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1679 }

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1680

cf89ff54912e (add_menu_item): Escape `&' characters in menu items and their keybindings.

Eli Zaretskii <eliz@gnu.org>

parents: 76086

1681 if (nlen > orig_len)

78022

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1682 {

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1683 p = out_string;

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1684 out_string = alloca (nlen + 1);

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1685 q = out_string;

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1686 while (*p)

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1687 {

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1688 if (unicode_append_menu)

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1689 {

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1690 if (*p == '&')

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1691 *q++ = *p;

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1692 *q++ = *p++;

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1693 }

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1694 else

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1695 {

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1696 if (_mbsnextc (p) == '&')

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1697 {

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1698 _mbsncpy (q, p, 1);

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1699 q = _mbsinc (q);

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1700 }

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1701 _mbsncpy (q, p, 1);

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1702 p = _mbsinc (p);

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1703 q = _mbsinc (q);

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1704 }

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1705 }

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1706 *q = '\0';

349c82ee7ef7 (add_menu_item): Don't use multibyte string functions on

Jason Rumney <jasonr@gnu.org>

parents: 78015

1707 }

cf89ff54912e (add_menu_item): Escape `&' characters in menu items and their keybindings.

Eli Zaretskii <eliz@gnu.org>

parents: 76086

1708

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1709 if (item != NULL)

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1710 fuFlags = MF_POPUP;

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1711 else if (wv->title || wv->call_data == 0)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1712 {

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1713 /* Only use MF_OWNERDRAW if GetMenuItemInfo is usable, since

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1714 we can't deallocate the memory otherwise. */

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1715 if (get_menu_item_info)

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1716 {

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1717 out_string = (char *) local_alloc (strlen (wv->name) + 1);

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1718 strcpy (out_string, wv->name);

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1719 #ifdef MENU_DEBUG

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1720 DebPrint ("Menu: allocing %ld for owner-draw", out_string);

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1721 #endif

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1722 fuFlags = MF_OWNERDRAW | MF_DISABLED;

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1723 }

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1724 else

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1725 fuFlags = MF_DISABLED;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1726 }

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1727

da3ee40952bf Add skeleton support for help strings on menus.

Jason Rumney <jasonr@gnu.org>

parents: 26729

1728 /* Draw radio buttons and tickboxes. */

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1729 else if (wv->selected && (wv->button_type == BUTTON_TYPE_TOGGLE ||

41108

ef7a153a2c68 (add-menu-item): Make help_echo and radio buttons

Jason Rumney <jasonr@gnu.org>

parents: 40962

1730 wv->button_type == BUTTON_TYPE_RADIO))

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1731 fuFlags |= MF_CHECKED;

a590f8d0dbd2 [HAVE_BOXES]: Remove #undef.

Jason Rumney <jasonr@gnu.org>

parents: 27896

1732 else

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1733 fuFlags |= MF_UNCHECKED;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1734 }

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1735

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1736 if (unicode_append_menu && out_string)

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1737 {

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1738 /* Convert out_string from UTF-8 to UTF-16-LE. */

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1739 int utf8_len = strlen (out_string);

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1740 WCHAR * utf16_string;

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1741 if (fuFlags & MF_OWNERDRAW)

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1742 utf16_string = local_alloc ((utf8_len + 1) * sizeof (WCHAR));

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1743 else

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1744 utf16_string = alloca ((utf8_len + 1) * sizeof (WCHAR));

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1745

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1746 utf8to16 (out_string, utf8_len, utf16_string);

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1747 return_value = unicode_append_menu (menu, fuFlags,

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1748 item != NULL ? (UINT) item

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1749 : (UINT) wv->call_data,

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1750 utf16_string);

65301

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1751 if (!return_value)

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1752 {

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1753 /* On W9x/ME, unicode menus are not supported, though AppendMenuW

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1754 apparently does exist at least in some cases and appears to be

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1755 stubbed out to do nothing. out_string is UTF-8, but since

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1756 our standard menus are in English and this is only going to

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1757 happen the first time a menu is used, the encoding is

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1758 of minor importance compared with menus not working at all. */

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1759 return_value =

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1760 AppendMenu (menu, fuFlags,

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1761 item != NULL ? (UINT) item: (UINT) wv->call_data,

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1762 out_string);

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1763 /* Don't use unicode menus in future. */

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1764 unicode_append_menu = NULL;

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1765 }

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1766

c0c0b5bf96ab (add_menu_item): If unicode_append_menu returns an

Jason Rumney <jasonr@gnu.org>

parents: 64770

1767 if (unicode_append_menu && (fuFlags & MF_OWNERDRAW))

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1768 local_free (out_string);

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1769 }

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1770 else

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1771 {

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1772 return_value =

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1773 AppendMenu (menu,

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1774 fuFlags,

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1775 item != NULL ? (UINT) item : (UINT) wv->call_data,

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1776 out_string );

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1777 }

a590f8d0dbd2 [HAVE_BOXES]: Remove #undef.

Jason Rumney <jasonr@gnu.org>

parents: 27896

1778

a590f8d0dbd2 [HAVE_BOXES]: Remove #undef.

Jason Rumney <jasonr@gnu.org>

parents: 27896

1779 /* This must be done after the menu item is created. */

41108

ef7a153a2c68 (add-menu-item): Make help_echo and radio buttons

Jason Rumney <jasonr@gnu.org>

parents: 40962

1780 if (!wv->title && wv->call_data != 0)

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1781 {

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1782 if (set_menu_item_info)

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1783 {

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1784 MENUITEMINFO info;

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1785 bzero (&info, sizeof (info));

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1786 info.cbSize = sizeof (info);

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1787 info.fMask = MIIM_DATA;

32671

bbd3be4db5f2 (add_menu_item): Do not use MF_OWNERDRAW for titles, as it has stopped working.

Jason Rumney <jasonr@gnu.org>

parents: 31114

1788

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1789 /* Set help string for menu item. Leave it as a Lisp_Object

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1790 until it is ready to be displayed, since GC can happen while

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1791 menus are active. */

55671

6817f9469688 (add_menu_item, w32_menu_display_help) [USE_LISP_UNION_TYPE]: Cast

Jason Rumney <jasonr@gnu.org>

parents: 53326

1792 if (!NILP (wv->help))

6817f9469688 (add_menu_item, w32_menu_display_help) [USE_LISP_UNION_TYPE]: Cast

Jason Rumney <jasonr@gnu.org>

parents: 53326

1793 #ifdef USE_LISP_UNION_TYPE

6817f9469688 (add_menu_item, w32_menu_display_help) [USE_LISP_UNION_TYPE]: Cast

Jason Rumney <jasonr@gnu.org>

parents: 53326

1794 info.dwItemData = (DWORD) (wv->help).i;

6817f9469688 (add_menu_item, w32_menu_display_help) [USE_LISP_UNION_TYPE]: Cast

Jason Rumney <jasonr@gnu.org>

parents: 53326

1795 #else

6817f9469688 (add_menu_item, w32_menu_display_help) [USE_LISP_UNION_TYPE]: Cast

Jason Rumney <jasonr@gnu.org>

parents: 53326

1796 info.dwItemData = (DWORD) (wv->help);

6817f9469688 (add_menu_item, w32_menu_display_help) [USE_LISP_UNION_TYPE]: Cast

Jason Rumney <jasonr@gnu.org>

parents: 53326

1797 #endif

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1798 if (wv->button_type == BUTTON_TYPE_RADIO)

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1799 {

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1800 /* CheckMenuRadioItem allows us to differentiate TOGGLE and

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1801 RADIO items, but is not available on NT 3.51 and earlier. */

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1802 info.fMask |= MIIM_TYPE | MIIM_STATE;

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1803 info.fType = MFT_RADIOCHECK | MFT_STRING;

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1804 info.dwTypeData = out_string;

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1805 info.fState = wv->selected ? MFS_CHECKED : MFS_UNCHECKED;

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1806 }

33971

c33b80a45f6a (add_menu_item): Reset menu item text when changing type to radio button.

Jason Rumney <jasonr@gnu.org>

parents: 32988

1807

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1808 set_menu_item_info (menu,

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1809 item != NULL ? (UINT) item : (UINT) wv->call_data,

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1810 FALSE, &info);

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1811 }

eb7af01c7f27 (add_menu_item): Fix problems with using ownerdraw for

Andrew Innes <andrewi@gnu.org>

parents: 36313

1812 }

a590f8d0dbd2 [HAVE_BOXES]: Remove #undef.

Jason Rumney <jasonr@gnu.org>

parents: 27896

1813 return return_value;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1814 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1815

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1816 /* Construct native Windows menu(bar) based on widget_value tree. */

31114

cd392fdf0e9f Include keyboard.h before frame.h. Fix compile

Andrew Innes <andrewi@gnu.org>

parents: 30989

1817 int

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1818 fill_in_menu (HMENU menu, widget_value *wv)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1819 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1820 int items_added = 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1821

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1822 for ( ; wv != NULL; wv = wv->next)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1823 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1824 if (wv->contents)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1825 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1826 HMENU sub_menu = CreatePopupMenu ();

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1827

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1828 if (sub_menu == NULL)

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1829 return 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1830

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1831 if (!fill_in_menu (sub_menu, wv->contents) ||

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1832 !add_menu_item (menu, wv, sub_menu))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1833 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1834 DestroyMenu (sub_menu);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1835 return 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1836 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1837 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1838 else

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1839 {

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1840 if (!add_menu_item (menu, wv, NULL))

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1841 return 0;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1842 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1843 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1844 return 1;

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1845 }

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1846

2c8492145fc8 (single_submenu): Set help string to NULL if none.

Jason Rumney <jasonr@gnu.org>

parents: 27932

1847 /* Display help string for currently pointed to menu item. Not

2c8492145fc8 (single_submenu): Set help string to NULL if none.

Jason Rumney <jasonr@gnu.org>

parents: 27932

1848 supported on NT 3.51 and earlier, as GetMenuItemInfo is not

2c8492145fc8 (single_submenu): Set help string to NULL if none.

Jason Rumney <jasonr@gnu.org>

parents: 27932

1849 available. */

2c8492145fc8 (single_submenu): Set help string to NULL if none.

Jason Rumney <jasonr@gnu.org>

parents: 27932

1850 void

41646

258fa72efab7 (w32_menu_display_help): Actually add the new argument

Andrew Innes <andrewi@gnu.org>

parents: 41637

1851 w32_menu_display_help (HWND owner, HMENU menu, UINT item, UINT flags)

2c8492145fc8 (single_submenu): Set help string to NULL if none.

Jason Rumney <jasonr@gnu.org>

parents: 27932

1852 {

2c8492145fc8 (single_submenu): Set help string to NULL if none.

Jason Rumney <jasonr@gnu.org>

parents: 27932

1853 if (get_menu_item_info)

2c8492145fc8 (single_submenu): Set help string to NULL if none.

Jason Rumney <jasonr@gnu.org>

parents: 27932

1854 {

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1855 struct frame *f = x_window_to_frame (&one_w32_display_info, owner);

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1856 Lisp_Object frame, help;

2c8492145fc8 (single_submenu): Set help string to NULL if none.

Jason Rumney <jasonr@gnu.org>

parents: 27932

1857

64632

13b6920b1146 (w32_menu_display_help): Suppress tooltip when navigating menus with

Jason Rumney <jasonr@gnu.org>

parents: 64084

1858 /* No help echo on owner-draw menu items, or when the keyboard is used

13b6920b1146 (w32_menu_display_help): Suppress tooltip when navigating menus with

Jason Rumney <jasonr@gnu.org>

parents: 64084

1859 to navigate the menus, since tooltips are distracting if they pop

13b6920b1146 (w32_menu_display_help): Suppress tooltip when navigating menus with

Jason Rumney <jasonr@gnu.org>

parents: 64084

1860 up elsewhere. */

13b6920b1146 (w32_menu_display_help): Suppress tooltip when navigating menus with

Jason Rumney <jasonr@gnu.org>

parents: 64084

1861 if (flags & MF_OWNERDRAW || flags & MF_POPUP

13b6920b1146 (w32_menu_display_help): Suppress tooltip when navigating menus with

Jason Rumney <jasonr@gnu.org>

parents: 64084

1862 || !(flags & MF_MOUSESELECT))

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1863 help = Qnil;

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1864 else

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1865 {

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1866 MENUITEMINFO info;

2c8492145fc8 (single_submenu): Set help string to NULL if none.

Jason Rumney <jasonr@gnu.org>

parents: 27932

1867

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1868 bzero (&info, sizeof (info));

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1869 info.cbSize = sizeof (info);

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1870 info.fMask = MIIM_DATA;

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1871 get_menu_item_info (menu, item, FALSE, &info);

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1872

55671

6817f9469688 (add_menu_item, w32_menu_display_help) [USE_LISP_UNION_TYPE]: Cast

Jason Rumney <jasonr@gnu.org>

parents: 53326

1873 #ifdef USE_LISP_UNION_TYPE

6817f9469688 (add_menu_item, w32_menu_display_help) [USE_LISP_UNION_TYPE]: Cast

Jason Rumney <jasonr@gnu.org>

parents: 53326

1874 help = info.dwItemData ? (Lisp_Object) ((EMACS_INT) info.dwItemData)

6817f9469688 (add_menu_item, w32_menu_display_help) [USE_LISP_UNION_TYPE]: Cast

Jason Rumney <jasonr@gnu.org>

parents: 53326

1875 : Qnil;

6817f9469688 (add_menu_item, w32_menu_display_help) [USE_LISP_UNION_TYPE]: Cast

Jason Rumney <jasonr@gnu.org>

parents: 53326

1876 #else

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1877 help = info.dwItemData ? (Lisp_Object) info.dwItemData : Qnil;

55671

6817f9469688 (add_menu_item, w32_menu_display_help) [USE_LISP_UNION_TYPE]: Cast

Jason Rumney <jasonr@gnu.org>

parents: 53326

1878 #endif

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1879 }

30989

2152817050ff (keymap_panes): Pass the keymap's prompt as the pane name to

Jason Rumney <jasonr@gnu.org>

parents: 30238

1880

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1881 /* Store the help echo in the keyboard buffer as the X toolkit

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1882 version does, rather than directly showing it. This seems to

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1883 solve the GC problems that were present when we based the

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1884 Windows code on the non-toolkit version. */

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1885 if (f)

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1886 {

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1887 XSETFRAME (frame, f);

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1888 kbd_buffer_store_help_event (frame, help);

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1889 }

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1890 else

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1891 /* X version has a loop through frames here, which doesn't

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1892 appear to do anything, unless it has some side effect. */

d797ce338b4b (add_menu_item): Do not use owner-draw for disabled menu items.

Jason Rumney <jasonr@gnu.org>

parents: 41251

1893 show_help_echo (help, Qnil, Qnil, Qnil, 1);

2c8492145fc8 (single_submenu): Set help string to NULL if none.

Jason Rumney <jasonr@gnu.org>

parents: 27932

1894 }

2c8492145fc8 (single_submenu): Set help string to NULL if none.

Jason Rumney <jasonr@gnu.org>

parents: 27932

1895 }

2c8492145fc8 (single_submenu): Set help string to NULL if none.

Jason Rumney <jasonr@gnu.org>

parents: 27932

1896

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1897 /* Free memory used by owner-drawn strings. */

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1898 static void

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1899 w32_free_submenu_strings (menu)

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1900 HMENU menu;

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1901 {

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1902 int i, num = GetMenuItemCount (menu);

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1903 for (i = 0; i < num; i++)

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1904 {

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1905 MENUITEMINFO info;

41930

d5fc57bcb0f2 (w32_free_submenu_strings): Clear menu item struct

Jason Rumney <jasonr@gnu.org>

parents: 41908

1906 bzero (&info, sizeof (info));

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1907 info.cbSize = sizeof (info);

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1908 info.fMask = MIIM_DATA | MIIM_TYPE | MIIM_SUBMENU;

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1909

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1910 get_menu_item_info (menu, i, TRUE, &info);

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1911

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1912 /* Owner-drawn names are held in dwItemData. */

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1913 if ((info.fType & MF_OWNERDRAW) && info.dwItemData)

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1914 {

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1915 #ifdef MENU_DEBUG

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1916 DebPrint ("Menu: freeing %ld for owner-draw", info.dwItemData);

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1917 #endif

52f36f4b0e4f (local_heap, local_alloc, local_free): New macros.

Richard M. Stallman <rms@gnu.org>

parents: 46370

1918 local_free (info.dwItemData);

4d8905b9ee49 (_widget_value): Make `help' field a Lisp_Object. Add

Jason Rumney <jasonr@gnu.org>

parents: 41733

1919 }

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1920

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1921 /* Recurse down submenus. */

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1922 if (info.hSubMenu)

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1923 w32_free_submenu_strings (info.hSubMenu);

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1924 }

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1925 }

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1926

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1927 void

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1928 w32_free_menu_strings (hwnd)

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1929 HWND hwnd;

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1930 {

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1931 HMENU menu = current_popup_menu;

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1932

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1933 if (get_menu_item_info)

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1934 {

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1935 /* If there is no popup menu active, free the strings from the frame's

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1936 menubar. */

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1937 if (!menu)

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1938 menu = GetMenu (hwnd);

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1939

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1940 if (menu)

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1941 w32_free_submenu_strings (menu);

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1942 }

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1943

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1944 current_popup_menu = NULL;

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1945 }

2c8492145fc8 (single_submenu): Set help string to NULL if none.

Jason Rumney <jasonr@gnu.org>

parents: 27932

1946

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1947 #endif /* HAVE_MENUS */

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1948

73788

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1949 /* The following is used by delayed window autoselection. */

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1950

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1951 DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0,

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1952 doc: /* Return t if a menu or popup dialog is active on selected frame. */)

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1953 ()

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1954 {

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1955 #ifdef HAVE_MENUS

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1956 FRAME_PTR f;

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1957 f = SELECTED_FRAME ();

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1958 return (f->output_data.w32->menubar_active > 0) ? Qt : Qnil;

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1959 #else

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1960 return Qnil;

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1961 #endif /* HAVE_MENUS */

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1962 }

177184091f28 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.

Chong Yidong <cyd@stupidchicken.com>

parents: 73695

1963

4d7b83cc03aa Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.

Ben Key <bkey1@tampabay.rr.com>

parents: 46815

1964 void syms_of_w32menu ()

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1965 {

90920

b3ae82a0a4fd (syms_of_w32menu): Use DEFSYM macro.

Jason Rumney <jasonr@gnu.org>

parents: 90776

1966 globals_of_w32menu ();

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1967

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1968 current_popup_menu = NULL;

917737801660 (current_popup_menu, get_menu_item_info):

Jason Rumney <jasonr@gnu.org>

parents: 41646

1969

90920

b3ae82a0a4fd (syms_of_w32menu): Use DEFSYM macro.

Jason Rumney <jasonr@gnu.org>

parents: 90776

1970 DEFSYM (Qdebug_on_next_call, "debug-on-next-call");

07341673efa6 Include buffer.h.

Richard M. Stallman <rms@gnu.org>

parents: 15110

1971

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1972 defsubr (&Sx_popup_menu);

73695

3901ff3eaf2c (Fmenu_or_popup_active_p): New function.

Eli Zaretskii <eliz@gnu.org>

parents: 72773

1973 defsubr (&Smenu_or_popup_active_p);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1974 #ifdef HAVE_MENUS

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1975 defsubr (&Sx_popup_dialog);

3d1ce72aa7b9 Replace code with a new version written from scratch

Geoff Voelker <voelker@cs.washington.edu>

parents: 21612

1976 #endif

53ba95a88cf2 Initial revision

Geoff Voelker <voelker@cs.washington.edu>

parents:

1977 }

48888

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1978

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1979 /*

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1980 globals_of_w32menu is used to initialize those global variables that

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1981 must always be initialized on startup even when the global variable

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1982 initialized is non zero (see the function main in emacs.c).

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1983 globals_of_w32menu is called from syms_of_w32menu when the global

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1984 variable initialized is 0 and directly from main when initialized

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1985 is non zero.

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1986 */

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1987 void globals_of_w32menu ()

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1988 {

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1989 /* See if Get/SetMenuItemInfo functions are available. */

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1990 HMODULE user32 = GetModuleHandle ("user32.dll");

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1991 get_menu_item_info = (GetMenuItemInfoA_Proc) GetProcAddress (user32, "GetMenuItemInfoA");

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1992 set_menu_item_info = (SetMenuItemInfoA_Proc) GetProcAddress (user32, "SetMenuItemInfoA");

1fa5ffcb2ac8 (_widget_value): Added lname and lkey.

Jason Rumney <jasonr@gnu.org>

parents: 55671

1993 unicode_append_menu = (AppendMenuW_Proc) GetProcAddress (user32, "AppendMenuW");

48888

f0df5f687c15 Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

Ben Key <bkey1@tampabay.rr.com>

parents: 48375

1994 }

52401

695cf19ef79e Add arch taglines

Miles Bader <miles@gnu.org>

parents: 51573