annotate src/menu.h @ 109581:06384b3caebf

Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top. * lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu-customize-enable-left) (menu-bar-showhide-tool-bar-menu-customize-disable) (menu-bar-showhide-tool-bar-menu-customize-enable-right) (menu-bar-showhide-tool-bar-menu-customize-enable-top) (menu-bar-showhide-tool-bar-menu-customize-enable-bottom): New functions (menu-bar-showhide-tool-bar-menu): If tool bar is moveable, make a menu for Options => toolbar that can move it. * src/frame.c (Qtool_bar_position): New variable. (make_frame): Set tool_bar_position to Qtop. (frame_parms): Add tool-bar-position. (x_report_frame_params): Store tool_bar_position. (x_set_fringe_width): Reset wm size hint after fringe changes. * src/frame.h (struct frame): Add tool_bar_position. (Qbottom): Declare. * src/gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro. (xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth. (xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH. (xg_create_frame_widgets): Create a hobox for placing widgets vertically. Use gtk_box_pack_start. (xg_height_or_width_changed): Renamed from xg_height_changed. (x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width. (xg_update_frame_menubar, free_frame_menubar): Change to xg_height_or_width_changed. (xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar size correctly. Remove hardcoded 4, instead use handlebox size - toolbar size. (xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar size correctly. Use handlebox size + toolbar size as additional size. (xg_pack_tool_bar): POS is a new parameter. Set orientation of tool bar based on pos. Only make handlebox_widget if NULL. Check if tool bar goes to vbox or hbox depending on pos. (xg_update_tool_bar_sizes): New function. (update_frame_tool_bar): Remove old_req, new_req. Do not get tool bar height, call xg_update_tool_bar_sizes instead. (free_frame_tool_bar): Remove from hbox or vbox depending on toolbar_in_hbox, Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero. (xg_change_toolbar_position): New function. * src/gtkutil.h (xg_change_toolbar_position): Declare. * src/window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT and FRAME_TOOLBAR_LEFT_WIDTH. * src/xfns.c (x_set_tool_bar_position): New function. (xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT. (x_frame_parm_handlers): Add x_set_tool_bar_position. (syms_of_xfns): if USE_GTK, provide move-toolbar. * src/xterm.c (x_set_window_size_1): Add FRAME_TOOLBAR_WIDTH to pixelwidth. * src/xterm.h (struct x_output): Add toolbar_top_height, toolbar_bottom_height, toolbar_left_width, toolbar_right_width. Remove toolbar_height. if USE_GTK: Add hbox_widget and toolbar_in_hbox. (FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT) (FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros. (FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT.
author Jan D. <jan.h.d@swipnet.se>
date Thu, 29 Jul 2010 18:49:59 +0200
parents e16f43875a48
children 8ee3605b9d8a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
96608
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
1 /* Functions to manipulate menus.
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 105923
diff changeset
2 Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
96608
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
3
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
4 This file is part of GNU Emacs.
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
5
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
6 GNU Emacs is free software: you can redistribute it and/or modify
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
7 it under the terms of the GNU General Public License as published by
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
8 the Free Software Foundation, either version 3 of the License, or
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
9 (at your option) any later version.
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
10
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
11 GNU Emacs is distributed in the hope that it will be useful,
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
14 GNU General Public License for more details.
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
15
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
17 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
18
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
19 #ifndef MENU_H
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
20 #define MENU_H
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
21
105923
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
22 extern Lisp_Object Vmenu_updating_frame;
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
23
109099
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
24 extern void init_menu_items (void);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
25 extern void finish_menu_items (void);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
26 extern void discard_menu_items (void);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
27 extern void save_menu_items (void);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
28 extern int parse_single_submenu (Lisp_Object, Lisp_Object, Lisp_Object);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
29 extern void list_of_panes (Lisp_Object);
96608
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
30 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI)
109099
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
31 extern void free_menubar_widget_value_tree (widget_value *);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
32 extern void update_submenu_strings (widget_value *);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
33 extern void find_and_call_menu_selection (FRAME_PTR, int,
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
34 Lisp_Object, void *);
96608
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
35 #endif
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
36
105923
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
37 #ifdef HAVE_X_WINDOWS
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
38 extern void mouse_position_for_popup (FRAME_PTR f, int *x, int *y);
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
39 #endif
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
40
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
41 extern Lisp_Object w32_menu_show (FRAME_PTR, int, int, int, int,
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
42 Lisp_Object, char **);
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
43 extern Lisp_Object ns_menu_show (FRAME_PTR, int, int, int, int,
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
44 Lisp_Object, char **);
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
45 extern Lisp_Object xmenu_show (FRAME_PTR, int, int, int, int,
1011707400d3 * menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
46 Lisp_Object, char **, EMACS_UINT);
96608
127e54f8220e * menu.h: New file.
Andreas Schwab <schwab@suse.de>
parents:
diff changeset
47 #endif /* MENU_H */
96621
bf6f87d07e3b Add arch tagline
Miles Bader <miles@gnu.org>
parents: 96608
diff changeset
48
bf6f87d07e3b Add arch tagline
Miles Bader <miles@gnu.org>
parents: 96608
diff changeset
49 /* arch-tag: c32b2778-724d-4e85-81d7-45f98530a988
bf6f87d07e3b Add arch tagline
Miles Bader <miles@gnu.org>
parents: 96608
diff changeset
50 (do not change this comment) */