Mercurial > emacs
annotate src/commands.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 |
---|---|
239 | 1 /* Definitions needed by most editing commands. |
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) 1985, 1994, 2001, 2002, 2003, 2004, |
79759 | 3 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
239 | 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) |
239 | 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. */ | |
239 | 21 |
22 | |
23 #define Ctl(c) ((c)&037) | |
24 | |
3886
92f6b47e3e8d
* keyboard.c (menu_bar_items, read_key_sequence): Use
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
25 /* Define the names of keymaps, just so people can refer to them in |
92f6b47e3e8d
* keyboard.c (menu_bar_items, read_key_sequence): Use
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
26 calls to initial_define_key. These should *not* be used after |
92f6b47e3e8d
* keyboard.c (menu_bar_items, read_key_sequence): Use
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
27 initialization; use-global-map doesn't affect these; it sets |
92f6b47e3e8d
* keyboard.c (menu_bar_items, read_key_sequence): Use
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
28 current_global_map instead. */ |
239 | 29 extern Lisp_Object global_map; |
30 extern Lisp_Object meta_map; | |
31 extern Lisp_Object control_x_map; | |
32 | |
33 extern Lisp_Object Vminibuffer_local_map; | |
34 | |
35 extern Lisp_Object Vminibuffer_local_ns_map; | |
36 | |
37 /* keymap used for minibuffers when doing completion */ | |
38 extern Lisp_Object Vminibuffer_local_completion_map; | |
39 | |
67258
a68df09a8a34
(Vminibuffer_local_filename_completion_map): Declare a new keymap for
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
40 /* keymap used for minibuffers when doing completion in filenames*/ |
a68df09a8a34
(Vminibuffer_local_filename_completion_map): Declare a new keymap for
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
41 extern Lisp_Object Vminibuffer_local_filename_completion_map; |
a68df09a8a34
(Vminibuffer_local_filename_completion_map): Declare a new keymap for
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
42 |
239 | 43 /* keymap used for minibuffers when doing completion and require a match */ |
44 extern Lisp_Object Vminibuffer_local_must_match_map; | |
45 | |
67258
a68df09a8a34
(Vminibuffer_local_filename_completion_map): Declare a new keymap for
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
46 /* keymap used for minibuffers when doing completion in filenames |
a68df09a8a34
(Vminibuffer_local_filename_completion_map): Declare a new keymap for
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
47 and require a match */ |
a68df09a8a34
(Vminibuffer_local_filename_completion_map): Declare a new keymap for
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
48 extern Lisp_Object Vminibuffer_local_must_match_filename_map; |
a68df09a8a34
(Vminibuffer_local_filename_completion_map): Declare a new keymap for
Eli Zaretskii <eliz@gnu.org>
parents:
64770
diff
changeset
|
49 |
239 | 50 /* Last character of last key sequence. */ |
51 extern Lisp_Object last_command_char; | |
52 | |
1080 | 53 /* Last input character read as a command, not counting menus |
54 reached by the mouse. */ | |
55 extern Lisp_Object last_nonmenu_event; | |
56 | |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1587
diff
changeset
|
57 /* List of command events to be re-read, or Qnil. */ |
7171
945fd4c43a14
(Vunread_command_events): Renamed.
Richard M. Stallman <rms@gnu.org>
parents:
6536
diff
changeset
|
58 extern Lisp_Object Vunread_command_events; |
1587
57ae5625fe22
* commands.h (unread_command_event): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1507
diff
changeset
|
59 |
8273
cd8665daa5a8
(unread_command_char): Declared.
Richard M. Stallman <rms@gnu.org>
parents:
7331
diff
changeset
|
60 /* Command char event to be re-read, or -1 if none. |
cd8665daa5a8
(unread_command_char): Declared.
Richard M. Stallman <rms@gnu.org>
parents:
7331
diff
changeset
|
61 Setting this is obsolete, but some things should still check it. */ |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
22967
diff
changeset
|
62 extern EMACS_INT unread_command_char; |
8273
cd8665daa5a8
(unread_command_char): Declared.
Richard M. Stallman <rms@gnu.org>
parents:
7331
diff
changeset
|
63 |
6536
4fa1c2b2f1e9
(this_command, last_command): Declared.
Richard M. Stallman <rms@gnu.org>
parents:
6179
diff
changeset
|
64 /* The command being executed by the command loop. |
12162
f670e669470b
(last_command): Var deleted; now part of struct kboard.
Karl Heuer <kwzh@gnu.org>
parents:
8273
diff
changeset
|
65 Commands may set this, and the value set will be copied into |
f670e669470b
(last_command): Var deleted; now part of struct kboard.
Karl Heuer <kwzh@gnu.org>
parents:
8273
diff
changeset
|
66 current_kboard->Vlast_command instead of the actual command. */ |
22967
63801d5488f4
(Vthis_command): Renamed from this_command.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
67 extern Lisp_Object Vthis_command; |
6536
4fa1c2b2f1e9
(this_command, last_command): Declared.
Richard M. Stallman <rms@gnu.org>
parents:
6179
diff
changeset
|
68 |
1587
57ae5625fe22
* commands.h (unread_command_event): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1507
diff
changeset
|
69 /* If not Qnil, this is a switch-frame event which we decided to put |
57ae5625fe22
* commands.h (unread_command_event): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1507
diff
changeset
|
70 off until the end of a key sequence. This should be read as the |
7171
945fd4c43a14
(Vunread_command_events): Renamed.
Richard M. Stallman <rms@gnu.org>
parents:
6536
diff
changeset
|
71 next command input, after any Vunread_command_events. |
1587
57ae5625fe22
* commands.h (unread_command_event): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1507
diff
changeset
|
72 |
57ae5625fe22
* commands.h (unread_command_event): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1507
diff
changeset
|
73 read_key_sequence uses this to delay switch-frame events until the |
57ae5625fe22
* commands.h (unread_command_event): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1507
diff
changeset
|
74 end of the key sequence; Fread_char uses it to put off switch-frame |
57ae5625fe22
* commands.h (unread_command_event): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1507
diff
changeset
|
75 events until a non-ASCII event is acceptable as input. */ |
57ae5625fe22
* commands.h (unread_command_event): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
1507
diff
changeset
|
76 extern Lisp_Object unread_switch_frame; |
239 | 77 |
67831
5cb0abe0420f
(last_point_position_window): Declare.
Richard M. Stallman <rms@gnu.org>
parents:
67258
diff
changeset
|
78 /* The value of point when the last command was started. */ |
6179
e2bb2d0b8a00
New variable last_point_position.
Karl Heuer <kwzh@gnu.org>
parents:
3886
diff
changeset
|
79 extern int last_point_position; |
e2bb2d0b8a00
New variable last_point_position.
Karl Heuer <kwzh@gnu.org>
parents:
3886
diff
changeset
|
80 |
7331
18bc27b97236
(last_point_position_buffer): Declared.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
81 /* The buffer that was current when the last command was started. */ |
18bc27b97236
(last_point_position_buffer): Declared.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
82 extern Lisp_Object last_point_position_buffer; |
18bc27b97236
(last_point_position_buffer): Declared.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
83 |
67831
5cb0abe0420f
(last_point_position_window): Declare.
Richard M. Stallman <rms@gnu.org>
parents:
67258
diff
changeset
|
84 /* The window that was selected when the last command was started. */ |
5cb0abe0420f
(last_point_position_window): Declare.
Richard M. Stallman <rms@gnu.org>
parents:
67258
diff
changeset
|
85 extern Lisp_Object last_point_position_window; |
5cb0abe0420f
(last_point_position_window): Declare.
Richard M. Stallman <rms@gnu.org>
parents:
67258
diff
changeset
|
86 |
239 | 87 /* Nonzero means ^G can quit instantly */ |
88 extern int immediate_quit; | |
89 | |
61981
8131d95ff037
(Vexecuting_kbd_macro): Declare instead of Vexecuting_macro.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
90 extern Lisp_Object Vexecuting_kbd_macro; |
239 | 91 |
92 /* Nonzero if input is coming from the keyboard */ | |
93 | |
61981
8131d95ff037
(Vexecuting_kbd_macro): Declare instead of Vexecuting_macro.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
94 #define INTERACTIVE (NILP (Vexecuting_kbd_macro) && !noninteractive) |
239 | 95 |
96 /* Set this nonzero to force reconsideration of mode line. */ | |
97 | |
98 extern int update_mode_lines; | |
99 | |
100 /* Nonzero means reading single-character input with prompt | |
101 so put cursor on minibuffer after the prompt. */ | |
102 | |
103 extern int cursor_in_echo_area; | |
52401 | 104 |
105 /* arch-tag: 4f7ca0b7-6a56-4b20-8bf5-b67a99921d1d | |
106 (do not change this comment) */ |