Mercurial > emacs
view leim/quail/indian.el @ 83004:7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
lib-src/emacsclient.c (window_change_signal): Renamed to pass_signal_to_emacs.
(init_signal): Pass SIGINT and SIGQUIT to the emacs process.
lisp/faces.el (face-valid-attribute-values): Use the window-system
function, not the variable.
(read-face-attribute, face-spec-set-match-display, frame-set-background-mode)
(face-set-after-frame-default): Ditto.
lisp/frame.el (make-frame-on-tty): Added interactive declaration
(suggested by Robert J. Chassell). Use tty-create-frame-with-faces,
not make-terminal-frame.
src/termhooks.h (struct display_method): Renamed to display for brevity.
(struct display): Added all display hook variables as members of this structure.
Added next_display, reference_count, type and display_info components.
(FRAME_MUST_WRITE_SPACES, FRAME_FAST_CLEAR_END_OF_LINE, FRAME_LINE_INS_DEL_OK)
(FRAME_CHAR_INS_DEL_OK, FRAME_SCROLL_REGION_OK, FRAME_SCROLL_REGION_COST)
(FRAME_MEMORY_BELOW_FRAME, FRAME_RIF): Updated for struct display.
(FRAME_DISPLAY): New macro.
(create_display, delete_display): New prototypes.
src/frame.h (struct frame): Added `display' member, removed display_method.
(FRAME_LIVE_P): Look at f->display, not f->output_data.
src/termchar.h (struct tty_display_info): Removed display_method component.
(FRAME_TTY): Use the display structure, not output_data.
src/term.c (display_list): New variable.
(cursor_to_hook, raw_cursor_to_hook, clear_to_end_hook, clear_frame_hook)
(clear_end_of_line_hook, ins_del_lines_hook, delete_glyphs_hook)
(ring_bell_hook, reset_terminal_modes_hook, set_terminal_modes_hook)
(update_begin_hook, update_end_hook, set_terminal_window_hook)
(insert_glyphs_hook, write_glyphs_hook, delete_glyphs_hoo, read_socket_hook)
(frame_up_to_date_hook, mouse_position_hook, frame_rehighlight_hook)
(frame_raise_lower_hook, set_vertical_scroll_bar_hook, condemn_scroll_bars_hook)
(redeem_scroll_bar_hook, judge_scroll_bars_hook): Moved to struct display.
(tty_display_method_template): Removed.
(syms_of_term): Don't initialize tty_display_method_template.
(ring_bell, set_terminal_modes, reset_terminal_modes, update_begin)
(update_end, set_terminal_window, cursor_to, raw_cursor_to, clear_to_end)
(clear_frame, clear_end_of_line, write_glyphs, insert_glyphs)
(delete_glyphs, ins_del_lines): Access display hooks through the frame pointer.
(Ftty_display_color_p): Use the frame given as a parameter, or else return nil.
(Ftty_display_color_cells): Ditto.
(get_named_tty): Renamed to get_named_tty_display, changed return type to struct display.
(term_dummy_init): Renamed to initial_term_init. Create and return an initial display.
(term_init): Initialize a new struct display and return a pointer to
it instead of tty_display_info. Removed frame initialization kludge.
(Fdelete_tty): Updated for struct display.
(delete_tty): The parameter type is now struct display, not tty_display_info.
Delete the display, too.
(create_tty_output): New function for creating tty_output structures.
(delete_tty_output): New function for deleting tty_output structures.
(create_display): New function for creating and registering display structures.
(delete_display): New function for deleting and unregistering display structures.
src/dispextern.h: Updated prototypes.
src/dispnew.c: Include frame.h before termhooks.h.
(init_display): Updated term_init call to new signature.
src/emacs.c: Include frame.h (for termhooks.h).
src/keymap.c: Ditto.
src/lread.c: Ditto.
src/xsmfns.c: Ditto.
src/process.c: Include frame.h before termhooks.h.
src/frame.c (Fwindow_system): New function.
(syms_of_frame): Initialize it.
(make_terminal_frame): Open the terminal device before creating the new frame.
Disable scrollbars here, term_init cannot do that anymore.
(Fdelete_frame): Use the new delete_frame_hook, don't do display-specific
frame deletion here. Ditto for delete_display_hook.
(Fmouse_position, Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus): Access display hooks through the frame pointer.
src/keyboard.c: Include frame.h before termhooks.h.
(start_polling, input_polling_used, stop_polling, gobble_input): Ignore read_socket_hook.
(kbd_buffer_get_event, Fset_input_mode): Access display hooks through the frame pointer.
(read_avail_input): Loop through all display devices for and call all read_socket_hook functions. Check ttys even if read_socket_hook returned an error.
src/sysdep.c (discard_tty_input): Ignore read_socket_hook.
(stuff_char): Don't do anything if the current frame is not on a termcap display.
(request_sigio, unrequest_sigio): Ignore read_socket_hook.
(init_sys_modes): Always call narrow_foreground_group. Set up terminal modes and sigio even under X.
src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window): Access display hooks through the frame pointer.
(echo_area_display): Don't be afraid of termcap frames during an X+tty combo session.
src/xfaces.c: Include termhooks.h.
(Ftty_supports_face_attributes_p): Use the given frame, not selected_frame.
src/xfns.c (x_set_scroll_bar_foreground, x_set_scroll_bar_background): Access display hooks through the frame pointer.
(Fx_create_frame, x_create_tip_frame): Initialize the frame's display structure.
src/xmenu.c: Include termhooks.h after frame.h.
src/xselect.c (x_own_selection, some_frame_on_display, x_get_foreign_selection)
(Fx_disown_selection_internal, Fx_get_cut_buffer_internal)
(Fx_store_cut_buffer_internal, Fx_rotate_cut_buffers_internal): Don't do anything
if the selected frame is not an X frame.
src/xterm.c (x_display_method): Removed.
(x_create_frame_display, x_delete_frame_display): New functions for handling struct display objects.
(x_term_init): Set up a new struct display object, too.
(x_delete_display): Delete the struct display corresponding to the X display.
(x_initialize): Moved hook initialization to x_create_frame_display.
src/xterm.h (x_display_method): Removed.
(struct x_display_info): Added frame_display component.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-44
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 05 Jan 2004 05:54:35 +0000 |
parents | 695cf19ef79e |
children | 23a17af379b1 375f2633d815 |
line wrap: on
line source
;;; indian.el --- Quail packages for inputting Indian ;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. ;; Author: KAWABATA, Taichi <kawabata@m17n.org> ;; Keywords: multilingual, input method, Indian, Devanagari ;; 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 2, 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, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; History: ;; 2000.12.12 ;; Totally re-written from devanagari.el to handle multiple Indian Scripts. ;;; Code: (require 'quail) (require 'devan-util) (require 'ind-util) (defun quail-indian-preceding-char-position (position) "Return the position of preceding composite character." (let (prec-composed) (if (char-valid-p (char-before position)) ;; range o.k. (if (setq prec-composed (find-composition (1- position))) (car prec-composed) (1- position)) nil))) (defvar quail-indian-update-preceding-char nil) (make-variable-frame-local 'quail-indian-update-preceding-char) ;; Input value :: ;; CONTROL-FLAG is integer `n' ;; quail-current-key :: keyboard input. ;; Only first `n' can be translated. ;; quail-current-str :: corresonding string. ;; jobs :: (1) put last (len-n) char to unrread-command-event. ;; (2) put translated string to quail-current-str. ;; ;; CONTROL-FLAG is t (terminate) or nil (proceed the translation) ;; quail-current-key :: keyboard input. ;; quail-current-str :: corresponding string. ;; jobs :: (1) put modified translated string to quail-current-str. ;; ;; When non-nil value is returned from quail-translation-update-function, ;; the quail-current-str is split to characters and put into event queue, ;; with `compose-last-char' event with composition info at the end. (defun quail-indian-update-translation (control-flag) ;; make quail-current-str string when possible. (if (char-valid-p quail-current-str) (setq quail-current-str (char-to-string quail-current-str))) ;(message "\n input control-flag=%s, str=%s, key=%s q-ind-upd-prec-char=%s" ; control-flag quail-current-str quail-current-key ; quail-indian-update-preceding-char) ;; reset quail-indian-update-preceding-char if it's initial. (if (= (overlay-start quail-overlay) (overlay-end quail-overlay)) (setq quail-indian-update-preceding-char nil)) ;; Check the preceding character of the quail region. If the ;; preceding character can be composed with quail-current-str, then ;; grab that preceding character into the quail-current-str and ;; remove that char from the region. (let* (prec-char-position composition-regexp prec-char-str candidate-str match-pos match-end) (when (and quail-current-str (null quail-indian-update-preceding-char) (null input-method-use-echo-area) (null input-method-exit-on-first-char) (setq prec-char-position (quail-indian-preceding-char-position (overlay-start quail-overlay))) (setq composition-regexp (if prec-char-position (caar (elt composition-function-table (char-after prec-char-position))))) (setq prec-char-str (buffer-substring prec-char-position (overlay-start quail-overlay)) candidate-str (concat prec-char-str quail-current-str) match-pos (string-match composition-regexp candidate-str) match-end (match-end 0)) (> match-end (length prec-char-str))) (setq quail-indian-update-preceding-char prec-char-str) (delete-region prec-char-position (overlay-start quail-overlay)))) (setq quail-current-str (indian-compose-string (concat quail-indian-update-preceding-char quail-current-str))) (if (numberp control-flag) (setq unread-command-events (string-to-list (substring quail-current-key control-flag)))) (when control-flag (setq quail-indian-update-preceding-char nil)) ;(message "output control-flag=%s, str=%s, key=%s q-ind-upd-prec-char=%s" ; control-flag quail-current-str quail-current-key ; quail-indian-update-preceding-char) control-flag) ;;; ;;; Input by transliteration ;;; (defun quail-define-indian-trans-package (hashtbls pkgname lang title doc) (funcall 'quail-define-package pkgname lang title t doc nil nil nil nil nil nil t nil 'quail-indian-update-translation) (maphash (lambda (key val) (quail-defrule key (if (= (length val) 1) (string-to-char val) (vector val)))) (cdr hashtbls))) ;; This needs to be seen by quail-update-leim-list-file, but cannot be ;; commented out because quail-update-leim-list-file ignores ;; commented-out lines. (if nil (quail-define-package "devanagari-itrans" "Devanagari" "DevIT" t "Devanagari ITRANS")) (quail-define-indian-trans-package indian-dev-itrans-v5-hash "devanagari-itrans" "Devanagari" "DevIT" "Devanagari transliteration by ITRANS method.") (if nil (quail-define-package "devanagari-kyoto-harvard" "Devanagari" "DevKH" t "Devanagari Kyoto-Harvard")) (quail-define-indian-trans-package indian-dev-kyoto-harvard-hash "devanagari-kyoto-harvard" "Devanagari" "DevKH" "Devanagari transliteration by Kyoto-Harvard method.") (if nil (quail-define-package "devanagari-aiba" "Devanagari" "DevAB" t "Devanagari Aiba")) (quail-define-indian-trans-package indian-dev-aiba-hash "devanagari-aiba" "Devanagari" "DevAB" "Devanagari transliteration by Aiba-method.") (if nil (quail-define-package "punjabi-itrans" "Punjabi" "PnjIT" t "Punjabi ITRANS")) (quail-define-indian-trans-package indian-pnj-itrans-v5-hash "punjabi-itrans" "Punjabi" "PnjIT" "Punjabi transliteration by ITRANS method.") (if nil (quail-define-package "gujarati-itrans" "Gujarati" "GjrIT" t "Gujarati ITRANS")) (quail-define-indian-trans-package indian-gjr-itrans-v5-hash "gujarati-itrans" "Gujarati" "GjrIT" "Gujarati transliteration by ITRANS method.") (if nil (quail-define-package "oriya-itrans" "Oriya" "OriIT" t "Oriya ITRANS")) (quail-define-indian-trans-package indian-ori-itrans-v5-hash "oriya-itrans" "Oriya" "OriIT" "Oriya transliteration by ITRANS method.") (if nil (quail-define-package "bengali-itrans" "Bengali" "BngIT" t "Bengali ITRANS")) (quail-define-indian-trans-package indian-bng-itrans-v5-hash "bengali-itrans" "Bengali" "BngIT" "Bengali transliteration by ITRANS method.") (if nil (quail-define-package "assamese-itrans" "Assamese" "AsmIT" t "Assamese ITRANS")) (quail-define-indian-trans-package indian-asm-itrans-v5-hash "assamese-itrans" "Assamese" "AsmIT" "Assamese transliteration by ITRANS method.") (if nil (quail-define-package "telugu-itrans" "Telugu" "TlgIT" t "Telugu ITRANS")) (quail-define-indian-trans-package indian-tlg-itrans-v5-hash "telugu-itrans" "Telugu" "TlgIT" "Telugu transliteration by ITRANS method.") (if nil (quail-define-package "kannada-itrans" "Kannada" "KndIT" t "Kannada ITRANS")) (quail-define-indian-trans-package indian-knd-itrans-v5-hash "kannada-itrans" "Kannada" "KndIT" "Kannada transliteration by ITRANS method.") (if nil (quail-define-package "malayalam-itrans" "Malayalam" "MlmIT" t "Malayalam ITRANS")) (quail-define-indian-trans-package indian-mlm-itrans-v5-hash "malayalam-itrans" "Malayalam" "MlmIT" "Malayalam transliteration by ITRANS method.") (if nil (quail-define-package "tamil-itrans" "Tamil" "TmlIT" t "Tamil ITRANS")) (quail-define-indian-trans-package indian-tml-itrans-v5-hash "tamil-itrans" "Tamil" "TmlIT" "Tamil transliteration by ITRANS method.") ;;; ;;; Input by Inscript ;;; (defun quail-indian-flatten-list (lst) "Flatten the nested LIST so that there would be no innner list." (if (listp lst) (apply 'append (mapcar 'quail-indian-flatten-list lst)) (list lst))) (defun quail-define-inscript-package (char-table key-table pkgname lang title docstring) (setq char-table (quail-indian-flatten-list char-table)) (setq key-table (quail-indian-flatten-list key-table)) (funcall 'quail-define-package pkgname lang title nil docstring nil nil nil nil nil nil nil nil 'quail-indian-update-translation) (dolist (key key-table) (let ((val (pop char-table))) (if (and key val) (quail-defrule (if (char-valid-p key) (char-to-string key) key) (if (stringp val) (vector val) val)))))) ;; (defvar inscript-dev-keytable '( (;; VOWELS (18) (?D nil) (?E ?e) (?F ?f) (?R ?r) (?G ?g) (?T ?t) (?+ ?=) ("F]" "f]") (?! ?@) (?Z ?z) (?S ?s) (?W ?w) (?| ?\\) (?~ ?`) (?A ?a) (?Q ?q) ("+]" "=]") ("R]" "r]")) (;; CONSONANTS (42) ?k ?K ?i ?I ?U ;; GRUTTALS ?\; ?: ?p ?P ?} ;; PALATALS ?' ?\" ?\[ ?{ ?C ;; CEREBRALS ?l ?L ?o ?O ?v ?V ;; DENTALS ?h ?H ?y ?Y ?c ;; LABIALS ?/ ?j ?J ?n ?N "N]" ?b ;; SEMIVOWELS ?M ?< ?m ?u ;; SIBILANTS "k]" "K]" "i]" "p]" "[]" "{]" "H]" "/]" ;; NUKTAS ?% ?&) (;; Misc Symbols (7) ?X ?x ?_ ">]" ?d "X]" ?>) (;; Digits ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9) (;; Inscripts ?# ?$ ?^ ?* ?\]))) (if nil (quail-define-package "devanagari-inscript" "Devanagari" "DevIS" t "Devanagari keyboard Inscript")) (quail-define-inscript-package indian-dev-base-table inscript-dev-keytable "devanagari-inscript" "Devanagari" "DevIS" "Devanagari keyboard Inscript.") (if nil (quail-define-package "punjabi-inscript" "Punjabi" "PnjIS" t "Punjabi keyboard Inscript")) (quail-define-inscript-package indian-pnj-base-table inscript-dev-keytable "punjabi-inscript" "Punjabi" "PnjIS" "Punjabi keyboard Inscript.") (if nil (quail-define-package "gujarati-inscript" "Gujarati" "GjrIS" t "Gujarati keyboard Inscript")) (quail-define-inscript-package indian-gjr-base-table inscript-dev-keytable "gujarati-inscript" "Gujarati" "GjrIS" "Gujarati keyboard Inscript.") (if nil (quail-define-package "oriya-inscript" "Oriya" "OriIS" t "Oriya keyboard Inscript")) (quail-define-inscript-package indian-ori-base-table inscript-dev-keytable "oriya-inscript" "Oriya" "OriIS" "Oriya keyboard Inscript.") (if nil (quail-define-package "bengali-inscript" "Bengali" "BngIS" t "Bengali keyboard Inscript")) (quail-define-inscript-package indian-bng-base-table inscript-dev-keytable "bengali-inscript" "Bengali" "BngIS" "Bengali keyboard Inscript.") (if nil (quail-define-package "assamese-inscript" "Assamese" "AsmIS" t "Assamese keyboard Inscript")) (quail-define-inscript-package indian-asm-base-table inscript-dev-keytable "assamese-inscript" "Assamese" "AsmIS" "Assamese keyboard Inscript.") (if nil (quail-define-package "telugu-inscript" "Telugu" "TlgIS" t "Telugu keyboard Inscript")) (quail-define-inscript-package indian-dev-base-table inscript-dev-keytable "telugu-inscript" "Telugu" "TlgIS" "Telugu keyboard Inscript.") (if nil (quail-define-package "kannada-inscript" "Kannada" "KndIS" t "Kannada keyboard Inscript")) (quail-define-inscript-package indian-knd-base-table inscript-dev-keytable "kannada-inscript" "Kannada" "KndIS" "Kannada keyboard Inscript.") (if nil (quail-define-package "malayalam-inscript" "Malayalam" "MlmIS" t "Malayalam keyboard Inscript")) (quail-define-inscript-package indian-mlm-base-table inscript-dev-keytable "malayalam-inscript" "Malayalam" "MlmIS" "Malayalam keyboard Inscript.") (if nil (quail-define-package "tamil-inscript" "Tamil" "TmlIS" t "Tamil keyboard Inscript")) (quail-define-inscript-package indian-tml-base-table inscript-dev-keytable "tamil-inscript" "Tamil" "TmlIS" "Tamil keyboard Inscript.") ;;; arch-tag: 9e5a621e-f7d5-4fce-9543-0a51b407c940 ;;; indian.el ends here