Mercurial > emacs
annotate src/s/gnu.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 | 4e8dcb0d6fe0 |
| children | 417b1e4d63cd |
| rev | line source |
|---|---|
| 8605 | 1 /* Definitions file for GNU Emacs running on the GNU Hurd. |
|
108635
e565448628b8
Set rallocobj with configure, not cpp.
Glenn Morris <rgm@gnu.org>
parents:
108310
diff
changeset
|
2 |
|
e565448628b8
Set rallocobj with configure, not cpp.
Glenn Morris <rgm@gnu.org>
parents:
108310
diff
changeset
|
3 Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
|
e565448628b8
Set rallocobj with configure, not cpp.
Glenn Morris <rgm@gnu.org>
parents:
108310
diff
changeset
|
4 2008, 2009, 2010 Free Software Foundation, Inc. |
| 8605 | 5 |
| 6 This file is part of GNU Emacs. | |
| 7 | |
|
94715
1f134b61867c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79756
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
| 8605 | 9 it under the terms of the GNU General Public License as published by |
|
94715
1f134b61867c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79756
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
|
1f134b61867c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79756
diff
changeset
|
11 (at your option) any later version. |
| 8605 | 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 | |
|
94715
1f134b61867c
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79756
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 8605 | 20 |
| 21 | |
| 96303 | 22 /* Get most of the stuff from bsd-common */ |
| 23 #include "bsd-common.h" | |
| 8605 | 24 |
| 25 #undef SYSTEM_TYPE | |
| 26 #define SYSTEM_TYPE "gnu" | |
| 27 | |
| 28640 | 28 #undef NLIST_STRUCT |
| 8605 | 29 |
| 30 #define SIGNALS_VIA_CHARACTERS | |
| 31 | |
|
108691
5a44435f0c71
Set linker-related things with configure.
Glenn Morris <rgm@gnu.org>
parents:
108635
diff
changeset
|
32 /* libc defines data_start. */ |
| 8605 | 33 #define DATA_START ({ extern int data_start; (char *) &data_start; }) |
| 34 | |
|
9985
0a58678f81c6
[NOT_C_CODE]: Include fcntl.h.
Roland McGrath <roland@gnu.org>
parents:
9914
diff
changeset
|
35 /* Some losing code fails to include this and then assumes |
|
0a58678f81c6
[NOT_C_CODE]: Include fcntl.h.
Roland McGrath <roland@gnu.org>
parents:
9914
diff
changeset
|
36 that because it is braindead that O_RDONLY==0. */ |
|
0a58678f81c6
[NOT_C_CODE]: Include fcntl.h.
Roland McGrath <roland@gnu.org>
parents:
9914
diff
changeset
|
37 #include <fcntl.h> |
| 25032 | 38 |
|
45047
2f566cb931fe
[emacs]: Include stdio.h.
Richard M. Stallman <rms@gnu.org>
parents:
28640
diff
changeset
|
39 #ifdef emacs |
|
2f566cb931fe
[emacs]: Include stdio.h.
Richard M. Stallman <rms@gnu.org>
parents:
28640
diff
changeset
|
40 #include <stdio.h> /* Get the definition of _IO_STDIO_H. */ |
|
2f566cb931fe
[emacs]: Include stdio.h.
Richard M. Stallman <rms@gnu.org>
parents:
28640
diff
changeset
|
41 #if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM) |
|
2f566cb931fe
[emacs]: Include stdio.h.
Richard M. Stallman <rms@gnu.org>
parents:
28640
diff
changeset
|
42 /* new C libio names */ |
|
2f566cb931fe
[emacs]: Include stdio.h.
Richard M. Stallman <rms@gnu.org>
parents:
28640
diff
changeset
|
43 #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ |
|
2f566cb931fe
[emacs]: Include stdio.h.
Richard M. Stallman <rms@gnu.org>
parents:
28640
diff
changeset
|
44 ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base) |
|
2f566cb931fe
[emacs]: Include stdio.h.
Richard M. Stallman <rms@gnu.org>
parents:
28640
diff
changeset
|
45 #endif /* !_IO_STDIO_H */ |
|
2f566cb931fe
[emacs]: Include stdio.h.
Richard M. Stallman <rms@gnu.org>
parents:
28640
diff
changeset
|
46 #endif /* emacs */ |
| 52401 | 47 |
| 48 /* arch-tag: 577983d9-87a6-4922-b8f8-ff2b563714a4 | |
| 49 (do not change this comment) */ |
