Mercurial > emacs
annotate src/sysselect.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 | 63671fb2a78d 376148b31b5e |
| rev | line source |
|---|---|
| 10526 | 1 /* sysselect.h - System-dependent definitions for the select function. |
|
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) 1995, 2001, 2002, 2003, 2004, 2005, |
| 106815 | 3 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 10526 | 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:
91702
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
| 10526 | 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:
91702
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:
91702
diff
changeset
|
10 (at your option) any later version. |
| 10526 | 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:
91702
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 10526 | 19 |
| 62002 | 20 #ifdef HAVE_SYS_SELECT_H |
|
97266
80acedef7417
cleanup in s/darwin.h, define DARWIN_OS and use it instead of DARWIN and/or MAC_OSX; also, nsterm.m: small unrelated cleanups
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
21 #if defined (DARWIN_OS) |
|
62105
988582b0e877
[DARWIN || MAC_OSX ]: Temporarily undefine
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
62002
diff
changeset
|
22 #undef init_process |
|
988582b0e877
[DARWIN || MAC_OSX ]: Temporarily undefine
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
62002
diff
changeset
|
23 #endif |
| 10526 | 24 #include <sys/select.h> |
|
97266
80acedef7417
cleanup in s/darwin.h, define DARWIN_OS and use it instead of DARWIN and/or MAC_OSX; also, nsterm.m: small unrelated cleanups
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
97043
diff
changeset
|
25 #if defined (DARWIN_OS) |
|
62105
988582b0e877
[DARWIN || MAC_OSX ]: Temporarily undefine
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
62002
diff
changeset
|
26 #define init_process emacs_init_process |
|
988582b0e877
[DARWIN || MAC_OSX ]: Temporarily undefine
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
62002
diff
changeset
|
27 #endif |
| 10526 | 28 #endif |
| 29 | |
| 30 #ifdef FD_SET | |
| 31 #ifdef FD_SETSIZE | |
| 32 #define MAXDESC FD_SETSIZE | |
| 33 #else | |
| 34 #define MAXDESC 64 | |
| 35 #endif | |
| 36 #define SELECT_TYPE fd_set | |
| 37 #else /* no FD_SET */ | |
| 38 #define MAXDESC 32 | |
| 39 #define SELECT_TYPE int | |
| 40 | |
| 41 /* Define the macros to access a single-int bitmap of descriptors. */ | |
| 42 #define FD_SET(n, p) (*(p) |= (1 << (n))) | |
| 43 #define FD_CLR(n, p) (*(p) &= ~(1 << (n))) | |
| 44 #define FD_ISSET(n, p) (*(p) & (1 << (n))) | |
| 45 #define FD_ZERO(p) (*(p) = 0) | |
| 46 #endif /* no FD_SET */ | |
| 47 | |
|
91702
b7a5a89054dc
* configure.in (LIBX11_MACHINE, HAVE_XFREE386): Remove code
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79759
diff
changeset
|
48 #if !defined (HAVE_SELECT) |
| 10526 | 49 #define select sys_select |
| 50 #endif | |
| 52401 | 51 |
| 52 /* arch-tag: 36d05500-8cf6-4847-8e78-6721f18c06ef | |
| 53 (do not change this comment) */ |
