Mercurial > emacs
annotate src/widget.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 | e16f43875a48 |
| children | 417b1e4d63cd |
| rev | line source |
|---|---|
| 5626 | 1 /* The emacs frame widget public header file. |
|
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, 2001, 2002, 2003, 2004, 2005, |
| 106815 | 3 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 5626 | 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 |
| 5626 | 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. |
| 5626 | 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/>. */ |
| 5626 | 19 |
| 20 /* Emacs 19 face widget ported by Fred Pierresteguy */ | |
| 21 | |
| 22 #ifndef _EmacsFrame_h | |
| 23 #define _EmacsFrame_h | |
| 24 | |
| 25 #define XtNminibuffer "minibuffer" | |
| 26 #define XtCMinibuffer "Minibuffer" | |
| 27 #define XtNunsplittable "unsplittable" | |
| 28 #define XtCUnsplittable "Unsplittable" | |
| 29 #define XtNinternalBorderWidth "internalBorderWidth" | |
| 30 #define XtCInternalBorderWidth "InternalBorderWidth" | |
| 31 #define XtNinterline "interline" | |
| 32 #define XtCInterline "Interline" | |
| 33 | |
| 34 #ifndef XtNfont | |
| 35 #define XtNfont "font" | |
| 36 #endif | |
| 37 #ifndef XtCFont | |
| 38 #define XtCFont "Font" | |
| 39 #endif | |
| 40 #ifndef XtNforeground | |
| 41 #define XtNforeground "foreground" | |
| 42 #endif | |
| 43 #ifndef XtCForeground | |
| 44 #define XtCForeground "Foreground" | |
| 45 #endif | |
| 46 | |
| 47 #define XtNcursorColor "cursorColor" | |
| 48 #define XtCCursorColor "CursorColor" | |
| 49 #define XtNbarCursor "barCursor" | |
| 50 #define XtCBarCursor "BarCursor" | |
| 51 | |
| 52 #define XtNvisualBell "visualBell" | |
| 53 #define XtCVisualBell "VisualBell" | |
| 54 #define XtCBellVolume "BellVolume" | |
| 55 #define XtNbellVolume "bellVolume" | |
| 56 | |
| 57 #define XtNpointerBackground "pointerBackground" | |
| 58 #define XtNpointerColor "pointerColor" | |
| 59 | |
| 60 #define XtNtextPointer "textPointer" | |
| 61 #define XtNspacePointer "spacePointer" | |
| 62 #define XtNmodeLinePointer "modePointer" | |
| 63 #define XtNgcPointer "gcPointer" | |
| 64 | |
| 65 #define XtNemacsFrame "emacsFrame" | |
| 66 #define XtCEmacsFrame "EmacsFrame" | |
| 67 | |
| 68 #ifndef XtNgeometry | |
| 69 #define XtNgeometry "geometry" | |
| 70 #endif | |
| 71 #ifndef XtCGeometry | |
| 72 #define XtCGeometry "Geometry" | |
| 73 #endif | |
|
9229
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
74 #ifndef XtNshowGrip |
|
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
75 #define XtNshowGrip "showGrip" |
|
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
76 #endif |
|
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
77 #ifndef XtNallowResize |
|
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
78 #define XtNallowResize "allowResize" |
|
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
79 #endif |
|
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
80 #ifndef XtNresizeToPreferred |
|
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
81 #define XtNresizeToPreferred "resizeToPreferred" |
|
097322f7b8ad
Declare XtNshowGrip, XtNallowResize, and XtNresizeToPreferred.
Paul Reilly <pmr@pajato.com>
parents:
5705
diff
changeset
|
82 #endif |
| 5626 | 83 |
| 84 #define XtNinitialGeometry "initialGeometry" | |
| 85 #define XtCInitialGeometry "InitialGeometry" | |
| 86 | |
| 87 /* structures | |
| 88 */ | |
| 89 typedef struct _EmacsFrameRec *EmacsFrame; | |
| 90 typedef struct _EmacsFrameClassRec *EmacsFrameClass; | |
| 91 | |
| 92 extern WidgetClass emacsFrameClass; | |
| 93 | |
| 94 extern struct _DisplayContext* display_context; | |
| 95 | |
| 96 /* Special entrypoints */ | |
| 109099 | 97 void EmacsFrameSetCharSize (Widget, int, int); |
| 98 void widget_store_internal_border (Widget widget); | |
| 5626 | 99 |
| 100 #endif /* _EmacsFrame_h */ | |
| 52401 | 101 |
| 102 /* arch-tag: 98be17cc-8878-4701-abfa-66f1c04e9cb7 | |
| 103 (do not change this comment) */ |
