Mercurial > emacs
annotate src/lastfile.c @ 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 | 1d1d5d9bd884 |
| children | 376148b31b5e |
| rev | line source |
|---|---|
| 484 | 1 /* Mark end of data space to dump as pure, for GNU Emacs. |
|
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
68651
diff
changeset
|
2 Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, |
| 106815 | 3 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 484 | 4 |
| 5 This file is part of GNU Emacs. | |
| 6 | |
|
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
| 484 | 8 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:
79759
diff
changeset
|
9 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:
79759
diff
changeset
|
10 (at your option) any later version. |
| 484 | 11 |
| 12 GNU Emacs is distributed in the hope that it will be useful, | |
| 13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 GNU General Public License for more details. | |
| 16 | |
| 17 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:
79759
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 484 | 19 |
| 20 | |
| 21 /* How this works: | |
| 22 | |
| 23 Fdump_emacs dumps everything up to my_edata as text space (pure). | |
| 24 | |
| 25 The files of Emacs are written so as to have no initialized | |
| 26 data that can ever need to be altered except at the first startup. | |
| 27 This is so that those words can be dumped as sharable text. | |
| 28 | |
| 29 It is not possible to exercise such control over library files. | |
| 30 So it is necessary to refrain from making their data areas shared. | |
| 31 Therefore, this file is loaded following all the files of Emacs | |
| 32 but before library files. | |
| 33 As a result, the symbol my_edata indicates the point | |
| 34 in data space between data coming from Emacs and data | |
| 35 coming from libraries. | |
| 36 */ | |
| 37 | |
|
24099
38b8a103975c
Include config.h to pick up data layout pragmas.
Andrew Innes <andrewi@gnu.org>
parents:
21623
diff
changeset
|
38 #include <config.h> |
|
38b8a103975c
Include config.h to pick up data layout pragmas.
Andrew Innes <andrewi@gnu.org>
parents:
21623
diff
changeset
|
39 |
|
11077
e80116526bd6
(my_edata): Declare as char array, not int.
Richard M. Stallman <rms@gnu.org>
parents:
484
diff
changeset
|
40 char my_edata[] = "End of Emacs initialized data"; |
|
e80116526bd6
(my_edata): Declare as char array, not int.
Richard M. Stallman <rms@gnu.org>
parents:
484
diff
changeset
|
41 |
|
19726
e003f00f25ed
(my_endbss) [WINDOWSNT]: New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
42 /* Help unexec locate the end of the .bss area used by Emacs (which |
|
e003f00f25ed
(my_endbss) [WINDOWSNT]: New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
43 isn't always a separate section in NT executables). */ |
|
e003f00f25ed
(my_endbss) [WINDOWSNT]: New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
44 char my_endbss[1]; |
|
24099
38b8a103975c
Include config.h to pick up data layout pragmas.
Andrew Innes <andrewi@gnu.org>
parents:
21623
diff
changeset
|
45 |
|
21623
6c7a46148dd4
* lastfile.c (_my_endbss, my_endbss_static): New variables.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19726
diff
changeset
|
46 /* The Alpha MSVC linker globally segregates all static and public bss |
|
6c7a46148dd4
* lastfile.c (_my_endbss, my_endbss_static): New variables.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19726
diff
changeset
|
47 data, so we must take both into account to determine the true extent |
|
6c7a46148dd4
* lastfile.c (_my_endbss, my_endbss_static): New variables.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19726
diff
changeset
|
48 of the bss area used by Emacs. */ |
|
6c7a46148dd4
* lastfile.c (_my_endbss, my_endbss_static): New variables.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19726
diff
changeset
|
49 static char _my_endbss[1]; |
|
6c7a46148dd4
* lastfile.c (_my_endbss, my_endbss_static): New variables.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19726
diff
changeset
|
50 char * my_endbss_static = _my_endbss; |
| 52401 | 51 |
| 52 /* arch-tag: 67e81ab4-e14f-44b2-8875-c0c12252223e | |
| 53 (do not change this comment) */ |
