Mercurial > emacs
annotate src/sheap.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 | 9b9426ae2633 376148b31b5e |
| rev | line source |
|---|---|
|
66663
d74deb025f5a
(STATIC_HEAP_SIZE): Increment both definitions.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
1 /* simulate `sbrk' with an array in .bss, for `unexec' support for Cygwin; |
|
d74deb025f5a
(STATIC_HEAP_SIZE): Increment both definitions.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
2 complete rewrite of xemacs Cygwin `unexec' code |
| 54844 | 3 |
| 106815 | 4 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 54844 | 5 |
| 6 This file is part of GNU Emacs. | |
| 7 | |
|
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
| 54844 | 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:
79759
diff
changeset
|
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:
79759
diff
changeset
|
11 (at your option) any later version. |
| 54844 | 12 |
| 13 GNU Emacs is distributed in the hope that it will be useful, | |
| 14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 GNU General Public License for more details. | |
| 17 | |
| 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:
79759
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 54844 | 20 |
| 21 #include <config.h> | |
| 22 #include <stdio.h> | |
|
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100951
diff
changeset
|
23 #include <setjmp.h> |
| 54844 | 24 #include "lisp.h" |
| 25 | |
| 26 #include <unistd.h> | |
| 27 | |
|
69554
e6104b603d86
(STATIC_HEAP_SIZE): Enlarge STATIC_HEAP_SIZE to 12MB.
Eli Zaretskii <eliz@gnu.org>
parents:
68651
diff
changeset
|
28 #define STATIC_HEAP_SIZE (12 * 1024 * 1024) |
| 54844 | 29 |
| 30 int debug_sheap = 0; | |
| 31 | |
| 32 #define BLOCKSIZE 4096 | |
| 33 | |
| 34 char bss_sbrk_buffer[STATIC_HEAP_SIZE]; | |
| 35 char *bss_sbrk_ptr; | |
| 36 int bss_sbrk_did_unexec; | |
| 37 | |
| 38 void * | |
| 39 bss_sbrk (ptrdiff_t request_size) | |
| 40 { | |
| 41 if (!bss_sbrk_ptr) | |
| 42 { | |
| 43 bss_sbrk_ptr = bss_sbrk_buffer; | |
| 44 #ifdef CYGWIN | |
| 45 sbrk (BLOCKSIZE); /* force space for fork to work */ | |
| 46 #endif | |
| 47 } | |
| 48 | |
| 49 if (!(int) request_size) | |
| 50 { | |
| 51 return (bss_sbrk_ptr); | |
| 52 } | |
| 53 else if (bss_sbrk_ptr + (int) request_size < bss_sbrk_buffer) | |
| 54 { | |
| 55 printf | |
| 56 ("attempt to free too much: avail %d used %d failed request %d\n", | |
| 57 STATIC_HEAP_SIZE, bss_sbrk_ptr - bss_sbrk_buffer, | |
| 58 (int) request_size); | |
| 59 exit (-1); | |
| 60 return 0; | |
| 61 } | |
| 62 else if (bss_sbrk_ptr + (int) request_size > | |
| 63 bss_sbrk_buffer + STATIC_HEAP_SIZE) | |
| 64 { | |
| 65 printf ("static heap exhausted: avail %d used %d failed request %d\n", | |
| 66 STATIC_HEAP_SIZE, | |
| 67 bss_sbrk_ptr - bss_sbrk_buffer, (int) request_size); | |
| 68 exit (-1); | |
| 69 return 0; | |
| 70 } | |
| 71 else if ((int) request_size < 0) | |
| 72 { | |
| 73 bss_sbrk_ptr += (int) request_size; | |
| 74 if (debug_sheap) | |
| 75 printf ("freed size %d\n", request_size); | |
| 76 return bss_sbrk_ptr; | |
| 77 } | |
| 78 else | |
| 79 { | |
| 80 char *ret = bss_sbrk_ptr; | |
| 81 if (debug_sheap) | |
| 82 printf ("allocated 0x%08x size %d\n", ret, request_size); | |
| 83 bss_sbrk_ptr += (int) request_size; | |
| 84 return ret; | |
| 85 } | |
| 86 } | |
| 87 | |
| 88 void | |
| 89 report_sheap_usage (int die_if_pure_storage_exceeded) | |
| 90 { | |
| 91 char buf[200]; | |
| 92 sprintf (buf, "Static heap usage: %d of %d bytes", | |
| 93 bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE); | |
| 94 message ("%s", buf); | |
| 95 } | |
|
54858
44a3fff23885
Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents:
54844
diff
changeset
|
96 |
|
44a3fff23885
Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents:
54844
diff
changeset
|
97 /* arch-tag: 1bc386e8-71c2-4da4-b8b5-c1674a9cf926 |
|
44a3fff23885
Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents:
54844
diff
changeset
|
98 (do not change this comment) */ |
