Mercurial > emacs
annotate src/widgetprv.h @ 94938:5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
conditionals. Don't check enable_font_backend. Delete all codes
used only when USE_FONT_BACKEND is not defined. Use
FONT_XXX_NAME_NUMERIC instead of face_numeric_xxx.
(QCfoundry, QCadstyle, QCregistry, QCspacing, QCsize, QCavgwidth)
(Qp): Extern them.
(clear_font_table, load_face_font, xlfd_lookup_field_contents):
Deleted.
(struct font_name): Deleted.
(xlfd_numeric_value, xlfd_symbolic_value): Deleted.
(compare_fonts_by_sort_order): New function.
(xlfd_numeric_slant, xlfd_symbolic_slant, xlfd_numeric_weight)
(xlfd_symbolic_weight, xlfd_numeric_swidth, xlfd_symbolic_swidth):
Deleted.
(Fx_family_fonts): Use font_list_entities, and sort fonts by
compare_fonts_by_sort_order.
(Fx_font_family_list): Call Ffont_family_list.
(face_numeric_value, face_numeric_weight, face_numeric_slant)
(face_numeric_swidth, face_symbolic_value, face_symbolic_weight)
(face_symbolic_slant, face_symbolic_swidth)
(split_font_name_into_vector, build_font_name_from_vector)
(xlfd_fixed_p, xlfd_point_size, pixel_point_size)
(font_rescale_ratio, split_font_name, build_font_name)
(free_font_names, sort_fonts, x_face_list_fonts)
(face_font_available_p, sorted_font_list, cmp_font_names)
(font_list_1, concat_font_list, font_list, remove_duplicates):
Deleted.
(Fx_list_fonts): Use Ffont_list.
(LFACE_AVGWIDTH): Deleted.
(check_lface_attrs): Don't check LFACE_AVGWIDTH. Check LFACE_FONT
by FONTP.
(lface_fully_specified_p): Don't check LFACE_AVGWIDTH.
(set_lface_from_font_name): Delete it.
(set_lface_from_font): Renamed from
set_lface_from_font_and_fontset. Caller changed. Don't set
LFACE_AVGWIDTH. Use FONT_XXX_FOR_FACE to get a symbol suitable
for face.
(merge_face_vectors): Copy font-spec if necessary. Clear
properties of the font-spec if necessary.
(merge_face_ref): Clear properties of the font-spec if necessary.
(Finternal_set_lisp_face_attribute): Likewise.
(set_font_frame_param): Use font_load_for_lface to load a
font-object, and call Fmodify_frame_parameters with it.
(x_update_menu_appearance): Don't check LFACE_AVGWIDTH. Get XLFD
font name by Ffont_xlfd_name.
(Finternal_lisp_face_attribute_values): Don't check QCweight,
QCslant, and QCwidth.
(Fface_font): Get a font name from font->props[FONT_NAME_INDEX].
(lface_same_font_attributes_p): Don't check LFACE_AVGWIDTH.
Compare fonts by EQ.
(lookup_non_ascii_face): Deleted.
(face_for_font): The 2nd argument changed.
(x_supports_face_attributes_p): Don't check LFACE_AVGWIDTH. Check
atomic font properties by case insensitive.
(realize_non_ascii_face): Set face->overstrike correctly.
(realize_x_face): Likewise. Check if LFACE_FONT is a font_object.
(dump_realized_face): Get font name from
font->props[FONT_NAME_INDEX]. Don't print font_info_id.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Wed, 14 May 2008 01:41:52 +0000 |
parents | fc2bcd2a8aad |
children | 606f2d163a64 29adfc9354e7 |
rev | line source |
---|---|
5628 | 1 /* The emacs frame widget private 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, |
79759 | 3 2006, 2007, 2008 Free Software Foundation, Inc. |
5628 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
78260
922696f363b0
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75227
diff
changeset
|
9 the Free Software Foundation; either version 3, or (at your option) |
5628 | 10 any later version. |
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 | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
64084 | 19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
20 Boston, MA 02110-1301, USA. */ | |
5628 | 21 |
22 /* Emacs 19 face widget ported by Fred Pierresteguy */ | |
23 | |
24 #ifndef _EmacsFrameP_h | |
25 #define _EmacsFrameP_h | |
26 | |
27 #include <X11/IntrinsicP.h> | |
28 #include <X11/CoreP.h> | |
29 #include "widget.h" | |
30 | |
31 typedef struct { | |
32 struct frame* frame; /* the *emacs* frame object */ | |
33 | |
34 /* Resources that can't be done from lisp. | |
35 */ | |
36 char* geometry; /* geometry spec of this frame */ | |
37 Boolean iconic; /* whether this frame is iconic */ | |
38 | |
39 /* The rest of this is crap and should be deleted. | |
40 */ | |
41 int minibuffer; /* 0: normal frames with minibuffers. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
14186
diff
changeset
|
42 * 1: frames without minibuffers |
5628 | 43 * 2: minibuffer only. */ |
44 Boolean unsplittable; /* frame can only have one window */ | |
45 | |
46 int internal_border_width; /* internal borders */ | |
47 int interline; /* skips between lines */ | |
48 | |
49 XFontStruct* font; /* font */ | |
50 Pixel foreground_pixel; /* foreground */ | |
51 | |
52 Pixel cursor_color; /* text cursor color */ | |
53 Boolean bar_cursor; /* 1 if bar, 0 if block */ | |
54 | |
55 Boolean visual_bell; /* flash instead of beep */ | |
56 int bell_volume; /* how loud is beep */ | |
57 | |
58 /* private state */ | |
59 | |
60 } EmacsFramePart; | |
61 | |
62 typedef struct _EmacsFrameRec { /* full instance record */ | |
63 CorePart core; | |
64 EmacsFramePart emacs_frame; | |
65 } EmacsFrameRec; | |
66 | |
67 typedef struct { /* new fields for EmacsFrame class */ | |
68 int dummy; | |
69 } EmacsFrameClassPart; | |
70 | |
71 typedef struct _EmacsFrameClassRec { /* full class record declaration */ | |
72 CoreClassPart core_class; | |
73 EmacsFrameClassPart emacs_frame_class; | |
74 } EmacsFrameClassRec; | |
75 | |
76 extern EmacsFrameClassRec emacsFrameClassRec; /* class pointer */ | |
77 | |
78 | |
79 | |
80 #endif /* _EmacsFrameP_h */ | |
52401 | 81 |
82 /* arch-tag: 2b579b4c-f697-4f86-b27a-35b7cb1a4a1c | |
83 (do not change this comment) */ |