Mercurial > hg > xemacs-beta
annotate lisp/mule/mule-composite-stub.el @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 09 Jul 2008 20:46:22 +0200 |
| parents | 2923009caf47 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 778 | 1 ;;; mule-composite-stub.el --- Stubs of composition support -*- coding: iso-2022-7bit; -*- |
| 2 | |
| 3 ;; Copyright (C) 2002 Ben Wing. | |
| 4 | |
| 5 ;; Keywords: multibyte character, composition | |
| 6 | |
| 7 ;; This file is part of XEmacs. | |
| 8 | |
| 9 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 10 ;; under the terms of the GNU General Public License as published by | |
| 11 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 12 ;; any later version. | |
| 13 | |
| 14 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 15 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 17 ;; General Public License for more details. | |
| 18 | |
| 19 ;; You should have received a copy of the GNU General Public License | |
| 20 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 21 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 22 ;; 02111-1307, USA. | |
| 23 | |
| 24 ;;; Synched up with: Emacs 21.1 (src/fontset.c, src/composite.c). | |
| 25 | |
| 26 ;;; Commentary: | |
| 27 | |
| 28 ;;; Code: | |
| 29 | |
| 30 (defvar use-default-ascent (make-char-table 'generic) | |
| 31 "UNIMPLEMENTED. | |
| 32 Char table of characters whose ascent values should be ignored. | |
| 33 If an entry for a character is non-nil, the ascent value of the glyph | |
| 34 is assumed to be what specified by _MULE_DEFAULT_ASCENT property of a font. | |
| 35 | |
| 36 This affects how a composite character which contains | |
| 37 such a character is displayed on screen.") | |
| 38 | |
| 39 (defvar ignore-relative-composition (make-char-table 'generic) | |
| 40 "UNIMPLEMENTED. | |
| 41 Char table of characters which is not composed relatively. | |
| 42 If an entry for a character is non-nil, a composition sequence | |
| 43 which contains that character is displayed so that | |
| 44 the glyph of that character is put without considering | |
| 45 an ascent and descent value of a previous character.") | |
| 46 | |
| 47 (defvar compose-chars-after-function 'compose-chars-after | |
| 48 "UNIMPLEMENTED. | |
| 49 Function to adjust composition of buffer text. | |
| 50 | |
| 51 The function is called with three arguments FROM, TO, and OBJECT. | |
| 52 FROM and TO specify the range of text of which composition should be | |
| 53 adjusted. OBJECT, if non-nil, is a string that contains the text. | |
| 54 | |
| 55 This function is called after a text with `composition' property is | |
| 56 inserted or deleted to keep `composition' property of buffer text | |
| 57 valid. | |
| 58 | |
| 59 The default value is the function `compose-chars-after'.") | |
| 60 | |
| 61 (defvar composition-function-table (make-char-table 'generic) | |
| 62 "UNIMPLEMENTED. | |
| 63 Char table of patterns and functions to make a composition. | |
| 64 | |
| 65 Each element is nil or an alist of PATTERNs vs FUNCs, where PATTERNs | |
| 66 are regular expressions and FUNCs are functions. FUNC is responsible | |
| 67 for composing text matching the corresponding PATTERN. FUNC is called | |
| 68 with three arguments FROM, TO, and PATTERN. See the function | |
| 69 `compose-chars-after' for more detail. | |
| 70 | |
| 71 This table is looked up by the first character of a composition when | |
| 72 the composition gets invalid after a change in a buffer.") | |
| 73 | |
| 74 (defun compose-region-internal (start end &optional components mod-func) | |
| 75 "UNIMPLEMENTED. | |
| 76 Internal use only. | |
| 77 | |
| 78 Compose text in the region between START and END. | |
| 79 Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC | |
| 80 for the composition. See `compose-region' for more detial." | |
| 81 nil) | |
| 82 | |
| 83 (defun compose-string-internal (string start end &optional components mod-func) | |
| 84 "UNIMPLEMENTED. | |
| 85 Internal use only. | |
| 86 | |
| 87 Compose text between indices START and END of STRING. | |
| 88 Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC | |
| 89 for the composition. See `compose-string' for more detial." | |
| 90 nil) | |
| 91 | |
| 92 (defun find-composition-internal (pos limit string detail-p) | |
| 93 "UNIMPLEMENTED. | |
| 94 Internal use only. | |
| 95 | |
| 96 Return information about composition at or nearest to position POS. | |
| 97 See `find-composition' for more detail." | |
| 98 nil) |