Mercurial > hg > xemacs-beta
annotate lisp/mule/mule-composite-stub.el @ 5639:1d1f385c9149
Call XKeysymToString() much less, it leaks.
src/ChangeLog addition:
2012-01-08 Aidan Kehoe <kehoea@parhasard.net>
* device-x.c:
* device-x.c (syms_of_device_x):
Move #'x-keysym-on-keyboard{,-sans-modifiers}-p to Lisp, the hash
table no longer stores the X keysyms, so we need to manipulate any
strings we have been handed.
* event-Xt.c (x_has_keysym):
Don't call XKeysymToString() here, it leaks; trust
x_keysym_to_emacs_keysym() instead.
* event-Xt.c (x_keysym_to_emacs_keysym):
No longer leak when looking up the strings for keysyms of the form
UABCD.
lisp/ChangeLog addition:
2012-01-08 Aidan Kehoe <kehoea@parhasard.net>
* x-init.el:
* x-init.el (pseudo-canonicalize-keysym): New.
* x-init.el: Move #'x-keysym-on-keyboard-sans-modifiers-p,
#'x-keysym-on-keyboard-p here from device-x.c, some string
manipulation it now needs to do is far easier in Lisp.
* x-win-xfree86.el:
* x-win-xfree86.el (x-win-init-xfree86):
No longer call #'x-keysym-on-keyboard{,-sans-modifiers}-p,
implement it ourselves cheaply.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 08 Jan 2012 20:41:37 +0000 |
| parents | 308d34e9f07d |
| children |
| 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 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
9 ;; XEmacs is free software: you can redistribute it and/or modify it |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
10 ;; under the terms of the GNU General Public License as published by the |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
11 ;; Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
12 ;; option) any later version. |
| 778 | 13 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
14 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
15 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
16 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
17 ;; for more details. |
| 778 | 18 |
| 19 ;; You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
778
diff
changeset
|
20 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 778 | 21 |
| 22 ;;; Synched up with: Emacs 21.1 (src/fontset.c, src/composite.c). | |
| 23 | |
| 24 ;;; Commentary: | |
| 25 | |
| 26 ;;; Code: | |
| 27 | |
| 28 (defvar use-default-ascent (make-char-table 'generic) | |
| 29 "UNIMPLEMENTED. | |
| 30 Char table of characters whose ascent values should be ignored. | |
| 31 If an entry for a character is non-nil, the ascent value of the glyph | |
| 32 is assumed to be what specified by _MULE_DEFAULT_ASCENT property of a font. | |
| 33 | |
| 34 This affects how a composite character which contains | |
| 35 such a character is displayed on screen.") | |
| 36 | |
| 37 (defvar ignore-relative-composition (make-char-table 'generic) | |
| 38 "UNIMPLEMENTED. | |
| 39 Char table of characters which is not composed relatively. | |
| 40 If an entry for a character is non-nil, a composition sequence | |
| 41 which contains that character is displayed so that | |
| 42 the glyph of that character is put without considering | |
| 43 an ascent and descent value of a previous character.") | |
| 44 | |
| 45 (defvar compose-chars-after-function 'compose-chars-after | |
| 46 "UNIMPLEMENTED. | |
| 47 Function to adjust composition of buffer text. | |
| 48 | |
| 49 The function is called with three arguments FROM, TO, and OBJECT. | |
| 50 FROM and TO specify the range of text of which composition should be | |
| 51 adjusted. OBJECT, if non-nil, is a string that contains the text. | |
| 52 | |
| 53 This function is called after a text with `composition' property is | |
| 54 inserted or deleted to keep `composition' property of buffer text | |
| 55 valid. | |
| 56 | |
| 57 The default value is the function `compose-chars-after'.") | |
| 58 | |
| 59 (defvar composition-function-table (make-char-table 'generic) | |
| 60 "UNIMPLEMENTED. | |
| 61 Char table of patterns and functions to make a composition. | |
| 62 | |
| 63 Each element is nil or an alist of PATTERNs vs FUNCs, where PATTERNs | |
| 64 are regular expressions and FUNCs are functions. FUNC is responsible | |
| 65 for composing text matching the corresponding PATTERN. FUNC is called | |
| 66 with three arguments FROM, TO, and PATTERN. See the function | |
| 67 `compose-chars-after' for more detail. | |
| 68 | |
| 69 This table is looked up by the first character of a composition when | |
| 70 the composition gets invalid after a change in a buffer.") | |
| 71 | |
| 72 (defun compose-region-internal (start end &optional components mod-func) | |
| 73 "UNIMPLEMENTED. | |
| 74 Internal use only. | |
| 75 | |
| 76 Compose text in the region between START and END. | |
| 77 Optional 3rd and 4th arguments are COMPONENTS and MODIFICATION-FUNC | |
| 78 for the composition. See `compose-region' for more detial." | |
| 79 nil) | |
| 80 | |
| 81 (defun compose-string-internal (string start end &optional components mod-func) | |
| 82 "UNIMPLEMENTED. | |
| 83 Internal use only. | |
| 84 | |
| 85 Compose text between indices START and END of STRING. | |
| 86 Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC | |
| 87 for the composition. See `compose-string' for more detial." | |
| 88 nil) | |
| 89 | |
| 90 (defun find-composition-internal (pos limit string detail-p) | |
| 91 "UNIMPLEMENTED. | |
| 92 Internal use only. | |
| 93 | |
| 94 Return information about composition at or nearest to position POS. | |
| 95 See `find-composition' for more detail." | |
| 96 nil) |