Mercurial > emacs
annotate src/syswait.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 | 1d1d5d9bd884 |
| children | 376148b31b5e |
| rev | line source |
|---|---|
| 4626 | 1 /* Define wait system call interface for 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) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, |
| 106815 | 3 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 4626 | 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:
87730
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
| 4626 | 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:
87730
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:
87730
diff
changeset
|
10 (at your option) any later version. |
| 4626 | 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:
87730
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 4626 | 19 |
| 20 /* Define the structure that the wait system call stores. | |
| 21 On many systems, there is a structure defined for this. | |
| 22 But on vanilla-ish USG systems there is not. */ | |
| 23 | |
|
30066
0c8b413f3f35
Use the autoconf recommended approach. Old code #if'd out in case we
Dave Love <fx@gnu.org>
parents:
16220
diff
changeset
|
24 #ifndef EMACS_SYSWAIT_H |
|
0c8b413f3f35
Use the autoconf recommended approach. Old code #if'd out in case we
Dave Love <fx@gnu.org>
parents:
16220
diff
changeset
|
25 #define EMACS_SYSWAIT_H |
|
0c8b413f3f35
Use the autoconf recommended approach. Old code #if'd out in case we
Dave Love <fx@gnu.org>
parents:
16220
diff
changeset
|
26 |
| 30465 | 27 #include <sys/types.h> |
|
30066
0c8b413f3f35
Use the autoconf recommended approach. Old code #if'd out in case we
Dave Love <fx@gnu.org>
parents:
16220
diff
changeset
|
28 |
|
41185
d12c8d3334f4
Delete conditionals for HPUX7, ISC 4.1, and convex.
Richard M. Stallman <rms@gnu.org>
parents:
41138
diff
changeset
|
29 #ifdef HAVE_SYS_WAIT_H /* We have sys/wait.h with POSIXoid definitions. */ |
|
46865
971ae7795f13
Only the include of sys/wait.h tests HAVE_SYS_WAIT_H.
Richard M. Stallman <rms@gnu.org>
parents:
41185
diff
changeset
|
30 #include <sys/wait.h> |
|
971ae7795f13
Only the include of sys/wait.h tests HAVE_SYS_WAIT_H.
Richard M. Stallman <rms@gnu.org>
parents:
41185
diff
changeset
|
31 #endif /* !HAVE_SYS_WAIT_H */ |
| 30465 | 32 |
| 33 #ifndef WCOREDUMP /* not POSIX */ | |
| 34 #define WCOREDUMP(status) ((status) & 0x80) | |
|
30066
0c8b413f3f35
Use the autoconf recommended approach. Old code #if'd out in case we
Dave Love <fx@gnu.org>
parents:
16220
diff
changeset
|
35 #endif |
|
46865
971ae7795f13
Only the include of sys/wait.h tests HAVE_SYS_WAIT_H.
Richard M. Stallman <rms@gnu.org>
parents:
41185
diff
changeset
|
36 #ifndef WEXITSTATUS |
| 30465 | 37 #define WEXITSTATUS(status) (((status) & 0xff00) >> 8) |
|
46865
971ae7795f13
Only the include of sys/wait.h tests HAVE_SYS_WAIT_H.
Richard M. Stallman <rms@gnu.org>
parents:
41185
diff
changeset
|
38 #endif |
|
971ae7795f13
Only the include of sys/wait.h tests HAVE_SYS_WAIT_H.
Richard M. Stallman <rms@gnu.org>
parents:
41185
diff
changeset
|
39 #ifndef WIFEXITED |
| 30465 | 40 #define WIFEXITED(status) (WTERMSIG(status) == 0) |
|
46865
971ae7795f13
Only the include of sys/wait.h tests HAVE_SYS_WAIT_H.
Richard M. Stallman <rms@gnu.org>
parents:
41185
diff
changeset
|
41 #endif |
|
971ae7795f13
Only the include of sys/wait.h tests HAVE_SYS_WAIT_H.
Richard M. Stallman <rms@gnu.org>
parents:
41185
diff
changeset
|
42 #ifndef WIFSTOPPED |
| 30465 | 43 #define WIFSTOPPED(status) (((status) & 0xff) == 0x7f) |
|
46865
971ae7795f13
Only the include of sys/wait.h tests HAVE_SYS_WAIT_H.
Richard M. Stallman <rms@gnu.org>
parents:
41185
diff
changeset
|
44 #endif |
|
971ae7795f13
Only the include of sys/wait.h tests HAVE_SYS_WAIT_H.
Richard M. Stallman <rms@gnu.org>
parents:
41185
diff
changeset
|
45 #ifndef WIFSIGNALED |
| 30465 | 46 #define WIFSIGNALED(status) (!WIFSTOPPED(status) && !WIFEXITED(status)) |
|
46865
971ae7795f13
Only the include of sys/wait.h tests HAVE_SYS_WAIT_H.
Richard M. Stallman <rms@gnu.org>
parents:
41185
diff
changeset
|
47 #endif |
|
971ae7795f13
Only the include of sys/wait.h tests HAVE_SYS_WAIT_H.
Richard M. Stallman <rms@gnu.org>
parents:
41185
diff
changeset
|
48 #ifndef WSTOPSIG |
| 30465 | 49 #define WSTOPSIG(status) WEXITSTATUS(status) |
|
46865
971ae7795f13
Only the include of sys/wait.h tests HAVE_SYS_WAIT_H.
Richard M. Stallman <rms@gnu.org>
parents:
41185
diff
changeset
|
50 #endif |
|
971ae7795f13
Only the include of sys/wait.h tests HAVE_SYS_WAIT_H.
Richard M. Stallman <rms@gnu.org>
parents:
41185
diff
changeset
|
51 #ifndef WTERMSIG |
| 30465 | 52 #define WTERMSIG(status) ((status) & 0x7f) |
|
46865
971ae7795f13
Only the include of sys/wait.h tests HAVE_SYS_WAIT_H.
Richard M. Stallman <rms@gnu.org>
parents:
41185
diff
changeset
|
53 #endif |
| 30465 | 54 |
| 55 #undef WRETCODE | |
| 56 #define WRETCODE(status) WEXITSTATUS (status) | |
|
30066
0c8b413f3f35
Use the autoconf recommended approach. Old code #if'd out in case we
Dave Love <fx@gnu.org>
parents:
16220
diff
changeset
|
57 |
|
0c8b413f3f35
Use the autoconf recommended approach. Old code #if'd out in case we
Dave Love <fx@gnu.org>
parents:
16220
diff
changeset
|
58 |
|
0c8b413f3f35
Use the autoconf recommended approach. Old code #if'd out in case we
Dave Love <fx@gnu.org>
parents:
16220
diff
changeset
|
59 #endif /* EMACS_SYSWAIT_H */ |
| 52401 | 60 |
| 61 /* arch-tag: 7e5d9719-ec66-4b6f-89bb-563eea16a899 | |
| 62 (do not change this comment) */ |
