Mercurial > hg > xemacs-beta
view src/frame-tty.c @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 19 Sep 2009 22:53:13 +0100 |
parents | e34711681f30 |
children | 308d34e9f07d |
line wrap: on
line source
/* TTY frame functions. Copyright (C) 1995, 1997 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 2002 Ben Wing. This file is part of XEmacs. XEmacs 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 2, or (at your option) any later version. XEmacs 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 XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Written by Ben Wing. Multi-frame support added by Hrvoje Niksic. */ #include <config.h> #include "lisp.h" #include "device-impl.h" #include "events.h" #include "frame-impl.h" #include "console-tty-impl.h" /* Default properties to use when creating frames. */ Lisp_Object Vdefault_tty_frame_plist; Lisp_Object Qframe_number, Qmake_frame_after_init_entry_point; static void tty_raise_frame (struct frame *); static void tty_init_frame_1 (struct frame *f, Lisp_Object UNUSED (props), int frame_name_is_defaulted) { struct device *d = XDEVICE (FRAME_DEVICE (f)); struct console *c = XCONSOLE (DEVICE_CONSOLE (d)); ++CONSOLE_TTY_DATA (c)->frame_count; f->order_count = CONSOLE_TTY_DATA (c)->frame_count; f->height = CONSOLE_TTY_DATA (c)->height; f->width = CONSOLE_TTY_DATA (c)->width; if (frame_name_is_defaulted) f->name = emacs_sprintf_string ("F%d", f->order_count); } static void tty_init_frame_3 (struct frame *f) { tty_raise_frame (f); } static void tty_select_frame_if_unhidden (Lisp_Object frame) { if (FRAME_REPAINT_P (XFRAME (frame))) select_frame_1 (frame); } static void tty_schedule_frame_select (struct frame *f) { Lisp_Object frame = wrap_frame (f); enqueue_magic_eval_event (tty_select_frame_if_unhidden, frame); } static void tty_after_init_frame (struct frame *f, int UNUSED (first_on_device), int first_on_console) { if (first_on_console) call1 (Qmake_frame_after_init_entry_point, FRAME_CONSOLE (f)); } /* Change from withdrawn state to mapped state. */ static void tty_make_frame_visible (struct frame *f) { if (!FRAME_VISIBLE_P (f)) { f->visible = -1; } } /* Change from mapped state to withdrawn state. */ static void tty_make_frame_invisible (struct frame *f) { f->visible = 0; } static void tty_make_frame_hidden (struct frame *f) { f->visible = -1; } static void tty_make_frame_unhidden (struct frame *f) { if (!FRAME_REPAINT_P (f)) { SET_FRAME_CLEAR (f); f->visible = 1; } } static int tty_frame_visible_p (struct frame *f) { return FRAME_VISIBLE_P (f); } static void tty_raise_frame_no_select (struct frame *f) { LIST_LOOP_2 (frame, DEVICE_FRAME_LIST (XDEVICE (FRAME_DEVICE (f)))) { struct frame *o = XFRAME (frame); if (o != f && FRAME_REPAINT_P (o)) { tty_make_frame_hidden (o); break; } } tty_make_frame_unhidden (f); } static void tty_raise_frame (struct frame *f) { tty_raise_frame_no_select (f); tty_schedule_frame_select (f); } static void tty_lower_frame (struct frame *f) { Lisp_Object frame_list = DEVICE_FRAME_LIST (XDEVICE (FRAME_DEVICE (f))); Lisp_Object tail, new_; if (!FRAME_REPAINT_P (f)) return; LIST_LOOP (tail, frame_list) { if (f == XFRAME (XCAR (tail))) break; } /* To lower this frame, another frame has to be raised. Return if there is no other frame. */ if (NILP (tail) && EQ (frame_list, tail)) return; tty_make_frame_hidden (f); if (CONSP (XCDR (tail))) new_ = XCAR (XCDR (tail)); else new_ = XCAR (frame_list); tty_make_frame_unhidden (XFRAME (new_)); tty_schedule_frame_select (XFRAME (new_)); } static void tty_delete_frame (struct frame *f) { struct device *d = XDEVICE (FRAME_DEVICE (f)); if (!NILP (DEVICE_SELECTED_FRAME (d))) tty_raise_frame (XFRAME (DEVICE_SELECTED_FRAME (d))); } static Lisp_Object tty_frame_property (struct frame *f, Lisp_Object property) { if (EQ (Qframe_number, property)) return make_int (f->order_count); return Qunbound; } static int tty_internal_frame_property_p (struct frame *UNUSED (f), Lisp_Object property) { return EQ (property, Qframe_number); } static Lisp_Object tty_frame_properties (struct frame *f) { Lisp_Object props = Qnil; props = cons3 (Qframe_number, make_int (f->order_count), props); return props; } /************************************************************************/ /* initialization */ /************************************************************************/ void console_type_create_frame_tty (void) { CONSOLE_HAS_METHOD (tty, init_frame_1); CONSOLE_HAS_METHOD (tty, init_frame_3); CONSOLE_HAS_METHOD (tty, after_init_frame); CONSOLE_HAS_METHOD (tty, make_frame_visible); CONSOLE_HAS_METHOD (tty, make_frame_invisible); CONSOLE_HAS_METHOD (tty, frame_visible_p); CONSOLE_HAS_METHOD (tty, raise_frame); CONSOLE_HAS_METHOD (tty, lower_frame); CONSOLE_HAS_METHOD (tty, delete_frame); CONSOLE_HAS_METHOD (tty, frame_property); CONSOLE_HAS_METHOD (tty, internal_frame_property_p); CONSOLE_HAS_METHOD (tty, frame_properties); } void syms_of_frame_tty (void) { DEFSYMBOL (Qframe_number); DEFSYMBOL (Qmake_frame_after_init_entry_point); } void vars_of_frame_tty (void) { DEFVAR_LISP ("default-tty-frame-plist", &Vdefault_tty_frame_plist /* Plist of default frame-creation properties for tty frames. These are in addition to and override what is specified in `default-frame-plist', but are overridden by the arguments to the particular call to `make-frame'. */ ); Vdefault_tty_frame_plist = Qnil; tty_console_methods->device_specific_frame_props = &Vdefault_tty_frame_plist; /* Tty frames are now supported. Advertise a feature to indicate this. */ Fprovide (intern ("tty-frames")); }