annotate oldXMenu/AddPane.c @ 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 fec5e03aaf59
children edf631bdbb7a ec58e5c426ef 5cc91198ffb2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
76174
fec5e03aaf59 Remove FSF copyright since file does not differ significantly from X11
Glenn Morris <rgm@gnu.org>
parents: 75348
diff changeset
1 /* Copyright Massachusetts Institute of Technology 1985 */
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
2
76174
fec5e03aaf59 Remove FSF copyright since file does not differ significantly from X11
Glenn Morris <rgm@gnu.org>
parents: 75348
diff changeset
3 #include "copyright.h"
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
4
Dave Love <fx@gnu.org>
parents:
diff changeset
5 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
6 * XMenu: MIT Project Athena, X Window system menu package
Dave Love <fx@gnu.org>
parents:
diff changeset
7 *
Dave Love <fx@gnu.org>
parents:
diff changeset
8 * XMenuAddPane - Adds a pane to an XMenu object.
Dave Love <fx@gnu.org>
parents:
diff changeset
9 *
Dave Love <fx@gnu.org>
parents:
diff changeset
10 * Author: Tony Della Fera, DEC
Dave Love <fx@gnu.org>
parents:
diff changeset
11 * August, 1985
Dave Love <fx@gnu.org>
parents:
diff changeset
12 *
Dave Love <fx@gnu.org>
parents:
diff changeset
13 */
Dave Love <fx@gnu.org>
parents:
diff changeset
14
Dave Love <fx@gnu.org>
parents:
diff changeset
15 #include <config.h>
Dave Love <fx@gnu.org>
parents:
diff changeset
16 #include "XMenuInt.h"
Dave Love <fx@gnu.org>
parents:
diff changeset
17
Dave Love <fx@gnu.org>
parents:
diff changeset
18 int
Dave Love <fx@gnu.org>
parents:
diff changeset
19 XMenuAddPane(display, menu, label, active)
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 25858
diff changeset
20 Display *display;
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
21 register XMenu *menu; /* Menu object to be modified. */
Dave Love <fx@gnu.org>
parents:
diff changeset
22 register char *label; /* Selection label. */
Dave Love <fx@gnu.org>
parents:
diff changeset
23 int active; /* Make selection active? */
Dave Love <fx@gnu.org>
parents:
diff changeset
24 {
Dave Love <fx@gnu.org>
parents:
diff changeset
25 register XMPane *pane; /* Newly created pane. */
Dave Love <fx@gnu.org>
parents:
diff changeset
26 register XMSelect *select; /* Initial selection for the new pane. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 25858
diff changeset
27
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
28 int label_length; /* Label length in characters. */
Dave Love <fx@gnu.org>
parents:
diff changeset
29 int label_width; /* Label width in pixels. */
Dave Love <fx@gnu.org>
parents:
diff changeset
30
Dave Love <fx@gnu.org>
parents:
diff changeset
31 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
32 * Check for NULL pointers!
Dave Love <fx@gnu.org>
parents:
diff changeset
33 */
Dave Love <fx@gnu.org>
parents:
diff changeset
34 if (label == NULL) {
Dave Love <fx@gnu.org>
parents:
diff changeset
35 _XMErrorCode = XME_ARG_BOUNDS;
Dave Love <fx@gnu.org>
parents:
diff changeset
36 return(XM_FAILURE);
Dave Love <fx@gnu.org>
parents:
diff changeset
37 }
Dave Love <fx@gnu.org>
parents:
diff changeset
38
Dave Love <fx@gnu.org>
parents:
diff changeset
39 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
40 * Calloc the XMPane structure and the initial XMSelect.
Dave Love <fx@gnu.org>
parents:
diff changeset
41 */
Dave Love <fx@gnu.org>
parents:
diff changeset
42 pane = (XMPane *)calloc(1, sizeof(XMPane));
Dave Love <fx@gnu.org>
parents:
diff changeset
43 if (pane == NULL) {
Dave Love <fx@gnu.org>
parents:
diff changeset
44 _XMErrorCode = XME_CALLOC;
Dave Love <fx@gnu.org>
parents:
diff changeset
45 return(XM_FAILURE);
Dave Love <fx@gnu.org>
parents:
diff changeset
46 }
Dave Love <fx@gnu.org>
parents:
diff changeset
47 select = (XMSelect *)calloc(1, sizeof(XMSelect));
Dave Love <fx@gnu.org>
parents:
diff changeset
48 if (select == NULL) {
Dave Love <fx@gnu.org>
parents:
diff changeset
49 _XMErrorCode = XME_CALLOC;
Dave Love <fx@gnu.org>
parents:
diff changeset
50 return(XM_FAILURE);
Dave Love <fx@gnu.org>
parents:
diff changeset
51 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 25858
diff changeset
52
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
53 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
54 * Determine label size.
Dave Love <fx@gnu.org>
parents:
diff changeset
55 */
Dave Love <fx@gnu.org>
parents:
diff changeset
56 label_length = strlen(label);
Dave Love <fx@gnu.org>
parents:
diff changeset
57 label_width = XTextWidth(menu->p_fnt_info,
Dave Love <fx@gnu.org>
parents:
diff changeset
58 label,
Dave Love <fx@gnu.org>
parents:
diff changeset
59 label_length);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 25858
diff changeset
60
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
61 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
62 * Set up the initial selection.
Dave Love <fx@gnu.org>
parents:
diff changeset
63 * Values not explicitly set are zeroed by calloc.
Dave Love <fx@gnu.org>
parents:
diff changeset
64 */
Dave Love <fx@gnu.org>
parents:
diff changeset
65 select->next = select;
Dave Love <fx@gnu.org>
parents:
diff changeset
66 select->prev = select;
Dave Love <fx@gnu.org>
parents:
diff changeset
67 select->type = SL_HEADER;
Dave Love <fx@gnu.org>
parents:
diff changeset
68 select->serial = -1;
Dave Love <fx@gnu.org>
parents:
diff changeset
69 select->parent_p = pane;
Dave Love <fx@gnu.org>
parents:
diff changeset
70
Dave Love <fx@gnu.org>
parents:
diff changeset
71 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
72 * Fill the XMPane structure.
Dave Love <fx@gnu.org>
parents:
diff changeset
73 * X and Y position are set to 0 since a recompute will follow.
Dave Love <fx@gnu.org>
parents:
diff changeset
74 */
Dave Love <fx@gnu.org>
parents:
diff changeset
75 pane->type = PANE;
Dave Love <fx@gnu.org>
parents:
diff changeset
76 pane->active = active;
Dave Love <fx@gnu.org>
parents:
diff changeset
77 pane->serial = -1;
Dave Love <fx@gnu.org>
parents:
diff changeset
78 pane->label = label;
Dave Love <fx@gnu.org>
parents:
diff changeset
79 pane->label_width = label_width;
Dave Love <fx@gnu.org>
parents:
diff changeset
80 pane->label_length = label_length;
Dave Love <fx@gnu.org>
parents:
diff changeset
81 pane->s_list = select;
Dave Love <fx@gnu.org>
parents:
diff changeset
82
Dave Love <fx@gnu.org>
parents:
diff changeset
83 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
84 * Insert the pane at the end of the pane list.
Dave Love <fx@gnu.org>
parents:
diff changeset
85 */
Dave Love <fx@gnu.org>
parents:
diff changeset
86 emacs_insque(pane, menu->p_list->prev);
Dave Love <fx@gnu.org>
parents:
diff changeset
87
Dave Love <fx@gnu.org>
parents:
diff changeset
88 /*
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 25858
diff changeset
89 * Update the pane count.
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
90 */
Dave Love <fx@gnu.org>
parents:
diff changeset
91 menu->p_count++;
Dave Love <fx@gnu.org>
parents:
diff changeset
92
Dave Love <fx@gnu.org>
parents:
diff changeset
93 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
94 * Schedule a recompute.
Dave Love <fx@gnu.org>
parents:
diff changeset
95 */
Dave Love <fx@gnu.org>
parents:
diff changeset
96 menu->recompute = 1;
Dave Love <fx@gnu.org>
parents:
diff changeset
97
Dave Love <fx@gnu.org>
parents:
diff changeset
98 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
99 * Return the pane number just added.
Dave Love <fx@gnu.org>
parents:
diff changeset
100 */
Dave Love <fx@gnu.org>
parents:
diff changeset
101 _XMErrorCode = XME_NO_ERROR;
Dave Love <fx@gnu.org>
parents:
diff changeset
102 return((menu->p_count - 1));
Dave Love <fx@gnu.org>
parents:
diff changeset
103 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
104
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
105 /* arch-tag: 62a26021-f29d-48ba-96ef-3b6c4ebd6547
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
106 (do not change this comment) */