Mercurial > emacs
view src/commands.h @ 3075:878381e48b0d
* xfns.c: Clear out the old face stuff.
(x_face_table, n_faces, x_set_face, x_set_glyph, Fx_set_face_font,
Fx_set_face, Fx_get_face): Removed.
(syms_of_xfns): Remove defsubr for Fx_set_face.
Arrange for font names to get fully resolved - no wildcards.
* xfns.c (x_set_frame_parameters): Store the value in the frame
parameter alist before we call the setter function, so the setter
function can touch up the value if it chooses.
(x_set_foreground_color, x_set_background_color): Call
recompute_basic_faces, so their GC's will reflect the changes.
(x_new_font): Add extern declaration - this returns a Lisp_Object
now, the fully resolved font name.
(x_set_font): Accept the fully resolved name from x_new_font, and
put it in the frame's parameter alist. Call recompute_basic_faces.
* xterm.c (x_new_font): Return the fully resolved font name, Qnil
(if no match), or Qt (match, but unacceptable metrics).
* xterm.c (x_new_font): Don't call init_frame_faces.
* xterm.h: New section for declarations for xfaces.c.
(init_frame_faces, free_frame_faces, intern_face,
face_name_id_number, same_size_fonts, recompute_basic_faces,
compute_char_face, compute_glyph_face): Declare these here.
* xfaces.c (same_size_fonts): We can now remove this extern
declaration.
* xfns.c (face_name_id_number): Likewise.
* xterm.c (intern_face): Likewise.
* xfns.c (Fx_list_fonts): Remember that FACE may not have a font
specified. Don't specify 30000 as the maximum limit on the number
of fontns returned - 2000 is more reasonable.
Treat faces as structures specifying modifications to the frame's
parameters, rather than things which need to specify a complete
set of parameters by themselves.
* xfaces.c (init_frame_faces): Don't set up the two frame display
faces by querying the GC - just leave all their fields blank, and
call recompute_basic_faces, letting build_face do the work of
consulting the frame when necessary.
(recompute_basic_faces): New function.
(compute_base_faces): New function for obtaining the "identity"
for compute_char_face and compute_glyph_face.
(compute_char_face, compute_glyph_face): Call it, instead of copying
FRAME_DEFAULT_FACE.
* xfns.c (x_make_gc): No need to call init_frame_faces here.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Tue, 25 May 1993 14:03:41 +0000 |
parents | 04fb1d3d6992 |
children | 92f6b47e3e8d |
line wrap: on
line source
/* Definitions needed by most editing commands. Copyright (C) 1985 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #define Ctl(c) ((c)&037) /* Define the names of keymaps, just so people can refer to them in calls to initial_define_key */ extern Lisp_Object global_map; extern Lisp_Object meta_map; extern Lisp_Object control_x_map; /* Keymap for mouse commands. */ extern Lisp_Object Vglobal_mouse_map; extern Lisp_Object Vminibuffer_local_map; extern Lisp_Object Vminibuffer_local_ns_map; /* keymap used for minibuffers when doing completion */ extern Lisp_Object Vminibuffer_local_completion_map; /* keymap used for minibuffers when doing completion and require a match */ extern Lisp_Object Vminibuffer_local_must_match_map; /* Last character of last key sequence. */ extern Lisp_Object last_command_char; /* Last input character read as a command, not counting menus reached by the mouse. */ extern Lisp_Object last_nonmenu_event; /* List of command events to be re-read, or Qnil. */ extern Lisp_Object unread_command_events; /* If not Qnil, this is a switch-frame event which we decided to put off until the end of a key sequence. This should be read as the next command input, after any unread_command_events. read_key_sequence uses this to delay switch-frame events until the end of the key sequence; Fread_char uses it to put off switch-frame events until a non-ASCII event is acceptable as input. */ extern Lisp_Object unread_switch_frame; /* Previous command symbol found here for comparison */ extern Lisp_Object last_command; /* Nonzero means ^G can quit instantly */ extern int immediate_quit; extern Lisp_Object Vexecuting_macro; /* Nonzero if input is coming from the keyboard */ #define INTERACTIVE (NILP (Vexecuting_macro) && !noninteractive) /* Set this nonzero to force reconsideration of mode line. */ extern int update_mode_lines; /* Nonzero means reading single-character input with prompt so put cursor on minibuffer after the prompt. */ extern int cursor_in_echo_area;