Mercurial > emacs
view leim/quail/indian.el @ 51207:7e176ef34c10
Make (many) trivial substitutions for renamed and
new macros in dispextern.h, frame.h and window.h.
(make_window): Initialize new members
left_margin_cols, right_margin_cols, left_fringe_width,
right_fringe_width, fringes_outside_margins, scroll_bar_width,
and vertical_scroll_bar_type.
(coordinates_in_window): Adapted to new fringe/margin positions
and per-window fringes and scroll-bars.
Fix bug related to incorrectly adjusting coordinates by
frame's internal_border_width (the effect normally negible since
the internal_border_width is typically 0 or 1 pixel, but very
noticeable for an internal_border_width of e.g. 25 pixels).
Upon successful return (other than ON_NOTHING), the coordinates
are now always properly converted to window relative for the
given display element.
(window_from_coordinates): Add new parameters wx and wy to
return the window relative x and y position in the returned
window and part. A null arg means, don't return the position.
All callers changed.
(adjust_window_margins): New function which may reduce the width
of the display margins if a window's text area is too small after
resizing or splitting windows.
(size_window): Fix bug that did not account for display margin
widths when checking the minimum width of a window; use
adjust_window_margins.
(set_window_buffer): Call Fset_window_fringes and
Fset_window_scroll_bars to setup per-window elements.
Add new arg KEEP_MARGINS_P. Non-nil means to keep window's
existing display margin, fringe widths, and scroll bar settings
(e.g. after splitting a window or resizing the frame). All
callers changed.
(Fset_window_buffer): New arg KEEP_MARGINS. All callers changed.
(Fsplit_window): Duplicate original window's display margin,
fringe, and scroll-bar settings; then call Fset_window_buffer with
KEEP_MARGINS non-nil. This fixes a bug which caused a split
window to only preserve the display margins in one of the windows.
When splitting horisontally, call adjust_window_margins on both
windows to ensure that the text area of the new windows is non too
narrow. This fixes a bug which could cause emacs to trap if the
width of the split window was less than the width of the display
margins.
(window_box_text_cols): Renamed from window_internal_width. All
uses changed. Adapt to per-window fringes and scroll bars.
Fix bug that caused vertical separator to be subtracted also on
window frames. Fix another bug that did not reduce the returned
value by the columns used for display margins.
(window_scroll_line_based): Fix bug related to scrolling too much
when display margins are present (implicitly fixed by the fix to
window_box_text_cols).
(scroll_left, scroll_right): Fix bug related to scrolling too far
by default when display margins are present (implicitly fixed by
the fix to window_box_text_cols).
(struct saved_window): Rename members left to left_col, top to
top_line, width to total_cols, height to total_lines, orig_top to
orig_top_line, orig_height to orig_total_lines. All uses changed.
New members left_margin_cols, right_margin_cols,
left_fringe_width, right_fringe_width, fringes_outside_margins,
scroll_bar_width, and vertical_scroll_bar_type for saving
per-window display elements.
(Fset_window_configuration): Restore display margins, fringes,
and scroll bar settings. This fixes a bug which caused display
margins to be discarded when saving and restoring a window
configuration.
(save_window_save): Save display margins, fringes, and scroll bar
settings. This fixes a bug which caused display margins to be
discarded when saving and restoring a window configuration.
(Fset_window_margins): Do nothing if display margins are not
really changed. Otherwise, call adjust_window_margins to ensure
the text area doesn't get too narrow. This fixes a bug which
could cause emacs to trap if setting display margins wider than
the width of the window.
(Fset_window_fringes): New defun to allow user to specifically set
this window's fringe widths and position vs. display margins.
(Fwindow_fringes): New defun to return window's actual fringe
settings.
(Fset_window_scroll_bars): New defun to allow user to specifically
set this window's scroll bar width and position.
(Fwindow_scroll_bars): New defun to return window's actual scroll
bar settings.
(compare_window_configurations): Also compare display margins,
fringes, and scroll bar settings.
(syms_of_window): Defsubr new defuns for fringe and scroll bars.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sat, 24 May 2003 22:07:51 +0000 |
parents | 9155d2fdd73c |
children | f57cb35e417f d7ddb3e565de |
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) ;;; update function ;; CONTROL-FLAG is integer (n) ;; quail-current-key :: keyboard input. ;; Only first n can be translated. ;; quail-current-string :: corresonding string. Translated when last ;; time CONTROL-FLAG is nil. ;; todo :: (1) put last (len-n) char to unrread-command-event. ;; (2) put translated string to quail-current-string. ;; ;; CONTROL-FLAG is t (terminate) or nil (proceed the translation) ;; quail-current-key :: keyboard input. ;; quail-current-string :: corresponding string. Created by database. ;; todo :: (1) put modified translated string to quail-current-string. (defun quail-indian-update-translation (control-flag) ;;(message "input control-flag=%s, string=%s, key=%s" ;; control-flag quail-current-str quail-current-key) ;; make quail-current-str string when possible. (if (char-valid-p quail-current-str) (setq quail-current-str (char-to-string quail-current-str))) ;; 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)) ;; set quial-indian-update-preceding-char if appropriate. (let* (prec-char-position composition-regexp prec-char-str candidate-str match-pos match-end) (when (and quail-current-str (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))))) ;; (null quail-indian-update-preceding-char) (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)))) ;; make quail-current-str string when possible. (if (null quail-current-str) (setq quail-current-str "")) ;; set quail-current-str unless control-flag is number. (if (numberp control-flag) (setq quail-indian-update-preceding-char nil quail-current-str (if (equal quail-current-str "") (substring quail-current-key 0 control-flag) (indian-compose-string quail-current-str)) unread-command-events (string-to-list (substring quail-current-key control-flag))) (if quail-indian-update-preceding-char (setq quail-current-str (concat quail-indian-update-preceding-char quail-current-str))) (setq quail-current-str (indian-compose-string quail-current-str))) (when (eq t control-flag) ;; reset preceding-char if translation is terminated. (setq quail-indian-update-preceding-char nil)) ;; compose to previous char if it looks possible. ;;(message " out control-flag=%s, string=%s, key=%s" ;; control-flag quail-current-str quail-current-key) 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.") ;;; indian.el ends here