Mercurial > emacs
annotate src/fontset.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 | fc7a8c411aa3 |
| rev | line source |
|---|---|
| 17052 | 1 /* Header for fontset handler. |
|
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
74605
diff
changeset
|
2 Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, |
| 106815 | 3 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
|
74605
6ee41fdd69ff
Update AIST copyright years.
Kenichi Handa <handa@m17n.org>
parents:
68651
diff
changeset
|
4 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
| 106815 | 5 2005, 2006, 2007, 2008, 2009, 2010 |
| 67658 | 6 National Institute of Advanced Industrial Science and Technology (AIST) |
| 7 Registration Number H14PRO021 | |
|
90409
0347a454915c
(FONT_INFO_FROM_FACE): New macro.
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
8 Copyright (C) 2003, 2006 |
|
88376
7c109f1a7bcb
(struct font_info): Type of the member encoding_type
Kenichi Handa <handa@m17n.org>
parents:
41053
diff
changeset
|
9 National Institute of Advanced Industrial Science and Technology (AIST) |
|
7c109f1a7bcb
(struct font_info): Type of the member encoding_type
Kenichi Handa <handa@m17n.org>
parents:
41053
diff
changeset
|
10 Registration Number H13PRO009 |
| 17052 | 11 |
| 17071 | 12 This file is part of GNU Emacs. |
| 13 | |
|
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94927
diff
changeset
|
14 GNU Emacs is free software: you can redistribute it and/or modify |
| 17071 | 15 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:
94927
diff
changeset
|
16 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:
94927
diff
changeset
|
17 (at your option) any later version. |
| 17052 | 18 |
| 17071 | 19 GNU Emacs is distributed in the hope that it will be useful, |
| 20 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 21 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 22 GNU General Public License for more details. | |
| 17052 | 23 |
| 17071 | 24 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:
94927
diff
changeset
|
25 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 17052 | 26 |
|
29573
2b0359c5b384
(EMACS_FONTSET_H): Renamed from _FONTSET_H.
Kenichi Handa <handa@m17n.org>
parents:
28224
diff
changeset
|
27 #ifndef EMACS_FONTSET_H |
|
2b0359c5b384
(EMACS_FONTSET_H): Renamed from _FONTSET_H.
Kenichi Handa <handa@m17n.org>
parents:
28224
diff
changeset
|
28 #define EMACS_FONTSET_H |
| 17052 | 29 |
| 30 /* Check if any window system is used now. */ | |
| 109099 | 31 extern void (*check_window_system_func) (void); |
| 17052 | 32 |
|
28224
04099a17871f
(FONT_NOT_OPENED, FONT_NOT_FOUND): Macros removed.
Kenichi Handa <handa@m17n.org>
parents:
26857
diff
changeset
|
33 struct face; |
|
04099a17871f
(FONT_NOT_OPENED, FONT_NOT_FOUND): Macros removed.
Kenichi Handa <handa@m17n.org>
parents:
26857
diff
changeset
|
34 |
| 109099 | 35 extern void free_face_fontset (FRAME_PTR, struct face *); |
| 36 extern Lisp_Object fontset_font_pattern (FRAME_PTR, struct face *, int); | |
| 37 extern int face_suitable_for_char_p (struct face *, int); | |
| 38 extern int face_for_char (FRAME_PTR, struct face *, int, | |
| 39 int, Lisp_Object); | |
| 40 extern Lisp_Object font_for_char (struct face *, int, int, Lisp_Object); | |
|
97825
2f7d54ce5f2a
(font_for_char): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
96546
diff
changeset
|
41 |
| 109099 | 42 extern int make_fontset_for_ascii_face (FRAME_PTR, int, struct face *); |
| 43 extern int fontset_from_font (Lisp_Object); | |
| 44 extern int fs_query_fontset (Lisp_Object, int); | |
|
21552
14f3ce59e036
(FONT_ENCODING_NOT_DECIDED): The value is changed to 255.
Kenichi Handa <handa@m17n.org>
parents:
20855
diff
changeset
|
45 EXFUN (Fquery_fontset, 2); |
| 109099 | 46 extern Lisp_Object list_fontsets (struct frame *, Lisp_Object, int); |
| 17052 | 47 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
41053
diff
changeset
|
48 extern Lisp_Object Vuse_default_ascent; |
|
19281
5834b16ab7fa
(Vignore_relative_composition): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
18541
diff
changeset
|
49 extern Lisp_Object Vignore_relative_composition; |
|
19449
7574338c92e2
Adjusted for the name change of
Kenichi Handa <handa@m17n.org>
parents:
19281
diff
changeset
|
50 extern Lisp_Object Valternate_fontname_alist; |
|
28224
04099a17871f
(FONT_NOT_OPENED, FONT_NOT_FOUND): Macros removed.
Kenichi Handa <handa@m17n.org>
parents:
26857
diff
changeset
|
51 extern Lisp_Object Vfontset_alias_alist; |
|
26857
cd7f4013a815
(struct font_info): New member vertical_centering.
Kenichi Handa <handa@m17n.org>
parents:
25031
diff
changeset
|
52 extern Lisp_Object Vvertical_centering_font_regexp; |
|
90508
1a247e569906
(Votf_script_alist): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
90467
diff
changeset
|
53 extern Lisp_Object Votf_script_alist; |
|
18345
6e93b01c3883
(font_idx_temp): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
18341
diff
changeset
|
54 |
| 109099 | 55 extern Lisp_Object fontset_name (int); |
| 56 extern Lisp_Object fontset_ascii (int); | |
| 57 extern int fontset_height (int); | |
|
28224
04099a17871f
(FONT_NOT_OPENED, FONT_NOT_FOUND): Macros removed.
Kenichi Handa <handa@m17n.org>
parents:
26857
diff
changeset
|
58 |
|
90409
0347a454915c
(FONT_INFO_FROM_FACE): New macro.
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
59 struct font; |
| 109099 | 60 extern int face_for_font (struct frame *, Lisp_Object, struct face *); |
|
90409
0347a454915c
(FONT_INFO_FROM_FACE): New macro.
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
61 |
|
29573
2b0359c5b384
(EMACS_FONTSET_H): Renamed from _FONTSET_H.
Kenichi Handa <handa@m17n.org>
parents:
28224
diff
changeset
|
62 #endif /* EMACS_FONTSET_H */ |
| 52401 | 63 |
| 64 /* arch-tag: c27cef7b-3cab-488a-8398-7a4daa96bb77 | |
| 65 (do not change this comment) */ |
