Mercurial > emacs
annotate src/mem-limits.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 | 0f876b86540d |
| children | 417b1e4d63cd |
| rev | line source |
|---|---|
| 486 | 1 /* Includes for memory limit warnings. |
|
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
69389
diff
changeset
|
2 Copyright (C) 1990, 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004, |
| 106815 | 3 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 486 | 4 |
| 5 This file is part of GNU Emacs. | |
| 6 | |
|
94994
29adfc9354e7
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 |
| 486 | 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:
79759
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:
79759
diff
changeset
|
10 (at your option) any later version. |
| 486 | 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 | |
|
94994
29adfc9354e7
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/>. */ |
| 486 | 19 |
|
5497
525a2027ec95
[MSDOS] (get_lim_data): Use go32 call.
Richard M. Stallman <rms@gnu.org>
parents:
4254
diff
changeset
|
20 #ifdef MSDOS |
|
525a2027ec95
[MSDOS] (get_lim_data): Use go32 call.
Richard M. Stallman <rms@gnu.org>
parents:
4254
diff
changeset
|
21 #include <dpmi.h> |
| 46950 | 22 extern int etext; |
|
5497
525a2027ec95
[MSDOS] (get_lim_data): Use go32 call.
Richard M. Stallman <rms@gnu.org>
parents:
4254
diff
changeset
|
23 #endif |
|
525a2027ec95
[MSDOS] (get_lim_data): Use go32 call.
Richard M. Stallman <rms@gnu.org>
parents:
4254
diff
changeset
|
24 |
|
5547
261bf09dc10a
Include <sys/types.h> before <sys/resource.h>.
Roland McGrath <roland@gnu.org>
parents:
5497
diff
changeset
|
25 /* Some systems need this before <sys/resource.h>. */ |
|
261bf09dc10a
Include <sys/types.h> before <sys/resource.h>.
Roland McGrath <roland@gnu.org>
parents:
5497
diff
changeset
|
26 #include <sys/types.h> |
|
261bf09dc10a
Include <sys/types.h> before <sys/resource.h>.
Roland McGrath <roland@gnu.org>
parents:
5497
diff
changeset
|
27 |
|
51399
c2c7a2898903
Use HAVE_SYS_RESOURCE_H, HAVE_SYS_VLIMIT_H.
Dave Love <fx@gnu.org>
parents:
49549
diff
changeset
|
28 #ifdef HAVE_SYS_RESOURCE_H |
|
c2c7a2898903
Use HAVE_SYS_RESOURCE_H, HAVE_SYS_VLIMIT_H.
Dave Love <fx@gnu.org>
parents:
49549
diff
changeset
|
29 # include <sys/time.h> |
|
c2c7a2898903
Use HAVE_SYS_RESOURCE_H, HAVE_SYS_VLIMIT_H.
Dave Love <fx@gnu.org>
parents:
49549
diff
changeset
|
30 # include <sys/resource.h> |
|
c2c7a2898903
Use HAVE_SYS_RESOURCE_H, HAVE_SYS_VLIMIT_H.
Dave Love <fx@gnu.org>
parents:
49549
diff
changeset
|
31 #else |
|
c2c7a2898903
Use HAVE_SYS_RESOURCE_H, HAVE_SYS_VLIMIT_H.
Dave Love <fx@gnu.org>
parents:
49549
diff
changeset
|
32 # if HAVE_SYS_VLIMIT_H |
|
c2c7a2898903
Use HAVE_SYS_RESOURCE_H, HAVE_SYS_VLIMIT_H.
Dave Love <fx@gnu.org>
parents:
49549
diff
changeset
|
33 # include <sys/vlimit.h> /* Obsolete, says glibc */ |
|
c2c7a2898903
Use HAVE_SYS_RESOURCE_H, HAVE_SYS_VLIMIT_H.
Dave Love <fx@gnu.org>
parents:
49549
diff
changeset
|
34 # endif |
| 3055 | 35 #endif |
| 36 | |
| 486 | 37 typedef unsigned long SIZE; |
| 38 | |
|
109574
0f876b86540d
* src/mem-limits.h: Remove duplicated includes.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109536
diff
changeset
|
39 extern char *start_of_data (void); |
|
55875
65f0675acb04
(EXCEEDS_LISP_PTR) [USE_LSB_TAG]: Never true.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
40 #if defined USE_LSB_TAG |
|
65f0675acb04
(EXCEEDS_LISP_PTR) [USE_LSB_TAG]: Never true.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
41 #define EXCEEDS_LISP_PTR(ptr) 0 |
|
65f0675acb04
(EXCEEDS_LISP_PTR) [USE_LSB_TAG]: Never true.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
42 #elif defined DATA_SEG_BITS |
|
1592
613783a3f00c
* mem-limits.h [DATA_SEG_BITS] (EXCEEDS_LISP_PTR): Remember to
Jim Blandy <jimb@redhat.com>
parents:
1450
diff
changeset
|
43 #define EXCEEDS_LISP_PTR(ptr) \ |
|
8830
3f019f2a13f9
Check for __alpha, in __osf__ conditional.
Richard M. Stallman <rms@gnu.org>
parents:
7010
diff
changeset
|
44 (((EMACS_UINT) (ptr) & ~DATA_SEG_BITS) >> VALBITS) |
|
1592
613783a3f00c
* mem-limits.h [DATA_SEG_BITS] (EXCEEDS_LISP_PTR): Remember to
Jim Blandy <jimb@redhat.com>
parents:
1450
diff
changeset
|
45 #else |
|
8830
3f019f2a13f9
Check for __alpha, in __osf__ conditional.
Richard M. Stallman <rms@gnu.org>
parents:
7010
diff
changeset
|
46 #define EXCEEDS_LISP_PTR(ptr) ((EMACS_UINT) (ptr) >> VALBITS) |
|
1592
613783a3f00c
* mem-limits.h [DATA_SEG_BITS] (EXCEEDS_LISP_PTR): Remember to
Jim Blandy <jimb@redhat.com>
parents:
1450
diff
changeset
|
47 #endif |
| 486 | 48 |
| 52401 | 49 /* arch-tag: fe39244e-e54f-4208-b7aa-02556f7841c5 |
| 50 (do not change this comment) */ |
