annotate src/keymap.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 228a5fa4eda0
children fc7a8c411aa3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
39691
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1 /* Functions to manipulate keymaps.
68651
3bd95f4f2941 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64770
diff changeset
2 Copyright (C) 2001, 2002, 2003, 2004, 2005,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100951
diff changeset
3 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
39691
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
4
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
5 This file is part of GNU Emacs.
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
6
94994
29adfc9354e7 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94005
diff changeset
7 GNU Emacs is free software: you can redistribute it and/or modify
39691
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
8 it under the terms of the GNU General Public License as published by
94994
29adfc9354e7 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94005
diff changeset
9 the Free Software Foundation, either version 3 of the License, or
29adfc9354e7 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94005
diff changeset
10 (at your option) any later version.
39691
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
11
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
15 GNU General Public License for more details.
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
16
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
94994
29adfc9354e7 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94005
diff changeset
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
39691
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
19
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
20 #ifndef KEYMAP_H
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
21 #define KEYMAP_H
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
22
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
23 #define KEYMAPP(m) (!NILP (get_keymap (m, 0, 0)))
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
24 extern Lisp_Object Qkeymap, Qmenu_bar;
109573
228a5fa4eda0 Remove extern declarations from .c files, and them to .h files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109099
diff changeset
25 extern Lisp_Object Qremap;
228a5fa4eda0 Remove extern declarations from .c files, and them to .h files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109099
diff changeset
26 extern Lisp_Object Qmenu_item;
228a5fa4eda0 Remove extern declarations from .c files, and them to .h files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109099
diff changeset
27 extern Lisp_Object Voverriding_local_map;
228a5fa4eda0 Remove extern declarations from .c files, and them to .h files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109099
diff changeset
28 extern Lisp_Object Voverriding_local_map_menu_flag;
39691
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
29 extern Lisp_Object current_global_map;
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
30 EXFUN (Fmake_sparse_keymap, 1);
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
31 EXFUN (Fkeymap_prompt, 1);
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
32 EXFUN (Fdefine_key, 3);
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
33 EXFUN (Flookup_key, 3);
76885
fcaf9518268a (Fcommand_remapping): New optional argument.
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
34 EXFUN (Fcommand_remapping, 3);
72889
25c755416160 * NEWS: explain new behavior and arguments of `key-binding' and
David Kastrup <dak@gnu.org>
parents: 68651
diff changeset
35 EXFUN (Fkey_binding, 4);
54926
9d9ed20a61d2 (Fkey_description): Fix prototype.
Kim F. Storm <storm@cua.dk>
parents: 52401
diff changeset
36 EXFUN (Fkey_description, 2);
39691
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
37 EXFUN (Fsingle_key_description, 2);
43153
d6162a8dc872 (Fkey_binding, Fwhere_is_internal): Update prototype.
Kim F. Storm <storm@cua.dk>
parents: 41292
diff changeset
38 EXFUN (Fwhere_is_internal, 5);
81609
7e640eac2dcb * keymaps.texi (Active Keymaps): Document new POSITION argument of
David Kastrup <dak@gnu.org>
parents: 76885
diff changeset
39 EXFUN (Fcurrent_active_maps, 2);
109099
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
40 extern Lisp_Object access_keymap (Lisp_Object, Lisp_Object, int, int, int);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
41 extern Lisp_Object get_keyelt (Lisp_Object, int);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
42 extern Lisp_Object get_keymap (Lisp_Object, int, int);
83420
521d3f18b3d1 Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents: 64770
diff changeset
43 EXFUN (Fset_keymap_parent, 2);
109099
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
44 extern void describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object,
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
45 char *, int, int, int, int);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
46 extern int current_minor_maps (Lisp_Object **, Lisp_Object **);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
47 extern void initial_define_key (Lisp_Object, int, char *);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
48 extern void initial_define_lispy_key (Lisp_Object, char *, char *);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
49 extern void syms_of_keymap (void);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
50 extern void keys_of_keymap (void);
39691
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
51
50797
5b0873c0b734 (map_keymap_function_t): New type.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49757
diff changeset
52 typedef void (*map_keymap_function_t)
109099
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
53 (Lisp_Object key, Lisp_Object val, Lisp_Object args, void* data);
e16f43875a48 Remove P_ and __P macros.
Jan D <jan.h.d@swipnet.se>
parents: 106815
diff changeset
54 extern void map_keymap (Lisp_Object map, map_keymap_function_t fun, Lisp_Object largs, void* cargs, int autoload);
94005
d3bf833831d6 * keymap.h (map_keymap_canonical): Declare.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
55 extern void map_keymap_canonical (Lisp_Object map,
d3bf833831d6 * keymap.h (map_keymap_canonical): Declare.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
56 map_keymap_function_t fun,
d3bf833831d6 * keymap.h (map_keymap_canonical): Declare.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
57 Lisp_Object args, void *data);
39691
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
58
27fe3d5767ed New file. Extracted from lisp.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
59 #endif
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 50797
diff changeset
60
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 50797
diff changeset
61 /* arch-tag: 7400d5a1-ef0b-43d0-b366-f4d678bf3ba2
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 50797
diff changeset
62 (do not change this comment) */