XEmacs-Patches December 2017

xemacs-patches@xemacs.org

3 participants
25 discussions

Test of all characters 6 years, 12 months

Stephen J. Turnbull

Hi, I got tired of having "make check" stall on mule-tests. Something I don't understand is going on, because Skip-Test-Unless is failing the char-code-limit condition, but doing the test anyway. The only thing I can think of is that Skip-Test-Unless is a macro but for some reason evaluates its condition anyway, which is a bug, but I'm not sure whether it's in XEmacs or in Skip-Test-Unless. Currently I'm dealing with it with the attached patch. If nobody has an idea about the underlying bug, I'll apply it in January. -- Associate Professor Division of Policy and Planning Science http://turnbull/sk.tsukuba.ac.jp/ Faculty of Systems and Information Email: turnbull(a)sk.tsukuba.ac.jp University of Tsukuba Tel: 029-853-5175 Tennodai 1-1-1, Tsukuba 305-8573 JAPAN

2 participants
1 comments

[COMMIT] Use the UnicodeData.txt installed with TeX if available, descr-text.el 7 years

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1513978751 0 # Fri Dec 22 21:39:11 2017 +0000 # Node ID b5c15ce519c23670ffba7da0c365f5044e137d90 # Parent ee0c60ee6616be2b917712a649809b8f6e5e2d06 Use the UnicodeData.txt installed with TeX if available, descr-text.el lisp/ChangeLog addition: 2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net> * descr-text.el (describe-char-unicodedata-file): The UnicodeData.txt installed with Perl no longer serves our needs. Use that installed by TeX instead, if available. diff -r ee0c60ee6616 -r b5c15ce519c2 lisp/ChangeLog --- a/lisp/ChangeLog Fri Dec 22 21:28:32 2017 +0000 +++ b/lisp/ChangeLog Fri Dec 22 21:39:11 2017 +0000 ＠＠ -1,3 +1,9 ＠＠ +2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net> + + * descr-text.el (describe-char-unicodedata-file): + The UnicodeData.txt installed with Perl no longer serves our + needs. Use that installed by TeX instead, if available. + 2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net> * compose.el: Rename from x-compose.el, it's not diff -r ee0c60ee6616 -r b5c15ce519c2 lisp/descr-text.el --- a/lisp/descr-text.el Fri Dec 22 21:28:32 2017 +0000 +++ b/lisp/descr-text.el Fri Dec 22 21:39:11 2017 +0000 ＠＠ -208,31 +208,20 ＠＠ (describe-property-list properties))))) (defcustom describe-char-unicodedata-file - ;; XEmacs change; initialise this by default, using Perl. - (let ((have-perl + ;; XEmacs change; initialise this by default, using TeX. + (let ((have-kpsewhich (member-if #'(lambda (path) - (file-exists-p (format "%s%cperl" path directory-sep-char))) + (file-exists-p (format "%s%ckpsewhich" path directory-sep-char))) exec-path)) - installprivlib res) - (when have-perl - (setq installprivlib + path) + (when have-kpsewhich + (setq path (with-string-as-buffer-contents "" - (shell-command "perl -V:installprivlib" t) - ;; 1+ because buffer offsets start at one. - (delete-region 1 (1+ (length "installprivlib='"))) - ;; Delete the final newline, semicolon and quotation mark. - (delete-region (- (point-max) 3) (point-max)))) - (cond - ((file-exists-p - (setq res - (format "%s%cunicore%cUnicodeData.txt" - installprivlib directory-sep-char directory-sep-char)))) - ((file-exists-p - (setq res - (format "%s%cunicode%cUnicodeData.txt" - installprivlib directory-sep-char directory-sep-char))))) - res)) + (shell-command "kpsewhich UnicodeData.txt" t) + ;; Delete the final newline + (delete-region (- (point-max) 1) (point-max)))) + (if (file-exists-p path) path))) "Location of Unicode data file. This is the UnicodeData.txt file from the Unicode Consortium, used for diagnostics. If it is non-nil `describe-char' will print data -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

[COMMIT] Don't crash in redisplay with Ethiopic and error-checking. 7 years

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1513978112 0 # Fri Dec 22 21:28:32 2017 +0000 # Node ID ee0c60ee6616be2b917712a649809b8f6e5e2d06 # Parent 46efc7173defd0f4f41bd8f3819970c4876c551a Don't crash in redisplay with Ethiopic and error-checking. src/ChangeLog addition: 2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net> * redisplay-x.c (separate_textual_runs_mule): The output of a charset's CCL program is just two octets, it is incorrect and buggy to transform it to an "external charset codepoint", something that will usually error in redisplay. Remove this unicode-internal change from Ben. diff -r 46efc7173def -r ee0c60ee6616 src/ChangeLog --- a/src/ChangeLog Fri Dec 22 12:48:38 2017 +0000 +++ b/src/ChangeLog Fri Dec 22 21:28:32 2017 +0000 ＠＠ -1,3 +1,11 ＠＠ +2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net> + + * redisplay-x.c (separate_textual_runs_mule): + The output of a charset's CCL program is just two octets, it is + incorrect and buggy to transform it to an "external charset + codepoint", something that will usually error in redisplay. Remove + this unicode-internal change from Ben. + 2017-12-20 Aidan Kehoe <kehoea(a)parhasard.net> Use Lisp characters as the keysym for event objects reflecting diff -r 46efc7173def -r ee0c60ee6616 src/redisplay-x.c --- a/src/redisplay-x.c Fri Dec 22 12:48:38 2017 +0000 +++ b/src/redisplay-x.c Fri Dec 22 21:28:32 2017 +0000 ＠＠ -357,9 +357,6 ＠＠ ccl_driver (&char_converter, 0, buf, 0, 0, 0, CCL_MODE_ENCODING); byte1 = char_converter.reg[1]; byte2 = char_converter.reg[2]; - get_external_charset_codepoint (charset, make_fixnum (byte1), - make_fixnum (byte2), - &byte1, &byte2, 1); } else if (EQ (charset, Vcharset_ascii) && byte2 != CANT_DISPLAY_CHAR) { -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

[COMMIT] Remove the last of the X11-specific code, compose.el 7 years

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1513946918 0 # Fri Dec 22 12:48:38 2017 +0000 # Node ID 46efc7173defd0f4f41bd8f3819970c4876c551a # Parent 3de111a0da7b7880bb1473598b14a4cd84a97200 Remove the last of the X11-specific code, compose.el 2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net> * compose.el: [...] (decide-on-bindings): Remove the last of the X11-specific code, don't use the UABCD keysyms for some exotic composed base characters. diff -r 3de111a0da7b -r 46efc7173def lisp/ChangeLog --- a/lisp/ChangeLog Fri Dec 22 12:37:44 2017 +0000 +++ b/lisp/ChangeLog Fri Dec 22 12:48:38 2017 +0000 ＠＠ -2,6 +2,9 ＠＠ * compose.el: Rename from x-compose.el, it's not platform-specific. + (decide-on-bindings): + Remove the last of the X11-specific code, don't use the UABCD + keysyms for some exotic composed base characters. * gtk-compose.el (gtk-compose): Require the new feature. * isearch-mode.el (isearch-pre-command-hook): * keymap.el (for): diff -r 3de111a0da7b -r 46efc7173def lisp/compose.el --- a/lisp/compose.el Fri Dec 22 12:37:44 2017 +0000 +++ b/lisp/compose.el Fri Dec 22 12:48:38 2017 +0000 ＠＠ -406,9 +406,9 ＠＠ (compose-caron-map [?A] #x01CD) ;; CAPITAL A WITH CARON (compose-caron-map [?C] #x010C) ;; CAPITAL C WITH CARON (compose-caron-map [?D] #x010E) ;; CAPITAL D WITH CARON - (compose-caron-map [U01F1] #x01C4) ;; CAPITAL DZ WITH CARON + (compose-caron-map (decode-char 'ucs #x01f1) #x01C4) ;; CAPITAL DZ WITH CARON (compose-caron-map [?E] #x011A) ;; CAPITAL E WITH CARON - (compose-caron-map [U01B7] #x01EE) ;; CAPITAL EZH WITH CARON + (compose-caron-map (decode-char 'ucs #x01b7) #x01EE) ;; CAPITAL EZH WITH CARON (compose-caron-map [?G] #x01E6) ;; CAPITAL G WITH CARON (compose-caron-map [?H] #x021E) ;; CAPITAL H WITH CARON (compose-caron-map [?I] #x01CF) ;; CAPITAL I WITH CARON ＠＠ -424,9 +424,9 ＠＠ (compose-caron-map [?a] #x01CE) ;; SMALL A WITH CARON (compose-caron-map [?c] #x010D) ;; SMALL C WITH CARON (compose-caron-map [?d] #x010F) ;; SMALL D WITH CARON - (compose-caron-map [U01F3] #x01C6) ;; SMALL DZ WITH CARON + (compose-caron-map (decode-char 'ucs #x01F3) #x01C6) ;; SMALL DZ WITH CARON (compose-caron-map [?e] #x011B) ;; SMALL E WITH CARON - (compose-caron-map [U0292] #x01EF) ;; SMALL EZH WITH CARON + (compose-caron-map (decode-char 'ucs #x0292) #x01EF) ;; SMALL EZH WITH CARON (compose-caron-map [?g] #x01E7) ;; SMALL G WITH CARON (compose-caron-map [?h] #x021F) ;; SMALL H WITH CARON (compose-caron-map [?i] #x01D0) ;; SMALL I WITH CARON ＠＠ -515,7 +515,7 ＠＠ (compose-dot-map [?f] #x1E1F) ;; SMALL F WITH DOT ABOVE (compose-dot-map [?g] #x0121) ;; SMALL G WITH DOT ABOVE (compose-dot-map [?h] #x1E23) ;; SMALL H WITH DOT ABOVE - (compose-dot-map [U017F] #x1E9B) ;; SMALL LONG S WITH DOT ABOVE + (compose-dot-map (decode-char 'ucs #x017F) #x1E9B) ;; SMALL LONG S WITH DOT ABOVE (compose-dot-map [?m] #x1E41) ;; SMALL M WITH DOT ABOVE (compose-dot-map [?n] #x1E45) ;; SMALL N WITH DOT ABOVE (compose-dot-map [?o] #x022F) ;; SMALL O WITH DOT ABOVE ＠＠ -543,23 +543,23 ＠＠ (compose-hook-map [?V] #x01B2) ;; CAPITAL V WITH HOOK (compose-hook-map [?Y] #x01B3) ;; CAPITAL Y WITH HOOK (compose-hook-map [?Z] #x0224) ;; CAPITAL Z WITH HOOK - (compose-hook-map [U0262] #x029B) ;; SMALL CAPITAL G WITH HOOK + (compose-hook-map (decode-char 'ucs #x0262) #x029B) ;; SMALL CAPITAL G WITH HOOK (compose-hook-map [?b] #x0253) ;; SMALL B WITH HOOK (compose-hook-map [?c] #x0188) ;; SMALL C WITH HOOK (compose-hook-map [?d] #x0257) ;; SMALL D WITH HOOK (compose-hook-map [?f] #x0192) ;; SMALL F WITH HOOK (compose-hook-map [?g] #x0260) ;; SMALL G WITH HOOK (compose-hook-map [?h] #x0266) ;; SMALL H WITH HOOK - (compose-hook-map [U0266] #x0267) ;; SMALL HENG WITH HOOK + (compose-hook-map (decode-char 'ucs #x0266) #x0267) ;; SMALL HENG WITH HOOK (compose-hook-map [?k] #x0199) ;; SMALL K WITH HOOK (compose-hook-map [?m] #x0271) ;; SMALL M WITH HOOK (compose-hook-map [?p] #x01A5) ;; SMALL P WITH HOOK (compose-hook-map [?q] #x02A0) ;; SMALL Q WITH HOOK - (compose-hook-map [U025C] #x025D) ;; SMALL REVERSED OPEN E WITH HOOK + (compose-hook-map (decode-char 'ucs #x025C) #x025D) ;; SMALL REVERSED OPEN E WITH HOOK (compose-hook-map [?s] #x0282) ;; SMALL S WITH HOOK - (compose-hook-map [U0259] #x025A) ;; SMALL SCHWA WITH HOOK + (compose-hook-map (decode-char 'ucs #x0259) #x025A) ;; SMALL SCHWA WITH HOOK (compose-hook-map [?t] #x01AD) ;; SMALL T WITH HOOK - (compose-hook-map [U0279] #x027B) ;; SMALL TURNED R WITH HOOK + (compose-hook-map (decode-char 'ucs #x0279) #x027B) ;; SMALL TURNED R WITH HOOK (compose-hook-map [?v] #x028B) ;; SMALL V WITH HOOK (compose-hook-map [?y] #x01B4) ;; SMALL Y WITH HOOK (compose-hook-map [?z] #x0225) ;; SMALL Z WITH HOOK -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

[COMMIT] Rename x-compose.el to compose.el, it's not platform-specific. 7 years

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1513946264 0 # Fri Dec 22 12:37:44 2017 +0000 # Node ID 3de111a0da7b7880bb1473598b14a4cd84a97200 # Parent a69c6e871607eee0c429c827c5e0be49ede0bb17 Rename x-compose.el to compose.el, it's not platform-specific. lisp/ChangeLog addition: 2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net> * compose.el: Rename from x-compose.el, it's not platform-specific. * gtk-compose.el (gtk-compose): Require the new feature. * isearch-mode.el (isearch-pre-command-hook): * keymap.el (for): Update documentation, references to x-compose.el to reference the new name. diff -r a69c6e871607 -r 3de111a0da7b lisp/ChangeLog --- a/lisp/ChangeLog Wed Dec 20 00:13:53 2017 +0000 +++ b/lisp/ChangeLog Fri Dec 22 12:37:44 2017 +0000 ＠＠ -1,3 +1,13 ＠＠ +2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net> + + * compose.el: Rename from x-compose.el, it's not + platform-specific. + * gtk-compose.el (gtk-compose): Require the new feature. + * isearch-mode.el (isearch-pre-command-hook): + * keymap.el (for): + Update documentation, references to x-compose.el to reference the + new name. + 2017-12-01 Aidan Kehoe <kehoea(a)parhasard.net> * about.el (about): New custom group for this file. diff -r a69c6e871607 -r 3de111a0da7b lisp/compose.el --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lisp/compose.el Fri Dec 22 12:37:44 2017 +0000 ＠＠ -0,0 +1,965 ＠＠ +;;; compose.el --- Compose-key processing in XEmacs + +;; Copyright (C) 1992, 1993, 1997, 2005 Free Software Foundation, Inc. + +;; Author: Jamie Zawinski <jwz(a)jwz.org> +;; Maintainer: XEmacs Development Team +;; Rewritten by Martin Buchholz far too many times. +;; +;; Changed: 11 Jun 1997 by Heiko Muenkel <muenkel(a)tnt.uni-hannover.de> +;; The degree sign couldn't be inserted with the old version. +;; Keywords: i18n + +;; 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. + +;;; Synched up with: Not in FSF. + +;;; Commentary: + +;; created by jwz, 14-jun-92. +;;; changed by Jan Vroonhof, July 1997: Use function-key-map instead +;;; of global map. +;;; Preliminary support for +;;; XFree86 deadkeys + +;; This file implements DEC-, OpenWindows-, and HP-compatible "Compose" +;; processing for XEmacs. It was formerly named x-compose.el. + +;; If you are running a version of X which already does compose processing, +;; then you don't need this file. But the MIT R4 and R5 distributions don't +;; do compose processing, so you may want to fake it by using this code. + +;; The basic idea is that there are several ways to generate keysyms which +;; do not have keys devoted to them on your keyboard. + +;; The first method is by using "dead" keys. A dead key is a key which, +;; when typed, does not insert a character. Instead it modifies the +;; following character typed. So if you typed "dead-tilde" followed by "A", +;; then "A-tilde" would be inserted. Of course, this requires you to modify +;; your keyboard to include a "dead-tilde" key on it somewhere. + +;; The second method is by using a "Compose" key. With a Compose key, you +;; would type "Compose" then "tilde" then "A" to insert "A-tilde". + +;; There are a small number of dead keys: acute, grave, cedilla, diaeresis, +;; circumflex, tilde, and ring. There are a larger number of accented and +;; other characters accessible via the Compose key, so both are useful. + +;; To use this code, you will need to have a Compose key on your keyboard. +;; The default configuration of most X keyboards doesn't contain one. You +;; can, for example, turn the right "Meta" key into a "Compose" key with +;; this command: + +;; xmodmap -e "remove mod1 = Meta_R" -e "keysym Meta_R = Multi_key" + +;; Multi-key is the name that X (and emacs) know the "Compose" key by. +;; The "remove..." command is necessary because the "Compose" key must not +;; have any modifier bits associated with it. This exact command may not +;; work, depending on what system and keyboard you are using. If it +;; doesn't, you'll have to read the man page for xmodmap. You might want +;; to get the "xkeycaps" program from +;; <URL:http://www.jwz.org/xkeycaps/>, +;; which is a graphical front end to xmodmap +;; that hides xmodmap's arcane syntax from you. + +;; If for some reason you don't want to have a dedicated compose key on your +;; keyboard, you can use some other key as the prefix. For example, to make +;; "Meta-Shift-C" act as a compose key (so that "M-C , c" would insert the +;; character "ccedilla") you could do + +;; (global-set-key "\M-C" compose-map) + +;; I believe the bindings encoded in this file are the same as those used +;; by OpenWindows versions 2 and 3, and DEC VT320 terminals. Please let me +;; know if you think otherwise. + +;; Much thanks to Justin Bur <justin(a)crim.ca> for helping me understand how +;; this stuff is supposed to work. + +;; You also might want to consider getting Justin's patch for the MIT Xlib +;; that implements compose processing in the library. This will enable +;; compose processing in applications other than emacs as well. You can +;; get it from export.lcs.mit.edu in contrib/compose.tar.Z. + +;; This code has one feature that a more "builtin" Compose mechanism could +;; not have: at any point you can type C-h to get a list of the possible +;; completions of what you have typed so far. + +;; ---------------------------------------------------------------------- +;; +;; Notes from Aidan Kehoe, Thu Feb 12 16:21:18 GMT 2009 (these conflict to +;; some extent with the above): + +;; Giacomo Boffi's problem of +;; 20050324103919.8D22E4901(a)boffi95.stru.polimi.it is caused by Xlib doing +;; the compose processing. To turn that off, you need to recompile without +;; XIM support, or start up XEmacs in a locale that the system supports but +;; X11 does not (for me, ru_RU.CP866 works for this). This will be +;; preferable anyway for some people, because the XIM support drops +;; sequences we would prefer to see. E.g. in the following situation, with +;; an XIM build: + +;; $ LC_CTYPE=de_DE.ISO8859-1 ./xemacs -vanilla & + +;; Input: dead-acute a +;; Seen by XEmacs: aacute (thanks to XIM) +;; Action: U+00E1 is inserted in the buffer + +;; Input: dead-abovedot o +;; Seen by XEmacs: dead-abovedot o (XIM does not intervene, since no +;; characters in this locale are generated with +;; dead-abovedot) +;; Action: U+022F is inserted in the buffer (thanks to this file) + +;; Input: dead-acute r +;; Seen by XEmacs: nothing (thanks to XIM, it considers U+0155 unavailable) +;; Action: nothing + +;; Without XIM, all the above inputs would work fine, independent of your +;; locale. + +;; Also, XIM does not intervene at all with the second or subsequent X11 +;; devices created, and this file is needed for compose processing +;; there. This may be a bug in our use of XIM, or it may a bug in XIM +;; itself. + +;; ＠＠#### This should probably be integrated into general Usenet handling +;; of composition sequences. + +;;; Code: + +(macrolet + ((define-compose-map (&rest keymap-symbols) + (loop + for keymap-symbol in keymap-symbols + with result = nil + do + ;; Required to tell XEmacs the keymaps were actually autoloaded. + ;; #### Make this unnecessary! + (push `(fset ',keymap-symbol ,keymap-symbol) result) + (push `(defconst ,keymap-symbol (make-sparse-keymap ',keymap-symbol)) + result) + finally return (cons 'progn result)))) + (define-compose-map compose-map compose-acute-map compose-grave-map + compose-cedilla-map compose-diaeresis-map compose-circumflex-map + compose-tilde-map compose-ring-map compose-caron-map compose-macron-map + compose-breve-map compose-dot-map compose-doubleacute-map + compose-ogonek-map compose-hook-map compose-horn-map compose-stroke-map)) + +(define-key compose-map 'acute compose-acute-map) +(define-key compose-map 'grave compose-grave-map) +(define-key compose-map 'cedilla compose-cedilla-map) +(define-key compose-map 'diaeresis compose-diaeresis-map) +(define-key compose-map 'circumflex compose-circumflex-map) +(define-key compose-map 'tilde compose-tilde-map) +(define-key compose-map 'degree compose-ring-map) +(define-key compose-map 'caron compose-caron-map) +(define-key compose-map 'macron compose-macron-map) +(define-key compose-map 'doubleacute compose-doubleacute-map) +(define-key compose-map 'ogonek compose-ogonek-map) +(define-key compose-map 'breve compose-breve-map) +(define-key compose-map 'abovedot compose-dot-map) +(define-key compose-map 'stroke compose-stroke-map) + +;;(define-key function-key-map [multi-key] compose-map) + +;; The following is necessary, because one can't rebind [degree] +;; and use it to insert the degree sign! +;;(defun compose-insert-degree () +;; "Inserts a degree sign." +;; (interactive) +;; (insert ?\260)) + +(define-key compose-map [acute] compose-acute-map) +(define-key compose-map [?'] compose-acute-map) +(define-key compose-map [grave] compose-grave-map) +(define-key compose-map [?`] compose-grave-map) +(define-key compose-map [cedilla] compose-cedilla-map) +(define-key compose-map [?,] compose-cedilla-map) +(define-key compose-map [diaeresis] compose-diaeresis-map) +(define-key compose-map [?\"] compose-diaeresis-map) +(define-key compose-map [circumflex] compose-circumflex-map) +(define-key compose-map [?^] compose-circumflex-map) +(define-key compose-map [tilde] compose-tilde-map) +(define-key compose-map [~] compose-tilde-map) +(define-key compose-map [degree] compose-ring-map) +(define-key compose-map [?*] compose-ring-map) +(define-key compose-map [stroke] compose-stroke-map) + +(loop + for (keysym character-code map) + in '((caron #x02C7 compose-caron-map) + (macron #x00AF compose-macron-map) + (doubleacute #x02DD compose-doubleacute-map) + (ogonek #x02db compose-ogonek-map) + (breve #x0306 compose-breve-map) + (abovedot #x0307 compose-dot-map) + (U031b #x031b compose-horn-map)) + do + (define-key compose-map (vector keysym) map) + (when (setq character-code (decode-char 'ucs character-code)) + (define-key compose-map (vector character-code) map))) + + +;;; The contents of the "dead key" maps. These are shared by the +;;; compose-map. + +;;; Against the spirit of Unicode, which says that the precomposed +;;; characters are just there for round-trip compatibility with other +;;; encodings and don't reflect that they're necessarily used much, these +;;; are just the precomposed Latin characters in UnicodeData.txt; we don't +;;; support any decomposed characters here. (Not least because in general we +;;; don't have worthwhile support for precomposed characters.) + +(assert + (or (featurep 'mule) (null (decode-char 'ucs #x100))) + nil + "This code assumes no non-Mule characters have a UCS value \ +greater than #xFF, and needs to be rewritten if that is not true.") + +(macrolet + ((decide-on-bindings (&rest details) + "Look through DETAILS, working out which bindings work on non-Mule. + +This returns a long `if' statement that should be executed when this file is +loaded; it assumes that #xFF is the inclusive upper bound for the Unicode +value of characters under non-Mule. " + (loop for (map key binding) in details + with if-mule = nil + with without-mule = nil + do + (push `(define-key ,map ,key + (vector (list (decode-char 'ucs ,binding)))) if-mule) + (when (<= binding #xFF) + (push `(define-key ,map ,key + (vector (list (decode-char 'ucs ,binding)))) + without-mule)) + finally return `(if (featurep 'mule) + (progn ,＠if-mule) + ,＠without-mule)))) + (decide-on-bindings + (compose-acute-map [space] #x0027) ;; APOSTROPHE + (compose-acute-map [?\'] #x00B4) ;; ACUTE ACCENT + (compose-acute-map [?A] #x00C1) ;; CAPITAL A WITH ACUTE + (compose-acute-map [?C] #x0106) ;; CAPITAL C WITH ACUTE + (compose-acute-map [?E] #x00C9) ;; CAPITAL E WITH ACUTE + (compose-acute-map [?G] #x01F4) ;; CAPITAL G WITH ACUTE + (compose-acute-map [?I] #x00CD) ;; CAPITAL I WITH ACUTE + (compose-acute-map [?K] #x1E30) ;; CAPITAL K WITH ACUTE + (compose-acute-map [?L] #x0139) ;; CAPITAL L WITH ACUTE + (compose-acute-map [?M] #x1E3E) ;; CAPITAL M WITH ACUTE + (compose-acute-map [?N] #x0143) ;; CAPITAL N WITH ACUTE + (compose-acute-map [?O] #x00D3) ;; CAPITAL O WITH ACUTE + (compose-acute-map [?P] #x1E54) ;; CAPITAL P WITH ACUTE + (compose-acute-map [?R] #x0154) ;; CAPITAL R WITH ACUTE + (compose-acute-map [?S] #x015A) ;; CAPITAL S WITH ACUTE + (compose-acute-map [?U] #x00DA) ;; CAPITAL U WITH ACUTE + (compose-acute-map [?W] #x1E82) ;; CAPITAL W WITH ACUTE + (compose-acute-map [?Y] #x00DD) ;; CAPITAL Y WITH ACUTE + (compose-acute-map [?Z] #x0179) ;; CAPITAL Z WITH ACUTE + (compose-acute-map [?a] #x00E1) ;; SMALL A WITH ACUTE + (compose-acute-map [?c] #x0107) ;; SMALL C WITH ACUTE + (compose-acute-map [?e] #x00E9) ;; SMALL E WITH ACUTE + (compose-acute-map [?g] #x01F5) ;; SMALL G WITH ACUTE + (compose-acute-map [?i] #x00ED) ;; SMALL I WITH ACUTE + (compose-acute-map [?k] #x1E31) ;; SMALL K WITH ACUTE + (compose-acute-map [?l] #x013A) ;; SMALL L WITH ACUTE + (compose-acute-map [?m] #x1E3F) ;; SMALL M WITH ACUTE + (compose-acute-map [?n] #x0144) ;; SMALL N WITH ACUTE + (compose-acute-map [?o] #x00F3) ;; SMALL O WITH ACUTE + (compose-acute-map [?p] #x1E55) ;; SMALL P WITH ACUTE + (compose-acute-map [?r] #x0155) ;; SMALL R WITH ACUTE + (compose-acute-map [?s] #x015B) ;; SMALL S WITH ACUTE + (compose-acute-map [?u] #x00FA) ;; SMALL U WITH ACUTE + (compose-acute-map [?w] #x1E83) ;; SMALL W WITH ACUTE + (compose-acute-map [?y] #x00FD) ;; SMALL Y WITH ACUTE + (compose-acute-map [?z] #x017A) ;; SMALL Z WITH ACUTE + (compose-grave-map [space] #x0060) ;; GRAVE ACCENT + (compose-grave-map [?\`] #x0060) ;; GRAVE ACCENT + (compose-grave-map [?A] #x00C0) ;; CAPITAL A WITH GRAVE + (compose-grave-map [?E] #x00C8) ;; CAPITAL E WITH GRAVE + (compose-grave-map [?I] #x00CC) ;; CAPITAL I WITH GRAVE + (compose-grave-map [?N] #x01F8) ;; CAPITAL N WITH GRAVE + (compose-grave-map [?O] #x00D2) ;; CAPITAL O WITH GRAVE + (compose-grave-map [?U] #x00D9) ;; CAPITAL U WITH GRAVE + (compose-grave-map [?W] #x1E80) ;; CAPITAL W WITH GRAVE + (compose-grave-map [?Y] #x1EF2) ;; CAPITAL Y WITH GRAVE + (compose-grave-map [?a] #x00E0) ;; SMALL A WITH GRAVE + (compose-grave-map [?e] #x00E8) ;; SMALL E WITH GRAVE + (compose-grave-map [?i] #x00EC) ;; SMALL I WITH GRAVE + (compose-grave-map [?n] #x01F9) ;; SMALL N WITH GRAVE + (compose-grave-map [?o] #x00F2) ;; SMALL O WITH GRAVE + (compose-grave-map [?u] #x00F9) ;; SMALL U WITH GRAVE + (compose-grave-map [?w] #x1E81) ;; SMALL W WITH GRAVE + (compose-grave-map [?y] #x1EF3) ;; SMALL Y WITH GRAVE + (compose-cedilla-map [space] #x002C) ;; COMMA + (compose-cedilla-map [?\,] #x00B8) ;; CEDILLA + (compose-cedilla-map [C] #x00C7) ;; CAPITAL C WITH CEDILLA + (compose-cedilla-map [D] #x1E10) ;; CAPITAL D WITH CEDILLA + (compose-cedilla-map [E] #x0228) ;; CAPITAL E WITH CEDILLA + (compose-cedilla-map [G] #x0122) ;; CAPITAL G WITH CEDILLA + (compose-cedilla-map [H] #x1E28) ;; CAPITAL H WITH CEDILLA + (compose-cedilla-map [K] #x0136) ;; CAPITAL K WITH CEDILLA + (compose-cedilla-map [L] #x013B) ;; CAPITAL L WITH CEDILLA + (compose-cedilla-map [N] #x0145) ;; CAPITAL N WITH CEDILLA + (compose-cedilla-map [R] #x0156) ;; CAPITAL R WITH CEDILLA + (compose-cedilla-map [S] #x015E) ;; CAPITAL S WITH CEDILLA + (compose-cedilla-map [T] #x0162) ;; CAPITAL T WITH CEDILLA + (compose-cedilla-map [c] #x00E7) ;; SMALL C WITH CEDILLA + (compose-cedilla-map [d] #x1E11) ;; SMALL D WITH CEDILLA + (compose-cedilla-map [e] #x0229) ;; SMALL E WITH CEDILLA + (compose-cedilla-map [g] #x0123) ;; SMALL G WITH CEDILLA + (compose-cedilla-map [h] #x1E29) ;; SMALL H WITH CEDILLA + (compose-cedilla-map [k] #x0137) ;; SMALL K WITH CEDILLA + (compose-cedilla-map [l] #x013C) ;; SMALL L WITH CEDILLA + (compose-cedilla-map [n] #x0146) ;; SMALL N WITH CEDILLA + (compose-cedilla-map [r] #x0157) ;; SMALL R WITH CEDILLA + (compose-cedilla-map [s] #x015F) ;; SMALL S WITH CEDILLA + (compose-cedilla-map [t] #x0163) ;; SMALL T WITH CEDILLA + (compose-diaeresis-map [space] #x00A8) ;; DIAERESIS + (compose-diaeresis-map [?\"] #x00A8) ;; DIAERESIS + (compose-diaeresis-map [?s] #x00DF) ;; SMALL SHARP S + (compose-diaeresis-map [?A] #x00C4) ;; CAPITAL A WITH DIAERESIS + (compose-diaeresis-map [?E] #x00CB) ;; CAPITAL E WITH DIAERESIS + (compose-diaeresis-map [?H] #x1E26) ;; CAPITAL H WITH DIAERESIS + (compose-diaeresis-map [?I] #x00CF) ;; CAPITAL I WITH DIAERESIS + (compose-diaeresis-map [?O] #x00D6) ;; CAPITAL O WITH DIAERESIS + (compose-diaeresis-map [?U] #x00DC) ;; CAPITAL U WITH DIAERESIS + (compose-diaeresis-map [?W] #x1E84) ;; CAPITAL W WITH DIAERESIS + (compose-diaeresis-map [?X] #x1E8C) ;; CAPITAL X WITH DIAERESIS + (compose-diaeresis-map [?Y] #x0178) ;; CAPITAL Y WITH DIAERESIS + (compose-diaeresis-map [?a] #x00E4) ;; SMALL A WITH DIAERESIS + (compose-diaeresis-map [?e] #x00EB) ;; SMALL E WITH DIAERESIS + (compose-diaeresis-map [?h] #x1E27) ;; SMALL H WITH DIAERESIS + (compose-diaeresis-map [?i] #x00EF) ;; SMALL I WITH DIAERESIS + (compose-diaeresis-map [?o] #x00F6) ;; SMALL O WITH DIAERESIS + (compose-diaeresis-map [?t] #x1E97) ;; SMALL T WITH DIAERESIS + (compose-diaeresis-map [?u] #x00FC) ;; SMALL U WITH DIAERESIS + (compose-diaeresis-map [?w] #x1E85) ;; SMALL W WITH DIAERESIS + (compose-diaeresis-map [?x] #x1E8D) ;; SMALL X WITH DIAERESIS + (compose-diaeresis-map [?y] #x00FF) ;; SMALL Y WITH DIAERESIS + (compose-circumflex-map [space] #x005e) ;; CIRCUMFLEX ACCENT + (compose-circumflex-map [?A] #x00C2) ;; CAPITAL A WITH CIRCUMFLEX + (compose-circumflex-map [?C] #x0108) ;; CAPITAL C WITH CIRCUMFLEX + (compose-circumflex-map [?E] #x00CA) ;; CAPITAL E WITH CIRCUMFLEX + (compose-circumflex-map [?G] #x011C) ;; CAPITAL G WITH CIRCUMFLEX + (compose-circumflex-map [?H] #x0124) ;; CAPITAL H WITH CIRCUMFLEX + (compose-circumflex-map [?I] #x00CE) ;; CAPITAL I WITH CIRCUMFLEX + (compose-circumflex-map [?J] #x0134) ;; CAPITAL J WITH CIRCUMFLEX + (compose-circumflex-map [?O] #x00D4) ;; CAPITAL O WITH CIRCUMFLEX + (compose-circumflex-map [?S] #x015C) ;; CAPITAL S WITH CIRCUMFLEX + (compose-circumflex-map [?U] #x00DB) ;; CAPITAL U WITH CIRCUMFLEX + (compose-circumflex-map [?W] #x0174) ;; CAPITAL W WITH CIRCUMFLEX + (compose-circumflex-map [?Y] #x0176) ;; CAPITAL Y WITH CIRCUMFLEX + (compose-circumflex-map [?Z] #x1E90) ;; CAPITAL Z WITH CIRCUMFLEX + (compose-circumflex-map [?a] #x00e2) ;; SMALL A WITH CIRCUMFLEX + (compose-circumflex-map [?c] #x0109) ;; SMALL C WITH CIRCUMFLEX + (compose-circumflex-map [?e] #x00ea) ;; SMALL E WITH CIRCUMFLEX + (compose-circumflex-map [?g] #x011d) ;; SMALL G WITH CIRCUMFLEX + (compose-circumflex-map [?h] #x0125) ;; SMALL H WITH CIRCUMFLEX + (compose-circumflex-map [?i] #x00ee) ;; SMALL I WITH CIRCUMFLEX + (compose-circumflex-map [?j] #x0135) ;; SMALL J WITH CIRCUMFLEX + (compose-circumflex-map [?o] #x00f4) ;; SMALL O WITH CIRCUMFLEX + (compose-circumflex-map [?s] #x015d) ;; SMALL S WITH CIRCUMFLEX + (compose-circumflex-map [?u] #x00fb) ;; SMALL U WITH CIRCUMFLEX + (compose-circumflex-map [?w] #x0175) ;; SMALL W WITH CIRCUMFLEX + (compose-circumflex-map [?y] #x0177) ;; SMALL Y WITH CIRCUMFLEX + (compose-circumflex-map [?z] #x1e91) ;; SMALL Z WITH CIRCUMFLEX + (compose-tilde-map [space] #x007E) ;; TILDE + (compose-tilde-map [?A] #x00C3) ;; CAPITAL A WITH TILDE + (compose-tilde-map [?E] #x1EBC) ;; CAPITAL E WITH TILDE + (compose-tilde-map [?I] #x0128) ;; CAPITAL I WITH TILDE + (compose-tilde-map [?N] #x00D1) ;; CAPITAL N WITH TILDE + (compose-tilde-map [?O] #x00D5) ;; CAPITAL O WITH TILDE + (compose-tilde-map [?U] #x0168) ;; CAPITAL U WITH TILDE + (compose-tilde-map [?V] #x1E7C) ;; CAPITAL V WITH TILDE + (compose-tilde-map [?Y] #x1EF8) ;; CAPITAL Y WITH TILDE + (compose-tilde-map [?a] #x00E3) ;; SMALL A WITH TILDE + (compose-tilde-map [?e] #x1EBD) ;; SMALL E WITH TILDE + (compose-tilde-map [?i] #x0129) ;; SMALL I WITH TILDE + (compose-tilde-map [?n] #x00F1) ;; SMALL N WITH TILDE + (compose-tilde-map [?o] #x00F5) ;; SMALL O WITH TILDE + (compose-tilde-map [?u] #x0169) ;; SMALL U WITH TILDE + (compose-tilde-map [?v] #x1E7D) ;; SMALL V WITH TILDE + (compose-tilde-map [?y] #x1EF9) ;; SMALL Y WITH TILDE + (compose-ring-map [space] #x00B0) ;; DEGREE SIGN + (compose-ring-map [?A] #x00C5) ;; CAPITAL A WITH RING ABOVE + (compose-ring-map [?U] #x016E) ;; CAPITAL U WITH RING ABOVE + (compose-ring-map [?a] #x00E5) ;; SMALL A WITH RING ABOVE + (compose-ring-map [?u] #x016F) ;; SMALL U WITH RING ABOVE + (compose-ring-map [?w] #x1E98) ;; SMALL W WITH RING ABOVE + (compose-ring-map [?y] #x1E99) ;; SMALL Y WITH RING ABOVE + (compose-caron-map [space] #x02C7) ;; CARON + (compose-caron-map [?A] #x01CD) ;; CAPITAL A WITH CARON + (compose-caron-map [?C] #x010C) ;; CAPITAL C WITH CARON + (compose-caron-map [?D] #x010E) ;; CAPITAL D WITH CARON + (compose-caron-map [U01F1] #x01C4) ;; CAPITAL DZ WITH CARON + (compose-caron-map [?E] #x011A) ;; CAPITAL E WITH CARON + (compose-caron-map [U01B7] #x01EE) ;; CAPITAL EZH WITH CARON + (compose-caron-map [?G] #x01E6) ;; CAPITAL G WITH CARON + (compose-caron-map [?H] #x021E) ;; CAPITAL H WITH CARON + (compose-caron-map [?I] #x01CF) ;; CAPITAL I WITH CARON + (compose-caron-map [?K] #x01E8) ;; CAPITAL K WITH CARON + (compose-caron-map [?L] #x013D) ;; CAPITAL L WITH CARON + (compose-caron-map [?N] #x0147) ;; CAPITAL N WITH CARON + (compose-caron-map [?O] #x01D1) ;; CAPITAL O WITH CARON + (compose-caron-map [?R] #x0158) ;; CAPITAL R WITH CARON + (compose-caron-map [?S] #x0160) ;; CAPITAL S WITH CARON + (compose-caron-map [?T] #x0164) ;; CAPITAL T WITH CARON + (compose-caron-map [?U] #x01D3) ;; CAPITAL U WITH CARON + (compose-caron-map [?Z] #x017D) ;; CAPITAL Z WITH CARON + (compose-caron-map [?a] #x01CE) ;; SMALL A WITH CARON + (compose-caron-map [?c] #x010D) ;; SMALL C WITH CARON + (compose-caron-map [?d] #x010F) ;; SMALL D WITH CARON + (compose-caron-map [U01F3] #x01C6) ;; SMALL DZ WITH CARON + (compose-caron-map [?e] #x011B) ;; SMALL E WITH CARON + (compose-caron-map [U0292] #x01EF) ;; SMALL EZH WITH CARON + (compose-caron-map [?g] #x01E7) ;; SMALL G WITH CARON + (compose-caron-map [?h] #x021F) ;; SMALL H WITH CARON + (compose-caron-map [?i] #x01D0) ;; SMALL I WITH CARON + (compose-caron-map [?j] #x01F0) ;; SMALL J WITH CARON + (compose-caron-map [?k] #x01E9) ;; SMALL K WITH CARON + (compose-caron-map [?l] #x013E) ;; SMALL L WITH CARON + (compose-caron-map [?n] #x0148) ;; SMALL N WITH CARON + (compose-caron-map [?o] #x01D2) ;; SMALL O WITH CARON + (compose-caron-map [?r] #x0159) ;; SMALL R WITH CARON + (compose-caron-map [?s] #x0161) ;; SMALL S WITH CARON + (compose-caron-map [?t] #x0165) ;; SMALL T WITH CARON + (compose-caron-map [?u] #x01D4) ;; SMALL U WITH CARON + (compose-caron-map [?z] #x017E) ;; SMALL Z WITH CARON + (compose-macron-map [space] #x00AF) ;; MACRON + (compose-macron-map [?A] #x0100) ;; CAPITAL A WITH MACRON + (compose-macron-map [AE] #x01E2) ;; CAPITAL AE WITH MACRON + (compose-macron-map [?E] #x0112) ;; CAPITAL E WITH MACRON + (compose-macron-map [?G] #x1E20) ;; CAPITAL G WITH MACRON + (compose-macron-map [?I] #x012A) ;; CAPITAL I WITH MACRON + (compose-macron-map [?O] #x014C) ;; CAPITAL O WITH MACRON + (compose-macron-map [?U] #x016A) ;; CAPITAL U WITH MACRON + (compose-macron-map [?Y] #x0232) ;; CAPITAL Y WITH MACRON + (compose-macron-map [?a] #x0101) ;; SMALL A WITH MACRON + (compose-macron-map [ae] #x01E3) ;; SMALL AE WITH MACRON + (compose-macron-map [?e] #x0113) ;; SMALL E WITH MACRON + (compose-macron-map [?g] #x1E21) ;; SMALL G WITH MACRON + (compose-macron-map [?i] #x012B) ;; SMALL I WITH MACRON + (compose-macron-map [?o] #x014D) ;; SMALL O WITH MACRON + (compose-macron-map [?u] #x016B) ;; SMALL U WITH MACRON + (compose-macron-map [?y] #x0233) ;; SMALL Y WITH MACRON + (compose-doubleacute-map [space] #x02DD) ;; DOUBLE ACUTE ACCENT + (compose-doubleacute-map [?O] #x0150) ;; CAPITAL O WITH DOUBLE ACUTE + (compose-doubleacute-map [?U] #x0170) ;; CAPITAL U WITH DOUBLE ACUTE + (compose-doubleacute-map [?o] #x0151) ;; SMALL O WITH DOUBLE ACUTE + (compose-doubleacute-map [?u] #x0171) ;; SMALL U WITH DOUBLE ACUTE + (compose-ogonek-map [space] #x02DB) ;; OGONEK + (compose-ogonek-map [?A] #x0104) ;; CAPITAL A WITH OGONEK + (compose-ogonek-map [?E] #x0118) ;; CAPITAL E WITH OGONEK + (compose-ogonek-map [?I] #x012E) ;; CAPITAL I WITH OGONEK + (compose-ogonek-map [?O] #x01EA) ;; CAPITAL O WITH OGONEK + (compose-ogonek-map [?U] #x0172) ;; CAPITAL U WITH OGONEK + (compose-ogonek-map [?a] #x0105) ;; SMALL A WITH OGONEK + (compose-ogonek-map [?e] #x0119) ;; SMALL E WITH OGONEK + (compose-ogonek-map [?i] #x012F) ;; SMALL I WITH OGONEK + (compose-ogonek-map [?o] #x01EB) ;; SMALL O WITH OGONEK + (compose-ogonek-map [?u] #x0173) ;; SMALL U WITH OGONEK + (compose-breve-map [space] #x02D8) ;; BREVE + (compose-breve-map [?A] #x0102) ;; CAPITAL A WITH BREVE + (compose-breve-map [?E] #x0114) ;; CAPITAL E WITH BREVE + (compose-breve-map [?G] #x011E) ;; CAPITAL G WITH BREVE + (compose-breve-map [?I] #x012C) ;; CAPITAL I WITH BREVE + (compose-breve-map [?O] #x014E) ;; CAPITAL O WITH BREVE + (compose-breve-map [?U] #x016C) ;; CAPITAL U WITH BREVE + (compose-breve-map [?a] #x0103) ;; SMALL A WITH BREVE + (compose-breve-map [?e] #x0115) ;; SMALL E WITH BREVE + (compose-breve-map [?g] #x011F) ;; SMALL G WITH BREVE + (compose-breve-map [?i] #x012D) ;; SMALL I WITH BREVE + (compose-breve-map [?o] #x014F) ;; SMALL O WITH BREVE + (compose-breve-map [?u] #x016D) ;; SMALL U WITH BREVE + (compose-dot-map [space] #x02D9) ;; DOT ABOVE + (compose-dot-map [?A] #x0226) ;; CAPITAL A WITH DOT ABOVE + (compose-dot-map [?B] #x1E02) ;; CAPITAL B WITH DOT ABOVE + (compose-dot-map [?C] #x010A) ;; CAPITAL C WITH DOT ABOVE + (compose-dot-map [?D] #x1E0A) ;; CAPITAL D WITH DOT ABOVE + (compose-dot-map [?E] #x0116) ;; CAPITAL E WITH DOT ABOVE + (compose-dot-map [?F] #x1E1E) ;; CAPITAL F WITH DOT ABOVE + (compose-dot-map [?G] #x0120) ;; CAPITAL G WITH DOT ABOVE + (compose-dot-map [?H] #x1E22) ;; CAPITAL H WITH DOT ABOVE + (compose-dot-map [?I] #x0130) ;; CAPITAL I WITH DOT ABOVE + (compose-dot-map [?M] #x1E40) ;; CAPITAL M WITH DOT ABOVE + (compose-dot-map [?N] #x1E44) ;; CAPITAL N WITH DOT ABOVE + (compose-dot-map [?O] #x022E) ;; CAPITAL O WITH DOT ABOVE + (compose-dot-map [?P] #x1E56) ;; CAPITAL P WITH DOT ABOVE + (compose-dot-map [?R] #x1E58) ;; CAPITAL R WITH DOT ABOVE + (compose-dot-map [?S] #x1E60) ;; CAPITAL S WITH DOT ABOVE + (compose-dot-map [?T] #x1E6A) ;; CAPITAL T WITH DOT ABOVE + (compose-dot-map [?W] #x1E86) ;; CAPITAL W WITH DOT ABOVE + (compose-dot-map [?X] #x1E8A) ;; CAPITAL X WITH DOT ABOVE + (compose-dot-map [?Y] #x1E8E) ;; CAPITAL Y WITH DOT ABOVE + (compose-dot-map [?Z] #x017B) ;; CAPITAL Z WITH DOT ABOVE + (compose-dot-map [?a] #x0227) ;; SMALL A WITH DOT ABOVE + (compose-dot-map [?b] #x1E03) ;; SMALL B WITH DOT ABOVE + (compose-dot-map [?c] #x010B) ;; SMALL C WITH DOT ABOVE + (compose-dot-map [?d] #x1E0B) ;; SMALL D WITH DOT ABOVE + (compose-dot-map [?e] #x0117) ;; SMALL E WITH DOT ABOVE + (compose-dot-map [?f] #x1E1F) ;; SMALL F WITH DOT ABOVE + (compose-dot-map [?g] #x0121) ;; SMALL G WITH DOT ABOVE + (compose-dot-map [?h] #x1E23) ;; SMALL H WITH DOT ABOVE + (compose-dot-map [U017F] #x1E9B) ;; SMALL LONG S WITH DOT ABOVE + (compose-dot-map [?m] #x1E41) ;; SMALL M WITH DOT ABOVE + (compose-dot-map [?n] #x1E45) ;; SMALL N WITH DOT ABOVE + (compose-dot-map [?o] #x022F) ;; SMALL O WITH DOT ABOVE + (compose-dot-map [?p] #x1E57) ;; SMALL P WITH DOT ABOVE + (compose-dot-map [?r] #x1E59) ;; SMALL R WITH DOT ABOVE + (compose-dot-map [?s] #x1E61) ;; SMALL S WITH DOT ABOVE + (compose-dot-map [?t] #x1E6B) ;; SMALL T WITH DOT ABOVE + (compose-dot-map [?w] #x1E87) ;; SMALL W WITH DOT ABOVE + (compose-dot-map [?x] #x1E8B) ;; SMALL X WITH DOT ABOVE + (compose-dot-map [?y] #x1E8F) ;; SMALL Y WITH DOT ABOVE + (compose-dot-map [?z] #x017C) ;; SMALL Z WITH DOT ABOVE + (compose-dot-map [?i] #x0131) ;; SMALL DOTLESS I + (compose-dot-map [?j] #x0237) ;; SMALL DOTLESS J + ;; There is nothing obvious we can bind space to on compose-hook-map, + ;; these are IPA characters that are in Unicode theory not + ;; precomposed. + (compose-hook-map [?B] #x0181) ;; CAPITAL B WITH HOOK + (compose-hook-map [?C] #x0187) ;; CAPITAL C WITH HOOK + (compose-hook-map [?D] #x018A) ;; CAPITAL D WITH HOOK + (compose-hook-map [?F] #x0191) ;; CAPITAL F WITH HOOK + (compose-hook-map [?G] #x0193) ;; CAPITAL G WITH HOOK + (compose-hook-map [?K] #x0198) ;; CAPITAL K WITH HOOK + (compose-hook-map [?P] #x01A4) ;; CAPITAL P WITH HOOK + (compose-hook-map [?T] #x01AC) ;; CAPITAL T WITH HOOK + (compose-hook-map [?V] #x01B2) ;; CAPITAL V WITH HOOK + (compose-hook-map [?Y] #x01B3) ;; CAPITAL Y WITH HOOK + (compose-hook-map [?Z] #x0224) ;; CAPITAL Z WITH HOOK + (compose-hook-map [U0262] #x029B) ;; SMALL CAPITAL G WITH HOOK + (compose-hook-map [?b] #x0253) ;; SMALL B WITH HOOK + (compose-hook-map [?c] #x0188) ;; SMALL C WITH HOOK + (compose-hook-map [?d] #x0257) ;; SMALL D WITH HOOK + (compose-hook-map [?f] #x0192) ;; SMALL F WITH HOOK + (compose-hook-map [?g] #x0260) ;; SMALL G WITH HOOK + (compose-hook-map [?h] #x0266) ;; SMALL H WITH HOOK + (compose-hook-map [U0266] #x0267) ;; SMALL HENG WITH HOOK + (compose-hook-map [?k] #x0199) ;; SMALL K WITH HOOK + (compose-hook-map [?m] #x0271) ;; SMALL M WITH HOOK + (compose-hook-map [?p] #x01A5) ;; SMALL P WITH HOOK + (compose-hook-map [?q] #x02A0) ;; SMALL Q WITH HOOK + (compose-hook-map [U025C] #x025D) ;; SMALL REVERSED OPEN E WITH HOOK + (compose-hook-map [?s] #x0282) ;; SMALL S WITH HOOK + (compose-hook-map [U0259] #x025A) ;; SMALL SCHWA WITH HOOK + (compose-hook-map [?t] #x01AD) ;; SMALL T WITH HOOK + (compose-hook-map [U0279] #x027B) ;; SMALL TURNED R WITH HOOK + (compose-hook-map [?v] #x028B) ;; SMALL V WITH HOOK + (compose-hook-map [?y] #x01B4) ;; SMALL Y WITH HOOK + (compose-hook-map [?z] #x0225) ;; SMALL Z WITH HOOK + (compose-horn-map [space] #x031b) + (compose-horn-map [?O] #x01A0) ;; CAPITAL O WITH HORN + (compose-horn-map [?U] #x01AF) ;; CAPITAL U WITH HORN + (compose-horn-map [?o] #x01A1) ;; SMALL O WITH HORN + (compose-horn-map [?u] #x01B0) ;; SMALL U WITH HORN + (compose-stroke-map [?A] #x023a) ;; CAPITAL A WITH STROKE + (compose-stroke-map [?a] #x2c65) ;; SMALL A WITH STROKE + (compose-stroke-map [?B] #x0243) ;; CAPITAL B WITH STROKE + (compose-stroke-map [?b] #x0180) ;; SMALL B WITH STROKE + (compose-stroke-map [?C] #x023b) ;; CAPITAL C WITH STROKE + (compose-stroke-map [?c] #x023c) ;; SMALL C WITH STROKE + (compose-stroke-map [?D] #x0110) ;; CAPITAL D WITH STROKE + (compose-stroke-map [?d] #x0111) ;; SMALL D WITH STROKE + (compose-stroke-map [?E] #x0246) ;; CAPITAL E WITH STROKE + (compose-stroke-map [?e] #x0247) ;; SMALL E WITH STROKE + (compose-stroke-map [?G] #x01e4) ;; CAPITAL G WITH STROKE + (compose-stroke-map [?g] #x01e5) ;; SMALL G WITH STROKE + (compose-stroke-map [?H] #x0126) ;; CAPITAL H WITH STROKE + (compose-stroke-map [?h] #x0127) ;; SMALL H WITH STROKE + (compose-stroke-map [?I] #x0197) ;; CAPITAL I WITH STROKE + (compose-stroke-map [?i] #x0268) ;; SMALL I WITH STROKE + (compose-stroke-map [?J] #x0248) ;; CAPITAL J WITH STROKE + (compose-stroke-map [?j] #x0249) ;; SMALL J WITH STROKE + (compose-stroke-map [?K] #xa740) ;; CAPITAL K WITH STROKE + (compose-stroke-map [?k] #xa741) ;; SMALL K WITH STROKE + (compose-stroke-map [?L] #x0141) ;; CAPITAL L WITH STROKE + (compose-stroke-map [?l] #x0142) ;; SMALL L WITH STROKE + (compose-stroke-map [?O] #x00d8) ;; CAPITAL O WITH STROKE + (compose-stroke-map [?o] #x00f8) ;; SMALL O WITH STROKE + (compose-stroke-map [?P] #x2c63) ;; CAPITAL P WITH STROKE + (compose-stroke-map [?p] #x1d7d) ;; SMALL P WITH STROKE + (compose-stroke-map [?R] #x024c) ;; CAPITAL R WITH STROKE + (compose-stroke-map [?r] #x024d) ;; SMALL R WITH STROKE + (compose-stroke-map [?T] #x0166) ;; CAPITAL T WITH STROKE + (compose-stroke-map [?t] #x0167) ;; SMALL T WITH STROKE + (compose-stroke-map [?Y] #x024e) ;; CAPITAL Y WITH STROKE + (compose-stroke-map [?y] #x024f) ;; SMALL Y WITH STROKE + (compose-stroke-map [?Z] #x01b5) ;; CAPITAL Z WITH STROKE + (compose-stroke-map [?z] #x01b6) ;; SMALL Z WITH STROKE +)) + + +;;; The rest of the compose-map. These are the composed characters +;;; that are not accessible via "dead" keys. + +(define-key compose-map " '" "'") +(define-key compose-map " ^" "^") +(define-key compose-map " `" "`") +(define-key compose-map " ~" "~") +(define-key compose-map " " [(?\240)]) +(define-key compose-map " \"" [(?\250)]) +(define-key compose-map " :" [(?\250)]) +(define-key compose-map " *" [(?\260)]) + +(define-key compose-map "!!" [(?\241)]) +(define-key compose-map "!^" [(?\246)]) +(define-key compose-map "!S" [(?\247)]) +(define-key compose-map "!s" [(?\247)]) +(define-key compose-map "!P" [(?\266)]) +(define-key compose-map "!p" [(?\266)]) + +(define-key compose-map "((" "[") +(define-key compose-map "(-" "{") + +(define-key compose-map "))" "]") +(define-key compose-map ")-" "}") + +(define-key compose-map "++" "#") +(define-key compose-map "+-" [(?\261)]) + +(define-key compose-map "-(" "{") +(define-key compose-map "-)" "}") +(define-key compose-map "--" "-") +(define-key compose-map "-L" [(?\243)]) +(define-key compose-map "-l" [(?\243)]) +(define-key compose-map "-Y" [(?\245)]) +(define-key compose-map "-y" [(?\245)]) +(define-key compose-map "-," [(?\254)]) +(define-key compose-map "-|" [(?\254)]) +(define-key compose-map "-^" [(?\257)]) +(define-key compose-map "-+" [(?\261)]) +(define-key compose-map "-:" [(?\367)]) +(define-key compose-map "-D" [(?\320)]) +(define-key compose-map "-d" [(?\360)]) +(define-key compose-map "-a" [(?\252)]) + +(define-key compose-map ".^" [(?\267)]) + +(define-key compose-map "//" "\\") +(define-key compose-map "/<" "\\") +(define-key compose-map "/^" "|") +(define-key compose-map "/C" [(?\242)]) +(define-key compose-map "/c" [(?\242)]) +(define-key compose-map "/U" [(?\265)]) +(define-key compose-map "/u" [(?\265)]) +(define-key compose-map "/O" [(?\330)]) +(define-key compose-map "/o" [(?\370)]) + +(define-key compose-map "0X" [(?\244)]) +(define-key compose-map "0x" [(?\244)]) +(define-key compose-map "0S" [(?\247)]) +(define-key compose-map "0s" [(?\247)]) +(define-key compose-map "0C" [(?\251)]) +(define-key compose-map "0c" [(?\251)]) +(define-key compose-map "0R" [(?\256)]) +(define-key compose-map "0r" [(?\256)]) +(define-key compose-map "0^" [(?\260)]) + +(define-key compose-map "1^" [(?\271)]) +(define-key compose-map "14" [(?\274)]) +(define-key compose-map "12" [(?\275)]) + +(define-key compose-map "2^" [(?\262)]) + +(define-key compose-map "3^" [(?\263)]) +(define-key compose-map "34" [(?\276)]) + +(define-key compose-map ":-" [(?\367)]) + +(define-key compose-map "</" "\\") +(define-key compose-map "<<" [(?\253)]) + +(define-key compose-map "=L" [(?\243)]) +(define-key compose-map "=l" [(?\243)]) +(define-key compose-map "=Y" [(?\245)]) +(define-key compose-map "=y" [(?\245)]) + +(define-key compose-map ">>" [(?\273)]) + +(define-key compose-map "??" [(?\277)]) + +(define-key compose-map "AA" "＠") +(define-key compose-map "Aa" "＠") +(define-key compose-map "A_" [(?\252)]) +(define-key compose-map "A`" [(?\300)]) +(define-key compose-map "A'" [(?\301)]) +(define-key compose-map "A^" [(?\302)]) +(define-key compose-map "A~" [(?\303)]) +(define-key compose-map "A\"" [(?\304)]) +(define-key compose-map "A*" [(?\305)]) +(define-key compose-map "AE" [(?\306)]) + +(define-key compose-map "C/" [(?\242)]) +(define-key compose-map "C|" [(?\242)]) +(define-key compose-map "C0" [(?\251)]) +(define-key compose-map "CO" [(?\251)]) +(define-key compose-map "Co" [(?\251)]) +(define-key compose-map "C," [(?\307)]) + +(define-key compose-map "D-" [(?\320)]) + +(define-key compose-map "E`" [(?\310)]) +(define-key compose-map "E'" [(?\311)]) +(define-key compose-map "E^" [(?\312)]) +(define-key compose-map "E\"" [(?\313)]) + +(define-key compose-map "I`" [(?\314)]) +(define-key compose-map "I'" [(?\315)]) +(define-key compose-map "I^" [(?\316)]) +(define-key compose-map "I\"" [(?\317)]) + +(define-key compose-map "L-" [(?\243)]) +(define-key compose-map "L=" [(?\243)]) + +(define-key compose-map "N~" [(?\321)]) + +(define-key compose-map "OX" [(?\244)]) +(define-key compose-map "Ox" [(?\244)]) +(define-key compose-map "OS" [(?\247)]) +(define-key compose-map "Os" [(?\247)]) +(define-key compose-map "OC" [(?\251)]) +(define-key compose-map "Oc" [(?\251)]) +(define-key compose-map "OR" [(?\256)]) +(define-key compose-map "Or" [(?\256)]) +(define-key compose-map "O_" [(?\272)]) +(define-key compose-map "O`" [(?\322)]) +(define-key compose-map "O'" [(?\323)]) +(define-key compose-map "O^" [(?\324)]) +(define-key compose-map "O~" [(?\325)]) +(define-key compose-map "O\"" [(?\326)]) +(define-key compose-map "O/" [(?\330)]) + +(define-key compose-map "P!" [(?\266)]) + +(define-key compose-map "R0" [(?\256)]) +(define-key compose-map "RO" [(?\256)]) +(define-key compose-map "Ro" [(?\256)]) + +(define-key compose-map "S!" [(?\247)]) +(define-key compose-map "S0" [(?\247)]) +(define-key compose-map "SO" [(?\247)]) +(define-key compose-map "So" [(?\247)]) +(define-key compose-map "SS" [(?\337)]) + +(define-key compose-map "TH" [(?\336)]) + +(define-key compose-map "U`" [(?\331)]) +(define-key compose-map "U'" [(?\332)]) +(define-key compose-map "U^" [(?\333)]) +(define-key compose-map "U\"" [(?\334)]) + +(define-key compose-map "X0" [(?\244)]) +(define-key compose-map "XO" [(?\244)]) +(define-key compose-map "Xo" [(?\244)]) + +(define-key compose-map "Y-" [(?\245)]) +(define-key compose-map "Y=" [(?\245)]) +(define-key compose-map "Y'" [(?\335)]) + +(define-key compose-map "_A" [(?\252)]) +(define-key compose-map "_a" [(?\252)]) +(define-key compose-map "_^" [(?\257)]) +(define-key compose-map "_O" [(?\272)]) +(define-key compose-map "_o" [(?\272)]) + +(define-key compose-map "aA" "＠") +(define-key compose-map "aa" "＠") +(define-key compose-map "a_" [(?\252)]) +(define-key compose-map "a-" [(?\252)]) +(define-key compose-map "a`" [(?\340)]) +(define-key compose-map "a'" [(?\341)]) +(define-key compose-map "a^" [(?\342)]) +(define-key compose-map "a~" [(?\343)]) +(define-key compose-map "a\"" [(?\344)]) +(define-key compose-map "a*" [(?\345)]) +(define-key compose-map "ae" [(?\346)]) + +(define-key compose-map "c/" [(?\242)]) +(define-key compose-map "c|" [(?\242)]) +(define-key compose-map "c0" [(?\251)]) +(define-key compose-map "cO" [(?\251)]) +(define-key compose-map "co" [(?\251)]) +(define-key compose-map "c," [(?\347)]) + +(define-key compose-map "d-" [(?\360)]) + +(define-key compose-map "e`" [(?\350)]) +(define-key compose-map "e'" [(?\351)]) +(define-key compose-map "e^" [(?\352)]) +(define-key compose-map "e\"" [(?\353)]) + +(define-key compose-map "i`" [(?\354)]) +(define-key compose-map "i'" [(?\355)]) +(define-key compose-map "i^" [(?\356)]) +(define-key compose-map "i\"" [(?\357)]) +(define-key compose-map "i:" [(?\357)]) + +(define-key compose-map "l-" [(?\243)]) +(define-key compose-map "l=" [(?\243)]) + +(define-key compose-map "n~" [(?\361)]) + +(define-key compose-map "oX" [(?\244)]) +(define-key compose-map "ox" [(?\244)]) +(define-key compose-map "oC" [(?\251)]) +(define-key compose-map "oc" [(?\251)]) +(define-key compose-map "oR" [(?\256)]) +(define-key compose-map "or" [(?\256)]) +(define-key compose-map "oS" [(?\247)]) +(define-key compose-map "os" [(?\247)]) +(define-key compose-map "o_" [(?\272)]) +(define-key compose-map "o`" [(?\362)]) +(define-key compose-map "o'" [(?\363)]) +(define-key compose-map "o^" [(?\364)]) +(define-key compose-map "o~" [(?\365)]) +(define-key compose-map "o\"" [(?\366)]) +(define-key compose-map "o/" [(?\370)]) + +(define-key compose-map "p!" [(?\266)]) + +(define-key compose-map "r0" [(?\256)]) +(define-key compose-map "rO" [(?\256)]) +(define-key compose-map "ro" [(?\256)]) + +(define-key compose-map "s!" [(?\247)]) +(define-key compose-map "s0" [(?\247)]) +(define-key compose-map "sO" [(?\247)]) +(define-key compose-map "so" [(?\247)]) +(define-key compose-map "ss" [(?\337)]) + +(define-key compose-map "th" [(?\376)]) + +(define-key compose-map "u`" [(?\371)]) +(define-key compose-map "u'" [(?\372)]) +(define-key compose-map "u^" [(?\373)]) +(define-key compose-map "u\"" [(?\374)]) +(define-key compose-map "u/" [(?\265)]) + +(define-key compose-map "x0" [(?\244)]) +(define-key compose-map "xO" [(?\244)]) +(define-key compose-map "xo" [(?\244)]) +(define-key compose-map "xx" [(?\327)]) + +(define-key compose-map "y-" [(?\245)]) +(define-key compose-map "y=" [(?\245)]) +(define-key compose-map "y'" [(?\375)]) +(define-key compose-map "y\"" [(?\377)]) + +(define-key compose-map "|C" [(?\242)]) +(define-key compose-map "|c" [(?\242)]) +(define-key compose-map "||" [(?\246)]) + + +;; Make colon equivalent to doublequote for diaeresis processing. Some +;; Xlibs do this. +(labels ((alias-colon-to-doublequote (keymap) + (map-keymap + #'(lambda (key value) + (when (keymapp value) + (alias-colon-to-doublequote value)) + (when (eq key '\") + (define-key keymap ":" value))) + keymap))) + (alias-colon-to-doublequote compose-map)) + +;;; Electric dead keys: making a' mean a-acute. + + +(defun electric-diacritic (&optional count) + "Modify the previous character with an accent. +For example, if `:' is bound to this command, then typing `a:' +will first insert `a' and then turn it into `\344' (adiaeresis). +The minimum list of keys to which this command may be bound (and the accents +which it understands) are: + + ' (acute) \301\311\315\323\332\335 \341\351\355\363\372\375 + ` (grave) \300\310\314\322\331 \340\350\354\362\371 + : (diaeresis) \304\313\317\326\334 \344\353\357\366\374\377 + ^ (circumflex) \302\312\316\324\333 \342\352\356\364\373 + , (cedilla) \307\347 + . (ring) \305\345" + (interactive "p") + (or count (setq count 1)) + + (if (not (eq last-command 'self-insert-command)) + ;; Only do the magic if the two chars were typed in succession. + (self-insert-command count) + + ;; This is so that ``a : C-x u'' will transform `adiaeresis' back into `a:' + (self-insert-command count) + (undo-boundary) + (delete-char (- count)) + + (let* ((c last-command-char) + (map (cond ((eq c ?') compose-acute-map) + ((eq c ?`) compose-grave-map) + ((eq c ?,) compose-cedilla-map) + ((eq c ?:) compose-diaeresis-map) + ((eq c ?^) compose-circumflex-map) + ((eq c ?~) compose-tilde-map) + ((eq c ?.) compose-ring-map) + (t (error "unknown diacritic: %s (%c)" c c)))) + (base-char (preceding-char)) + (mod-char (and (>= (downcase base-char) ?a) ; only do alphabetics? + (<= (downcase base-char) ?z) + (lookup-key map (make-string 1 base-char))))) + (when (and (vectorp mod-char) (eql (length mod-char) 1)) + (setq mod-char (aref mod-char 0)) + (if (and (consp mod-char) (eql (length mod-char) 1) + (characterp (car mod-char))) + (setq mod-char (car mod-char)))) + (if (and mod-char (symbolp mod-char)) + (setq mod-char (or (get-character-of-keysym mod-char) mod-char))) + (if (and mod-char (> count 0)) + (delete-char -1) + (setq mod-char c)) + (while (> count 0) + (insert mod-char) + (setq count (1- count)))))) + +;; should "::" mean "�" and ": " mean ":"? +;; should we also do +;; (?~ +;; (?A "\303") +;; (?C "\307") +;; (?D "\320") +;; (?N "\321") +;; (?O "\325") +;; (?a "\343") +;; (?c "\347") +;; (?d "\360") +;; (?n "\361") +;; (?o "\365") +;; (?> "\273") +;; (?< "\253") +;; (? "~")) ; no special code +;; (?\/ +;; (?A "\305") ;; A-with-ring (Norwegian and Danish) +;; (?E "\306") ;; AE-ligature (Norwegian and Danish) +;; (?O "\330") +;; (?a "\345") ;; a-with-ring (Norwegian and Danish) +;; (?e "\346") ;; ae-ligature (Norwegian and Danish) +;; (?o "\370") +;; (? "/")) ; no special code + + +(provide 'x-compose) +(provide 'compose) + +;;; compose.el ends here diff -r a69c6e871607 -r 3de111a0da7b lisp/gtk-compose.el --- a/lisp/gtk-compose.el Wed Dec 20 00:13:53 2017 +0000 +++ b/lisp/gtk-compose.el Fri Dec 22 12:37:44 2017 +0000 ＠＠ -17,6 +17,6 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. -(require 'x-compose) +(require 'compose) (provide 'gtk-compose) diff -r a69c6e871607 -r 3de111a0da7b lisp/isearch-mode.el --- a/lisp/isearch-mode.el Wed Dec 20 00:13:53 2017 +0000 +++ b/lisp/isearch-mode.el Fri Dec 22 12:37:44 2017 +0000 ＠＠ -1618,14 +1618,14 ＠＠ ;; bound to self-insert-command, then do the same thing as for ;; self-inserting commands: arrange for that character to be ;; added to the search string. If we didn't do this, then - ;; typing a compose sequence (a la x-compose.el) would + ;; typing a compose sequence (a la compose.el) would ;; terminate the search and insert the character, instead of ;; searching for that character. ;; ;; We should continue doing this, since it's pretty much the ;; behavior one would expect, but it will stop being so ;; necessary once key-translation- map exists and is used by - ;; x-compose.el and things like it, since the translation will + ;; compose.el and things like it, since the translation will ;; have been done before we see the keys. ;; (cond ((eq this-command 'self-insert-command) diff -r a69c6e871607 -r 3de111a0da7b lisp/keymap.el --- a/lisp/keymap.el Wed Dec 20 00:13:53 2017 +0000 +++ b/lisp/keymap.el Fri Dec 22 12:37:44 2017 +0000 ＠＠ -552,7 +552,7 ＠＠ ;; The autoloads for the compose map, and their bindings in ;; function-key-map-parent are used by GTK as well as X11. And Julian -;; Bradfield, at least, uses x-compose on the TTY, it's reasonable to make +;; Bradfield, at least, uses compose.el on the TTY, it's reasonable to make ;; them generally available. (loop for map in '(compose-acute-map compose-breve-map compose-caron-map ＠＠ -562,7 +562,7 ＠＠ compose-hook-map compose-horn-map compose-macron-map compose-map compose-ogonek-map compose-ring-map compose-stroke-map compose-tilde-map) - do (autoload map "x-compose" nil t 'keymap)) + do (autoload map "compose" nil t 'keymap)) (loop for (key map) diff -r a69c6e871607 -r 3de111a0da7b lisp/x-compose.el --- a/lisp/x-compose.el Wed Dec 20 00:13:53 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 ＠＠ -1,964 +0,0 ＠＠ -;;; x-compose.el --- Compose-key processing in XEmacs - -;; Copyright (C) 1992, 1993, 1997, 2005 Free Software Foundation, Inc. - -;; Author: Jamie Zawinski <jwz(a)jwz.org> -;; Maintainer: XEmacs Development Team -;; Rewritten by Martin Buchholz far too many times. -;; -;; Changed: 11 Jun 1997 by Heiko Muenkel <muenkel(a)tnt.uni-hannover.de> -;; The degree sign couldn't be inserted with the old version. -;; Keywords: i18n - -;; 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. - -;;; Synched up with: Not in FSF. - -;;; Commentary: - -;; created by jwz, 14-jun-92. -;;; changed by Jan Vroonhof, July 1997: Use function-key-map instead -;;; of global map. -;;; Preliminary support for -;;; XFree86 deadkeys - -;; This file implements DEC-, OpenWindows-, and HP-compatible "Compose" -;; processing for XEmacs. - -;; If you are running a version of X which already does compose processing, -;; then you don't need this file. But the MIT R4 and R5 distributions don't -;; do compose processing, so you may want to fake it by using this code. - -;; The basic idea is that there are several ways to generate keysyms which -;; do not have keys devoted to them on your keyboard. - -;; The first method is by using "dead" keys. A dead key is a key which, -;; when typed, does not insert a character. Instead it modifies the -;; following character typed. So if you typed "dead-tilde" followed by "A", -;; then "A-tilde" would be inserted. Of course, this requires you to modify -;; your keyboard to include a "dead-tilde" key on it somewhere. - -;; The second method is by using a "Compose" key. With a Compose key, you -;; would type "Compose" then "tilde" then "A" to insert "A-tilde". - -;; There are a small number of dead keys: acute, grave, cedilla, diaeresis, -;; circumflex, tilde, and ring. There are a larger number of accented and -;; other characters accessible via the Compose key, so both are useful. - -;; To use this code, you will need to have a Compose key on your keyboard. -;; The default configuration of most X keyboards doesn't contain one. You -;; can, for example, turn the right "Meta" key into a "Compose" key with -;; this command: - -;; xmodmap -e "remove mod1 = Meta_R" -e "keysym Meta_R = Multi_key" - -;; Multi-key is the name that X (and emacs) know the "Compose" key by. -;; The "remove..." command is necessary because the "Compose" key must not -;; have any modifier bits associated with it. This exact command may not -;; work, depending on what system and keyboard you are using. If it -;; doesn't, you'll have to read the man page for xmodmap. You might want -;; to get the "xkeycaps" program from -;; <URL:http://www.jwz.org/xkeycaps/>, -;; which is a graphical front end to xmodmap -;; that hides xmodmap's arcane syntax from you. - -;; If for some reason you don't want to have a dedicated compose key on your -;; keyboard, you can use some other key as the prefix. For example, to make -;; "Meta-Shift-C" act as a compose key (so that "M-C , c" would insert the -;; character "ccedilla") you could do - -;; (global-set-key "\M-C" compose-map) - -;; I believe the bindings encoded in this file are the same as those used -;; by OpenWindows versions 2 and 3, and DEC VT320 terminals. Please let me -;; know if you think otherwise. - -;; Much thanks to Justin Bur <justin(a)crim.ca> for helping me understand how -;; this stuff is supposed to work. - -;; You also might want to consider getting Justin's patch for the MIT Xlib -;; that implements compose processing in the library. This will enable -;; compose processing in applications other than emacs as well. You can -;; get it from export.lcs.mit.edu in contrib/compose.tar.Z. - -;; This code has one feature that a more "builtin" Compose mechanism could -;; not have: at any point you can type C-h to get a list of the possible -;; completions of what you have typed so far. - -;; ---------------------------------------------------------------------- -;; -;; Notes from Aidan Kehoe, Thu Feb 12 16:21:18 GMT 2009 (these conflict to -;; some extent with the above): - -;; Giacomo Boffi's problem of -;; 20050324103919.8D22E4901(a)boffi95.stru.polimi.it is caused by Xlib doing -;; the compose processing. To turn that off, you need to recompile without -;; XIM support, or start up XEmacs in a locale that the system supports but -;; X11 does not (for me, ru_RU.CP866 works for this). This will be -;; preferable anyway for some people, because the XIM support drops -;; sequences we would prefer to see. E.g. in the following situation, with -;; an XIM build: - -;; $ LC_CTYPE=de_DE.ISO8859-1 ./xemacs -vanilla & - -;; Input: dead-acute a -;; Seen by XEmacs: aacute (thanks to XIM) -;; Action: U+00E1 is inserted in the buffer - -;; Input: dead-abovedot o -;; Seen by XEmacs: dead-abovedot o (XIM does not intervene, since no -;; characters in this locale are generated with -;; dead-abovedot) -;; Action: U+022F is inserted in the buffer (thanks to this file) - -;; Input: dead-acute r -;; Seen by XEmacs: nothing (thanks to XIM, it considers U+0155 unavailable) -;; Action: nothing - -;; Without XIM, all the above inputs would work fine, independent of your -;; locale. - -;; Also, XIM does not intervene at all with the second or subsequent X11 -;; devices created, and this file is needed for compose processing -;; there. This may be a bug in our use of XIM, or it may a bug in XIM -;; itself. - -;; ＠＠#### This should probably be integrated into general Usenet handling -;; of composition sequences. - -;;; Code: - -(macrolet - ((define-compose-map (&rest keymap-symbols) - (loop - for keymap-symbol in keymap-symbols - with result = nil - do - ;; Required to tell XEmacs the keymaps were actually autoloaded. - ;; #### Make this unnecessary! - (push `(fset ',keymap-symbol ,keymap-symbol) result) - (push `(defconst ,keymap-symbol (make-sparse-keymap ',keymap-symbol)) - result) - finally return (cons 'progn result)))) - (define-compose-map compose-map compose-acute-map compose-grave-map - compose-cedilla-map compose-diaeresis-map compose-circumflex-map - compose-tilde-map compose-ring-map compose-caron-map compose-macron-map - compose-breve-map compose-dot-map compose-doubleacute-map - compose-ogonek-map compose-hook-map compose-horn-map compose-stroke-map)) - -(define-key compose-map 'acute compose-acute-map) -(define-key compose-map 'grave compose-grave-map) -(define-key compose-map 'cedilla compose-cedilla-map) -(define-key compose-map 'diaeresis compose-diaeresis-map) -(define-key compose-map 'circumflex compose-circumflex-map) -(define-key compose-map 'tilde compose-tilde-map) -(define-key compose-map 'degree compose-ring-map) -(define-key compose-map 'caron compose-caron-map) -(define-key compose-map 'macron compose-macron-map) -(define-key compose-map 'doubleacute compose-doubleacute-map) -(define-key compose-map 'ogonek compose-ogonek-map) -(define-key compose-map 'breve compose-breve-map) -(define-key compose-map 'abovedot compose-dot-map) -(define-key compose-map 'stroke compose-stroke-map) - -;;(define-key function-key-map [multi-key] compose-map) - -;; The following is necessary, because one can't rebind [degree] -;; and use it to insert the degree sign! -;;(defun compose-insert-degree () -;; "Inserts a degree sign." -;; (interactive) -;; (insert ?\260)) - -(define-key compose-map [acute] compose-acute-map) -(define-key compose-map [?'] compose-acute-map) -(define-key compose-map [grave] compose-grave-map) -(define-key compose-map [?`] compose-grave-map) -(define-key compose-map [cedilla] compose-cedilla-map) -(define-key compose-map [?,] compose-cedilla-map) -(define-key compose-map [diaeresis] compose-diaeresis-map) -(define-key compose-map [?\"] compose-diaeresis-map) -(define-key compose-map [circumflex] compose-circumflex-map) -(define-key compose-map [?^] compose-circumflex-map) -(define-key compose-map [tilde] compose-tilde-map) -(define-key compose-map [~] compose-tilde-map) -(define-key compose-map [degree] compose-ring-map) -(define-key compose-map [?*] compose-ring-map) -(define-key compose-map [stroke] compose-stroke-map) - -(loop - for (keysym character-code map) - in '((caron #x02C7 compose-caron-map) - (macron #x00AF compose-macron-map) - (doubleacute #x02DD compose-doubleacute-map) - (ogonek #x02db compose-ogonek-map) - (breve #x0306 compose-breve-map) - (abovedot #x0307 compose-dot-map) - (U031b #x031b compose-horn-map)) - do - (define-key compose-map (vector keysym) map) - (when (setq character-code (decode-char 'ucs character-code)) - (define-key compose-map (vector character-code) map))) - - -;;; The contents of the "dead key" maps. These are shared by the -;;; compose-map. - -;;; Against the spirit of Unicode, which says that the precomposed -;;; characters are just there for round-trip compatibility with other -;;; encodings and don't reflect that they're necessarily used much, these -;;; are just the precomposed Latin characters in UnicodeData.txt; we don't -;;; support any decomposed characters here. (Not least because in general we -;;; don't have worthwhile support for precomposed characters.) - -(assert - (or (featurep 'mule) (null (decode-char 'ucs #x100))) - nil - "This code assumes no non-Mule characters have a UCS value \ -greater than #xFF, and needs to be rewritten if that is not true.") - -(macrolet - ((decide-on-bindings (&rest details) - "Look through DETAILS, working out which bindings work on non-Mule. - -This returns a long `if' statement that should be executed when this file is -loaded; it assumes that #xFF is the inclusive upper bound for the Unicode -value of characters under non-Mule. " - (loop for (map key binding) in details - with if-mule = nil - with without-mule = nil - do - (push `(define-key ,map ,key - (vector (list (decode-char 'ucs ,binding)))) if-mule) - (when (<= binding #xFF) - (push `(define-key ,map ,key - (vector (list (decode-char 'ucs ,binding)))) - without-mule)) - finally return `(if (featurep 'mule) - (progn ,＠if-mule) - ,＠without-mule)))) - (decide-on-bindings - (compose-acute-map [space] #x0027) ;; APOSTROPHE - (compose-acute-map [?\'] #x00B4) ;; ACUTE ACCENT - (compose-acute-map [?A] #x00C1) ;; CAPITAL A WITH ACUTE - (compose-acute-map [?C] #x0106) ;; CAPITAL C WITH ACUTE - (compose-acute-map [?E] #x00C9) ;; CAPITAL E WITH ACUTE - (compose-acute-map [?G] #x01F4) ;; CAPITAL G WITH ACUTE - (compose-acute-map [?I] #x00CD) ;; CAPITAL I WITH ACUTE - (compose-acute-map [?K] #x1E30) ;; CAPITAL K WITH ACUTE - (compose-acute-map [?L] #x0139) ;; CAPITAL L WITH ACUTE - (compose-acute-map [?M] #x1E3E) ;; CAPITAL M WITH ACUTE - (compose-acute-map [?N] #x0143) ;; CAPITAL N WITH ACUTE - (compose-acute-map [?O] #x00D3) ;; CAPITAL O WITH ACUTE - (compose-acute-map [?P] #x1E54) ;; CAPITAL P WITH ACUTE - (compose-acute-map [?R] #x0154) ;; CAPITAL R WITH ACUTE - (compose-acute-map [?S] #x015A) ;; CAPITAL S WITH ACUTE - (compose-acute-map [?U] #x00DA) ;; CAPITAL U WITH ACUTE - (compose-acute-map [?W] #x1E82) ;; CAPITAL W WITH ACUTE - (compose-acute-map [?Y] #x00DD) ;; CAPITAL Y WITH ACUTE - (compose-acute-map [?Z] #x0179) ;; CAPITAL Z WITH ACUTE - (compose-acute-map [?a] #x00E1) ;; SMALL A WITH ACUTE - (compose-acute-map [?c] #x0107) ;; SMALL C WITH ACUTE - (compose-acute-map [?e] #x00E9) ;; SMALL E WITH ACUTE - (compose-acute-map [?g] #x01F5) ;; SMALL G WITH ACUTE - (compose-acute-map [?i] #x00ED) ;; SMALL I WITH ACUTE - (compose-acute-map [?k] #x1E31) ;; SMALL K WITH ACUTE - (compose-acute-map [?l] #x013A) ;; SMALL L WITH ACUTE - (compose-acute-map [?m] #x1E3F) ;; SMALL M WITH ACUTE - (compose-acute-map [?n] #x0144) ;; SMALL N WITH ACUTE - (compose-acute-map [?o] #x00F3) ;; SMALL O WITH ACUTE - (compose-acute-map [?p] #x1E55) ;; SMALL P WITH ACUTE - (compose-acute-map [?r] #x0155) ;; SMALL R WITH ACUTE - (compose-acute-map [?s] #x015B) ;; SMALL S WITH ACUTE - (compose-acute-map [?u] #x00FA) ;; SMALL U WITH ACUTE - (compose-acute-map [?w] #x1E83) ;; SMALL W WITH ACUTE - (compose-acute-map [?y] #x00FD) ;; SMALL Y WITH ACUTE - (compose-acute-map [?z] #x017A) ;; SMALL Z WITH ACUTE - (compose-grave-map [space] #x0060) ;; GRAVE ACCENT - (compose-grave-map [?\`] #x0060) ;; GRAVE ACCENT - (compose-grave-map [?A] #x00C0) ;; CAPITAL A WITH GRAVE - (compose-grave-map [?E] #x00C8) ;; CAPITAL E WITH GRAVE - (compose-grave-map [?I] #x00CC) ;; CAPITAL I WITH GRAVE - (compose-grave-map [?N] #x01F8) ;; CAPITAL N WITH GRAVE - (compose-grave-map [?O] #x00D2) ;; CAPITAL O WITH GRAVE - (compose-grave-map [?U] #x00D9) ;; CAPITAL U WITH GRAVE - (compose-grave-map [?W] #x1E80) ;; CAPITAL W WITH GRAVE - (compose-grave-map [?Y] #x1EF2) ;; CAPITAL Y WITH GRAVE - (compose-grave-map [?a] #x00E0) ;; SMALL A WITH GRAVE - (compose-grave-map [?e] #x00E8) ;; SMALL E WITH GRAVE - (compose-grave-map [?i] #x00EC) ;; SMALL I WITH GRAVE - (compose-grave-map [?n] #x01F9) ;; SMALL N WITH GRAVE - (compose-grave-map [?o] #x00F2) ;; SMALL O WITH GRAVE - (compose-grave-map [?u] #x00F9) ;; SMALL U WITH GRAVE - (compose-grave-map [?w] #x1E81) ;; SMALL W WITH GRAVE - (compose-grave-map [?y] #x1EF3) ;; SMALL Y WITH GRAVE - (compose-cedilla-map [space] #x002C) ;; COMMA - (compose-cedilla-map [?\,] #x00B8) ;; CEDILLA - (compose-cedilla-map [C] #x00C7) ;; CAPITAL C WITH CEDILLA - (compose-cedilla-map [D] #x1E10) ;; CAPITAL D WITH CEDILLA - (compose-cedilla-map [E] #x0228) ;; CAPITAL E WITH CEDILLA - (compose-cedilla-map [G] #x0122) ;; CAPITAL G WITH CEDILLA - (compose-cedilla-map [H] #x1E28) ;; CAPITAL H WITH CEDILLA - (compose-cedilla-map [K] #x0136) ;; CAPITAL K WITH CEDILLA - (compose-cedilla-map [L] #x013B) ;; CAPITAL L WITH CEDILLA - (compose-cedilla-map [N] #x0145) ;; CAPITAL N WITH CEDILLA - (compose-cedilla-map [R] #x0156) ;; CAPITAL R WITH CEDILLA - (compose-cedilla-map [S] #x015E) ;; CAPITAL S WITH CEDILLA - (compose-cedilla-map [T] #x0162) ;; CAPITAL T WITH CEDILLA - (compose-cedilla-map [c] #x00E7) ;; SMALL C WITH CEDILLA - (compose-cedilla-map [d] #x1E11) ;; SMALL D WITH CEDILLA - (compose-cedilla-map [e] #x0229) ;; SMALL E WITH CEDILLA - (compose-cedilla-map [g] #x0123) ;; SMALL G WITH CEDILLA - (compose-cedilla-map [h] #x1E29) ;; SMALL H WITH CEDILLA - (compose-cedilla-map [k] #x0137) ;; SMALL K WITH CEDILLA - (compose-cedilla-map [l] #x013C) ;; SMALL L WITH CEDILLA - (compose-cedilla-map [n] #x0146) ;; SMALL N WITH CEDILLA - (compose-cedilla-map [r] #x0157) ;; SMALL R WITH CEDILLA - (compose-cedilla-map [s] #x015F) ;; SMALL S WITH CEDILLA - (compose-cedilla-map [t] #x0163) ;; SMALL T WITH CEDILLA - (compose-diaeresis-map [space] #x00A8) ;; DIAERESIS - (compose-diaeresis-map [?\"] #x00A8) ;; DIAERESIS - (compose-diaeresis-map [?s] #x00DF) ;; SMALL SHARP S - (compose-diaeresis-map [?A] #x00C4) ;; CAPITAL A WITH DIAERESIS - (compose-diaeresis-map [?E] #x00CB) ;; CAPITAL E WITH DIAERESIS - (compose-diaeresis-map [?H] #x1E26) ;; CAPITAL H WITH DIAERESIS - (compose-diaeresis-map [?I] #x00CF) ;; CAPITAL I WITH DIAERESIS - (compose-diaeresis-map [?O] #x00D6) ;; CAPITAL O WITH DIAERESIS - (compose-diaeresis-map [?U] #x00DC) ;; CAPITAL U WITH DIAERESIS - (compose-diaeresis-map [?W] #x1E84) ;; CAPITAL W WITH DIAERESIS - (compose-diaeresis-map [?X] #x1E8C) ;; CAPITAL X WITH DIAERESIS - (compose-diaeresis-map [?Y] #x0178) ;; CAPITAL Y WITH DIAERESIS - (compose-diaeresis-map [?a] #x00E4) ;; SMALL A WITH DIAERESIS - (compose-diaeresis-map [?e] #x00EB) ;; SMALL E WITH DIAERESIS - (compose-diaeresis-map [?h] #x1E27) ;; SMALL H WITH DIAERESIS - (compose-diaeresis-map [?i] #x00EF) ;; SMALL I WITH DIAERESIS - (compose-diaeresis-map [?o] #x00F6) ;; SMALL O WITH DIAERESIS - (compose-diaeresis-map [?t] #x1E97) ;; SMALL T WITH DIAERESIS - (compose-diaeresis-map [?u] #x00FC) ;; SMALL U WITH DIAERESIS - (compose-diaeresis-map [?w] #x1E85) ;; SMALL W WITH DIAERESIS - (compose-diaeresis-map [?x] #x1E8D) ;; SMALL X WITH DIAERESIS - (compose-diaeresis-map [?y] #x00FF) ;; SMALL Y WITH DIAERESIS - (compose-circumflex-map [space] #x005e) ;; CIRCUMFLEX ACCENT - (compose-circumflex-map [?A] #x00C2) ;; CAPITAL A WITH CIRCUMFLEX - (compose-circumflex-map [?C] #x0108) ;; CAPITAL C WITH CIRCUMFLEX - (compose-circumflex-map [?E] #x00CA) ;; CAPITAL E WITH CIRCUMFLEX - (compose-circumflex-map [?G] #x011C) ;; CAPITAL G WITH CIRCUMFLEX - (compose-circumflex-map [?H] #x0124) ;; CAPITAL H WITH CIRCUMFLEX - (compose-circumflex-map [?I] #x00CE) ;; CAPITAL I WITH CIRCUMFLEX - (compose-circumflex-map [?J] #x0134) ;; CAPITAL J WITH CIRCUMFLEX - (compose-circumflex-map [?O] #x00D4) ;; CAPITAL O WITH CIRCUMFLEX - (compose-circumflex-map [?S] #x015C) ;; CAPITAL S WITH CIRCUMFLEX - (compose-circumflex-map [?U] #x00DB) ;; CAPITAL U WITH CIRCUMFLEX - (compose-circumflex-map [?W] #x0174) ;; CAPITAL W WITH CIRCUMFLEX - (compose-circumflex-map [?Y] #x0176) ;; CAPITAL Y WITH CIRCUMFLEX - (compose-circumflex-map [?Z] #x1E90) ;; CAPITAL Z WITH CIRCUMFLEX - (compose-circumflex-map [?a] #x00e2) ;; SMALL A WITH CIRCUMFLEX - (compose-circumflex-map [?c] #x0109) ;; SMALL C WITH CIRCUMFLEX - (compose-circumflex-map [?e] #x00ea) ;; SMALL E WITH CIRCUMFLEX - (compose-circumflex-map [?g] #x011d) ;; SMALL G WITH CIRCUMFLEX - (compose-circumflex-map [?h] #x0125) ;; SMALL H WITH CIRCUMFLEX - (compose-circumflex-map [?i] #x00ee) ;; SMALL I WITH CIRCUMFLEX - (compose-circumflex-map [?j] #x0135) ;; SMALL J WITH CIRCUMFLEX - (compose-circumflex-map [?o] #x00f4) ;; SMALL O WITH CIRCUMFLEX - (compose-circumflex-map [?s] #x015d) ;; SMALL S WITH CIRCUMFLEX - (compose-circumflex-map [?u] #x00fb) ;; SMALL U WITH CIRCUMFLEX - (compose-circumflex-map [?w] #x0175) ;; SMALL W WITH CIRCUMFLEX - (compose-circumflex-map [?y] #x0177) ;; SMALL Y WITH CIRCUMFLEX - (compose-circumflex-map [?z] #x1e91) ;; SMALL Z WITH CIRCUMFLEX - (compose-tilde-map [space] #x007E) ;; TILDE - (compose-tilde-map [?A] #x00C3) ;; CAPITAL A WITH TILDE - (compose-tilde-map [?E] #x1EBC) ;; CAPITAL E WITH TILDE - (compose-tilde-map [?I] #x0128) ;; CAPITAL I WITH TILDE - (compose-tilde-map [?N] #x00D1) ;; CAPITAL N WITH TILDE - (compose-tilde-map [?O] #x00D5) ;; CAPITAL O WITH TILDE - (compose-tilde-map [?U] #x0168) ;; CAPITAL U WITH TILDE - (compose-tilde-map [?V] #x1E7C) ;; CAPITAL V WITH TILDE - (compose-tilde-map [?Y] #x1EF8) ;; CAPITAL Y WITH TILDE - (compose-tilde-map [?a] #x00E3) ;; SMALL A WITH TILDE - (compose-tilde-map [?e] #x1EBD) ;; SMALL E WITH TILDE - (compose-tilde-map [?i] #x0129) ;; SMALL I WITH TILDE - (compose-tilde-map [?n] #x00F1) ;; SMALL N WITH TILDE - (compose-tilde-map [?o] #x00F5) ;; SMALL O WITH TILDE - (compose-tilde-map [?u] #x0169) ;; SMALL U WITH TILDE - (compose-tilde-map [?v] #x1E7D) ;; SMALL V WITH TILDE - (compose-tilde-map [?y] #x1EF9) ;; SMALL Y WITH TILDE - (compose-ring-map [space] #x00B0) ;; DEGREE SIGN - (compose-ring-map [?A] #x00C5) ;; CAPITAL A WITH RING ABOVE - (compose-ring-map [?U] #x016E) ;; CAPITAL U WITH RING ABOVE - (compose-ring-map [?a] #x00E5) ;; SMALL A WITH RING ABOVE - (compose-ring-map [?u] #x016F) ;; SMALL U WITH RING ABOVE - (compose-ring-map [?w] #x1E98) ;; SMALL W WITH RING ABOVE - (compose-ring-map [?y] #x1E99) ;; SMALL Y WITH RING ABOVE - (compose-caron-map [space] #x02C7) ;; CARON - (compose-caron-map [?A] #x01CD) ;; CAPITAL A WITH CARON - (compose-caron-map [?C] #x010C) ;; CAPITAL C WITH CARON - (compose-caron-map [?D] #x010E) ;; CAPITAL D WITH CARON - (compose-caron-map [U01F1] #x01C4) ;; CAPITAL DZ WITH CARON - (compose-caron-map [?E] #x011A) ;; CAPITAL E WITH CARON - (compose-caron-map [U01B7] #x01EE) ;; CAPITAL EZH WITH CARON - (compose-caron-map [?G] #x01E6) ;; CAPITAL G WITH CARON - (compose-caron-map [?H] #x021E) ;; CAPITAL H WITH CARON - (compose-caron-map [?I] #x01CF) ;; CAPITAL I WITH CARON - (compose-caron-map [?K] #x01E8) ;; CAPITAL K WITH CARON - (compose-caron-map [?L] #x013D) ;; CAPITAL L WITH CARON - (compose-caron-map [?N] #x0147) ;; CAPITAL N WITH CARON - (compose-caron-map [?O] #x01D1) ;; CAPITAL O WITH CARON - (compose-caron-map [?R] #x0158) ;; CAPITAL R WITH CARON - (compose-caron-map [?S] #x0160) ;; CAPITAL S WITH CARON - (compose-caron-map [?T] #x0164) ;; CAPITAL T WITH CARON - (compose-caron-map [?U] #x01D3) ;; CAPITAL U WITH CARON - (compose-caron-map [?Z] #x017D) ;; CAPITAL Z WITH CARON - (compose-caron-map [?a] #x01CE) ;; SMALL A WITH CARON - (compose-caron-map [?c] #x010D) ;; SMALL C WITH CARON - (compose-caron-map [?d] #x010F) ;; SMALL D WITH CARON - (compose-caron-map [U01F3] #x01C6) ;; SMALL DZ WITH CARON - (compose-caron-map [?e] #x011B) ;; SMALL E WITH CARON - (compose-caron-map [U0292] #x01EF) ;; SMALL EZH WITH CARON - (compose-caron-map [?g] #x01E7) ;; SMALL G WITH CARON - (compose-caron-map [?h] #x021F) ;; SMALL H WITH CARON - (compose-caron-map [?i] #x01D0) ;; SMALL I WITH CARON - (compose-caron-map [?j] #x01F0) ;; SMALL J WITH CARON - (compose-caron-map [?k] #x01E9) ;; SMALL K WITH CARON - (compose-caron-map [?l] #x013E) ;; SMALL L WITH CARON - (compose-caron-map [?n] #x0148) ;; SMALL N WITH CARON - (compose-caron-map [?o] #x01D2) ;; SMALL O WITH CARON - (compose-caron-map [?r] #x0159) ;; SMALL R WITH CARON - (compose-caron-map [?s] #x0161) ;; SMALL S WITH CARON - (compose-caron-map [?t] #x0165) ;; SMALL T WITH CARON - (compose-caron-map [?u] #x01D4) ;; SMALL U WITH CARON - (compose-caron-map [?z] #x017E) ;; SMALL Z WITH CARON - (compose-macron-map [space] #x00AF) ;; MACRON - (compose-macron-map [?A] #x0100) ;; CAPITAL A WITH MACRON - (compose-macron-map [AE] #x01E2) ;; CAPITAL AE WITH MACRON - (compose-macron-map [?E] #x0112) ;; CAPITAL E WITH MACRON - (compose-macron-map [?G] #x1E20) ;; CAPITAL G WITH MACRON - (compose-macron-map [?I] #x012A) ;; CAPITAL I WITH MACRON - (compose-macron-map [?O] #x014C) ;; CAPITAL O WITH MACRON - (compose-macron-map [?U] #x016A) ;; CAPITAL U WITH MACRON - (compose-macron-map [?Y] #x0232) ;; CAPITAL Y WITH MACRON - (compose-macron-map [?a] #x0101) ;; SMALL A WITH MACRON - (compose-macron-map [ae] #x01E3) ;; SMALL AE WITH MACRON - (compose-macron-map [?e] #x0113) ;; SMALL E WITH MACRON - (compose-macron-map [?g] #x1E21) ;; SMALL G WITH MACRON - (compose-macron-map [?i] #x012B) ;; SMALL I WITH MACRON - (compose-macron-map [?o] #x014D) ;; SMALL O WITH MACRON - (compose-macron-map [?u] #x016B) ;; SMALL U WITH MACRON - (compose-macron-map [?y] #x0233) ;; SMALL Y WITH MACRON - (compose-doubleacute-map [space] #x02DD) ;; DOUBLE ACUTE ACCENT - (compose-doubleacute-map [?O] #x0150) ;; CAPITAL O WITH DOUBLE ACUTE - (compose-doubleacute-map [?U] #x0170) ;; CAPITAL U WITH DOUBLE ACUTE - (compose-doubleacute-map [?o] #x0151) ;; SMALL O WITH DOUBLE ACUTE - (compose-doubleacute-map [?u] #x0171) ;; SMALL U WITH DOUBLE ACUTE - (compose-ogonek-map [space] #x02DB) ;; OGONEK - (compose-ogonek-map [?A] #x0104) ;; CAPITAL A WITH OGONEK - (compose-ogonek-map [?E] #x0118) ;; CAPITAL E WITH OGONEK - (compose-ogonek-map [?I] #x012E) ;; CAPITAL I WITH OGONEK - (compose-ogonek-map [?O] #x01EA) ;; CAPITAL O WITH OGONEK - (compose-ogonek-map [?U] #x0172) ;; CAPITAL U WITH OGONEK - (compose-ogonek-map [?a] #x0105) ;; SMALL A WITH OGONEK - (compose-ogonek-map [?e] #x0119) ;; SMALL E WITH OGONEK - (compose-ogonek-map [?i] #x012F) ;; SMALL I WITH OGONEK - (compose-ogonek-map [?o] #x01EB) ;; SMALL O WITH OGONEK - (compose-ogonek-map [?u] #x0173) ;; SMALL U WITH OGONEK - (compose-breve-map [space] #x02D8) ;; BREVE - (compose-breve-map [?A] #x0102) ;; CAPITAL A WITH BREVE - (compose-breve-map [?E] #x0114) ;; CAPITAL E WITH BREVE - (compose-breve-map [?G] #x011E) ;; CAPITAL G WITH BREVE - (compose-breve-map [?I] #x012C) ;; CAPITAL I WITH BREVE - (compose-breve-map [?O] #x014E) ;; CAPITAL O WITH BREVE - (compose-breve-map [?U] #x016C) ;; CAPITAL U WITH BREVE - (compose-breve-map [?a] #x0103) ;; SMALL A WITH BREVE - (compose-breve-map [?e] #x0115) ;; SMALL E WITH BREVE - (compose-breve-map [?g] #x011F) ;; SMALL G WITH BREVE - (compose-breve-map [?i] #x012D) ;; SMALL I WITH BREVE - (compose-breve-map [?o] #x014F) ;; SMALL O WITH BREVE - (compose-breve-map [?u] #x016D) ;; SMALL U WITH BREVE - (compose-dot-map [space] #x02D9) ;; DOT ABOVE - (compose-dot-map [?A] #x0226) ;; CAPITAL A WITH DOT ABOVE - (compose-dot-map [?B] #x1E02) ;; CAPITAL B WITH DOT ABOVE - (compose-dot-map [?C] #x010A) ;; CAPITAL C WITH DOT ABOVE - (compose-dot-map [?D] #x1E0A) ;; CAPITAL D WITH DOT ABOVE - (compose-dot-map [?E] #x0116) ;; CAPITAL E WITH DOT ABOVE - (compose-dot-map [?F] #x1E1E) ;; CAPITAL F WITH DOT ABOVE - (compose-dot-map [?G] #x0120) ;; CAPITAL G WITH DOT ABOVE - (compose-dot-map [?H] #x1E22) ;; CAPITAL H WITH DOT ABOVE - (compose-dot-map [?I] #x0130) ;; CAPITAL I WITH DOT ABOVE - (compose-dot-map [?M] #x1E40) ;; CAPITAL M WITH DOT ABOVE - (compose-dot-map [?N] #x1E44) ;; CAPITAL N WITH DOT ABOVE - (compose-dot-map [?O] #x022E) ;; CAPITAL O WITH DOT ABOVE - (compose-dot-map [?P] #x1E56) ;; CAPITAL P WITH DOT ABOVE - (compose-dot-map [?R] #x1E58) ;; CAPITAL R WITH DOT ABOVE - (compose-dot-map [?S] #x1E60) ;; CAPITAL S WITH DOT ABOVE - (compose-dot-map [?T] #x1E6A) ;; CAPITAL T WITH DOT ABOVE - (compose-dot-map [?W] #x1E86) ;; CAPITAL W WITH DOT ABOVE - (compose-dot-map [?X] #x1E8A) ;; CAPITAL X WITH DOT ABOVE - (compose-dot-map [?Y] #x1E8E) ;; CAPITAL Y WITH DOT ABOVE - (compose-dot-map [?Z] #x017B) ;; CAPITAL Z WITH DOT ABOVE - (compose-dot-map [?a] #x0227) ;; SMALL A WITH DOT ABOVE - (compose-dot-map [?b] #x1E03) ;; SMALL B WITH DOT ABOVE - (compose-dot-map [?c] #x010B) ;; SMALL C WITH DOT ABOVE - (compose-dot-map [?d] #x1E0B) ;; SMALL D WITH DOT ABOVE - (compose-dot-map [?e] #x0117) ;; SMALL E WITH DOT ABOVE - (compose-dot-map [?f] #x1E1F) ;; SMALL F WITH DOT ABOVE - (compose-dot-map [?g] #x0121) ;; SMALL G WITH DOT ABOVE - (compose-dot-map [?h] #x1E23) ;; SMALL H WITH DOT ABOVE - (compose-dot-map [U017F] #x1E9B) ;; SMALL LONG S WITH DOT ABOVE - (compose-dot-map [?m] #x1E41) ;; SMALL M WITH DOT ABOVE - (compose-dot-map [?n] #x1E45) ;; SMALL N WITH DOT ABOVE - (compose-dot-map [?o] #x022F) ;; SMALL O WITH DOT ABOVE - (compose-dot-map [?p] #x1E57) ;; SMALL P WITH DOT ABOVE - (compose-dot-map [?r] #x1E59) ;; SMALL R WITH DOT ABOVE - (compose-dot-map [?s] #x1E61) ;; SMALL S WITH DOT ABOVE - (compose-dot-map [?t] #x1E6B) ;; SMALL T WITH DOT ABOVE - (compose-dot-map [?w] #x1E87) ;; SMALL W WITH DOT ABOVE - (compose-dot-map [?x] #x1E8B) ;; SMALL X WITH DOT ABOVE - (compose-dot-map [?y] #x1E8F) ;; SMALL Y WITH DOT ABOVE - (compose-dot-map [?z] #x017C) ;; SMALL Z WITH DOT ABOVE - (compose-dot-map [?i] #x0131) ;; SMALL DOTLESS I - (compose-dot-map [?j] #x0237) ;; SMALL DOTLESS J - ;; There is nothing obvious we can bind space to on compose-hook-map, - ;; these are IPA characters that are in Unicode theory not - ;; precomposed. - (compose-hook-map [?B] #x0181) ;; CAPITAL B WITH HOOK - (compose-hook-map [?C] #x0187) ;; CAPITAL C WITH HOOK - (compose-hook-map [?D] #x018A) ;; CAPITAL D WITH HOOK - (compose-hook-map [?F] #x0191) ;; CAPITAL F WITH HOOK - (compose-hook-map [?G] #x0193) ;; CAPITAL G WITH HOOK - (compose-hook-map [?K] #x0198) ;; CAPITAL K WITH HOOK - (compose-hook-map [?P] #x01A4) ;; CAPITAL P WITH HOOK - (compose-hook-map [?T] #x01AC) ;; CAPITAL T WITH HOOK - (compose-hook-map [?V] #x01B2) ;; CAPITAL V WITH HOOK - (compose-hook-map [?Y] #x01B3) ;; CAPITAL Y WITH HOOK - (compose-hook-map [?Z] #x0224) ;; CAPITAL Z WITH HOOK - (compose-hook-map [U0262] #x029B) ;; SMALL CAPITAL G WITH HOOK - (compose-hook-map [?b] #x0253) ;; SMALL B WITH HOOK - (compose-hook-map [?c] #x0188) ;; SMALL C WITH HOOK - (compose-hook-map [?d] #x0257) ;; SMALL D WITH HOOK - (compose-hook-map [?f] #x0192) ;; SMALL F WITH HOOK - (compose-hook-map [?g] #x0260) ;; SMALL G WITH HOOK - (compose-hook-map [?h] #x0266) ;; SMALL H WITH HOOK - (compose-hook-map [U0266] #x0267) ;; SMALL HENG WITH HOOK - (compose-hook-map [?k] #x0199) ;; SMALL K WITH HOOK - (compose-hook-map [?m] #x0271) ;; SMALL M WITH HOOK - (compose-hook-map [?p] #x01A5) ;; SMALL P WITH HOOK - (compose-hook-map [?q] #x02A0) ;; SMALL Q WITH HOOK - (compose-hook-map [U025C] #x025D) ;; SMALL REVERSED OPEN E WITH HOOK - (compose-hook-map [?s] #x0282) ;; SMALL S WITH HOOK - (compose-hook-map [U0259] #x025A) ;; SMALL SCHWA WITH HOOK - (compose-hook-map [?t] #x01AD) ;; SMALL T WITH HOOK - (compose-hook-map [U0279] #x027B) ;; SMALL TURNED R WITH HOOK - (compose-hook-map [?v] #x028B) ;; SMALL V WITH HOOK - (compose-hook-map [?y] #x01B4) ;; SMALL Y WITH HOOK - (compose-hook-map [?z] #x0225) ;; SMALL Z WITH HOOK - (compose-horn-map [space] #x031b) - (compose-horn-map [?O] #x01A0) ;; CAPITAL O WITH HORN - (compose-horn-map [?U] #x01AF) ;; CAPITAL U WITH HORN - (compose-horn-map [?o] #x01A1) ;; SMALL O WITH HORN - (compose-horn-map [?u] #x01B0) ;; SMALL U WITH HORN - (compose-stroke-map [?A] #x023a) ;; CAPITAL A WITH STROKE - (compose-stroke-map [?a] #x2c65) ;; SMALL A WITH STROKE - (compose-stroke-map [?B] #x0243) ;; CAPITAL B WITH STROKE - (compose-stroke-map [?b] #x0180) ;; SMALL B WITH STROKE - (compose-stroke-map [?C] #x023b) ;; CAPITAL C WITH STROKE - (compose-stroke-map [?c] #x023c) ;; SMALL C WITH STROKE - (compose-stroke-map [?D] #x0110) ;; CAPITAL D WITH STROKE - (compose-stroke-map [?d] #x0111) ;; SMALL D WITH STROKE - (compose-stroke-map [?E] #x0246) ;; CAPITAL E WITH STROKE - (compose-stroke-map [?e] #x0247) ;; SMALL E WITH STROKE - (compose-stroke-map [?G] #x01e4) ;; CAPITAL G WITH STROKE - (compose-stroke-map [?g] #x01e5) ;; SMALL G WITH STROKE - (compose-stroke-map [?H] #x0126) ;; CAPITAL H WITH STROKE - (compose-stroke-map [?h] #x0127) ;; SMALL H WITH STROKE - (compose-stroke-map [?I] #x0197) ;; CAPITAL I WITH STROKE - (compose-stroke-map [?i] #x0268) ;; SMALL I WITH STROKE - (compose-stroke-map [?J] #x0248) ;; CAPITAL J WITH STROKE - (compose-stroke-map [?j] #x0249) ;; SMALL J WITH STROKE - (compose-stroke-map [?K] #xa740) ;; CAPITAL K WITH STROKE - (compose-stroke-map [?k] #xa741) ;; SMALL K WITH STROKE - (compose-stroke-map [?L] #x0141) ;; CAPITAL L WITH STROKE - (compose-stroke-map [?l] #x0142) ;; SMALL L WITH STROKE - (compose-stroke-map [?O] #x00d8) ;; CAPITAL O WITH STROKE - (compose-stroke-map [?o] #x00f8) ;; SMALL O WITH STROKE - (compose-stroke-map [?P] #x2c63) ;; CAPITAL P WITH STROKE - (compose-stroke-map [?p] #x1d7d) ;; SMALL P WITH STROKE - (compose-stroke-map [?R] #x024c) ;; CAPITAL R WITH STROKE - (compose-stroke-map [?r] #x024d) ;; SMALL R WITH STROKE - (compose-stroke-map [?T] #x0166) ;; CAPITAL T WITH STROKE - (compose-stroke-map [?t] #x0167) ;; SMALL T WITH STROKE - (compose-stroke-map [?Y] #x024e) ;; CAPITAL Y WITH STROKE - (compose-stroke-map [?y] #x024f) ;; SMALL Y WITH STROKE - (compose-stroke-map [?Z] #x01b5) ;; CAPITAL Z WITH STROKE - (compose-stroke-map [?z] #x01b6) ;; SMALL Z WITH STROKE -)) - - -;;; The rest of the compose-map. These are the composed characters -;;; that are not accessible via "dead" keys. - -(define-key compose-map " '" "'") -(define-key compose-map " ^" "^") -(define-key compose-map " `" "`") -(define-key compose-map " ~" "~") -(define-key compose-map " " [(?\240)]) -(define-key compose-map " \"" [(?\250)]) -(define-key compose-map " :" [(?\250)]) -(define-key compose-map " *" [(?\260)]) - -(define-key compose-map "!!" [(?\241)]) -(define-key compose-map "!^" [(?\246)]) -(define-key compose-map "!S" [(?\247)]) -(define-key compose-map "!s" [(?\247)]) -(define-key compose-map "!P" [(?\266)]) -(define-key compose-map "!p" [(?\266)]) - -(define-key compose-map "((" "[") -(define-key compose-map "(-" "{") - -(define-key compose-map "))" "]") -(define-key compose-map ")-" "}") - -(define-key compose-map "++" "#") -(define-key compose-map "+-" [(?\261)]) - -(define-key compose-map "-(" "{") -(define-key compose-map "-)" "}") -(define-key compose-map "--" "-") -(define-key compose-map "-L" [(?\243)]) -(define-key compose-map "-l" [(?\243)]) -(define-key compose-map "-Y" [(?\245)]) -(define-key compose-map "-y" [(?\245)]) -(define-key compose-map "-," [(?\254)]) -(define-key compose-map "-|" [(?\254)]) -(define-key compose-map "-^" [(?\257)]) -(define-key compose-map "-+" [(?\261)]) -(define-key compose-map "-:" [(?\367)]) -(define-key compose-map "-D" [(?\320)]) -(define-key compose-map "-d" [(?\360)]) -(define-key compose-map "-a" [(?\252)]) - -(define-key compose-map ".^" [(?\267)]) - -(define-key compose-map "//" "\\") -(define-key compose-map "/<" "\\") -(define-key compose-map "/^" "|") -(define-key compose-map "/C" [(?\242)]) -(define-key compose-map "/c" [(?\242)]) -(define-key compose-map "/U" [(?\265)]) -(define-key compose-map "/u" [(?\265)]) -(define-key compose-map "/O" [(?\330)]) -(define-key compose-map "/o" [(?\370)]) - -(define-key compose-map "0X" [(?\244)]) -(define-key compose-map "0x" [(?\244)]) -(define-key compose-map "0S" [(?\247)]) -(define-key compose-map "0s" [(?\247)]) -(define-key compose-map "0C" [(?\251)]) -(define-key compose-map "0c" [(?\251)]) -(define-key compose-map "0R" [(?\256)]) -(define-key compose-map "0r" [(?\256)]) -(define-key compose-map "0^" [(?\260)]) - -(define-key compose-map "1^" [(?\271)]) -(define-key compose-map "14" [(?\274)]) -(define-key compose-map "12" [(?\275)]) - -(define-key compose-map "2^" [(?\262)]) - -(define-key compose-map "3^" [(?\263)]) -(define-key compose-map "34" [(?\276)]) - -(define-key compose-map ":-" [(?\367)]) - -(define-key compose-map "</" "\\") -(define-key compose-map "<<" [(?\253)]) - -(define-key compose-map "=L" [(?\243)]) -(define-key compose-map "=l" [(?\243)]) -(define-key compose-map "=Y" [(?\245)]) -(define-key compose-map "=y" [(?\245)]) - -(define-key compose-map ">>" [(?\273)]) - -(define-key compose-map "??" [(?\277)]) - -(define-key compose-map "AA" "＠") -(define-key compose-map "Aa" "＠") -(define-key compose-map "A_" [(?\252)]) -(define-key compose-map "A`" [(?\300)]) -(define-key compose-map "A'" [(?\301)]) -(define-key compose-map "A^" [(?\302)]) -(define-key compose-map "A~" [(?\303)]) -(define-key compose-map "A\"" [(?\304)]) -(define-key compose-map "A*" [(?\305)]) -(define-key compose-map "AE" [(?\306)]) - -(define-key compose-map "C/" [(?\242)]) -(define-key compose-map "C|" [(?\242)]) -(define-key compose-map "C0" [(?\251)]) -(define-key compose-map "CO" [(?\251)]) -(define-key compose-map "Co" [(?\251)]) -(define-key compose-map "C," [(?\307)]) - -(define-key compose-map "D-" [(?\320)]) - -(define-key compose-map "E`" [(?\310)]) -(define-key compose-map "E'" [(?\311)]) -(define-key compose-map "E^" [(?\312)]) -(define-key compose-map "E\"" [(?\313)]) - -(define-key compose-map "I`" [(?\314)]) -(define-key compose-map "I'" [(?\315)]) -(define-key compose-map "I^" [(?\316)]) -(define-key compose-map "I\"" [(?\317)]) - -(define-key compose-map "L-" [(?\243)]) -(define-key compose-map "L=" [(?\243)]) - -(define-key compose-map "N~" [(?\321)]) - -(define-key compose-map "OX" [(?\244)]) -(define-key compose-map "Ox" [(?\244)]) -(define-key compose-map "OS" [(?\247)]) -(define-key compose-map "Os" [(?\247)]) -(define-key compose-map "OC" [(?\251)]) -(define-key compose-map "Oc" [(?\251)]) -(define-key compose-map "OR" [(?\256)]) -(define-key compose-map "Or" [(?\256)]) -(define-key compose-map "O_" [(?\272)]) -(define-key compose-map "O`" [(?\322)]) -(define-key compose-map "O'" [(?\323)]) -(define-key compose-map "O^" [(?\324)]) -(define-key compose-map "O~" [(?\325)]) -(define-key compose-map "O\"" [(?\326)]) -(define-key compose-map "O/" [(?\330)]) - -(define-key compose-map "P!" [(?\266)]) - -(define-key compose-map "R0" [(?\256)]) -(define-key compose-map "RO" [(?\256)]) -(define-key compose-map "Ro" [(?\256)]) - -(define-key compose-map "S!" [(?\247)]) -(define-key compose-map "S0" [(?\247)]) -(define-key compose-map "SO" [(?\247)]) -(define-key compose-map "So" [(?\247)]) -(define-key compose-map "SS" [(?\337)]) - -(define-key compose-map "TH" [(?\336)]) - -(define-key compose-map "U`" [(?\331)]) -(define-key compose-map "U'" [(?\332)]) -(define-key compose-map "U^" [(?\333)]) -(define-key compose-map "U\"" [(?\334)]) - -(define-key compose-map "X0" [(?\244)]) -(define-key compose-map "XO" [(?\244)]) -(define-key compose-map "Xo" [(?\244)]) - -(define-key compose-map "Y-" [(?\245)]) -(define-key compose-map "Y=" [(?\245)]) -(define-key compose-map "Y'" [(?\335)]) - -(define-key compose-map "_A" [(?\252)]) -(define-key compose-map "_a" [(?\252)]) -(define-key compose-map "_^" [(?\257)]) -(define-key compose-map "_O" [(?\272)]) -(define-key compose-map "_o" [(?\272)]) - -(define-key compose-map "aA" "＠") -(define-key compose-map "aa" "＠") -(define-key compose-map "a_" [(?\252)]) -(define-key compose-map "a-" [(?\252)]) -(define-key compose-map "a`" [(?\340)]) -(define-key compose-map "a'" [(?\341)]) -(define-key compose-map "a^" [(?\342)]) -(define-key compose-map "a~" [(?\343)]) -(define-key compose-map "a\"" [(?\344)]) -(define-key compose-map "a*" [(?\345)]) -(define-key compose-map "ae" [(?\346)]) - -(define-key compose-map "c/" [(?\242)]) -(define-key compose-map "c|" [(?\242)]) -(define-key compose-map "c0" [(?\251)]) -(define-key compose-map "cO" [(?\251)]) -(define-key compose-map "co" [(?\251)]) -(define-key compose-map "c," [(?\347)]) - -(define-key compose-map "d-" [(?\360)]) - -(define-key compose-map "e`" [(?\350)]) -(define-key compose-map "e'" [(?\351)]) -(define-key compose-map "e^" [(?\352)]) -(define-key compose-map "e\"" [(?\353)]) - -(define-key compose-map "i`" [(?\354)]) -(define-key compose-map "i'" [(?\355)]) -(define-key compose-map "i^" [(?\356)]) -(define-key compose-map "i\"" [(?\357)]) -(define-key compose-map "i:" [(?\357)]) - -(define-key compose-map "l-" [(?\243)]) -(define-key compose-map "l=" [(?\243)]) - -(define-key compose-map "n~" [(?\361)]) - -(define-key compose-map "oX" [(?\244)]) -(define-key compose-map "ox" [(?\244)]) -(define-key compose-map "oC" [(?\251)]) -(define-key compose-map "oc" [(?\251)]) -(define-key compose-map "oR" [(?\256)]) -(define-key compose-map "or" [(?\256)]) -(define-key compose-map "oS" [(?\247)]) -(define-key compose-map "os" [(?\247)]) -(define-key compose-map "o_" [(?\272)]) -(define-key compose-map "o`" [(?\362)]) -(define-key compose-map "o'" [(?\363)]) -(define-key compose-map "o^" [(?\364)]) -(define-key compose-map "o~" [(?\365)]) -(define-key compose-map "o\"" [(?\366)]) -(define-key compose-map "o/" [(?\370)]) - -(define-key compose-map "p!" [(?\266)]) - -(define-key compose-map "r0" [(?\256)]) -(define-key compose-map "rO" [(?\256)]) -(define-key compose-map "ro" [(?\256)]) - -(define-key compose-map "s!" [(?\247)]) -(define-key compose-map "s0" [(?\247)]) -(define-key compose-map "sO" [(?\247)]) -(define-key compose-map "so" [(?\247)]) -(define-key compose-map "ss" [(?\337)]) - -(define-key compose-map "th" [(?\376)]) - -(define-key compose-map "u`" [(?\371)]) -(define-key compose-map "u'" [(?\372)]) -(define-key compose-map "u^" [(?\373)]) -(define-key compose-map "u\"" [(?\374)]) -(define-key compose-map "u/" [(?\265)]) - -(define-key compose-map "x0" [(?\244)]) -(define-key compose-map "xO" [(?\244)]) -(define-key compose-map "xo" [(?\244)]) -(define-key compose-map "xx" [(?\327)]) - -(define-key compose-map "y-" [(?\245)]) -(define-key compose-map "y=" [(?\245)]) -(define-key compose-map "y'" [(?\375)]) -(define-key compose-map "y\"" [(?\377)]) - -(define-key compose-map "|C" [(?\242)]) -(define-key compose-map "|c" [(?\242)]) -(define-key compose-map "||" [(?\246)]) - - -;; Make colon equivalent to doublequote for diaeresis processing. Some -;; Xlibs do this. -(labels ((alias-colon-to-doublequote (keymap) - (map-keymap - #'(lambda (key value) - (when (keymapp value) - (alias-colon-to-doublequote value)) - (when (eq key '\") - (define-key keymap ":" value))) - keymap))) - (alias-colon-to-doublequote compose-map)) - -;;; Electric dead keys: making a' mean a-acute. - - -(defun electric-diacritic (&optional count) - "Modify the previous character with an accent. -For example, if `:' is bound to this command, then typing `a:' -will first insert `a' and then turn it into `\344' (adiaeresis). -The minimum list of keys to which this command may be bound (and the accents -which it understands) are: - - ' (acute) \301\311\315\323\332\335 \341\351\355\363\372\375 - ` (grave) \300\310\314\322\331 \340\350\354\362\371 - : (diaeresis) \304\313\317\326\334 \344\353\357\366\374\377 - ^ (circumflex) \302\312\316\324\333 \342\352\356\364\373 - , (cedilla) \307\347 - . (ring) \305\345" - (interactive "p") - (or count (setq count 1)) - - (if (not (eq last-command 'self-insert-command)) - ;; Only do the magic if the two chars were typed in succession. - (self-insert-command count) - - ;; This is so that ``a : C-x u'' will transform `adiaeresis' back into `a:' - (self-insert-command count) - (undo-boundary) - (delete-char (- count)) - - (let* ((c last-command-char) - (map (cond ((eq c ?') compose-acute-map) - ((eq c ?`) compose-grave-map) - ((eq c ?,) compose-cedilla-map) - ((eq c ?:) compose-diaeresis-map) - ((eq c ?^) compose-circumflex-map) - ((eq c ?~) compose-tilde-map) - ((eq c ?.) compose-ring-map) - (t (error "unknown diacritic: %s (%c)" c c)))) - (base-char (preceding-char)) - (mod-char (and (>= (downcase base-char) ?a) ; only do alphabetics? - (<= (downcase base-char) ?z) - (lookup-key map (make-string 1 base-char))))) - (when (and (vectorp mod-char) (eql (length mod-char) 1)) - (setq mod-char (aref mod-char 0)) - (if (and (consp mod-char) (eql (length mod-char) 1) - (characterp (car mod-char))) - (setq mod-char (car mod-char)))) - (if (and mod-char (symbolp mod-char)) - (setq mod-char (or (get-character-of-keysym mod-char) mod-char))) - (if (and mod-char (> count 0)) - (delete-char -1) - (setq mod-char c)) - (while (> count 0) - (insert mod-char) - (setq count (1- count)))))) - -;; should "::" mean "�" and ": " mean ":"? -;; should we also do -;; (?~ -;; (?A "\303") -;; (?C "\307") -;; (?D "\320") -;; (?N "\321") -;; (?O "\325") -;; (?a "\343") -;; (?c "\347") -;; (?d "\360") -;; (?n "\361") -;; (?o "\365") -;; (?> "\273") -;; (?< "\253") -;; (? "~")) ; no special code -;; (?\/ -;; (?A "\305") ;; A-with-ring (Norwegian and Danish) -;; (?E "\306") ;; AE-ligature (Norwegian and Danish) -;; (?O "\330") -;; (?a "\345") ;; a-with-ring (Norwegian and Danish) -;; (?e "\346") ;; ae-ligature (Norwegian and Danish) -;; (?o "\370") -;; (? "/")) ; no special code - - -(provide 'x-compose) - -;;; x-compose.el ends here -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

[COMMIT] Correct the placement of some #ifdefs, redisplay-gtk.c 7 years

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1513728276 0 # Wed Dec 20 00:04:36 2017 +0000 # Node ID 268f55c89b5c4bd6e5fe72eef1be8a2d6856a844 # Parent a5b21ebab055b2b74f16e61d09c57d88d268a74c Correct the placement of some #ifdefs, redisplay-gtk.c src/ChangeLog addition: 2017-12-20 Aidan Kehoe <kehoea(a)parhasard.net> * redisplay-gtk.c (XLIKE_bevel_area): * redisplay-gtk.c (gtk_text_attributes): Correct the placement of some #ifdefs here, get the code building under GTK2 again. diff -r a5b21ebab055 -r 268f55c89b5c src/ChangeLog --- a/src/ChangeLog Mon Dec 18 22:04:46 2017 +0000 +++ b/src/ChangeLog Wed Dec 20 00:04:36 2017 +0000 ＠＠ -1,3 +1,10 ＠＠ +2017-12-20 Aidan Kehoe <kehoea(a)parhasard.net> + + * redisplay-gtk.c (XLIKE_bevel_area): + * redisplay-gtk.c (gtk_text_attributes): + Correct the placement of some #ifdefs here, get the code building + under GTK2 again. + 2017-12-18 Aidan Kehoe <kehoea(a)parhasard.net> * event-Xt.c: ＠＠ -8,7 +15,7 ＠＠ * event-Xt.c (x_keysym_to_character): As above. * event-xlike-inc.c: - Move the Hangule, Armenian, Georgian, Azeri, Vietnamese support in + Move the Hangul, Armenian, Georgian, Azeri, Vietnamese support from here. * redisplay-gtk.c: * redisplay-x.c: diff -r a5b21ebab055 -r 268f55c89b5c src/redisplay-gtk.c --- a/src/redisplay-gtk.c Mon Dec 18 22:04:46 2017 +0000 +++ b/src/redisplay-gtk.c Wed Dec 20 00:04:36 2017 +0000 ＠＠ -182,6 +182,7 ＠＠ #ifdef HAVE_GTK3 GtkStyleContext *gstyle = gtk_widget_get_style_context (widget); GdkWindow *window = gtk_widget_get_window (widget); +#endif #if GTK_CHECK_VERSION(3, 22, 0) cairo_region_t *region = gdk_window_get_visible_region (window); /* We should be able to avoid the next call, but the GTK documentation ＠＠ -192,7 +193,6 ＠＠ #else cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget)); #endif -#endif GtkShadowType stype; if (shadow_thickness == 0) ＠＠ -604,7 +604,7 ＠＠ bg->blue)); #endif -#if HAVE_GTK3 +#ifdef HAVE_GTK3 GdkRGBA *fg = XCOLOR_INSTANCE_GTK_COLOR (cachel->foreground); GdkRGBA *bg = XCOLOR_INSTANCE_GTK_COLOR (cachel->background); -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

[COMMIT] Use non-ASCII Lisp characters as keysyms under X11 too, thank you Ben 7 years

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1513728833 0 # Wed Dec 20 00:13:53 2017 +0000 # Node ID a69c6e871607eee0c429c827c5e0be49ede0bb17 # Parent 268f55c89b5c4bd6e5fe72eef1be8a2d6856a844 Use non-ASCII Lisp characters as keysyms under X11 too, thank you Ben src/ChangeLog addition: 2017-12-20 Aidan Kehoe <kehoea(a)parhasard.net> Use Lisp characters as the keysym for event objects reflecting keys with character mappings on X11, as we do on every other platform, and as Ben suggests. * event-Xt.c: * event-Xt.c (USE_UNICODE_MAP): Don't use the current buffer for the Unicode conversion precedence list, use the language-specific default in Vdefault_unicode_precedence_array. * event-Xt.c (x_keysym_to_character): Give useful values for ASCII values too. * event-Xt.c (maybe_define_x_key_as_self_inserting_character): Don't mess around with the character-of-keysym property here, now we no longer use symbol keysyms for X11 keys with character mappings. * event-Xt.c (x_has_keysym): Call m_d_x_k_a_s_i_c() with its new simpler calling convention. * event-Xt.c (x_keysym_to_emacs_keysym): Call x_keysym_to_character() early. * event-Xt.c (x_to_emacs_keysym): Drop the SIMPLE_P argument, not used. * event-Xt.c (x_event_to_emacs_event): Update calls to x_to_emacs_keysym() correspondingly in this function. diff -r 268f55c89b5c -r a69c6e871607 src/ChangeLog --- a/src/ChangeLog Wed Dec 20 00:04:36 2017 +0000 +++ b/src/ChangeLog Wed Dec 20 00:13:53 2017 +0000 ＠＠ -1,3 +1,28 ＠＠ +2017-12-20 Aidan Kehoe <kehoea(a)parhasard.net> + + Use Lisp characters as the keysym for event objects reflecting + keys with character mappings on X11, as we do on every other + platform, and as Ben suggests. + * event-Xt.c: + * event-Xt.c (USE_UNICODE_MAP): + Don't use the current buffer for the Unicode conversion precedence + list, use the language-specific default in + Vdefault_unicode_precedence_array. + * event-Xt.c (x_keysym_to_character): + Give useful values for ASCII values too. + * event-Xt.c (maybe_define_x_key_as_self_inserting_character): + Don't mess around with the character-of-keysym property here, now + we no longer use symbol keysyms for X11 keys with character + mappings. + * event-Xt.c (x_has_keysym): + Call m_d_x_k_a_s_i_c() with its new simpler calling convention. + * event-Xt.c (x_keysym_to_emacs_keysym): + Call x_keysym_to_character() early. + * event-Xt.c (x_to_emacs_keysym): + Drop the SIMPLE_P argument, not used. + * event-Xt.c (x_event_to_emacs_event): + Update calls to x_to_emacs_keysym() correspondingly in this function. + 2017-12-20 Aidan Kehoe <kehoea(a)parhasard.net> * redisplay-gtk.c (XLIKE_bevel_area): diff -r 268f55c89b5c -r a69c6e871607 src/event-Xt.c --- a/src/event-Xt.c Wed Dec 20 00:04:36 2017 +0000 +++ b/src/event-Xt.c Wed Dec 20 00:13:53 2017 +0000 ＠＠ -125,7 +125,7 ＠＠ 0 }; -static Lisp_Object x_keysym_to_emacs_keysym (KeySym keysym, int simple_p); +static Lisp_Object x_keysym_to_emacs_keysym (KeySym keysym); void emacs_Xt_mapping_action (Widget w, XEvent *event); void debug_process_finalization (Lisp_Process *p); void emacs_Xt_event_handler (Widget wid, XtPointer closure, XEvent *event, ＠＠ -147,13 +147,12 ＠＠ && map[keysym - FIRST_KNOWN_##map ]) do \ { \ keysym -= FIRST_KNOWN_##map ; \ - return make_char (buffer_unicode_to_ichar ((int) map[keysym], \ - /* ＠＠#### need to get some sort \ - of buffer to compute this off; \ - only applies in the old-Mule \ - world */ \ - current_buffer, \ - CONVERR_SUCCEED)); \ + /* Use the language-environment precedence list, not that of */ \ + /* the current buffer. */ \ + return make_char (filtered_unicode_to_ichar \ + ((int) map[keysym], \ + Vdefault_unicode_precedence_array, NULL, \ + CONVERR_SUCCEED)); \ } while (0) /* Maps to Unicode for X11 KeySyms, where we don't have a direct internal ＠＠ -1004,8 +1003,12 ＠＠ int code = 0; #endif /* MULE */ + if (keysym < 0x100) + { + return make_char ((Ichar) keysym); + } + /* ＠＠#### Add support for 0xFE?? and 0xFF?? keysyms - Add support for KOI8-U extensions in the 0x06?? range See http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt */ ＠＠ -1021,11 +1024,12 ＠＠ return make_char (keysym & 0xFFFFFF); #else if (keysym >= 0x01000000 && keysym <= 0x0110FFFF) - return make_char (buffer_unicode_to_ichar - ((int) (keysym & 0xFFFFFF), - /* ＠＠#### need to get some sort of buffer to compute - this off; only applies in the old-Mule world */ - current_buffer, CONVERR_SUCCEED)); + /* Use the language-environment precedence list, not that of + the current buffer. */ + return make_char (filtered_unicode_to_ichar + ((int)(keysym & 0xFFFFFF), + Vdefault_unicode_precedence_array, NULL, + CONVERR_SUCCEED)); #endif /* not MULE */ if ((keysym & 0xff) < 0xa0) ＠＠ -1131,12 +1135,10 ＠＠ case 32: /* Currency. The lower sixteen bits of these keysyms happily correspond exactly to the Unicode code points of the associated characters */ - return make_char (buffer_unicode_to_ichar - ((int) (keysym & 0xffff), - /* ＠＠#### need to get some sort of buffer to - compute this off; only applies in the old-Mule - world */ - current_buffer, CONVERR_SUCCEED)); + return make_char (filtered_unicode_to_ichar + ((int) (keysym & 0xffff), + Vdefault_unicode_precedence_array, NULL, + CONVERR_SUCCEED)); /* ＠＠#### Support me! ＠＠ -1204,11 +1206,16 ＠＠ break; } - if (code == 0) - return Qnil; - - /* #### Is this check on !NILP (charset) needed? Maybe should be assert? */ - if (!NILP (charset)) + assert (!NILP (charset)); + + if (code == 0 || EQ (charset, Qzero)) + { + /* CHARSET being zero is unlikely, but we shouldn't crash, even with + error-checking turned on, if X11 gives us a keysym we don't + understand. Don't make it an assertion. */ + return Qnil; + } + else { /* First try to generate a unified character by converting through Unicode, then try converting directly to an Ichar (only matters ＠＠ -1216,16 +1223,21 ＠＠ int ucs = charset_codepoint_to_unicode (charset, 0, code, CONVERR_FAIL); if (ucs >= 0) { - /* ＠＠#### current_buffer dependency */ - Ichar ich = buffer_unicode_to_ichar (ucs, current_buffer, - CONVERR_FAIL); + Ichar ich + /* Use the language-environment precedence list, not that of the + current buffer. */ + = filtered_unicode_to_ichar (ucs, + Vdefault_unicode_precedence_array, + NULL, CONVERR_SUCCEED); if (ich >= 0) - return make_char (ich); + { + return make_char (ich); + } } else { - Ichar ich = - charset_codepoint_to_ichar (charset, 0, code, CONVERR_FAIL); + Ichar ich + = charset_codepoint_to_ichar (charset, 0, code, CONVERR_FAIL); if (ich >= 0) return make_char (ich); } ＠＠ -1242,29 +1254,18 ＠＠ /* keymap handling */ /************************************************************************/ -/* ＠＠#### This is the wrong approach, I think. We should not be exposing the - name of the keysym anywhere, or forcing the user to use this name. - At the Lisp level, the user should simply see the character itself, and - should be able to bind the actual character. Furthermore, introducing - the symbol introduces an X-specific dependency; I can't expect to set - a binding for a particular Unicode character and have it work on both - Windows and X. --ben */ +extern Lisp_Object Vcurrent_global_map; /* See comment near character_to_event(). */ static void -maybe_define_x_key_as_self_inserting_character (KeySym keysym, - Lisp_Object symbol) +maybe_define_x_key_as_self_inserting_character (Lisp_Object emacs_keysym) { - Lisp_Object character = x_keysym_to_character (keysym); - - if (CHARP (character)) + if (CHARP (emacs_keysym)) { - extern Lisp_Object Vcurrent_global_map; - extern Lisp_Object Qcharacter_of_keysym; - if (NILP (Flookup_key (Vcurrent_global_map, symbol, Qnil))) + if (NILP (Flookup_key (Vcurrent_global_map, emacs_keysym, Qnil))) { - Fput (symbol, Qcharacter_of_keysym, character); - Fdefine_key (Vcurrent_global_map, symbol, Qself_insert_command); + Fdefine_key (Vcurrent_global_map, emacs_keysym, + Qself_insert_command); } } } ＠＠ -1275,7 +1276,7 ＠＠ KeySym upper_lower[2]; int j; - if (keysym < 0x80) /* Optimize for ASCII keysyms */ + if (keysym < 0x80) /* ASCII keysyms have default bindings anyway. */ return; /* If you execute: ＠＠ -1292,7 +1293,7 ＠＠ for (j = 0; j < (upper_lower[0] == upper_lower[1] ? 1 : 2); j++) { KeySym ks = upper_lower[j]; - Lisp_Object sym = x_keysym_to_emacs_keysym (ks, 0); + Lisp_Object sym = x_keysym_to_emacs_keysym (ks); Lisp_Object new_value = with_modifiers ? Qt : Qsans_modifiers; Lisp_Object old_value = Fgethash (sym, hash_table, Qnil); ＠＠ -1300,7 +1301,7 ＠＠ && ! (EQ (old_value, Qsans_modifiers) && EQ (new_value, Qt))) { - maybe_define_x_key_as_self_inserting_character (ks, sym); + maybe_define_x_key_as_self_inserting_character (sym); Fputhash (sym, new_value, hash_table); } } ＠＠ -1846,32 +1847,19 ＠＠ /************************************************************************/ static Lisp_Object -x_keysym_to_emacs_keysym (KeySym keysym, int simple_p) +x_keysym_to_emacs_keysym (KeySym keysym) { Extbyte *name; DECLARE_EISTRING(einame); + Lisp_Object character; if (keysym >= XK_exclam && keysym <= XK_asciitilde) /* We must assume that the X keysym numbers for the ASCII graphic characters are the same as their ASCII codes. */ return make_char (keysym); - if (keysym >= 0x01000000 && keysym <= 0x0110FFFF) - { - /* These keysyms malloc with XKeysymToString(), *every time the - function is called.* Avoid leaking, construct the keysym string - ourselves. */ - Ascbyte buf [10]; - qxesprintf ((Ibyte *) buf, keysym & 0xff0000 ? "U%06X" : "U%04X", - (unsigned int) (keysym & 0xffffff)); - return KEYSYM (buf); - } - switch (keysym) { - /* These would be handled correctly by the default case, but by - special-casing them here we don't garbage a string or call - intern(). */ case XK_BackSpace: return QKbackspace; case XK_Tab: return QKtab; case XK_Linefeed: return QKlinefeed; ＠＠ -1881,8 +1869,15 ＠＠ case XK_Delete: return QKdelete; case 0: return Qnil; default: - if (simple_p) return Qnil; + character = x_keysym_to_character (keysym); + + if (CHARP (character)) + { + return character; + } + name = XKeysymToString (keysym); + if (!name || !name[0]) /* This happens if there is a mismatch between the Xlib of XEmacs and the Xlib of the X server... ＠＠ -1947,8 +1942,7 ＠＠ } static Lisp_Object -x_to_emacs_keysym (XKeyPressedEvent *event, int simple_p, KeySym *x_keysym_out) - /* simple_p means don't try too hard (ASCII only) */ +x_to_emacs_keysym (XKeyPressedEvent *event, KeySym *x_keysym_out) { KeySym keysym = NoSymbol; ＠＠ -1984,7 +1978,7 ＠＠ XLookupString (event, dummy, 200, &keysym, 0); *x_keysym_out = keysym; return (IsModifierKey (keysym) || keysym == XK_Mode_switch ) - ? Qnil : x_keysym_to_emacs_keysym (keysym, simple_p); + ? Qnil : x_keysym_to_emacs_keysym (keysym); } #endif /* ! XIM_MOTIF */ ＠＠ -2045,7 +2039,7 ＠＠ case XLookupBoth: *x_keysym_out = keysym; return (IsModifierKey (keysym) || keysym == XK_Mode_switch ) - ? Qnil : x_keysym_to_emacs_keysym (keysym, simple_p); + ? Qnil : x_keysym_to_emacs_keysym (keysym); case XLookupChars: { ＠＠ -2229,7 +2223,7 ＠＠ /* This used to compute the frame from the given X window and store it here, but we really don't care about the frame. */ SET_EVENT_CHANNEL (emacs_event, DEVICE_CONSOLE (d)); - keysym = x_to_emacs_keysym (&x_event->xkey, 0, &x_keysym); + keysym = x_to_emacs_keysym (&x_event->xkey, &x_keysym); /* If the emacs keysym is nil, then that means that the X keysym was either a Modifier or NoSymbol, which -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

[COMMIT] Split out stuff that has become X- or GTK-specific, post GTK-1.2. 7 years

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1513634686 0 # Mon Dec 18 22:04:46 2017 +0000 # Node ID a5b21ebab055b2b74f16e61d09c57d88d268a74c # Parent 9bdc40b8fb78fe1b9605e4e5129b4002b3a9835a Split out stuff that has become X- or GTK-specific, post GTK-1.2. src/ChangeLog addition: 2017-12-18 Aidan Kehoe <kehoea(a)parhasard.net> * event-Xt.c: * event-Xt.c (USE_UNICODE_MAP): Add support for Hangul, Armenian, Georgian, Azeri, Vietnamese support here. Merge the unicode-internal changes into this file. * event-Xt.c (x_keysym_to_character): As above. * event-xlike-inc.c: Move the Hangule, Armenian, Georgian, Azeri, Vietnamese support in here. * redisplay-gtk.c: * redisplay-x.c: * redisplay-x.c (separate_textual_runs_nomule): * redisplay-x.c (separate_textual_runs_xft_nomule): * redisplay-x.c (separate_textual_runs_xft_mule): * redisplay-x.c (separate_textual_runs_mule): * redisplay-x.c (x_text_width_single_run): * redisplay-x.c (x_text_width): * redisplay-x.c (x_window_output_begin): * redisplay-x.c (x_window_output_end): * redisplay-x.c (x_clear_region): * redisplay-x.c (x_clear_frame): * redisplay-x.c (x_bevel_area): * redisplay-x.c (x_output_horizontal_line): * redisplay-x.c (x_output_vertical_divider): * redisplay-x.c (x_ring_bell): * redisplay-x.c (x_flash): * redisplay-x.c (x_output_blank): * redisplay-x.c (x_output_eol_cursor): * redisplay-x.c (x_output_xlike_pixmap): * redisplay-x.c (x_output_string): Move all the X-specific stuff here from redisplay-xlike-inc.c, since it is no longer helpful on GTK with the end of support for GTK 1.0. * redisplay-xlike-inc.c: Delete all the newly-X-specific stuff from here. diff -r 9bdc40b8fb78 -r a5b21ebab055 src/ChangeLog --- a/src/ChangeLog Sun Dec 17 12:20:06 2017 +0000 +++ b/src/ChangeLog Mon Dec 18 22:04:46 2017 +0000 ＠＠ -1,3 +1,42 ＠＠ +2017-12-18 Aidan Kehoe <kehoea(a)parhasard.net> + + * event-Xt.c: + * event-Xt.c (USE_UNICODE_MAP): + Add support for Hangul, Armenian, Georgian, Azeri, Vietnamese + support here. + Merge the unicode-internal changes into this file. + * event-Xt.c (x_keysym_to_character): + As above. + * event-xlike-inc.c: + Move the Hangule, Armenian, Georgian, Azeri, Vietnamese support in + here. + * redisplay-gtk.c: + * redisplay-x.c: + * redisplay-x.c (separate_textual_runs_nomule): + * redisplay-x.c (separate_textual_runs_xft_nomule): + * redisplay-x.c (separate_textual_runs_xft_mule): + * redisplay-x.c (separate_textual_runs_mule): + * redisplay-x.c (x_text_width_single_run): + * redisplay-x.c (x_text_width): + * redisplay-x.c (x_window_output_begin): + * redisplay-x.c (x_window_output_end): + * redisplay-x.c (x_clear_region): + * redisplay-x.c (x_clear_frame): + * redisplay-x.c (x_bevel_area): + * redisplay-x.c (x_output_horizontal_line): + * redisplay-x.c (x_output_vertical_divider): + * redisplay-x.c (x_ring_bell): + * redisplay-x.c (x_flash): + * redisplay-x.c (x_output_blank): + * redisplay-x.c (x_output_eol_cursor): + * redisplay-x.c (x_output_xlike_pixmap): + * redisplay-x.c (x_output_string): + Move all the X-specific stuff here from redisplay-xlike-inc.c, + since it is no longer helpful on GTK with the end of support for + GTK 1.0. + * redisplay-xlike-inc.c: + Delete all the newly-X-specific stuff from here. + 2017-12-17 Aidan Kehoe <kehoea(a)parhasard.net> * console-gtk.c (gtk_perhaps_init_unseen_key_defaults): diff -r 9bdc40b8fb78 -r a5b21ebab055 src/event-Xt.c --- a/src/event-Xt.c Sun Dec 17 12:20:06 2017 +0000 +++ b/src/event-Xt.c Mon Dec 18 22:04:46 2017 +0000 ＠＠ -147,7 +147,13 ＠＠ && map[keysym - FIRST_KNOWN_##map ]) do \ { \ keysym -= FIRST_KNOWN_##map ; \ - return Funicode_to_char (make_fixnum (map[keysym]), Qnil); \ + return make_char (buffer_unicode_to_ichar ((int) map[keysym], \ + /* ＠＠#### need to get some sort \ + of buffer to compute this off; \ + only applies in the old-Mule \ + world */ \ + current_buffer, \ + CONVERR_SUCCEED)); \ } while (0) /* Maps to Unicode for X11 KeySyms, where we don't have a direct internal ＠＠ -155,11 +161,7 ＠＠ Kuhn's X11.keysyms--if you're ever comparing with that file, note the sequences of KeySyms often leave out entries, so you'll have to fill them in. Doesn't include support for Hangul, which it should, if the X11 - Hangul keysyms have ever been used anywhere. - - I'm not #ifdef'ing this based on wheter MULE is defined, because it's a - matter of 324 bytes in a stripped executable, and I want the - testing. :-P */ + Hangul keysyms have ever been used anywhere. */ static UINT_16_BIT const TECHNICAL[] = { ＠＠ -433,6 +435,444 ＠＠ 0x22A3, /* #x0BFC RIGHT TACK APL */ }; +static UINT_16_BIT const HANGUL[] = + { +#define FIRST_KNOWN_HANGUL 0xEA1 + 0x3131, /* #x0EA1 Hangul_Kiyeog */ + 0x3132, /* #x0EA2 Hangul_SsangKiyeog */ + 0x3133, /* #x0EA3 Hangul_KiyeogSios */ + 0x3134, /* #x0EA4 Hangul_Nieun */ + 0x3135, /* #x0EA5 Hangul_NieunJieuj */ + 0x3136, /* #x0EA6 Hangul_NieunHieuh */ + 0x3137, /* #x0EA7 Hangul_Dikeud */ + 0x3138, /* #x0EA8 Hangul_SsangDikeud */ + 0x3139, /* #x0EA9 Hangul_Rieul */ + 0x313a, /* #x0EAA Hangul_RieulKiyeog */ + 0x313b, /* #x0EAB Hangul_RieulMieum */ + 0x313c, /* #x0EAC Hangul_RieulPieub */ + 0x313d, /* #x0EAD Hangul_RieulSios */ + 0x313e, /* #x0EAE Hangul_RieulTieut */ + 0x313f, /* #x0EAF Hangul_RieulPhieuf */ + 0x3140, /* #x0EB0 Hangul_RieulHieuh */ + 0x3141, /* #x0EB1 Hangul_Mieum */ + 0x3142, /* #x0EB2 Hangul_Pieub */ + 0x3143, /* #x0EB3 Hangul_SsangPieub */ + 0x3144, /* #x0EB4 Hangul_PieubSios */ + 0x3145, /* #x0EB5 Hangul_Sios */ + 0x3146, /* #x0EB6 Hangul_SsangSios */ + 0x3147, /* #x0EB7 Hangul_Ieung */ + 0x3148, /* #x0EB8 Hangul_Jieuj */ + 0x3149, /* #x0EB9 Hangul_SsangJieuj */ + 0x314a, /* #x0EBA Hangul_Cieuc */ + 0x314b, /* #x0EBB Hangul_Khieuq */ + 0x314c, /* #x0EBC Hangul_Tieut */ + 0x314d, /* #x0EBD Hangul_Phieuf */ + 0x314e, /* #x0EBE Hangul_Hieuh */ + 0x314f, /* #x0EBF Hangul_A */ + 0x3150, /* #x0EC0 Hangul_AE */ + 0x3151, /* #x0EC1 Hangul_YA */ + 0x3152, /* #x0EC2 Hangul_YAE */ + 0x3153, /* #x0EC3 Hangul_EO */ + 0x3154, /* #x0EC4 Hangul_E */ + 0x3155, /* #x0EC5 Hangul_YEO */ + 0x3156, /* #x0EC6 Hangul_YE */ + 0x3157, /* #x0EC7 Hangul_O */ + 0x3158, /* #x0EC8 Hangul_WA */ + 0x3159, /* #x0EC9 Hangul_WAE */ + 0x315a, /* #x0ECA Hangul_OE */ + 0x315b, /* #x0ECB Hangul_YO */ + 0x315c, /* #x0ECC Hangul_U */ + 0x315d, /* #x0ECD Hangul_WEO */ + 0x315e, /* #x0ECE Hangul_WE */ + 0x315f, /* #x0ECF Hangul_WI */ + 0x3160, /* #x0ED0 Hangul_YU */ + 0x3161, /* #x0ED1 Hangul_EU */ + 0x3162, /* #x0ED2 Hangul_YI */ + 0x3163, /* #x0ED3 Hangul_I */ + 0x11a8, /* #x0ED4 Hangul_J_Kiyeog */ + 0x11a9, /* #x0ED5 Hangul_J_SsangKiyeog */ + 0x11aa, /* #x0ED6 Hangul_J_KiyeogSios */ + 0x11ab, /* #x0ED7 Hangul_J_Nieun */ + 0x11ac, /* #x0ED8 Hangul_J_NieunJieuj */ + 0x11ad, /* #x0ED9 Hangul_J_NieunHieuh */ + 0x11ae, /* #x0EDA Hangul_J_Dikeud */ + 0x11af, /* #x0EDB Hangul_J_Rieul */ + 0x11b0, /* #x0EDC Hangul_J_RieulKiyeog */ + 0x11b1, /* #x0EDD Hangul_J_RieulMieum */ + 0x11b2, /* #x0EDE Hangul_J_RieulPieub */ + 0x11b3, /* #x0EDF Hangul_J_RieulSios */ + 0x11b4, /* #x0EE0 Hangul_J_RieulTieut */ + 0x11b5, /* #x0EE1 Hangul_J_RieulPhieuf */ + 0x11b6, /* #x0EE2 Hangul_J_RieulHieuh */ + 0x11b7, /* #x0EE3 Hangul_J_Mieum */ + 0x11b8, /* #x0EE4 Hangul_J_Pieub */ + 0x11b9, /* #x0EE5 Hangul_J_PieubSios */ + 0x11ba, /* #x0EE6 Hangul_J_Sios */ + 0x11bb, /* #x0EE7 Hangul_J_SsangSios */ + 0x11bc, /* #x0EE8 Hangul_J_Ieung */ + 0x11bd, /* #x0EE9 Hangul_J_Jieuj */ + 0x11be, /* #x0EEA Hangul_J_Cieuc */ + 0x11bf, /* #x0EEB Hangul_J_Khieuq */ + 0x11c0, /* #x0EEC Hangul_J_Tieut */ + 0x11c1, /* #x0EED Hangul_J_Phieuf */ + 0x11c2, /* #x0EEE Hangul_J_Hieuh */ + 0x316d, /* #x0EEF Hangul_RieulYeorinHieuh */ + 0x3171, /* #x0EF0 Hangul_SunkyeongeumMieum */ + 0x3178, /* #x0EF1 Hangul_SunkyeongeumPieub */ + 0x317f, /* #x0EF2 Hangul_PanSios */ + 0x3181, /* #x0EF3 Hangul_KkogjiDalrinIeung */ + 0x3184, /* #x0EF4 Hangul_SunkyeongeumPhieuf */ + 0x3186, /* #x0EF5 Hangul_YeorinHieuh */ + 0x318d, /* #x0EF6 Hangul_AraeA */ + 0x318e, /* #x0EF7 Hangul_AraeAE */ + 0x11eb, /* #x0EF8 Hangul_J_PanSios */ + 0x11f0, /* #x0EF9 Hangul_J_KkogjiDalrinIeung */ + 0x11f9, /* #x0EFA Hangul_J_YeorinHieuh */ + 0x0000, /* #x0EFB */ + 0x0000, /* #x0EFC */ + 0x0000, /* #x0EFD */ + 0x0000, /* #x0EFE */ + 0x20a9, /* #x0EFF Korean_Won */ + }; + +static UINT_16_BIT const ARMENIAN[] = + { +#define FIRST_KNOWN_ARMENIAN 0x14A1 + 0x0000, /* #x14A1 Armenian_eternity */ + 0x0587, /* #x14A2 Armenian_ligature_ew */ + 0x0589, /* #x14A3 Armenian_verjaket */ + 0x0029, /* #x14A4 Armenian_parenright */ + 0x0028, /* #x14A5 Armenian_parenleft */ + 0x00bb, /* #x14A6 Armenian_guillemotright */ + 0x00ab, /* #x14A7 Armenian_guillemotleft */ + 0x2014, /* #x14A8 Armenian_em_dash */ + 0x002e, /* #x14A9 Armenian_mijaket */ + 0x055d, /* #x14AA Armenian_but */ + 0x002c, /* #x14AB Armenian_comma */ + 0x2013, /* #x14AC Armenian_en_dash */ + 0x058a, /* #x14AD Armenian_yentamna */ + 0x2026, /* #x14AE Armenian_ellipsis */ + 0x055c, /* #x14AF Armenian_amanak */ + 0x055b, /* #x14B0 Armenian_shesht */ + 0x055e, /* #x14B1 Armenian_paruyk */ + 0x0531, /* #x14B2 Armenian_AYB */ + 0x0561, /* #x14B3 Armenian_ayb */ + 0x0532, /* #x14B4 Armenian_BEN */ + 0x0562, /* #x14B5 Armenian_ben */ + 0x0533, /* #x14B6 Armenian_GIM */ + 0x0563, /* #x14B7 Armenian_gim */ + 0x0534, /* #x14B8 Armenian_DA */ + 0x0564, /* #x14B9 Armenian_da */ + 0x0535, /* #x14BA Armenian_YECH */ + 0x0565, /* #x14BB Armenian_yech */ + 0x0536, /* #x14BC Armenian_ZA */ + 0x0566, /* #x14BD Armenian_za */ + 0x0537, /* #x14BE Armenian_E */ + 0x0567, /* #x14BF Armenian_e */ + 0x0538, /* #x14C0 Armenian_AT */ + 0x0568, /* #x14C1 Armenian_at */ + 0x0539, /* #x14C2 Armenian_TO */ + 0x0569, /* #x14C3 Armenian_to */ + 0x053a, /* #x14C4 Armenian_ZHE */ + 0x056a, /* #x14C5 Armenian_zhe */ + 0x053b, /* #x14C6 Armenian_INI */ + 0x056b, /* #x14C7 Armenian_ini */ + 0x053c, /* #x14C8 Armenian_LYUN */ + 0x056c, /* #x14C9 Armenian_lyun */ + 0x053d, /* #x14CA Armenian_KHE */ + 0x056d, /* #x14CB Armenian_khe */ + 0x053e, /* #x14CC Armenian_TSA */ + 0x056e, /* #x14CD Armenian_tsa */ + 0x053f, /* #x14CE Armenian_KEN */ + 0x056f, /* #x14CF Armenian_ken */ + 0x0540, /* #x14D0 Armenian_HO */ + 0x0570, /* #x14D1 Armenian_ho */ + 0x0541, /* #x14D2 Armenian_DZA */ + 0x0571, /* #x14D3 Armenian_dza */ + 0x0542, /* #x14D4 Armenian_GHAT */ + 0x0572, /* #x14D5 Armenian_ghat */ + 0x0543, /* #x14D6 Armenian_TCHE */ + 0x0573, /* #x14D7 Armenian_tche */ + 0x0544, /* #x14D8 Armenian_MEN */ + 0x0574, /* #x14D9 Armenian_men */ + 0x0545, /* #x14DA Armenian_HI */ + 0x0575, /* #x14DB Armenian_hi */ + 0x0546, /* #x14DC Armenian_NU */ + 0x0576, /* #x14DD Armenian_nu */ + 0x0547, /* #x14DE Armenian_SHA */ + 0x0577, /* #x14DF Armenian_sha */ + 0x0548, /* #x14E0 Armenian_VO */ + 0x0578, /* #x14E1 Armenian_vo */ + 0x0549, /* #x14E2 Armenian_CHA */ + 0x0579, /* #x14E3 Armenian_cha */ + 0x054a, /* #x14E4 Armenian_PE */ + 0x057a, /* #x14E5 Armenian_pe */ + 0x054b, /* #x14E6 Armenian_JE */ + 0x057b, /* #x14E7 Armenian_je */ + 0x054c, /* #x14E8 Armenian_RA */ + 0x057c, /* #x14E9 Armenian_ra */ + 0x054d, /* #x14EA Armenian_SE */ + 0x057d, /* #x14EB Armenian_se */ + 0x054e, /* #x14EC Armenian_VEV */ + 0x057e, /* #x14ED Armenian_vev */ + 0x054f, /* #x14EE Armenian_TYUN */ + 0x057f, /* #x14EF Armenian_tyun */ + 0x0550, /* #x14F0 Armenian_RE */ + 0x0580, /* #x14F1 Armenian_re */ + 0x0551, /* #x14F2 Armenian_TSO */ + 0x0581, /* #x14F3 Armenian_tso */ + 0x0552, /* #x14F4 Armenian_VYUN */ + 0x0582, /* #x14F5 Armenian_vyun */ + 0x0553, /* #x14F6 Armenian_PYUR */ + 0x0583, /* #x14F7 Armenian_pyur */ + 0x0554, /* #x14F8 Armenian_KE */ + 0x0584, /* #x14F9 Armenian_ke */ + 0x0555, /* #x14FA Armenian_O */ + 0x0585, /* #x14FB Armenian_o */ + 0x0556, /* #x14FC Armenian_FE */ + 0x0586, /* #x14FD Armenian_fe */ + 0x055a, /* #x14FE Armenian_apostrophe */ + 0x00a7, /* #x14FF Armenian_section_sign */ + }; + +static UINT_16_BIT const GEORGIAN[] = + { +#define FIRST_KNOWN_GEORGIAN 0x15D0 + 0x10d0, /* #x15D0 Georgian_an */ + 0x10d1, /* #x15D1 Georgian_ban */ + 0x10d2, /* #x15D2 Georgian_gan */ + 0x10d3, /* #x15D3 Georgian_don */ + 0x10d4, /* #x15D4 Georgian_en */ + 0x10d5, /* #x15D5 Georgian_vin */ + 0x10d6, /* #x15D6 Georgian_zen */ + 0x10d7, /* #x15D7 Georgian_tan */ + 0x10d8, /* #x15D8 Georgian_in */ + 0x10d9, /* #x15D9 Georgian_kan */ + 0x10da, /* #x15DA Georgian_las */ + 0x10db, /* #x15DB Georgian_man */ + 0x10dc, /* #x15DC Georgian_nar */ + 0x10dd, /* #x15DD Georgian_on */ + 0x10de, /* #x15DE Georgian_par */ + 0x10df, /* #x15DF Georgian_zhar */ + 0x10e0, /* #x15E0 Georgian_rae */ + 0x10e1, /* #x15E1 Georgian_san */ + 0x10e2, /* #x15E2 Georgian_tar */ + 0x10e3, /* #x15E3 Georgian_un */ + 0x10e4, /* #x15E4 Georgian_phar */ + 0x10e5, /* #x15E5 Georgian_khar */ + 0x10e6, /* #x15E6 Georgian_ghan */ + 0x10e7, /* #x15E7 Georgian_qar */ + 0x10e8, /* #x15E8 Georgian_shin */ + 0x10e9, /* #x15E9 Georgian_chin */ + 0x10ea, /* #x15EA Georgian_can */ + 0x10eb, /* #x15EB Georgian_jil */ + 0x10ec, /* #x15EC Georgian_cil */ + 0x10ed, /* #x15ED Georgian_char */ + 0x10ee, /* #x15EE Georgian_xan */ + 0x10ef, /* #x15EF Georgian_jhan */ + 0x10f0, /* #x15F0 Georgian_hae */ + 0x10f1, /* #x15F1 Georgian_he */ + 0x10f2, /* #x15F2 Georgian_hie */ + 0x10f3, /* #x15F3 Georgian_we */ + 0x10f4, /* #x15F4 Georgian_har */ + 0x10f5, /* #x15F5 Georgian_hoe */ + 0x10f6, /* #x15F6 Georgian_fi */ + }; + +static UINT_16_BIT const AZERI_ETC[] = + { +#define FIRST_KNOWN_AZERI_ETC 0x16A2 + 0x0000, /* #x16A2 Ccedillaabovedot */ + 0x1e8a, /* #x16A3 Xabovedot */ + 0x0000, /* #x16A4 */ + 0x0000, /* #x16A5 Qabovedot */ + 0x012c, /* #x16A6 Ibreve */ + 0x0000, /* #x16A7 IE */ + 0x0000, /* #x16A8 UO */ + 0x01b5, /* #x16A9 Zstroke */ + 0x01e6, /* #x16AA Gcaron */ + 0x0000, /* #x16AB */ + 0x0000, /* #x16AC */ + 0x0000, /* #x16AD */ + 0x0000, /* #x16AE */ + 0x019f, /* #x16AF Obarred */ + 0x0000, /* #x16B0 */ + 0x0000, /* #x16B1 */ + 0x0000, /* #x16B2 ccedillaabovedot */ + 0x1e8b, /* #x16B3 xabovedot */ + 0x0000, /* #x16B4 Ocaron */ + 0x0000, /* #x16B5 qabovedot */ + 0x012d, /* #x16B6 ibreve */ + 0x0000, /* #x16B7 ie */ + 0x0000, /* #x16B8 uo */ + 0x01b6, /* #x16B9 zstroke */ + 0x01e7, /* #x16BA gcaron */ + 0x0000, /* #x16BB */ + 0x0000, /* #x16BC */ + 0x01d2, /* #x16BD ocaron */ + 0x0000, /* #x16BE */ + 0x0275, /* #x16BF obarred */ + 0x0000, /* #x16C0 */ + 0x0000, /* #x16C1 */ + 0x0000, /* #x16C2 */ + 0x0000, /* #x16C3 */ + 0x0000, /* #x16C4 */ + 0x0000, /* #x16C5 */ + 0x018f, /* #x16C6 SCHWA */ + 0x0000, /* #x16C7 */ + 0x0000, /* #x16C8 */ + 0x0000, /* #x16C9 */ + 0x0000, /* #x16CA */ + 0x0000, /* #x16CB */ + 0x0000, /* #x16CC */ + 0x0000, /* #x16CD */ + 0x0000, /* #x16CE */ + 0x0000, /* #x16CF */ + 0x0000, /* #x16D0 */ + 0x1e36, /* #x16D1 Lbelowdot */ + 0x0000, /* #x16D2 Lstrokebelowdot */ + 0x0000, /* #x16D3 Gtilde */ + 0x0000, /* #x16D4 */ + 0x0000, /* #x16D5 */ + 0x0000, /* #x16D6 */ + 0x0000, /* #x16D7 */ + 0x0000, /* #x16D8 */ + 0x0000, /* #x16D9 */ + 0x0000, /* #x16DA */ + 0x0000, /* #x16DB */ + 0x0000, /* #x16DC */ + 0x0000, /* #x16DD */ + 0x0000, /* #x16DE */ + 0x0000, /* #x16DF */ + 0x0000, /* #x16E0 */ + 0x1e37, /* #x16E1 lbelowdot */ + 0x0000, /* #x16E2 lstrokebelowdot */ + 0x0000, /* #x16E3 gtilde */ + 0x0000, /* #x16E4 */ + 0x0000, /* #x16E5 */ + 0x0000, /* #x16E6 */ + 0x0000, /* #x16E7 */ + 0x0000, /* #x16E8 */ + 0x0000, /* #x16E9 */ + 0x0000, /* #x16EA */ + 0x0000, /* #x16EB */ + 0x0000, /* #x16EC */ + 0x0000, /* #x16ED */ + 0x0000, /* #x16EE */ + 0x0000, /* #x16EF */ + 0x0000, /* #x16F0 */ + 0x0000, /* #x16F1 */ + 0x0000, /* #x16F2 */ + 0x0000, /* #x16F3 */ + 0x0000, /* #x16F4 */ + 0x0000, /* #x16F5 */ + 0x0259, /* #x16F6 schwa */ + }; + +static UINT_16_BIT const VIETNAMESE[] = + { +#define FIRST_KNOWN_VIETNAMESE 0x1E9F + 0x0303, /* #x1E9F combining_tilde */ + 0x1ea0, /* #x1EA0 Abelowdot */ + 0x1ea1, /* #x1EA1 abelowdot */ + 0x1ea2, /* #x1EA2 Ahook */ + 0x1ea3, /* #x1EA3 ahook */ + 0x1ea4, /* #x1EA4 Acircumflexacute */ + 0x1ea5, /* #x1EA5 acircumflexacute */ + 0x1ea6, /* #x1EA6 Acircumflexgrave */ + 0x1ea7, /* #x1EA7 acircumflexgrave */ + 0x1ea8, /* #x1EA8 Acircumflexhook */ + 0x1ea9, /* #x1EA9 acircumflexhook */ + 0x1eaa, /* #x1EAA Acircumflextilde */ + 0x1eab, /* #x1EAB acircumflextilde */ + 0x1eac, /* #x1EAC Acircumflexbelowdot */ + 0x1ead, /* #x1EAD acircumflexbelowdot */ + 0x1eae, /* #x1EAE Abreveacute */ + 0x1eaf, /* #x1EAF abreveacute */ + 0x1eb0, /* #x1EB0 Abrevegrave */ + 0x1eb1, /* #x1EB1 abrevegrave */ + 0x1eb2, /* #x1EB2 Abrevehook */ + 0x1eb3, /* #x1EB3 abrevehook */ + 0x1eb4, /* #x1EB4 Abrevetilde */ + 0x1eb5, /* #x1EB5 abrevetilde */ + 0x1eb6, /* #x1EB6 Abrevebelowdot */ + 0x1eb7, /* #x1EB7 abrevebelowdot */ + 0x1eb8, /* #x1EB8 Ebelowdot */ + 0x1eb9, /* #x1EB9 ebelowdot */ + 0x1eba, /* #x1EBA Ehook */ + 0x1ebb, /* #x1EBB ehook */ + 0x1ebc, /* #x1EBC Etilde */ + 0x1ebd, /* #x1EBD etilde */ + 0x1ebe, /* #x1EBE Ecircumflexacute */ + 0x1ebf, /* #x1EBF ecircumflexacute */ + 0x1ec0, /* #x1EC0 Ecircumflexgrave */ + 0x1ec1, /* #x1EC1 ecircumflexgrave */ + 0x1ec2, /* #x1EC2 Ecircumflexhook */ + 0x1ec3, /* #x1EC3 ecircumflexhook */ + 0x1ec4, /* #x1EC4 Ecircumflextilde */ + 0x1ec5, /* #x1EC5 ecircumflextilde */ + 0x1ec6, /* #x1EC6 Ecircumflexbelowdot */ + 0x1ec7, /* #x1EC7 ecircumflexbelowdot */ + 0x1ec8, /* #x1EC8 Ihook */ + 0x1ec9, /* #x1EC9 ihook */ + 0x1eca, /* #x1ECA Ibelowdot */ + 0x1ecb, /* #x1ECB ibelowdot */ + 0x1ecc, /* #x1ECC Obelowdot */ + 0x1ecd, /* #x1ECD obelowdot */ + 0x1ece, /* #x1ECE Ohook */ + 0x1ecf, /* #x1ECF ohook */ + 0x1ed0, /* #x1ED0 Ocircumflexacute */ + 0x1ed1, /* #x1ED1 ocircumflexacute */ + 0x1ed2, /* #x1ED2 Ocircumflexgrave */ + 0x1ed3, /* #x1ED3 ocircumflexgrave */ + 0x1ed4, /* #x1ED4 Ocircumflexhook */ + 0x1ed5, /* #x1ED5 ocircumflexhook */ + 0x1ed6, /* #x1ED6 Ocircumflextilde */ + 0x1ed7, /* #x1ED7 ocircumflextilde */ + 0x1ed8, /* #x1ED8 Ocircumflexbelowdot */ + 0x1ed9, /* #x1ED9 ocircumflexbelowdot */ + 0x1eda, /* #x1EDA Ohornacute */ + 0x1edb, /* #x1EDB ohornacute */ + 0x1edc, /* #x1EDC Ohorngrave */ + 0x1edd, /* #x1EDD ohorngrave */ + 0x1ede, /* #x1EDE Ohornhook */ + 0x1edf, /* #x1EDF ohornhook */ + 0x1ee0, /* #x1EE0 Ohorntilde */ + 0x1ee1, /* #x1EE1 ohorntilde */ + 0x1ee2, /* #x1EE2 Ohornbelowdot */ + 0x1ee3, /* #x1EE3 ohornbelowdot */ + 0x1ee4, /* #x1EE4 Ubelowdot */ + 0x1ee5, /* #x1EE5 ubelowdot */ + 0x1ee6, /* #x1EE6 Uhook */ + 0x1ee7, /* #x1EE7 uhook */ + 0x1ee8, /* #x1EE8 Uhornacute */ + 0x1ee9, /* #x1EE9 uhornacute */ + 0x1eea, /* #x1EEA Uhorngrave */ + 0x1eeb, /* #x1EEB uhorngrave */ + 0x1eec, /* #x1EEC Uhornhook */ + 0x1eed, /* #x1EED uhornhook */ + 0x1eee, /* #x1EEE Uhorntilde */ + 0x1eef, /* #x1EEF uhorntilde */ + 0x1ef0, /* #x1EF0 Uhornbelowdot */ + 0x1ef1, /* #x1EF1 uhornbelowdot */ + 0x0300, /* #x1EF2 combining_grave */ + 0x0301, /* #x1EF3 combining_acute */ + 0x1ef4, /* #x1EF4 Ybelowdot */ + 0x1ef5, /* #x1EF5 ybelowdot */ + 0x1ef6, /* #x1EF6 Yhook */ + 0x1ef7, /* #x1EF7 yhook */ + 0x1ef8, /* #x1EF8 Ytilde */ + 0x1ef9, /* #x1EF9 ytilde */ + + 0x01a0, /* #x1EFA Ohorn */ + 0x01a1, /* #x1EFB ohorn */ + 0x01af, /* #x1EFC Uhorn */ + 0x01b0, /* #x1EFD uhorn */ + + 0x0309, /* #x1EFE combining_hook */ + 0x0323, /* #x1EFF combining_belowdot */ + }; + static UINT_16_BIT const CYRILLIC[] = { 0x0452, /* #x06A1 CYRILLIC SMALL LETTER DJE */ ＠＠ -559,8 +999,16 ＠＠ static Lisp_Object x_keysym_to_character (KeySym keysym) { +#ifdef MULE Lisp_Object charset = Qzero; int code = 0; +#endif /* MULE */ + + /* ＠＠#### Add support for 0xFE?? and 0xFF?? keysyms + Add support for KOI8-U extensions in the 0x06?? range + + See http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt + */ /* Markus Kuhn's spec says keysyms in the range #x01000100 to #x0110FFFF and only those should correspond directly to Unicode code points, in ＠＠ -568,42 +1016,48 ＠＠ code points do the same thing with keysyms #x01000000-#x01000100. */ +#ifndef MULE + if (keysym >= 0x01000000 && keysym <= 0x010000FF) + return make_char (keysym & 0xFFFFFF); +#else if (keysym >= 0x01000000 && keysym <= 0x0110FFFF) - return Funicode_to_char (make_fixnum (keysym & 0xffffff), Qnil); + return make_char (buffer_unicode_to_ichar + ((int) (keysym & 0xFFFFFF), + /* ＠＠#### need to get some sort of buffer to compute + this off; only applies in the old-Mule world */ + current_buffer, CONVERR_SUCCEED)); +#endif /* not MULE */ if ((keysym & 0xff) < 0xa0) return Qnil; +#ifdef MULE switch (keysym >> 8) { - -#define USE_CHARSET(var,cs) \ - ((var) = charset_by_leading_byte (LEADING_BYTE_##cs)) - case 0: /* ASCII + Latin1 */ - USE_CHARSET (charset, LATIN_ISO8859_1); - code = keysym & 0x7f; + charset = Vcharset_latin_iso8859_1; + code = keysym & 0xff; break; case 1: /* Latin2 */ - USE_CHARSET (charset, LATIN_ISO8859_2); - code = keysym & 0x7f; + charset = Vcharset_latin_iso8859_2; + code = keysym & 0xff; break; case 2: /* Latin3 */ - USE_CHARSET (charset, LATIN_ISO8859_3); - code = keysym & 0x7f; + charset = Vcharset_latin_iso8859_3; + code = keysym & 0xff; break; case 3: /* Latin4 */ - USE_CHARSET (charset, LATIN_ISO8859_4); - code = keysym & 0x7f; + charset = Vcharset_latin_iso8859_4; + code = keysym & 0xff; break; case 4: /* Katakana */ - USE_CHARSET (charset, KATAKANA_JISX0201); + charset = Vcharset_katakana_jisx0201; if ((keysym & 0xff) > 0xa0) - code = keysym & 0x7f; + code = keysym & 0xff; break; case 5: /* Arabic */ - USE_CHARSET (charset, ARABIC_ISO8859_6); - code = keysym & 0x7f; + charset = Vcharset_arabic_iso8859_6; + code = keysym & 0xff; break; case 6: /* Cyrillic */ { ＠＠ -612,20 +1066,20 ＠＠ } case 7: /* Greek */ { - static UExtbyte const greek[] = /* 0x20 - 0x7f */ - {0x00, 0x36, 0x38, 0x39, 0x3a, 0x5a, 0x00, 0x3c, - 0x3e, 0x5b, 0x00, 0x3f, 0x00, 0x00, 0x35, 0x2f, - 0x00, 0x5c, 0x5d, 0x5e, 0x5f, 0x7a, 0x40, 0x7c, - 0x7d, 0x7b, 0x60, 0x7e, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, - 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, - 0x50, 0x51, 0x53, 0x00, 0x54, 0x55, 0x56, 0x57, - 0x58, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, - 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, - 0x70, 0x71, 0x73, 0x72, 0x74, 0x75, 0x76, 0x77, - 0x78, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - USE_CHARSET (charset, GREEK_ISO8859_7); + static UExtbyte const greek[] = /* 0xa0 - 0xff */ + {0x00, 0xb6, 0xb8, 0xb9, 0xba, 0xda, 0x00, 0xbc, + 0xbe, 0xdb, 0x00, 0xbf, 0x00, 0x00, 0xb5, 0xaf, + 0x00, 0xdc, 0xdd, 0xde, 0xdf, 0xfa, 0xc0, 0xfc, + 0xfd, 0xfb, 0xe0, 0xfe, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, + 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, + 0xd0, 0xd1, 0xd3, 0x00, 0xd4, 0xd5, 0xd6, 0xd7, + 0xd8, 0xd9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, + 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, + 0xf0, 0xf1, 0xf3, 0xf2, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + charset = Vcharset_greek_iso8859_7; code = greek[(keysym & 0x7f) - 0x20]; break; } ＠＠ -642,29 +1096,110 ＠＠ USE_UNICODE_MAP (keysym, APL); break; case 12: /* Hebrew */ - USE_CHARSET (charset, HEBREW_ISO8859_8); - code = keysym & 0x7f; + charset = Vcharset_hebrew_iso8859_8; + code = keysym & 0xff; break; case 13: /* Thai */ /* #### This needs to deal with character composition. - Are you sure we can't leave it to the X server? */ - USE_CHARSET (charset, THAI_TIS620); - code = keysym & 0x7f; + Are you sure we can't leave it to the X server? */ + charset = Vcharset_thai_tis620; + code = keysym & 0xff; + break; + case 14: /* Korean Hangul. */ + USE_UNICODE_MAP (keysym, HANGUL); + break; + case 18: /* Latin 8 - ISO8859-14. */ + charset = Ffind_charset (intern ("latin-iso8859-14")); + code = keysym & 0xff; break; - case 14: /* Korean Hangul. Would like some information on whether this - is worth doing--there don't appear to be any Korean keyboard - layouts in the XKB data files. */ + case 19: /* Latin 9 - ISO8859-15. */ + charset = Vcharset_latin_iso8859_15; + code = keysym & 0xff; + break; + case 20: /* Armenian. */ + USE_UNICODE_MAP (keysym, ARMENIAN); break; - - case 19: /* Latin 9 - ISO8859-15. */ - USE_CHARSET (charset, LATIN_ISO8859_15); - code = keysym & 0x7f; + case 21: /* Georgian. */ + USE_UNICODE_MAP (keysym, GEORGIAN); + break; + case 22: /* Azeri (and other Turkic or Caucasian languages of ex-USSR) */ + USE_UNICODE_MAP (keysym, AZERI_ETC); + break; + case 30: /* Vietnamese */ + USE_UNICODE_MAP (keysym, VIETNAMESE); break; case 32: /* Currency. The lower sixteen bits of these keysyms happily correspond exactly to the Unicode code points of the associated characters */ - return Funicode_to_char (make_fixnum (keysym & 0xffff), Qnil); - break; + return make_char (buffer_unicode_to_ichar + ((int) (keysym & 0xffff), + /* ＠＠#### need to get some sort of buffer to + compute this off; only applies in the old-Mule + world */ + current_buffer, CONVERR_SUCCEED)); + +/* ＠＠#### Support me! + + Actually, these are somewhat already supported by x-init.el/x-compose.el, + but only acute, grave, circum(flex), cedilla, diaeresis, tilde. We + should try to eliminate that code and use general Unicode support for + converting to precomposed sequences. + +0xfe50 U0300 f # dead_grave +0xfe51 U0301 f # dead_acute +0xfe52 U0302 f # dead_circumflex +0xfe53 U0303 f # dead_tilde +0xfe54 U0304 f # dead_macron +0xfe55 U0306 f # dead_breve +0xfe56 U0307 f # dead_abovedot +0xfe57 U0308 f # dead_diaeresis +0xfe58 U030a f # dead_abovering +0xfe59 U030b f # dead_doubleacute +0xfe5a U030c f # dead_caron +0xfe5b U0327 f # dead_cedilla +0xfe5c U0328 f # dead_ogonek +0xfe5d U0345 f # dead_iota +0xfe5e U3099 f # dead_voiced_sound +0xfe5f U309a f # dead_semivoiced_sound +0xfe60 U0323 f # dead_belowdot +0xfe61 U0309 f # dead_hook +0xfe62 U031b f # dead_horn + +What about these? We don't have to convert these to ASCII but make sure we +handle all of the KP-foo things and get them to behave like plain foo when +KP-foo isn't bound (which includes self-inserting the associated character +if necessary). DOCUMENT the existing system that does this. + +0xff08 U0008 f # BackSpace /- back space, back char -/ +0xff09 U0009 f # Tab +0xff0a U000a f # Linefeed /- Linefeed, LF -/ +0xff0b U000b f # Clear +0xff0d U000d f # Return /- Return, enter -/ +0xff13 U0013 f # Pause /- Pause, hold -/ +0xff14 U0014 f # Scroll_Lock +0xff15 U0015 f # Sys_Req +0xff1b U001b f # Escape +0xff80 U0020 f # KP_Space /- space -/ +0xff89 U0009 f # KP_Tab +0xff8d U000d f # KP_Enter /- enter -/ +0xffaa U002a f # KP_Multiply +0xffab U002b f # KP_Add +0xffac U002c f # KP_Separator /- separator, often comma -/ +0xffad U002d f # KP_Subtract +0xffae U002e f # KP_Decimal +0xffaf U002f f # KP_Divide +0xffb0 U0030 f # KP_0 +0xffb1 U0031 f # KP_1 +0xffb2 U0032 f # KP_2 +0xffb3 U0033 f # KP_3 +0xffb4 U0034 f # KP_4 +0xffb5 U0035 f # KP_5 +0xffb6 U0036 f # KP_6 +0xffb7 U0037 f # KP_7 +0xffb8 U0038 f # KP_8 +0xffb9 U0039 f # KP_9 +0xffbd U003d f # KP_Equal /- equals -/ +*/ default: break; } ＠＠ -672,19 +1207,35 ＠＠ if (code == 0) return Qnil; -#ifdef MULE - { - Lisp_Object unified = Funicode_to_char - (Fchar_to_unicode (make_char (make_ichar (charset, code, 0))), Qnil); - if (!NILP (unified)) - { - return unified; - } - return make_char (make_ichar (charset, code, 0)); - } -#else - return make_char (code + 0x80); -#endif + /* #### Is this check on !NILP (charset) needed? Maybe should be assert? */ + if (!NILP (charset)) + { + /* First try to generate a unified character by converting through + Unicode, then try converting directly to an Ichar (only matters + when non-Unicode-internal, else we get same results both ways). */ + int ucs = charset_codepoint_to_unicode (charset, 0, code, CONVERR_FAIL); + if (ucs >= 0) + { + /* ＠＠#### current_buffer dependency */ + Ichar ich = buffer_unicode_to_ichar (ucs, current_buffer, + CONVERR_FAIL); + if (ich >= 0) + return make_char (ich); + } + else + { + Ichar ich = + charset_codepoint_to_ichar (charset, 0, code, CONVERR_FAIL); + if (ich >= 0) + return make_char (ich); + } + } + return Qnil; +#else /* not MULE */ + if (keysym >= 0x100) + return Qnil; + return make_char (keysym); +#endif /* (not) MULE */ } /************************************************************************/ diff -r 9bdc40b8fb78 -r a5b21ebab055 src/event-xlike-inc.c --- a/src/event-xlike-inc.c Sun Dec 17 12:20:06 2017 +0000 +++ b/src/event-xlike-inc.c Mon Dec 18 22:04:46 2017 +0000 ＠＠ -162,1121 +162,3 ＠＠ return 0; } -#if defined (THIS_IS_X) || !defined (__GDK_KEYS_H__) - -#ifdef MULE - -/* Use an appropriate map to Unicode within x_keysym_to_character. Arguments - are evaluated multiple times. - - Breaks if an X11 keysym maps to zero in Unicode. */ - -#define USE_UNICODE_MAP(keysym, map) \ - if (keysym >= FIRST_KNOWN_##map \ - && (keysym < (FIRST_KNOWN_##map + countof (map))) \ - && map[keysym - FIRST_KNOWN_##map ]) do \ - { \ - keysym -= FIRST_KNOWN_##map ; \ - return make_char (buffer_unicode_to_ichar ((int) map[keysym], \ - /* ＠＠#### need to get some sort \ - of buffer to compute this off; \ - only applies in the old-Mule \ - world */ \ - current_buffer, \ - CONVERR_SUCCEED)); \ - } while (0) - -/* Maps to Unicode for X11 KeySyms, where we don't have a direct internal - mapping based on a Mule character set, or whatever. Taken from Markus - Kuhn's X11.keysyms--if you're ever comparing with that file, note the - sequences of KeySyms often leave out entries, so you'll have to fill them - in. Doesn't include support for Hangul, which it should, if the X11 - Hangul keysyms have ever been used anywhere. -*/ - -static UINT_16_BIT const TECHNICAL[] = - { - 0x23B7, /* #x08A1 LEFT RADICAL Technical */ - -#define FIRST_KNOWN_TECHNICAL 0x8A1 - - 0x0, /* #x08A2 TOP LEFT RADICAL Technical */ - 0x0, /* #x08A3 HORIZONTAL CONNECTOR Technical */ - 0x2320, /* #x08A4 TOP INTEGRAL Technical */ - 0x2321, /* #x08A5 BOTTOM INTEGRAL Technical */ - 0x0, /* #x08A6 VERTICAL CONNECTOR Technical */ - 0x23A1, /* #x08A7 TOP LEFT SQUARE BRACKET Technical */ - 0x23A3, /* #x08A8 BOTTOM LEFT SQUARE BRACKET Technical */ - 0x23A4, /* #x08A9 TOP RIGHT SQUARE BRACKET Technical */ - 0x23A6, /* #x08AA BOTTOM RIGHT SQUARE BRACKET Technical */ - 0x239B, /* #x08AB TOP LEFT PARENTHESIS Technical */ - 0x239D, /* #x08AC BOTTOM LEFT PARENTHESIS Technical */ - 0x239E, /* #x08AD TOP RIGHT PARENTHESIS Technical */ - 0x23A0, /* #x08AE BOTTOM RIGHT PARENTHESIS Technical */ - 0x23A8, /* #x08AF LEFT MIDDLE CURLY BRACE Technical */ - 0x23AC, /* #x08B0 RIGHT MIDDLE CURLY BRACE Technical */ - 0x0, /* #x08B1 TOP LEFT SUMMATION Technical */ - 0x0, /* #x08B2 BOTTOM LEFT SUMMATION Technical */ - 0x0, /* #x08B3 TOP VERTICAL SUMMATION CONNECTOR Technical */ - 0x0, /* #x08B4 BOTTOM VERTICAL SUMMATION CONNECTOR Technical */ - 0x0, /* #x08B5 TOP RIGHT SUMMATION Technical */ - 0x0, /* #x08B6 BOTTOM RIGHT SUMMATION Technical */ - 0x0, /* #x08B7 RIGHT MIDDLE SUMMATION Technical */ - 0x0, /* #x08B8 */ - 0x0, /* #x08B9 */ - 0x0, /* #x08BA */ - 0x0, /* #x08BB */ - 0x2264, /* #x08BC LESS THAN OR EQUAL SIGN Technical */ - 0x2260, /* #x08BD NOT EQUAL SIGN Technical */ - 0x2265, /* #x08BE GREATER THAN OR EQUAL SIGN Technical */ - 0x222B, /* #x08BF INTEGRAL Technical */ - 0x2234, /* #x08C0 THEREFORE Technical */ - 0x221D, /* #x08C1 VARIATION, PROPORTIONAL TO Technical */ - 0x221E, /* #x08C2 INFINITY Technical */ - 0x0, /* #x08C3 */ - 0x0, /* #x08C4 */ - 0x2207, /* #x08C5 NABLA, DEL Technical */ - 0x0, /* #x08C6 */ - 0x0, /* #x08C7 */ - 0x223C, /* #x08C8 IS APPROXIMATE TO Technical */ - 0x2243, /* #x08C9 SIMILAR OR EQUAL TO Technical */ - 0x0, /* #x08CA */ - 0x0, /* #x08CB */ - 0x0, /* #x08CC */ - 0x21D4, /* #x08CD IF AND ONLY IF Technical */ - 0x21D2, /* #x08CE IMPLIES Technical */ - 0x2261, /* #x08CF IDENTICAL TO Technical */ - 0x0, /* #x08D0 */ - 0x0, /* #x08D1 */ - 0x0, /* #x08D2 */ - 0x0, /* #x08D3 */ - 0x0, /* #x08D4 */ - 0x0, /* #x08D5 */ - 0x221A, /* #x08D6 RADICAL Technical */ - 0x0, /* #x08D7 */ - 0x0, /* #x08D8 */ - 0x0, /* #x08D9 */ - 0x2282, /* #x08DA IS INCLUDED IN Technical */ - 0x2283, /* #x08DB INCLUDES Technical */ - 0x2229, /* #x08DC INTERSECTION Technical */ - 0x222A, /* #x08DD UNION Technical */ - 0x2227, /* #x08DE LOGICAL AND Technical */ - 0x2228, /* #x08DF LOGICAL OR Technical */ - 0x0, /* #x08E0 */ - 0x0, /* #x08E1 */ - 0x0, /* #x08E2 */ - 0x0, /* #x08E3 */ - 0x0, /* #x08E4 */ - 0x0, /* #x08E5 */ - 0x0, /* #x08E6 */ - 0x0, /* #x08E7 */ - 0x0, /* #x08E8 */ - 0x0, /* #x08E9 */ - 0x0, /* #x08Ea */ - 0x0, /* #x08Eb */ - 0x0, /* #x08Ec */ - 0x0, /* #x08Ed */ - 0x0, /* #x08Ee */ - 0x2202, /* #x08EF PARTIAL DERIVATIVE Technical */ - 0x0, /* #x08F0 */ - 0x0, /* #x08F1 */ - 0x0, /* #x08F2 */ - 0x0, /* #x08F3 */ - 0x0, /* #x08F4 */ - 0x0, /* #x08F5 */ - 0x0192, /* #x08F6 FUNCTION Technical */ - 0x0, /* #x08F7 */ - 0x0, /* #x08F8 */ - 0x0, /* #x08F9 */ - 0x0, /* #x08FA */ - 0x2190, /* #x08FB LEFT ARROW Technical */ - 0x2191, /* #x08FC UPWARD ARROW Technical */ - 0x2192, /* #x08FD RIGHT ARROW Technical */ - 0x2193, /* #x08FE DOWNWARD ARROW Technical */ - }; - -static UINT_16_BIT const SPECIAL[] = - { - 0x25C6, /* #x09E0 SOLID DIAMOND Special */ - -#define FIRST_KNOWN_SPECIAL 0x9E0 - - 0x2592, /* #x09E1 CHECKERBOARD Special */ - 0x2409, /* #x09E2 ``HT'' Special */ - 0x240C, /* #x09E3 ``FF'' Special */ - 0x240D, /* #x09E4 ``CR'' Special */ - 0x240A, /* #x09E5 ``LF'' Special */ - 0x0, /* #x09E6 */ - 0x0, /* #x09E7 */ - 0x2424, /* #x09E8 ``NL'' Special */ - 0x240B, /* #x09E9 ``VT'' Special */ - 0x2518, /* #x09EA LOWER-RIGHT CORNER Special */ - 0x2510, /* #x09EB UPPER-RIGHT CORNER Special */ - 0x250C, /* #x09EC UPPER-LEFT CORNER Special */ - 0x2514, /* #x09ED LOWER-LEFT CORNER Special */ - 0x253C, /* #x09EE CROSSING-LINES Special */ - 0x23BA, /* #x09EF HORIZONTAL LINE, SCAN 1 Special */ - 0x23BB, /* #x09F0 HORIZONTAL LINE, SCAN 3 Special */ - 0x2500, /* #x09F1 HORIZONTAL LINE, SCAN 5 Special */ - 0x23BC, /* #x09F2 HORIZONTAL LINE, SCAN 7 Special */ - 0x23BD, /* #x09F3 HORIZONTAL LINE, SCAN 9 Special */ - 0x251C, /* #x09F4 LEFT ``T'' Special */ - 0x2524, /* #x09F5 RIGHT ``T'' Special */ - 0x2534, /* #x09F6 BOTTOM ``T'' Special */ - 0x252C, /* #x09F7 TOP ``T'' Special */ - 0x2502 /* #x09F8 VERTICAL BAR Special */ - }; - -static UINT_16_BIT const PUBLISHING[] = - { - 0x2003, /* #x0AA1 EM SPACE Publish */ - -#define FIRST_KNOWN_PUBLISHING 0xAA1 - - 0x2002, /* #x0AA2 EN SPACE Publish */ - 0x2004, /* #x0AA3 3/EM SPACE Publish */ - 0x2005, /* #x0AA4 4/EM SPACE Publish */ - 0x2007, /* #x0AA5 DIGIT SPACE Publish */ - 0x2008, /* #x0AA6 PUNCTUATION SPACE Publish */ - 0x2009, /* #x0AA7 THIN SPACE Publish */ - 0x200A, /* #x0AA8 HAIR SPACE Publish */ - 0x2014, /* #x0AA9 EM DASH Publish */ - 0x2013, /* #x0AAA EN DASH Publish */ - 0x0, /* #x0AAB */ - 0x0, /* #x0AAC SIGNIFICANT BLANK SYMBOL Publish */ - 0x0, /* #x0AAD */ - 0x2026, /* #x0AAE ELLIPSIS Publish */ - 0x2025, /* #x0AAF DOUBLE BASELINE DOT Publish */ - 0x2153, /* #x0AB0 VULGAR FRACTION ONE THIRD Publish */ - 0x2154, /* #x0AB1 VULGAR FRACTION TWO THIRDS Publish */ - 0x2155, /* #x0AB2 VULGAR FRACTION ONE FIFTH Publish */ - 0x2156, /* #x0AB3 VULGAR FRACTION TWO FIFTHS Publish */ - 0x2157, /* #x0AB4 VULGAR FRACTION THREE FIFTHS Publish */ - 0x2158, /* #x0AB5 VULGAR FRACTION FOUR FIFTHS Publish */ - 0x2159, /* #x0AB6 VULGAR FRACTION ONE SIXTH Publish */ - 0x215A, /* #x0AB7 VULGAR FRACTION FIVE SIXTHS Publish */ - 0x2105, /* #x0AB8 CARE OF Publish */ - 0x0, /* #x0AB9 */ - 0x0, /* #x0ABA */ - 0x2012, /* #x0ABB FIGURE DASH Publish */ - 0x3008, /* #x0ABC LEFT ANGLE BRACKET Publish */ - 0x002E, /* #x0ABD DECIMAL POINT Publish */ - 0x3009, /* #x0ABE RIGHT ANGLE BRACKET Publish */ - 0x0, /* #x0ABF MARKER Publish */ - 0x0, /* #x0AC0 */ - 0x0, /* #x0AC1 */ - 0x0, /* #x0AC2 */ - 0x215B, /* #x0AC3 VULGAR FRACTION ONE EIGHTH Publish */ - 0x215C, /* #x0AC4 VULGAR FRACTION THREE EIGHTHS Publish */ - 0x215D, /* #x0AC5 VULGAR FRACTION FIVE EIGHTHS Publish */ - 0x215E, /* #x0AC6 VULGAR FRACTION SEVEN EIGHTHS Publish */ - 0x0, /* #x0AC7 */ - 0x0, /* #x0AC8 */ - 0x2122, /* #x0AC9 TRADEMARK SIGN Publish */ - 0x0, /* #x0ACA SIGNATURE MARK Publish */ - 0x0, /* #x0ACB TRADEMARK SIGN IN CIRCLE Publish */ - 0x0, /* #x0ACC LEFT OPEN TRIANGLE Publish */ - 0x0, /* #x0ACD RIGHT OPEN TRIANGLE Publish */ - 0x0, /* #x0ACE EM OPEN CIRCLE Publish */ - 0x0, /* #x0ACF EM OPEN RECTANGLE Publish */ - 0x2018, /* #x0AD0 LEFT SINGLE QUOTATION MARK Publish */ - 0x2019, /* #x0AD1 RIGHT SINGLE QUOTATION MARK Publish */ - 0x201C, /* #x0AD2 LEFT DOUBLE QUOTATION MARK Publish */ - 0x201D, /* #x0AD3 RIGHT DOUBLE QUOTATION MARK Publish */ - 0x211E, /* #x0AD4 PRESCRIPTION, TAKE, RECIPE Publish */ - 0x0, /* #x0AD5 */ - 0x2032, /* #x0AD6 MINUTES Publish */ - 0x2033, /* #x0AD7 SECONDS Publish */ - 0x0, /* #x0AD8 */ - 0x271D, /* #x0AD9 LATIN CROSS Publish */ - 0x0, /* #x0ADA HEXAGRAM Publish */ - 0x0, /* #x0ADB FILLED RECTANGLE BULLET Publish */ - 0x0, /* #x0ADC FILLED LEFT TRIANGLE BULLET Publish */ - 0x0, /* #x0ADD FILLED RIGHT TRIANGLE BULLET Publish */ - 0x0, /* #x0ADE EM FILLED CIRCLE Publish */ - 0x0, /* #x0ADF EM FILLED RECTANGLE Publish */ - 0x0, /* #x0AE0 EN OPEN CIRCLE BULLET Publish */ - 0x0, /* #x0AE1 EN OPEN SQUARE BULLET Publish */ - 0x0, /* #x0AE2 OPEN RECTANGULAR BULLET Publish */ - 0x0, /* #x0AE3 OPEN TRIANGULAR BULLET UP Publish */ - 0x0, /* #x0AE4 OPEN TRIANGULAR BULLET DOWN Publish */ - 0x0, /* #x0AE5 OPEN STAR Publish */ - 0x0, /* #x0AE6 EN FILLED CIRCLE BULLET Publish */ - 0x0, /* #x0AE7 EN FILLED SQUARE BULLET Publish */ - 0x0, /* #x0AE8 FILLED TRIANGULAR BULLET UP Publish */ - 0x0, /* #x0AE9 FILLED TRIANGULAR BULLET DOWN Publish */ - 0x0, /* #x0AEA LEFT POINTER Publish */ - 0x0, /* #x0AEB RIGHT POINTER Publish */ - 0x2663, /* #x0AEC CLUB Publish */ - 0x2666, /* #x0AED DIAMOND Publish */ - 0x2665, /* #x0AEE HEART Publish */ - 0x0, /* #x0AEF */ - 0x2720, /* #x0AF0 MALTESE CROSS Publish */ - 0x2020, /* #x0AF1 DAGGER Publish */ - 0x2021, /* #x0AF2 DOUBLE DAGGER Publish */ - 0x2713, /* #x0AF3 CHECK MARK, TICK Publish */ - 0x2717, /* #x0AF4 BALLOT CROSS Publish */ - 0x266F, /* #x0AF5 MUSICAL SHARP Publish */ - 0x266D, /* #x0AF6 MUSICAL FLAT Publish */ - 0x2642, /* #x0AF7 MALE SYMBOL Publish */ - 0x2640, /* #x0AF8 FEMALE SYMBOL Publish */ - 0x260E, /* #x0AF9 TELEPHONE SYMBOL Publish */ - 0x2315, /* #x0AFA TELEPHONE RECORDER SYMBOL Publish */ - 0x2117, /* #x0AFB PHONOGRAPH COPYRIGHT SIGN Publish */ - 0x2038, /* #x0AFC CARET Publish */ - 0x201A, /* #x0AFD SINGLE LOW QUOTATION MARK Publish */ - 0x201E, /* #x0AFE DOUBLE LOW QUOTATION MARK Publish */ - }; - -static UINT_16_BIT const APL[] = - { - 0x22A5, /* #x0BC2 DOWN TACK APL */ -#define FIRST_KNOWN_APL 0xBC2 - 0x0, /* #x0BC3 UP SHOE (CAP) APL */ - 0x230A, /* #x0BC4 DOWN STILE APL */ - 0x0, /* #x0BC5 */ - 0x0, /* #x0BC6 UNDERBAR APL */ - 0x0, /* #x0BC7 */ - 0x0, /* #x0BC8 */ - 0x0, /* #x0BC9 */ - 0x2218, /* #x0BCA JOT APL */ - 0x0, /* #x0BCB */ - 0x2395, /* #x0BCC QUAD APL */ - 0x0, /* #x0BCD */ - 0x22A4, /* #x0BCE UP TACK APL */ - 0x25CB, /* #x0BCF CIRCLE APL */ - 0x0, /* #x0BD0 */ - 0x0, /* #x0BD1 */ - 0x0, /* #x0BD2 */ - 0x2308, /* #x0BD3 UP STILE APL */ - 0x0, /* #x0BD4 */ - 0x0, /* #x0BD5 */ - 0x0, /* #x0BD6 DOWN SHOE (CUP) APL */ - 0x0, /* #x0BD7 */ - 0x0, /* #x0BD8 RIGHT SHOE APL */ - 0x0, /* #x0BD9 */ - 0x0, /* #x0BDA LEFT SHOE APL */ - 0x0, /* #x0BDB */ - 0x0, /* #x0BDC */ - 0x22A2, /* #x0BDC LEFT TACK APL */ - 0x0, /* #x0BDE */ - 0x0, /* #x0BDF */ - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, /* 0x0BB0--0x0BBB */ - 0x0, 0x0, 0x0, 0x0, - 0x22A3, /* #x0BFC RIGHT TACK APL */ - }; - -static UINT_16_BIT const HANGUL[] = - { -#define FIRST_KNOWN_HANGUL 0xEA1 - 0x3131, /* #x0EA1 Hangul_Kiyeog */ - 0x3132, /* #x0EA2 Hangul_SsangKiyeog */ - 0x3133, /* #x0EA3 Hangul_KiyeogSios */ - 0x3134, /* #x0EA4 Hangul_Nieun */ - 0x3135, /* #x0EA5 Hangul_NieunJieuj */ - 0x3136, /* #x0EA6 Hangul_NieunHieuh */ - 0x3137, /* #x0EA7 Hangul_Dikeud */ - 0x3138, /* #x0EA8 Hangul_SsangDikeud */ - 0x3139, /* #x0EA9 Hangul_Rieul */ - 0x313a, /* #x0EAA Hangul_RieulKiyeog */ - 0x313b, /* #x0EAB Hangul_RieulMieum */ - 0x313c, /* #x0EAC Hangul_RieulPieub */ - 0x313d, /* #x0EAD Hangul_RieulSios */ - 0x313e, /* #x0EAE Hangul_RieulTieut */ - 0x313f, /* #x0EAF Hangul_RieulPhieuf */ - 0x3140, /* #x0EB0 Hangul_RieulHieuh */ - 0x3141, /* #x0EB1 Hangul_Mieum */ - 0x3142, /* #x0EB2 Hangul_Pieub */ - 0x3143, /* #x0EB3 Hangul_SsangPieub */ - 0x3144, /* #x0EB4 Hangul_PieubSios */ - 0x3145, /* #x0EB5 Hangul_Sios */ - 0x3146, /* #x0EB6 Hangul_SsangSios */ - 0x3147, /* #x0EB7 Hangul_Ieung */ - 0x3148, /* #x0EB8 Hangul_Jieuj */ - 0x3149, /* #x0EB9 Hangul_SsangJieuj */ - 0x314a, /* #x0EBA Hangul_Cieuc */ - 0x314b, /* #x0EBB Hangul_Khieuq */ - 0x314c, /* #x0EBC Hangul_Tieut */ - 0x314d, /* #x0EBD Hangul_Phieuf */ - 0x314e, /* #x0EBE Hangul_Hieuh */ - 0x314f, /* #x0EBF Hangul_A */ - 0x3150, /* #x0EC0 Hangul_AE */ - 0x3151, /* #x0EC1 Hangul_YA */ - 0x3152, /* #x0EC2 Hangul_YAE */ - 0x3153, /* #x0EC3 Hangul_EO */ - 0x3154, /* #x0EC4 Hangul_E */ - 0x3155, /* #x0EC5 Hangul_YEO */ - 0x3156, /* #x0EC6 Hangul_YE */ - 0x3157, /* #x0EC7 Hangul_O */ - 0x3158, /* #x0EC8 Hangul_WA */ - 0x3159, /* #x0EC9 Hangul_WAE */ - 0x315a, /* #x0ECA Hangul_OE */ - 0x315b, /* #x0ECB Hangul_YO */ - 0x315c, /* #x0ECC Hangul_U */ - 0x315d, /* #x0ECD Hangul_WEO */ - 0x315e, /* #x0ECE Hangul_WE */ - 0x315f, /* #x0ECF Hangul_WI */ - 0x3160, /* #x0ED0 Hangul_YU */ - 0x3161, /* #x0ED1 Hangul_EU */ - 0x3162, /* #x0ED2 Hangul_YI */ - 0x3163, /* #x0ED3 Hangul_I */ - 0x11a8, /* #x0ED4 Hangul_J_Kiyeog */ - 0x11a9, /* #x0ED5 Hangul_J_SsangKiyeog */ - 0x11aa, /* #x0ED6 Hangul_J_KiyeogSios */ - 0x11ab, /* #x0ED7 Hangul_J_Nieun */ - 0x11ac, /* #x0ED8 Hangul_J_NieunJieuj */ - 0x11ad, /* #x0ED9 Hangul_J_NieunHieuh */ - 0x11ae, /* #x0EDA Hangul_J_Dikeud */ - 0x11af, /* #x0EDB Hangul_J_Rieul */ - 0x11b0, /* #x0EDC Hangul_J_RieulKiyeog */ - 0x11b1, /* #x0EDD Hangul_J_RieulMieum */ - 0x11b2, /* #x0EDE Hangul_J_RieulPieub */ - 0x11b3, /* #x0EDF Hangul_J_RieulSios */ - 0x11b4, /* #x0EE0 Hangul_J_RieulTieut */ - 0x11b5, /* #x0EE1 Hangul_J_RieulPhieuf */ - 0x11b6, /* #x0EE2 Hangul_J_RieulHieuh */ - 0x11b7, /* #x0EE3 Hangul_J_Mieum */ - 0x11b8, /* #x0EE4 Hangul_J_Pieub */ - 0x11b9, /* #x0EE5 Hangul_J_PieubSios */ - 0x11ba, /* #x0EE6 Hangul_J_Sios */ - 0x11bb, /* #x0EE7 Hangul_J_SsangSios */ - 0x11bc, /* #x0EE8 Hangul_J_Ieung */ - 0x11bd, /* #x0EE9 Hangul_J_Jieuj */ - 0x11be, /* #x0EEA Hangul_J_Cieuc */ - 0x11bf, /* #x0EEB Hangul_J_Khieuq */ - 0x11c0, /* #x0EEC Hangul_J_Tieut */ - 0x11c1, /* #x0EED Hangul_J_Phieuf */ - 0x11c2, /* #x0EEE Hangul_J_Hieuh */ - 0x316d, /* #x0EEF Hangul_RieulYeorinHieuh */ - 0x3171, /* #x0EF0 Hangul_SunkyeongeumMieum */ - 0x3178, /* #x0EF1 Hangul_SunkyeongeumPieub */ - 0x317f, /* #x0EF2 Hangul_PanSios */ - 0x3181, /* #x0EF3 Hangul_KkogjiDalrinIeung */ - 0x3184, /* #x0EF4 Hangul_SunkyeongeumPhieuf */ - 0x3186, /* #x0EF5 Hangul_YeorinHieuh */ - 0x318d, /* #x0EF6 Hangul_AraeA */ - 0x318e, /* #x0EF7 Hangul_AraeAE */ - 0x11eb, /* #x0EF8 Hangul_J_PanSios */ - 0x11f0, /* #x0EF9 Hangul_J_KkogjiDalrinIeung */ - 0x11f9, /* #x0EFA Hangul_J_YeorinHieuh */ - 0x0000, /* #x0EFB */ - 0x0000, /* #x0EFC */ - 0x0000, /* #x0EFD */ - 0x0000, /* #x0EFE */ - 0x20a9, /* #x0EFF Korean_Won */ - }; - -static UINT_16_BIT const ARMENIAN[] = - { -#define FIRST_KNOWN_ARMENIAN 0x14A1 - 0x0000, /* #x14A1 Armenian_eternity */ - 0x0587, /* #x14A2 Armenian_ligature_ew */ - 0x0589, /* #x14A3 Armenian_verjaket */ - 0x0029, /* #x14A4 Armenian_parenright */ - 0x0028, /* #x14A5 Armenian_parenleft */ - 0x00bb, /* #x14A6 Armenian_guillemotright */ - 0x00ab, /* #x14A7 Armenian_guillemotleft */ - 0x2014, /* #x14A8 Armenian_em_dash */ - 0x002e, /* #x14A9 Armenian_mijaket */ - 0x055d, /* #x14AA Armenian_but */ - 0x002c, /* #x14AB Armenian_comma */ - 0x2013, /* #x14AC Armenian_en_dash */ - 0x058a, /* #x14AD Armenian_yentamna */ - 0x2026, /* #x14AE Armenian_ellipsis */ - 0x055c, /* #x14AF Armenian_amanak */ - 0x055b, /* #x14B0 Armenian_shesht */ - 0x055e, /* #x14B1 Armenian_paruyk */ - 0x0531, /* #x14B2 Armenian_AYB */ - 0x0561, /* #x14B3 Armenian_ayb */ - 0x0532, /* #x14B4 Armenian_BEN */ - 0x0562, /* #x14B5 Armenian_ben */ - 0x0533, /* #x14B6 Armenian_GIM */ - 0x0563, /* #x14B7 Armenian_gim */ - 0x0534, /* #x14B8 Armenian_DA */ - 0x0564, /* #x14B9 Armenian_da */ - 0x0535, /* #x14BA Armenian_YECH */ - 0x0565, /* #x14BB Armenian_yech */ - 0x0536, /* #x14BC Armenian_ZA */ - 0x0566, /* #x14BD Armenian_za */ - 0x0537, /* #x14BE Armenian_E */ - 0x0567, /* #x14BF Armenian_e */ - 0x0538, /* #x14C0 Armenian_AT */ - 0x0568, /* #x14C1 Armenian_at */ - 0x0539, /* #x14C2 Armenian_TO */ - 0x0569, /* #x14C3 Armenian_to */ - 0x053a, /* #x14C4 Armenian_ZHE */ - 0x056a, /* #x14C5 Armenian_zhe */ - 0x053b, /* #x14C6 Armenian_INI */ - 0x056b, /* #x14C7 Armenian_ini */ - 0x053c, /* #x14C8 Armenian_LYUN */ - 0x056c, /* #x14C9 Armenian_lyun */ - 0x053d, /* #x14CA Armenian_KHE */ - 0x056d, /* #x14CB Armenian_khe */ - 0x053e, /* #x14CC Armenian_TSA */ - 0x056e, /* #x14CD Armenian_tsa */ - 0x053f, /* #x14CE Armenian_KEN */ - 0x056f, /* #x14CF Armenian_ken */ - 0x0540, /* #x14D0 Armenian_HO */ - 0x0570, /* #x14D1 Armenian_ho */ - 0x0541, /* #x14D2 Armenian_DZA */ - 0x0571, /* #x14D3 Armenian_dza */ - 0x0542, /* #x14D4 Armenian_GHAT */ - 0x0572, /* #x14D5 Armenian_ghat */ - 0x0543, /* #x14D6 Armenian_TCHE */ - 0x0573, /* #x14D7 Armenian_tche */ - 0x0544, /* #x14D8 Armenian_MEN */ - 0x0574, /* #x14D9 Armenian_men */ - 0x0545, /* #x14DA Armenian_HI */ - 0x0575, /* #x14DB Armenian_hi */ - 0x0546, /* #x14DC Armenian_NU */ - 0x0576, /* #x14DD Armenian_nu */ - 0x0547, /* #x14DE Armenian_SHA */ - 0x0577, /* #x14DF Armenian_sha */ - 0x0548, /* #x14E0 Armenian_VO */ - 0x0578, /* #x14E1 Armenian_vo */ - 0x0549, /* #x14E2 Armenian_CHA */ - 0x0579, /* #x14E3 Armenian_cha */ - 0x054a, /* #x14E4 Armenian_PE */ - 0x057a, /* #x14E5 Armenian_pe */ - 0x054b, /* #x14E6 Armenian_JE */ - 0x057b, /* #x14E7 Armenian_je */ - 0x054c, /* #x14E8 Armenian_RA */ - 0x057c, /* #x14E9 Armenian_ra */ - 0x054d, /* #x14EA Armenian_SE */ - 0x057d, /* #x14EB Armenian_se */ - 0x054e, /* #x14EC Armenian_VEV */ - 0x057e, /* #x14ED Armenian_vev */ - 0x054f, /* #x14EE Armenian_TYUN */ - 0x057f, /* #x14EF Armenian_tyun */ - 0x0550, /* #x14F0 Armenian_RE */ - 0x0580, /* #x14F1 Armenian_re */ - 0x0551, /* #x14F2 Armenian_TSO */ - 0x0581, /* #x14F3 Armenian_tso */ - 0x0552, /* #x14F4 Armenian_VYUN */ - 0x0582, /* #x14F5 Armenian_vyun */ - 0x0553, /* #x14F6 Armenian_PYUR */ - 0x0583, /* #x14F7 Armenian_pyur */ - 0x0554, /* #x14F8 Armenian_KE */ - 0x0584, /* #x14F9 Armenian_ke */ - 0x0555, /* #x14FA Armenian_O */ - 0x0585, /* #x14FB Armenian_o */ - 0x0556, /* #x14FC Armenian_FE */ - 0x0586, /* #x14FD Armenian_fe */ - 0x055a, /* #x14FE Armenian_apostrophe */ - 0x00a7, /* #x14FF Armenian_section_sign */ - }; - -static UINT_16_BIT const GEORGIAN[] = - { -#define FIRST_KNOWN_GEORGIAN 0x15D0 - 0x10d0, /* #x15D0 Georgian_an */ - 0x10d1, /* #x15D1 Georgian_ban */ - 0x10d2, /* #x15D2 Georgian_gan */ - 0x10d3, /* #x15D3 Georgian_don */ - 0x10d4, /* #x15D4 Georgian_en */ - 0x10d5, /* #x15D5 Georgian_vin */ - 0x10d6, /* #x15D6 Georgian_zen */ - 0x10d7, /* #x15D7 Georgian_tan */ - 0x10d8, /* #x15D8 Georgian_in */ - 0x10d9, /* #x15D9 Georgian_kan */ - 0x10da, /* #x15DA Georgian_las */ - 0x10db, /* #x15DB Georgian_man */ - 0x10dc, /* #x15DC Georgian_nar */ - 0x10dd, /* #x15DD Georgian_on */ - 0x10de, /* #x15DE Georgian_par */ - 0x10df, /* #x15DF Georgian_zhar */ - 0x10e0, /* #x15E0 Georgian_rae */ - 0x10e1, /* #x15E1 Georgian_san */ - 0x10e2, /* #x15E2 Georgian_tar */ - 0x10e3, /* #x15E3 Georgian_un */ - 0x10e4, /* #x15E4 Georgian_phar */ - 0x10e5, /* #x15E5 Georgian_khar */ - 0x10e6, /* #x15E6 Georgian_ghan */ - 0x10e7, /* #x15E7 Georgian_qar */ - 0x10e8, /* #x15E8 Georgian_shin */ - 0x10e9, /* #x15E9 Georgian_chin */ - 0x10ea, /* #x15EA Georgian_can */ - 0x10eb, /* #x15EB Georgian_jil */ - 0x10ec, /* #x15EC Georgian_cil */ - 0x10ed, /* #x15ED Georgian_char */ - 0x10ee, /* #x15EE Georgian_xan */ - 0x10ef, /* #x15EF Georgian_jhan */ - 0x10f0, /* #x15F0 Georgian_hae */ - 0x10f1, /* #x15F1 Georgian_he */ - 0x10f2, /* #x15F2 Georgian_hie */ - 0x10f3, /* #x15F3 Georgian_we */ - 0x10f4, /* #x15F4 Georgian_har */ - 0x10f5, /* #x15F5 Georgian_hoe */ - 0x10f6, /* #x15F6 Georgian_fi */ - }; - -static UINT_16_BIT const AZERI_ETC[] = - { -#define FIRST_KNOWN_AZERI_ETC 0x16A2 - 0x0000, /* #x16A2 Ccedillaabovedot */ - 0x1e8a, /* #x16A3 Xabovedot */ - 0x0000, /* #x16A4 */ - 0x0000, /* #x16A5 Qabovedot */ - 0x012c, /* #x16A6 Ibreve */ - 0x0000, /* #x16A7 IE */ - 0x0000, /* #x16A8 UO */ - 0x01b5, /* #x16A9 Zstroke */ - 0x01e6, /* #x16AA Gcaron */ - 0x0000, /* #x16AB */ - 0x0000, /* #x16AC */ - 0x0000, /* #x16AD */ - 0x0000, /* #x16AE */ - 0x019f, /* #x16AF Obarred */ - 0x0000, /* #x16B0 */ - 0x0000, /* #x16B1 */ - 0x0000, /* #x16B2 ccedillaabovedot */ - 0x1e8b, /* #x16B3 xabovedot */ - 0x0000, /* #x16B4 Ocaron */ - 0x0000, /* #x16B5 qabovedot */ - 0x012d, /* #x16B6 ibreve */ - 0x0000, /* #x16B7 ie */ - 0x0000, /* #x16B8 uo */ - 0x01b6, /* #x16B9 zstroke */ - 0x01e7, /* #x16BA gcaron */ - 0x0000, /* #x16BB */ - 0x0000, /* #x16BC */ - 0x01d2, /* #x16BD ocaron */ - 0x0000, /* #x16BE */ - 0x0275, /* #x16BF obarred */ - 0x0000, /* #x16C0 */ - 0x0000, /* #x16C1 */ - 0x0000, /* #x16C2 */ - 0x0000, /* #x16C3 */ - 0x0000, /* #x16C4 */ - 0x0000, /* #x16C5 */ - 0x018f, /* #x16C6 SCHWA */ - 0x0000, /* #x16C7 */ - 0x0000, /* #x16C8 */ - 0x0000, /* #x16C9 */ - 0x0000, /* #x16CA */ - 0x0000, /* #x16CB */ - 0x0000, /* #x16CC */ - 0x0000, /* #x16CD */ - 0x0000, /* #x16CE */ - 0x0000, /* #x16CF */ - 0x0000, /* #x16D0 */ - 0x1e36, /* #x16D1 Lbelowdot */ - 0x0000, /* #x16D2 Lstrokebelowdot */ - 0x0000, /* #x16D3 Gtilde */ - 0x0000, /* #x16D4 */ - 0x0000, /* #x16D5 */ - 0x0000, /* #x16D6 */ - 0x0000, /* #x16D7 */ - 0x0000, /* #x16D8 */ - 0x0000, /* #x16D9 */ - 0x0000, /* #x16DA */ - 0x0000, /* #x16DB */ - 0x0000, /* #x16DC */ - 0x0000, /* #x16DD */ - 0x0000, /* #x16DE */ - 0x0000, /* #x16DF */ - 0x0000, /* #x16E0 */ - 0x1e37, /* #x16E1 lbelowdot */ - 0x0000, /* #x16E2 lstrokebelowdot */ - 0x0000, /* #x16E3 gtilde */ - 0x0000, /* #x16E4 */ - 0x0000, /* #x16E5 */ - 0x0000, /* #x16E6 */ - 0x0000, /* #x16E7 */ - 0x0000, /* #x16E8 */ - 0x0000, /* #x16E9 */ - 0x0000, /* #x16EA */ - 0x0000, /* #x16EB */ - 0x0000, /* #x16EC */ - 0x0000, /* #x16ED */ - 0x0000, /* #x16EE */ - 0x0000, /* #x16EF */ - 0x0000, /* #x16F0 */ - 0x0000, /* #x16F1 */ - 0x0000, /* #x16F2 */ - 0x0000, /* #x16F3 */ - 0x0000, /* #x16F4 */ - 0x0000, /* #x16F5 */ - 0x0259, /* #x16F6 schwa */ - }; - -static UINT_16_BIT const VIETNAMESE[] = - { -#define FIRST_KNOWN_VIETNAMESE 0x1E9F - 0x0303, /* #x1E9F combining_tilde */ - 0x1ea0, /* #x1EA0 Abelowdot */ - 0x1ea1, /* #x1EA1 abelowdot */ - 0x1ea2, /* #x1EA2 Ahook */ - 0x1ea3, /* #x1EA3 ahook */ - 0x1ea4, /* #x1EA4 Acircumflexacute */ - 0x1ea5, /* #x1EA5 acircumflexacute */ - 0x1ea6, /* #x1EA6 Acircumflexgrave */ - 0x1ea7, /* #x1EA7 acircumflexgrave */ - 0x1ea8, /* #x1EA8 Acircumflexhook */ - 0x1ea9, /* #x1EA9 acircumflexhook */ - 0x1eaa, /* #x1EAA Acircumflextilde */ - 0x1eab, /* #x1EAB acircumflextilde */ - 0x1eac, /* #x1EAC Acircumflexbelowdot */ - 0x1ead, /* #x1EAD acircumflexbelowdot */ - 0x1eae, /* #x1EAE Abreveacute */ - 0x1eaf, /* #x1EAF abreveacute */ - 0x1eb0, /* #x1EB0 Abrevegrave */ - 0x1eb1, /* #x1EB1 abrevegrave */ - 0x1eb2, /* #x1EB2 Abrevehook */ - 0x1eb3, /* #x1EB3 abrevehook */ - 0x1eb4, /* #x1EB4 Abrevetilde */ - 0x1eb5, /* #x1EB5 abrevetilde */ - 0x1eb6, /* #x1EB6 Abrevebelowdot */ - 0x1eb7, /* #x1EB7 abrevebelowdot */ - 0x1eb8, /* #x1EB8 Ebelowdot */ - 0x1eb9, /* #x1EB9 ebelowdot */ - 0x1eba, /* #x1EBA Ehook */ - 0x1ebb, /* #x1EBB ehook */ - 0x1ebc, /* #x1EBC Etilde */ - 0x1ebd, /* #x1EBD etilde */ - 0x1ebe, /* #x1EBE Ecircumflexacute */ - 0x1ebf, /* #x1EBF ecircumflexacute */ - 0x1ec0, /* #x1EC0 Ecircumflexgrave */ - 0x1ec1, /* #x1EC1 ecircumflexgrave */ - 0x1ec2, /* #x1EC2 Ecircumflexhook */ - 0x1ec3, /* #x1EC3 ecircumflexhook */ - 0x1ec4, /* #x1EC4 Ecircumflextilde */ - 0x1ec5, /* #x1EC5 ecircumflextilde */ - 0x1ec6, /* #x1EC6 Ecircumflexbelowdot */ - 0x1ec7, /* #x1EC7 ecircumflexbelowdot */ - 0x1ec8, /* #x1EC8 Ihook */ - 0x1ec9, /* #x1EC9 ihook */ - 0x1eca, /* #x1ECA Ibelowdot */ - 0x1ecb, /* #x1ECB ibelowdot */ - 0x1ecc, /* #x1ECC Obelowdot */ - 0x1ecd, /* #x1ECD obelowdot */ - 0x1ece, /* #x1ECE Ohook */ - 0x1ecf, /* #x1ECF ohook */ - 0x1ed0, /* #x1ED0 Ocircumflexacute */ - 0x1ed1, /* #x1ED1 ocircumflexacute */ - 0x1ed2, /* #x1ED2 Ocircumflexgrave */ - 0x1ed3, /* #x1ED3 ocircumflexgrave */ - 0x1ed4, /* #x1ED4 Ocircumflexhook */ - 0x1ed5, /* #x1ED5 ocircumflexhook */ - 0x1ed6, /* #x1ED6 Ocircumflextilde */ - 0x1ed7, /* #x1ED7 ocircumflextilde */ - 0x1ed8, /* #x1ED8 Ocircumflexbelowdot */ - 0x1ed9, /* #x1ED9 ocircumflexbelowdot */ - 0x1eda, /* #x1EDA Ohornacute */ - 0x1edb, /* #x1EDB ohornacute */ - 0x1edc, /* #x1EDC Ohorngrave */ - 0x1edd, /* #x1EDD ohorngrave */ - 0x1ede, /* #x1EDE Ohornhook */ - 0x1edf, /* #x1EDF ohornhook */ - 0x1ee0, /* #x1EE0 Ohorntilde */ - 0x1ee1, /* #x1EE1 ohorntilde */ - 0x1ee2, /* #x1EE2 Ohornbelowdot */ - 0x1ee3, /* #x1EE3 ohornbelowdot */ - 0x1ee4, /* #x1EE4 Ubelowdot */ - 0x1ee5, /* #x1EE5 ubelowdot */ - 0x1ee6, /* #x1EE6 Uhook */ - 0x1ee7, /* #x1EE7 uhook */ - 0x1ee8, /* #x1EE8 Uhornacute */ - 0x1ee9, /* #x1EE9 uhornacute */ - 0x1eea, /* #x1EEA Uhorngrave */ - 0x1eeb, /* #x1EEB uhorngrave */ - 0x1eec, /* #x1EEC Uhornhook */ - 0x1eed, /* #x1EED uhornhook */ - 0x1eee, /* #x1EEE Uhorntilde */ - 0x1eef, /* #x1EEF uhorntilde */ - 0x1ef0, /* #x1EF0 Uhornbelowdot */ - 0x1ef1, /* #x1EF1 uhornbelowdot */ - 0x0300, /* #x1EF2 combining_grave */ - 0x0301, /* #x1EF3 combining_acute */ - 0x1ef4, /* #x1EF4 Ybelowdot */ - 0x1ef5, /* #x1EF5 ybelowdot */ - 0x1ef6, /* #x1EF6 Yhook */ - 0x1ef7, /* #x1EF7 yhook */ - 0x1ef8, /* #x1EF8 Ytilde */ - 0x1ef9, /* #x1EF9 ytilde */ - - 0x01a0, /* #x1EFA Ohorn */ - 0x01a1, /* #x1EFB ohorn */ - 0x01af, /* #x1EFC Uhorn */ - 0x01b0, /* #x1EFD uhorn */ - - 0x0309, /* #x1EFE combining_hook */ - 0x0323, /* #x1EFF combining_belowdot */ - }; -#endif /* MULE */ - -static UINT_16_BIT const CYRILLIC[] = - { - 0x0452, /* #x06A1 CYRILLIC SMALL LETTER DJE */ -#define FIRST_KNOWN_CYRILLIC 0x6A1 - 0x0453, /* #x06A2 CYRILLIC SMALL LETTER GJE */ - 0x0451, /* #x06A3 CYRILLIC SMALL LETTER IO */ - 0x0454, /* #x06A4 CYRILLIC SMALL LETTER UKRAINIAN IE */ - 0x0455, /* #x06A5 CYRILLIC SMALL LETTER DZE */ - 0x0456, /* #x06A6 CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */ - 0x0457, /* #x06A7 CYRILLIC SMALL LETTER YI */ - 0x0458, /* #x06A8 CYRILLIC SMALL LETTER JE */ - 0x0459, /* #x06A9 CYRILLIC SMALL LETTER LJE */ - 0x045A, /* #x06AA CYRILLIC SMALL LETTER NJE */ - 0x045B, /* #x06AB CYRILLIC SMALL LETTER TSHE */ - 0x045C, /* #x06AC CYRILLIC SMALL LETTER KJE */ - 0x0491, /* #x06AD CYRILLIC SMALL LETTER GHE WITH UPTURN */ - 0x045E, /* #x06AE CYRILLIC SMALL LETTER SHORT U */ - 0x045F, /* #x06AF CYRILLIC SMALL LETTER DZHE */ - 0x2116, /* #x06B0 NUMERO SIGN */ - 0x0402, /* #x06B1 CYRILLIC CAPITAL LETTER DJE */ - 0x0403, /* #x06B2 CYRILLIC CAPITAL LETTER GJE */ - 0x0401, /* #x06B3 CYRILLIC CAPITAL LETTER IO */ - 0x0404, /* #x06B4 CYRILLIC CAPITAL LETTER UKRAINIAN IE */ - 0x0405, /* #x06B5 CYRILLIC CAPITAL LETTER DZE */ - 0x0406, /* #x06B6 CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */ - 0x0407, /* #x06B7 CYRILLIC CAPITAL LETTER YI */ - 0x0408, /* #x06B8 CYRILLIC CAPITAL LETTER JE */ - 0x0409, /* #x06B9 CYRILLIC CAPITAL LETTER LJE */ - 0x040A, /* #x06BA CYRILLIC CAPITAL LETTER NJE */ - 0x040B, /* #x06BB CYRILLIC CAPITAL LETTER TSHE */ - 0x040C, /* #x06BC CYRILLIC CAPITAL LETTER KJE */ - 0x0490, /* #x06BD CYRILLIC CAPITAL LETTER GHE WITH UPTURN */ - 0x040E, /* #x06BE CYRILLIC CAPITAL LETTER SHORT U */ - 0x040F, /* #x06BF CYRILLIC CAPITAL LETTER DZHE */ - 0x044E, /* #x06C0 CYRILLIC SMALL LETTER YU */ - 0x0430, /* #x06C1 CYRILLIC SMALL LETTER A */ - 0x0431, /* #x06C2 CYRILLIC SMALL LETTER BE */ - 0x0446, /* #x06C3 CYRILLIC SMALL LETTER TSE */ - 0x0434, /* #x06C4 CYRILLIC SMALL LETTER DE */ - 0x0435, /* #x06C5 CYRILLIC SMALL LETTER IE */ - 0x0444, /* #x06C6 CYRILLIC SMALL LETTER EF */ - 0x0433, /* #x06C7 CYRILLIC SMALL LETTER GHE */ - 0x0445, /* #x06C8 CYRILLIC SMALL LETTER HA */ - 0x0438, /* #x06C9 CYRILLIC SMALL LETTER I */ - 0x0439, /* #x06CA CYRILLIC SMALL LETTER SHORT I */ - 0x043A, /* #x06CB CYRILLIC SMALL LETTER KA */ - 0x043B, /* #x06CC CYRILLIC SMALL LETTER EL */ - 0x043C, /* #x06CD CYRILLIC SMALL LETTER EM */ - 0x043D, /* #x06CE CYRILLIC SMALL LETTER EN */ - 0x043E, /* #x06CF CYRILLIC SMALL LETTER O */ - 0x043F, /* #x06D0 CYRILLIC SMALL LETTER PE */ - 0x044F, /* #x06D1 CYRILLIC SMALL LETTER YA */ - 0x0440, /* #x06D2 CYRILLIC SMALL LETTER ER */ - 0x0441, /* #x06D3 CYRILLIC SMALL LETTER ES */ - 0x0442, /* #x06D4 CYRILLIC SMALL LETTER TE */ - 0x0443, /* #x06D5 CYRILLIC SMALL LETTER U */ - 0x0436, /* #x06D6 CYRILLIC SMALL LETTER ZHE */ - 0x0432, /* #x06D7 CYRILLIC SMALL LETTER VE */ - 0x044C, /* #x06D8 CYRILLIC SMALL LETTER SOFT SIGN */ - 0x044B, /* #x06D9 CYRILLIC SMALL LETTER YERU */ - 0x0437, /* #x06DA CYRILLIC SMALL LETTER ZE */ - 0x0448, /* #x06DB CYRILLIC SMALL LETTER SHA */ - 0x044D, /* #x06DC CYRILLIC SMALL LETTER E */ - 0x0449, /* #x06DD CYRILLIC SMALL LETTER SHCHA */ - 0x0447, /* #x06DE CYRILLIC SMALL LETTER CHE */ - 0x044A, /* #x06DF CYRILLIC SMALL LETTER HARD SIGN */ - 0x042E, /* #x06E0 CYRILLIC CAPITAL LETTER YU */ - 0x0410, /* #x06E1 CYRILLIC CAPITAL LETTER A */ - 0x0411, /* #x06E2 CYRILLIC CAPITAL LETTER BE */ - 0x0426, /* #x06E3 CYRILLIC CAPITAL LETTER TSE */ - 0x0414, /* #x06E4 CYRILLIC CAPITAL LETTER DE */ - 0x0415, /* #x06E5 CYRILLIC CAPITAL LETTER IE */ - 0x0424, /* #x06E6 CYRILLIC CAPITAL LETTER EF */ - 0x0413, /* #x06E7 CYRILLIC CAPITAL LETTER GHE */ - 0x0425, /* #x06E8 CYRILLIC CAPITAL LETTER HA */ - 0x0418, /* #x06E9 CYRILLIC CAPITAL LETTER I */ - 0x0419, /* #x06EA CYRILLIC CAPITAL LETTER SHORT I */ - 0x041A, /* #x06EB CYRILLIC CAPITAL LETTER KA */ - 0x041B, /* #x06EC CYRILLIC CAPITAL LETTER EL */ - 0x041C, /* #x06ED CYRILLIC CAPITAL LETTER EM */ - 0x041D, /* #x06EE CYRILLIC CAPITAL LETTER EN */ - 0x041E, /* #x06EF CYRILLIC CAPITAL LETTER O */ - 0x041F, /* #x06F0 CYRILLIC CAPITAL LETTER PE */ - 0x042F, /* #x06F1 CYRILLIC CAPITAL LETTER YA */ - 0x0420, /* #x06F2 CYRILLIC CAPITAL LETTER ER */ - 0x0421, /* #x06F3 CYRILLIC CAPITAL LETTER ES */ - 0x0422, /* #x06F4 CYRILLIC CAPITAL LETTER TE */ - 0x0423, /* #x06F5 CYRILLIC CAPITAL LETTER U */ - 0x0416, /* #x06F6 CYRILLIC CAPITAL LETTER ZHE */ - 0x0412, /* #x06F7 CYRILLIC CAPITAL LETTER VE */ - 0x042C, /* #x06F8 CYRILLIC CAPITAL LETTER SOFT SIGN */ - 0x042B, /* #x06F9 CYRILLIC CAPITAL LETTER YERU */ - 0x0417, /* #x06FA CYRILLIC CAPITAL LETTER ZE */ - 0x0428, /* #x06FB CYRILLIC CAPITAL LETTER SHA */ - 0x042D, /* #x06FC CYRILLIC CAPITAL LETTER E */ - 0x0429, /* #x06FD CYRILLIC CAPITAL LETTER SHCHA */ - 0x0427, /* #x06FE CYRILLIC CAPITAL LETTER CHE */ - 0x042A, /* #x06FF CYRILLIC CAPITAL LETTER HARD SIGN */ - }; - -/* For every key on the keyboard that has a known character correspondence, - we define the character-of-keysym property of its XEmacs keysym, and make - the default binding for the key be self-insert-command. - - The following magic is based on intimate knowledge of some of - X11/keysymdef.h. The keysym mappings defined by X11 are based on the - iso8859 standards, except for Cyrillic and Greek. - - In a non-Mule world, a user can still have a multi-lingual editor, by - doing (set-face-font "...-iso8859-2" (current-buffer)) for all their - Latin-2 buffers, etc. and the X11 keysyms corresponding to characters in - those character sets will still do the right thing (because of the - make_char (code + 0x80) non-Mule case below.) Of course, X11 keysyms in - other character sets will not do the right thing, because XEmacs won't - support the right thing. - - This code is also called when a command lookup is about to fail, and the - X11 platform code has worked out that it previously wasn't aware the - keysym of that command could be generated by the user's keyboard; in that - case, we bind its XEmacs keysym to self-insert-command if it has a - character correspondence we know about, and tell the general event code - that we've done so, so it can try the lookup again. - - Called from the GTK code because GTK 1 has no defined way of doing the - same thing, and this works for it on X11. It should be moved back into - event-Xt.c when and if the GTK port moves to GTK 2. */ - -#ifndef THIS_IS_GTK -static Lisp_Object -x_keysym_to_character (KeySym keysym) -#else -Lisp_Object -gtk_keysym_to_character (guint keysym) -#endif -{ -#ifdef MULE - Lisp_Object charset = Qzero; - int code = 0; -#endif /* MULE */ - - /* ＠＠#### Add support for 0xFE?? and 0xFF?? keysyms - Add support for KOI8-U extensions in the 0x06?? range - - See http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt - */ - - /* Markus Kuhn's spec says keysyms in the range #x01000100 to #x0110FFFF - and only those should correspond directly to Unicode code points, in - the range #x100-#x10FFFF; actual implementations can have the Latin 1 - code points do the same thing with keysyms - #x01000000-#x01000100. */ - -#ifndef MULE - if (keysym >= 0x01000000 && keysym <= 0x010000FF) - return make_char (keysym & 0xFFFFFF); -#else - if (keysym >= 0x01000000 && keysym <= 0x0110FFFF) - return make_char (buffer_unicode_to_ichar - ((int) (keysym & 0xFFFFFF), - /* ＠＠#### need to get some sort of buffer to compute - this off; only applies in the old-Mule world */ - current_buffer, CONVERR_SUCCEED)); -#endif /* not MULE */ - - if ((keysym & 0xff) < 0xa0) - return Qnil; - -#ifdef MULE - switch (keysym >> 8) - { - case 0: /* ASCII + Latin1 */ - charset = Vcharset_latin_iso8859_1; - code = keysym & 0xff; - break; - case 1: /* Latin2 */ - charset = Vcharset_latin_iso8859_2; - code = keysym & 0xff; - break; - case 2: /* Latin3 */ - charset = Vcharset_latin_iso8859_3; - code = keysym & 0xff; - break; - case 3: /* Latin4 */ - charset = Vcharset_latin_iso8859_4; - code = keysym & 0xff; - break; - case 4: /* Katakana */ - charset = Vcharset_katakana_jisx0201; - if ((keysym & 0xff) > 0xa0) - code = keysym & 0xff; - break; - case 5: /* Arabic */ - charset = Vcharset_arabic_iso8859_6; - code = keysym & 0xff; - break; - case 6: /* Cyrillic */ - { - USE_UNICODE_MAP (keysym, CYRILLIC); - break; - } - case 7: /* Greek */ - { - static UExtbyte const greek[] = /* 0xa0 - 0xff */ - {0x00, 0xb6, 0xb8, 0xb9, 0xba, 0xda, 0x00, 0xbc, - 0xbe, 0xdb, 0x00, 0xbf, 0x00, 0x00, 0xb5, 0xaf, - 0x00, 0xdc, 0xdd, 0xde, 0xdf, 0xfa, 0xc0, 0xfc, - 0xfd, 0xfb, 0xe0, 0xfe, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, - 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, - 0xd0, 0xd1, 0xd3, 0x00, 0xd4, 0xd5, 0xd6, 0xd7, - 0xd8, 0xd9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, - 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, - 0xf0, 0xf1, 0xf3, 0xf2, 0xf4, 0xf5, 0xf6, 0xf7, - 0xf8, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - charset = Vcharset_greek_iso8859_7; - code = greek[(keysym & 0x7f) - 0x20]; - break; - } - case 8: - USE_UNICODE_MAP (keysym, TECHNICAL); - break; - case 9: - USE_UNICODE_MAP (keysym, SPECIAL); - break; - case 10: - USE_UNICODE_MAP (keysym, PUBLISHING); - break; - case 11: - USE_UNICODE_MAP (keysym, APL); - break; - case 12: /* Hebrew */ - charset = Vcharset_hebrew_iso8859_8; - code = keysym & 0xff; - break; - case 13: /* Thai */ - /* #### This needs to deal with character composition. - Are you sure we can't leave it to the X server? */ - charset = Vcharset_thai_tis620; - code = keysym & 0xff; - break; - case 14: /* Korean Hangul. */ - USE_UNICODE_MAP (keysym, HANGUL); - break; - case 18: /* Latin 8 - ISO8859-14. */ - charset = Ffind_charset (intern ("latin-iso8859-14")); - code = keysym & 0xff; - break; - case 19: /* Latin 9 - ISO8859-15. */ - charset = Vcharset_latin_iso8859_15; - code = keysym & 0xff; - break; - case 20: /* Armenian. */ - USE_UNICODE_MAP (keysym, ARMENIAN); - break; - case 21: /* Georgian. */ - USE_UNICODE_MAP (keysym, GEORGIAN); - break; - case 22: /* Azeri (and other Turkic or Caucasian languages of ex-USSR) */ - USE_UNICODE_MAP (keysym, AZERI_ETC); - break; - case 30: /* Vietnamese */ - USE_UNICODE_MAP (keysym, VIETNAMESE); - break; - case 32: /* Currency. The lower sixteen bits of these keysyms happily - correspond exactly to the Unicode code points of the - associated characters */ - return make_char (buffer_unicode_to_ichar - ((int) (keysym & 0xffff), - /* ＠＠#### need to get some sort of buffer to - compute this off; only applies in the old-Mule - world */ - current_buffer, CONVERR_SUCCEED)); - -/* ＠＠#### Support me! - - Actually, these are somewhat already supported by x-init.el/x-compose.el, - but only acute, grave, circum(flex), cedilla, diaeresis, tilde. We - should try to eliminate that code and use general Unicode support for - converting to precomposed sequences. - -0xfe50 U0300 f # dead_grave -0xfe51 U0301 f # dead_acute -0xfe52 U0302 f # dead_circumflex -0xfe53 U0303 f # dead_tilde -0xfe54 U0304 f # dead_macron -0xfe55 U0306 f # dead_breve -0xfe56 U0307 f # dead_abovedot -0xfe57 U0308 f # dead_diaeresis -0xfe58 U030a f # dead_abovering -0xfe59 U030b f # dead_doubleacute -0xfe5a U030c f # dead_caron -0xfe5b U0327 f # dead_cedilla -0xfe5c U0328 f # dead_ogonek -0xfe5d U0345 f # dead_iota -0xfe5e U3099 f # dead_voiced_sound -0xfe5f U309a f # dead_semivoiced_sound -0xfe60 U0323 f # dead_belowdot -0xfe61 U0309 f # dead_hook -0xfe62 U031b f # dead_horn - -What about these? We don't have to convert these to ASCII but make sure we -Handle all of the KP-foo things and get them to behave like plain foo when -KP-foo isn't bound (which includes self-inserting the associated character -if necessary). DOCUMENT the existing system that does this. - -0xff08 U0008 f # BackSpace /- back space, back char -/ -0xff09 U0009 f # Tab -0xff0a U000a f # Linefeed /- Linefeed, LF -/ -0xff0b U000b f # Clear -0xff0d U000d f # Return /- Return, enter -/ -0xff13 U0013 f # Pause /- Pause, hold -/ -0xff14 U0014 f # Scroll_Lock -0xff15 U0015 f # Sys_Req -0xff1b U001b f # Escape -0xff80 U0020 f # KP_Space /- space -/ -0xff89 U0009 f # KP_Tab -0xff8d U000d f # KP_Enter /- enter -/ -0xffaa U002a f # KP_Multiply -0xffab U002b f # KP_Add -0xffac U002c f # KP_Separator /- separator, often comma -/ -0xffad U002d f # KP_Subtract -0xffae U002e f # KP_Decimal -0xffaf U002f f # KP_Divide -0xffb0 U0030 f # KP_0 -0xffb1 U0031 f # KP_1 -0xffb2 U0032 f # KP_2 -0xffb3 U0033 f # KP_3 -0xffb4 U0034 f # KP_4 -0xffb5 U0035 f # KP_5 -0xffb6 U0036 f # KP_6 -0xffb7 U0037 f # KP_7 -0xffb8 U0038 f # KP_8 -0xffb9 U0039 f # KP_9 -0xffbd U003d f # KP_Equal /- equals -/ -*/ - default: - break; - } - - if (code == 0) - return Qnil; - - /* #### Is this check on !NILP (charset) needed? Maybe should be assert? */ - if (!NILP (charset)) - { - /* First try to generate a unified character by converting through - Unicode, then try converting directly to an Ichar (only matters - when non-Unicode-internal, else we get same results both ways). */ - int ucs = charset_codepoint_to_unicode (charset, 0, code, CONVERR_FAIL); - if (ucs >= 0) - { - /* ＠＠#### current_buffer dependency */ - Ichar ich = buffer_unicode_to_ichar (ucs, current_buffer, - CONVERR_FAIL); - if (ich >= 0) - return make_char (ich); - } - else - { - Ichar ich = - charset_codepoint_to_ichar (charset, 0, code, CONVERR_FAIL); - if (ich >= 0) - return make_char (ich); - } - } - return Qnil; -#else /* not MULE */ - if (keysym >= 0x100) - return Qnil; - return make_char (keysym); -#endif /* (not) MULE */ -} - -#endif /* defined (THIS_IS_X) || !defined (__GDK_KEYS_H__) */ diff -r 9bdc40b8fb78 -r a5b21ebab055 src/redisplay-gtk.c --- a/src/redisplay-gtk.c Sun Dec 17 12:20:06 2017 +0000 +++ b/src/redisplay-gtk.c Mon Dec 18 22:04:46 2017 +0000 ＠＠ -875,6 +875,40 ＠＠ #endif } +/***************************************************************************** + gtk_output_string + + Given a string and a starting position, output that string in the + given face. If cursor is true, draw a cursor around the string. + Correctly handles multiple charsets in the string. + + The meaning of the parameters is something like this: + + W Window that the text is to be displayed in. + DL Display line that this text is on. The values in the + structure are used to determine the vertical position and + clipping range of the text. + BUF Pointer to those Ibytes to be output. + LEN Number of those Ibytes to be output + XPOS X position in pixels where the text should start being drawn. + XOFFSET Number of pixels to be chopped off the left side of the + text. The effect is as if the text were shifted to the + left this many pixels and clipped at XPOS. + CLIP_START Clip everything left of this X position. + WIDTH Clip everything right of XPOS + WIDTH. + FINDEX Index for the face cache element describing how to display + the text. + CURSOR #### I don't understand this. There's something + strange and overcomplexified with this variable. + Chuck, explain please? + CURSOR_START Starting X position of cursor. + CURSOR_WIDTH Width of cursor in pixels. + CURSOR_HEIGHT Height of cursor in pixels. + + Starting Y position of cursor is the top of the text line. + The cursor is drawn sometimes whether or not CURSOR is set. ??? + ****************************************************************************/ + void gtk_output_string (struct window *w, struct display_line *dl, const Ibyte *buf, Bytecount len, diff -r 9bdc40b8fb78 -r a5b21ebab055 src/redisplay-x.c --- a/src/redisplay-x.c Sun Dec 17 12:20:06 2017 +0000 +++ b/src/redisplay-x.c Mon Dec 18 22:04:46 2017 +0000 ＠＠ -32,29 +32,466 ＠＠ #define THIS_IS_X #include "redisplay-xlike-inc.c" -/* - XLIKE_text_width +/****************************************************************************/ +/* */ +/* Separate textual runs */ +/* */ +/****************************************************************************/ + + +/* Note: We do not use the Xmb*() functions and XFontSets, nor the Motif + XFontLists and CompoundStrings. Those functions are generally losing for a + number of reasons. Most important, they only support one locale (e.g. you + could display Japanese and ASCII text, but not mixed Japanese/Chinese + text). You could maybe call setlocale() frequently to try to deal with + this, but that would generally fail because an XFontSet is tied to one + locale and won't have the other character sets in it. + + fontconfig (the font database for Xft) has some specifier-like properties, + but it's not sufficient (witness the existence of Pango). Pango might do + the trick, but it's not a cross-platform solution; it would need + significant advantages to be worth the effort. */ + +struct textual_run +{ + Lisp_Object charset; + Extbyte *ptr; + int len; + int dimension; +}; - Given a string and a merged face, return the string's length in pixels - when displayed in the fonts associated with the face. +/* Separate out the text in STR of length LEN into a series of runs, stored in + RUN_STORAGE. RUN_STORAGE is guaranteed to hold enough space for all runs + that could be generated from this text. Each run points to the a stretch + of text given simply by the position codes TEXT_STORAGE into a series of + textual runs of a particular charset. Also convert the characters as + necessary into the format needed by XDrawImageString(), + XDrawImageString16(), et al. This means converting to one or two byte + format, possibly tweaking the high bits, and possibly running a CCL + program. You must pre-allocate the space used and pass in a pointer, + TEXT_STORAGE, and the ALLOCATE_RUNS_TEXT () macro is provided to do this + using stack space. Some of the window-system-specific implementations take + advantage of this step to do coding sytem translation, and the specific + amount of space needed depends on the window system. + + bufchar might not be fixed width (in the case of UTF-8). + + Returns the number of runs actually used. */ + +/* Notes on Xft implementation + + - With Unicode, we're no longer going to have repertoires reified as + charsets. (Not that we ever really did, what with corporate variants, + and so on.) So we really should be querying the face for the desired + font, rather than the character for the charset, and that's what would + determine the separation into runs. + - The widechar versions of fontconfig (and therefore Xft) functions + seem to be just bigendian Unicode. So there's actually no need to use + the 8-bit versions in computing runs and runes, it would seem. */ +#if !defined (USE_XFT) && !defined (MULE) + +#define ALLOCATE_RUNS_TEXT(storage, storage_len, str, len) \ + (storage = alloca_extbytes (len)) + static int -XLIKE_text_width (struct frame *f, struct face_cachel *cachel, - const Ichar *str, Charcount len) +separate_textual_runs_nomule (struct buffer * UNUSED (buf), + Extbyte *text_storage, + struct textual_run *run_storage, + const Ibyte *str, Bytecount len, + struct face_cachel *UNUSED(cachel)) +{ + if (!len) + return 0; + + run_storage[0].ptr = text_storage; + run_storage[0].len = len; + run_storage[0].dimension = 1; + run_storage[0].charset = Qnil; + + memcpy (text_storage, str, len); + + return 1; +} +#endif + +#ifdef USE_XFT +#ifdef WORDS_BIGENDIAN +#define ALLOCATE_RUNS_TEXT(storage, storage_len, str, len) \ + TO_EXTERNAL_FORMAT (DATA, (str, len), \ + ALLOCA, (storage, storage_len), \ + Qutf_16) +#else +extern Lisp_Object Qutf_16_little_endian; +#define ALLOCATE_RUNS_TEXT(storage, storage_len, str, len) \ + TO_EXTERNAL_FORMAT (DATA, (str, len), \ + ALLOCA, (storage, storage_len), \ + Qutf_16_little_endian) +#endif +#endif /* USE_XFT */ + +#if defined (USE_XFT) && !defined (MULE) +/* + Note that in this configuration the "Croatian hack" of using an 8-bit, + non-Latin-1 font to get localized display without Mule simply isn't + available. That's by design -- Unicode does not aid or abet that kind + of punning. + This means that the cast to XftChar16 gives the correct "conversion" to + UCS-2. */ +static int +separate_textual_runs_xft_nomule (struct buffer * UNUSED (buf), + Extbyte *text_storage, + struct textual_run *run_storage, + const Ibyte *str, Bytecount len, + struct face_cachel *UNUSED (cachel)) +{ + int i; + if (!len) + return 0; + + run_storage[0].ptr = text_storage; + run_storage[0].len = len; + run_storage[0].dimension = 2; + run_storage[0].charset = Qnil; + + return 1; +} +#endif + +#if defined (USE_XFT) && defined (MULE) +static int +separate_textual_runs_xft_mule (struct buffer *buf, + Extbyte *text_storage, + struct textual_run *run_storage, + const Ibyte *str, Bytecount len, + struct face_cachel *UNUSED (cachel)) +{ + Lisp_Object prev_charset = Qunbound; + const Ibyte *end = str + len; + Elemcount runs_so_far = 0; + + run_storage[0].ptr = text_storage; + run_storage[0].len = len; + run_storage[0].dimension = 2; + run_storage[0].charset = Qnil; + + while (str < end) + { + Ichar ch = itext_ichar (str); + Lisp_Object charset; + int byte1, byte2; + + /* ＠＠#### This use of CONVERR_SUBSTITUTE is somewhat bogus. + It will substitute a '?' if we can't convert. Not clear whether + this will work or not. Problem is that we really shouldn't + be doing things on a charset level. */ + buffer_ichar_to_charset_codepoint (ch, buf, &charset, &byte1, &byte2, + CONVERR_SUBSTITUTE); + + if (!EQ (charset, prev_charset)) + { + if (runs_so_far) + run_storage[runs_so_far-1].len = + (text_storage - run_storage[runs_so_far-1].ptr) >> 1; + run_storage[runs_so_far].ptr = text_storage; + run_storage[runs_so_far].dimension = 2; + run_storage[runs_so_far].charset = charset; + prev_charset = charset; + runs_so_far++; + } + + if (valid_unicode_leading_surrogate (*((XftChar16 *) (text_storage)))) + { + text_storage += sizeof (XftChar16); + } + text_storage += sizeof (XftChar16); + INC_IBYTEPTR (str); + } + + if (runs_so_far) + run_storage[runs_so_far-1].len = + (text_storage - run_storage[runs_so_far-1].ptr) >> 1; + return runs_so_far; +} +#endif + +#if !defined(USE_XFT) && defined(MULE) + +#define ALLOCATE_RUNS_TEXT(storage, storage_len, str, len) \ + (storage = alloca_extbytes ((storage_len = (2 * len)))) + +/* + This is the most complex function of this group, due to the various + indexing schemes used by different fonts. For our purposes, they + fall into three classes. Some fonts are indexed compatibly with ISO + 2022; those fonts just use the Mule internal representation directly + (typically the high bit must be reset; this is determined by the `graphic' + flag). Some fonts are indexed by Unicode, specifically by UCS-2. These + are all translated using `ichar_to_unicode'. Finally some fonts have + irregular indexes, and must be translated ad hoc. In XEmacs ad hoc + translations are accomplished with CCL programs. */ +static Elemcount +separate_textual_runs_mule (struct buffer *buf, + Extbyte *text_storage, + struct textual_run *run_storage, + const Ibyte *str, Bytecount len, + struct face_cachel *cachel) { - /* !!#### Needs review */ - int width_so_far = 0; - unsigned char *text_storage = (unsigned char *) ALLOCA (2 * len); + Lisp_Object prev_charset = Qunbound, ccl_prog; + int runs_so_far = 0; + const Ibyte *end = str + len; + int dimension = 1, need_ccl_conversion = 0; + struct ccl_program char_converter; + + int translate_to_ucs_2 = 0; + + while (str < end) + { + Ichar ch = itext_ichar (str); + Lisp_Object charset; + int byte1, byte2; + + buffer_ichar_to_charset_codepoint (ch, buf, &charset, &byte1, &byte2, + CONVERR_FAIL); + + /* If we can't convert, substitute a '~' (CANT_DISPLAY_CHAR). */ + /* ＠＠#### This is extremely bogus. We want it to substitute the + Unicode replacement character, but there's no charset for this. + We really shouldn't be doing things on a charset level. */ + if (NILP (charset)) + { + charset = Vcharset_ascii; + byte1 = 0; + byte2 = CANT_DISPLAY_CHAR; + } + + /* NOTE: Formerly we used to retrieve the XCHARSET_GRAPHIC() here + and use it below to determine whether to push the bytes into + the 128-255 range. This is now handled automatically by the + `offset' property of charsets, which should agree with `graphic'. + Logically, the `offset' property describes the numeric indices + of the characters, such as when they are used to index an array + or font, while the `graphic' property indicates which register + to select when encoding using iso2022. */ + + if (!EQ (charset, prev_charset)) + { + int offs; + + /* At this point, dimension' and `prev_charset' refer to just- + completed run. `runs_so_far' and `text_storage' refer to the + run about to start. */ + if (runs_so_far) + { + /* Update metadata for previous run. */ + run_storage[runs_so_far - 1].len = + text_storage - run_storage[runs_so_far - 1].ptr; + if (2 == dimension) run_storage[runs_so_far - 1].len >>= 1; + } + + /* Compute metadata for current run. + First, classify font. + If the font is indexed by UCS-2, set `translate_to_ucs_2'. + Else if the charset has a CCL program, set `need_ccl_conversion'. + These flags are almost mutually exclusive, but we're sloppy + about resetting "shadowed" flags. So the flags must be checked + in the proper order in computing byte1 and byte2, below. */ + + offs = FACE_CACHEL_OFFSET_ENSURE (cachel, charset); + + translate_to_ucs_2 = Stynarr_at (cachel->font_final_stage, offs); + if (translate_to_ucs_2) + { + dimension = 2; + } + else + { + dimension = XCHARSET_DIMENSION (charset); + + /* Check for CCL charset. + If setup_ccl_program fails, we'll get a garbaged display. + This should never happen, and even if it does, it should + be harmless (unless the X server has buggy handling of + characters undefined in the font). It may be marginally + more useful to users and debuggers than substituting a + fixed replacement character. */ + ccl_prog = XCHARSET_CCL_PROGRAM (charset); + if ((!NILP (ccl_prog)) + && (setup_ccl_program (&char_converter, ccl_prog) >= 0)) + { + need_ccl_conversion = 1; + } + /* Else, the charset must have an ISO 2022-compatible font index. + */ + } + + /* Initialize metadata for current run. */ + run_storage[runs_so_far].ptr = text_storage; + run_storage[runs_so_far].charset = charset; + run_storage[runs_so_far].dimension = dimension; + + /* Update loop variables. */ + prev_charset = charset; + runs_so_far++; + } + + /* Must check flags in this order. See comment above. */ + if (translate_to_ucs_2) + { + int ucs = ichar_to_unicode (ch, CONVERR_SUBSTITUTE); + /* If UCS is less than zero or greater than 0xFFFF, set ucs2 to + REPLACEMENT CHARACTER. */ + ucs = (ucs & ~0xFFFF) ? UNICODE_REPLACEMENT_CHAR : ucs; + + byte1 = ucs >> 8; + byte2 = ucs & 0xFF; + } + else if (need_ccl_conversion) + { + internal_to_external_charset_codepoint (charset, byte1, byte2, + &byte1, &byte2, 1); + char_converter.reg[0] = XCHARSET_ID (charset); + char_converter.reg[1] = byte1; + char_converter.reg[2] = byte2; + ccl_driver (&char_converter, 0, buf, 0, 0, 0, CCL_MODE_ENCODING); + byte1 = char_converter.reg[1]; + byte2 = char_converter.reg[2]; + get_external_charset_codepoint (charset, make_fixnum (byte1), + make_fixnum (byte2), + &byte1, &byte2, 1); + } + else if (EQ (charset, Vcharset_ascii) && byte2 != CANT_DISPLAY_CHAR) + { + const Ibyte *nonascii; + + nonascii = skip_ascii (str, end); + memcpy (text_storage, str, nonascii - str); + text_storage += nonascii - str; + str = nonascii; + continue; + } + + if (2 == dimension) + { + *text_storage++ = (Extbyte) byte1; + } + + *text_storage++ = (Extbyte) byte2; + INC_IBYTEPTR (str); + } + + if (runs_so_far) + { + run_storage[runs_so_far - 1].len = + text_storage - run_storage[runs_so_far - 1].ptr; + /* Dimension retains the relevant value for the run before it. */ + if (2 == dimension) + run_storage[runs_so_far - 1].len >>= 1; + } + + assert (runs_so_far < 0xFFFF); + + return runs_so_far; +} +#endif + +static int +separate_textual_runs (struct buffer *buf, + Extbyte *text_storage, + struct textual_run *run_storage, + const Ibyte *str, Bytecount len, + struct face_cachel *cachel) +{ +#if defined (USE_XFT) && defined (MULE) + return separate_textual_runs_xft_mule (buf, text_storage, run_storage, + str, len, cachel); +#endif +#if defined (USE_XFT) && !defined (MULE) + return separate_textual_runs_xft_nomule (buf, text_storage, run_storage, + str, len, cachel); +#endif +#if !defined (USE_XFT) && defined (MULE) + return separate_textual_runs_mule (buf, text_storage, run_storage, + str, len, cachel); +#endif +#if !defined (USE_XFT) && !defined (MULE) + return separate_textual_runs_nomule (buf, text_storage, run_storage, + str, len, cachel); +#endif +} + +/****************************************************************************/ +/* */ +/* X output routines */ +/* */ +/****************************************************************************/ + +static int +x_text_width_single_run (Display * USED_IF_XFT (dpy), + struct face_cachel *cachel, + struct textual_run *run) +{ + Lisp_Object font_inst = FACE_CACHEL_FONT (cachel, run->charset); + Lisp_Font_Instance *fi = XFONT_INSTANCE (font_inst); + + if (!fi->proportional_p) + return fi->width * run->len; +#ifdef USE_XFT + else if (FONT_INSTANCE_X_XFTFONT (fi)) + { + XGlyphInfo glyphinfo; + + assert (run->dimension == 2); + + XftTextExtents16 (dpy, FONT_INSTANCE_X_XFTFONT (fi), + (XftChar16 *) run->ptr, run->len, &glyphinfo); + + return glyphinfo.xOff; + } +#endif + else if (FONT_INSTANCE_X_FONT (fi)) + { + if (run->dimension == 2) + { + /* stderr_out ("Measuring wide characters\n"); */ + return XTextWidth16 (FONT_INSTANCE_X_FONT (fi), + (XChar2b *) (run->ptr), run->len); + } + else + { + return XTextWidth (FONT_INSTANCE_X_FONT (fi), run->ptr, run->len); + } + } + else + abort(); + return 0; /* shut up GCC */ +} + +/* x_text_width + + Given a string and a merged face, return the string's length in pixels + when displayed in the fonts associated with the face. */ + +static int +x_text_width (struct frame *f, struct face_cachel *cachel, const Ibyte *str, + Bytecount len) +{ + Extbyte *text_storage = NULL; + int width_so_far = 0, text_storage_len = 0; struct textual_run *runs = alloca_array (struct textual_run, len); + Display *dpy = DEVICE_X_DISPLAY (XDEVICE (f->device)); int nruns; int i; - nruns = separate_textual_runs (text_storage, runs, str, len, - cachel); + ALLOCATE_RUNS_TEXT (text_storage, text_storage_len, str, len); + nruns = separate_textual_runs (WINDOW_XBUFFER (FRAME_SELECTED_XWINDOW (f)), + text_storage, runs, str, len, cachel); + + USED (text_storage_len); for (i = 0; i < nruns; i++) - width_so_far += XLIKE_text_width_single_run (f, cachel, runs + i); + width_so_far += x_text_width_single_run (dpy, cachel, runs + i); return width_so_far; } ＠＠ -70,7 +507,7 ＠＠ Perform any necessary initialization prior to an update. ****************************************************************************/ static void -XLIKE_window_output_begin (struct window *UNUSED (w)) +x_window_output_begin (struct window *UNUSED (w)) { } ＠＠ -80,47 +517,47 ＠＠ Perform any necessary flushing of queues when an update has completed. ****************************************************************************/ static void -XLIKE_window_output_end (struct window *w) +x_window_output_end (struct window *w) { if (!(check_if_pending_expose_event (WINDOW_XDEVICE (w)))) XFlush (DEVICE_X_DISPLAY (WINDOW_XDEVICE (w))); } /**************************************************************************** - XLIKE_clear_region + x_clear_region Clear the area in the box defined by the given parameters using the given face. ****************************************************************************/ static void -XLIKE_clear_region (Lisp_Object UNUSED (locale), struct frame* f, +x_clear_region (Lisp_Object UNUSED (locale), struct frame* f, face_index UNUSED (findex), int x, int y, int width, int height, Lisp_Object fcolor, Lisp_Object bcolor, Lisp_Object background_pixmap, Lisp_Object background_placement) { - XLIKE_DISPLAY dpy = GET_XLIKE_DISPLAY (XDEVICE (f->device)); - XLIKE_WINDOW x_win = GET_XLIKE_WINDOW (f); - XLIKE_GC gc = NULL; + Display *dpy = DEVICE_X_DISPLAY (XDEVICE (f->device)); + Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f)); + GC gc = NULL; if (!UNBOUNDP (background_pixmap)) { - gc = XLIKE_get_gc (f, Qnil, fcolor, bcolor, - background_pixmap, background_placement, Qnil); - XLIKE_FILL_RECTANGLE (dpy, x_win, gc, x, y, width, height); + gc = x_get_gc (f, Qnil, fcolor, bcolor, background_pixmap, + background_placement, Qnil); + XFillRectangle (dpy, x_win, gc, x, y, width, height); } else { - XLIKE_CLEAR_AREA (dpy, x_win, x, y, width, height); + XClearArea (dpy, x_win, x, y, width, height, False); } } static void -XLIKE_clear_frame (struct frame *f) +x_clear_frame (struct frame *f) { - XLIKE_DISPLAY dpy = GET_XLIKE_X_DISPLAY (XDEVICE (f->device)); - XLIKE_WINDOW x_win = GET_XLIKE_WINDOW (f); + Display *dpy = DEVICE_X_DISPLAY (XDEVICE (f->device)); + Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f)); int x, y, width, height; Lisp_Object frame; ＠＠ -135,7 +572,7 ＠＠ y = FRAME_TOP_INTERNAL_BORDER_START (f) - 1; height = (FRAME_BOTTOM_INTERNAL_BORDER_END (f) - y); - XLIKE_CLEAR_AREA (dpy, x_win, x, y, width, height); + XClearArea (dpy, x_win, x, y, width, height, False); frame = wrap_frame (f); ＠＠ -159,7 +596,7 ＠＠ Draw shadows for the given area in the given face. ****************************************************************************/ static void -XLIKE_bevel_area (struct window *w, face_index findex, +x_bevel_area (struct window *w, face_index findex, int x, int y, int width, int height, int shadow_thickness, int edges, enum edge_style style) { ＠＠ -431,22 +868,22 ＠＠ } /***************************************************************************** - XLIKE_output_horizontal_line + x_output_horizontal_line Output a horizontal line in the foreground of its face. ****************************************************************************/ static void -XLIKE_output_horizontal_line (struct window *w, struct display_line *dl, - struct rune *rb) +x_output_horizontal_line (struct window *w, struct display_line *dl, + struct rune *rb) { struct frame *f = XFRAME (w->frame); struct device *d = XDEVICE (f->device); - XLIKE_DISPLAY dpy = GET_XLIKE_X_DISPLAY (d); - XLIKE_WINDOW x_win = GET_XLIKE_WINDOW (f); - XLIKE_GC gc; + Display *dpy = DEVICE_X_DISPLAY (d); + Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f)); + GC gc; int x = rb->xpos; int width = rb->width; - int height = XLIKE_DISPLAY_LINE_HEIGHT (dl); + int height = DISPLAY_LINE_HEIGHT (dl); int ypos1, ypos2, ypos3, ypos4; ypos1 = XLIKE_DISPLAY_LINE_YPOS (dl); ＠＠ -463,9 +900,9 ＠＠ Qnil, Qnil, Qnil, Qnil); if (ypos2 - ypos1 > 0) - XLIKE_FILL_RECTANGLE (dpy, x_win, gc, x, ypos1, width, ypos2 - ypos1); + XFillRectangle (dpy, x_win, gc, x, ypos1, width, ypos2 - ypos1); if (ypos4 - ypos3 > 0) - XLIKE_FILL_RECTANGLE (dpy, x_win, gc, x, ypos3, width, ypos4 - ypos3); + XFillRectangle (dpy, x_win, gc, x, ypos3, width, ypos4 - ypos3); } /* Now draw the line. */ ＠＠ -479,27 +916,27 ＠＠ if (ypos3 - ypos2 > 0) { - XLIKE_FILL_RECTANGLE (dpy, x_win, gc, x, ypos3, width, - rb->object.hline.thickness); + XFillRectangle (dpy, x_win, gc, x, ypos3, width, + rb->object.hline.thickness); } } /***************************************************************************** - XLIKE_output_vertical_divider + x_output_vertical_divider Draw a vertical divider down the right side of the given window. ****************************************************************************/ static void -XLIKE_output_vertical_divider (struct window *w, int USED_IF_X (clear)) +x_output_vertical_divider (struct window *w, int USED_IF_X (clear)) { struct frame *f = XFRAME (w->frame); struct device *d = XDEVICE (f->device); - XLIKE_DISPLAY dpy = GET_XLIKE_X_DISPLAY (d); - XLIKE_WINDOW x_win = GET_XLIKE_WINDOW (f); + Display *dpy = DEVICE_X_DISPLAY (d); + Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f)); Lisp_Object tmp_pixel; - XLIKE_GCVALUES gcv; - XLIKE_GC background_gc; + XGCValues gcv; + GC background_gc; enum edge_style style; unsigned long mask; int x, ytop, ybottom, width, shadow_thickness, spacing, line_width; ＠＠ -521,7 +958,7 ＠＠ /* First, get the GC's. */ XLIKE_SET_GC_COLOR (gcv.background, XCOLOR_INSTANCE_XLIKE_COLOR (tmp_pixel)); gcv.foreground = gcv.background; - gcv.graphics_exposures = XLIKE_FALSE; + gcv.graphics_exposures = False; mask = XLIKE_GC_FOREGROUND | XLIKE_GC_BACKGROUND | XLIKE_GC_EXPOSURES; background_gc = gc_cache_lookup (DEVICE_XLIKE_GC_CACHE (d), &gcv, mask); ＠＠ -532,9 +969,8 ＠＠ XClearArea (dpy, x_win, x, ytop, width, ybottom - ytop, False); /* Draw the divider line. */ - XLIKE_FILL_RECTANGLE (dpy, x_win, background_gc, - x + spacing + shadow_thickness, ytop, - line_width, ybottom - ytop); + XFillRectangle (dpy, x_win, background_gc, x + spacing + shadow_thickness, + ytop, line_width, ybottom - ytop); if (shadow_thickness < 0) { shadow_thickness = -shadow_thickness; ＠＠ -554,7 +990,7 ＠＠ /* Make audible bell. */ static void -XLIKE_ring_bell (struct device *d, int volume, int pitch, int duration) +x_ring_bell (struct device *d, int volume, int pitch, int duration) { Display *display = DEVICE_X_DISPLAY (d); ＠＠ -591,13 +1027,13 ＠＠ /* briefly swap the foreground and background colors. */ static int -XLIKE_flash (struct device *d) +x_flash (struct device *d) { struct frame *f = device_selected_frame (d); - XLIKE_DISPLAY dpy = GET_XLIKE_X_DISPLAY (d); - XLIKE_WINDOW win = GET_XLIKE_WINDOW (f); - XLIKE_GC gc = NULL; - XLIKE_GCVALUES gcv; + Display *dpy = DEVICE_X_DISPLAY (d); + Window win = XtWindow (FRAME_X_TEXT_WIDGET (f)); + GC gc = NULL; + XGCValues gcv; XLIKE_PIXEL tmp_fcolor, tmp_bcolor; Lisp_Object tmp_pixel, frame; struct window *w = XWINDOW (FRAME_ROOT_WINDOW (f)); ＠＠ -612,7 +1048,7 ＠＠ memset (&gcv, ~0, sizeof (gcv)); /* initialize all slots to ~0 */ XLIKE_SET_GC_PIXEL (gcv.foreground, tmp_fcolor ^ tmp_bcolor); gcv.function = XLIKE_GX_XOR; - gcv.graphics_exposures = XLIKE_FALSE; + gcv.graphics_exposures = False; gc = gc_cache_lookup (DEVICE_XLIKE_GC_CACHE (XDEVICE (f->device)), &gcv, XLIKE_GC_FOREGROUND | XLIKE_GC_FUNCTION | XLIKE_GC_EXPOSURES); default_face_width_and_height (frame, 0, &flash_height); ＠＠ -620,16 +1056,16 ＠＠ /* If window is tall, flash top and bottom line. */ if (EQ (Vvisible_bell, Qtop_bottom) && w->pixel_height > 3 * flash_height) { - XLIKE_FILL_RECTANGLE (dpy, win, gc, w->pixel_left, w->pixel_top, - w->pixel_width, flash_height); - XLIKE_FILL_RECTANGLE (dpy, win, gc, w->pixel_left, - w->pixel_top + w->pixel_height - flash_height, - w->pixel_width, flash_height); + XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top, + w->pixel_width, flash_height); + XFillRectangle (dpy, win, gc, w->pixel_left, + w->pixel_top + w->pixel_height - flash_height, + w->pixel_width, flash_height); } else /* If it is short, flash it all. */ - XLIKE_FILL_RECTANGLE (dpy, win, gc, w->pixel_left, w->pixel_top, - w->pixel_width, w->pixel_height); + XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top, w->pixel_width, + w->pixel_height); XLIKE_FLUSH (dpy); ＠＠ -653,16 +1089,16 ＠＠ /* If window is tall, flash top and bottom line. */ if (EQ (Vvisible_bell, Qtop_bottom) && w->pixel_height > 3 * flash_height) { - XLIKE_FILL_RECTANGLE (dpy, win, gc, w->pixel_left, w->pixel_top, - w->pixel_width, flash_height); - XLIKE_FILL_RECTANGLE (dpy, win, gc, w->pixel_left, - w->pixel_top + w->pixel_height - flash_height, - w->pixel_width, flash_height); + XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top, + w->pixel_width, flash_height); + XFillRectangle (dpy, win, gc, w->pixel_left, + w->pixel_top + w->pixel_height - flash_height, + w->pixel_width, flash_height); } else /* If it is short, flash it all. */ - XLIKE_FILL_RECTANGLE (dpy, win, gc, w->pixel_left, w->pixel_top, - w->pixel_width, w->pixel_height); + XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top, w->pixel_width, + w->pixel_height); XLIKE_FLUSH (dpy); ＠＠ -670,21 +1106,21 ＠＠ } /***************************************************************************** - XLIKE_output_blank + x_output_blank Output a blank by clearing the area it covers in the foreground color of its face. ****************************************************************************/ static void -XLIKE_output_blank (struct window *w, struct display_line *dl, struct rune *rb, - int start_pixpos, int cursor_start, int cursor_width) +x_output_blank (struct window *w, struct display_line *dl, struct rune *rb, + int start_pixpos, int cursor_start, int cursor_width) { struct frame *f = XFRAME (w->frame); struct device *d = XDEVICE (f->device); - XLIKE_DISPLAY dpy = GET_XLIKE_X_DISPLAY (d); - XLIKE_WINDOW x_win = GET_XLIKE_WINDOW (f); - XLIKE_GC gc; + Display *dpy = DEVICE_X_DISPLAY (d); + Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f)); + GC gc; struct face_cachel *cursor_cachel = WINDOW_FACE_CACHEL (w, get_builtin_face_cache_index ＠＠ -729,7 +1165,7 ＠＠ WINDOW_FACE_CACHEL_BACKGROUND_PLACEMENT (w, rb->findex), Qnil); - XLIKE_FILL_RECTANGLE (dpy, x_win, gc, x, y, width, height); + XFillRectangle (dpy, x_win, gc, x, y, width, height); /* If this rune is marked as having the cursor, then it is actually representing a tab. */ ＠＠ -759,8 +1195,8 ＠＠ { if (NILP (bar_cursor_value)) { - XLIKE_FILL_RECTANGLE (dpy, x_win, gc, cursor_start, cursor_y, - fi->width, cursor_height); + XFillRectangle (dpy, x_win, gc, cursor_start, cursor_y, + fi->width, cursor_height); } else { ＠＠ -769,9 +1205,9 ＠＠ gc = XLIKE_get_gc (f, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil, make_fixnum (bar_width)); - XLIKE_DRAW_LINE (dpy, x_win, gc, cursor_start + bar_width - 1, - cursor_y, cursor_start + bar_width - 1, - cursor_y + cursor_height - 1); + XDrawLine (dpy, x_win, gc, cursor_start + bar_width - 1, + cursor_y, cursor_start + bar_width - 1, + cursor_y + cursor_height - 1); } } else if (NILP (bar_cursor_value)) ＠＠ -784,16 +1220,16 ＠＠ /* The end-of-line cursor is narrower than the normal cursor. */ static void -XLIKE_output_eol_cursor (struct window *w, struct display_line *dl, int xpos, - face_index findex) +x_output_eol_cursor (struct window *w, struct display_line *dl, int xpos, + face_index findex) { struct frame *f = XFRAME (w->frame); struct device *d = XDEVICE (f->device); Lisp_Object window; - XLIKE_DISPLAY dpy = GET_XLIKE_X_DISPLAY (d); - XLIKE_WINDOW x_win = GET_XLIKE_WINDOW (f); - XLIKE_GC gc = NULL; + Display *dpy = DEVICE_X_DISPLAY (d); + Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f)); + GC gc = NULL; face_index elt = get_builtin_face_cache_index (w, Vtext_cursor_face); struct face_cachel *cursor_cachel = WINDOW_FACE_CACHEL (w, elt); ＠＠ -832,8 +1268,7 ＠＠ if (NILP (bar_cursor_value)) { - XLIKE_FILL_RECTANGLE (dpy, x_win, gc, x, cursor_y, width, - cursor_height); + XFillRectangle (dpy, x_win, gc, x, cursor_y, width, cursor_height); } else { ＠＠ -842,8 +1277,8 ＠＠ gc = XLIKE_get_gc (f, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil, make_fixnum (bar_width)); - XLIKE_DRAW_LINE (dpy, x_win, gc, x + bar_width - 1, cursor_y, - x + bar_width - 1, cursor_y + cursor_height - 1); + XDrawLine (dpy, x_win, gc, x + bar_width - 1, cursor_y, + x + bar_width - 1, cursor_y + cursor_height - 1); } } else if (NILP (bar_cursor_value)) ＠＠ -854,20 +1289,19 ＠＠ } static void -XLIKE_output_xlike_pixmap (struct frame *f, Lisp_Image_Instance *p, int x, - int y, int xoffset, int yoffset, - int width, int height, - XLIKE_COLOR fg, XLIKE_COLOR bg) +x_output_xlike_pixmap (struct frame *f, Lisp_Image_Instance *p, int x, int y, + int xoffset, int yoffset, int width, int height, + XColor fg, XColor bg) { struct device *d = XDEVICE (f->device); - XLIKE_DISPLAY dpy = GET_XLIKE_X_DISPLAY (d); - XLIKE_WINDOW x_win = GET_XLIKE_WINDOW (f); - XLIKE_GC gc; - XLIKE_GCVALUES gcv; + Display *dpy = DEVICE_X_DISPLAY (d); + Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f)); + GC gc; + XGCValues gcv; unsigned long pixmap_mask; memset (&gcv, ~0, sizeof (gcv)); - gcv.graphics_exposures = XLIKE_FALSE; + gcv.graphics_exposures = False; XLIKE_SET_GC_COLOR (gcv.foreground, fg); XLIKE_SET_GC_COLOR (gcv.background, bg); pixmap_mask = XLIKE_GC_FOREGROUND | XLIKE_GC_BACKGROUND | XLIKE_GC_EXPOSURES; ＠＠ -914,3 +1348,587 ＠＠ } } +/***************************************************************************** + x_output_string + + Given a string and a starting position, output that string in the + given face. If cursor is true, draw a cursor around the string. + Correctly handles multiple charsets in the string. + + The meaning of the parameters is something like this: + + W Window that the text is to be displayed in. + DL Display line that this text is on. The values in the + structure are used to determine the vertical position and + clipping range of the text. + BUF Pointer to those Ibytes to be output. + LEN Number of those Ibytes to be output + XPOS X position in pixels where the text should start being drawn. + XOFFSET Number of pixels to be chopped off the left side of the + text. The effect is as if the text were shifted to the + left this many pixels and clipped at XPOS. + CLIP_START Clip everything left of this X position. + WIDTH Clip everything right of XPOS + WIDTH. + FINDEX Index for the face cache element describing how to display + the text. + CURSOR #### I don't understand this. There's something + strange and overcomplexified with this variable. + Chuck, explain please? + CURSOR_START Starting X position of cursor. + CURSOR_WIDTH Width of cursor in pixels. + CURSOR_HEIGHT Height of cursor in pixels. + + Starting Y position of cursor is the top of the text line. + The cursor is drawn sometimes whether or not CURSOR is set. ??? + ****************************************************************************/ + +void +x_output_string (struct window *w, struct display_line *dl, const Ibyte *buf, + Bytecount len, int xpos, int xoffset, int clip_start, + int width, face_index findex, int cursor, int cursor_start, + int cursor_width, int cursor_height) +{ + /* General variables */ + struct frame *f = XFRAME (w->frame); + struct device *d = XDEVICE (f->device); + Display *dpy = DEVICE_X_DISPLAY (d); + Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f)); + Lisp_Object window = wrap_window (w); + + int clip_end; + + /* Cursor-related variables */ + int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d)); + int cursor_clip; + Lisp_Object bar_cursor_value = symbol_value_in_buffer (Qbar_cursor, + WINDOW_BUFFER (w)); + struct face_cachel *cursor_cachel = 0; + + /* Text-related variables */ + Lisp_Object bg_pmap; + GC gc, bgc; + int height = XLIKE_DISPLAY_LINE_HEIGHT (dl); + int ypos = XLIKE_DISPLAY_LINE_YPOS (dl); + Extbyte *text_storage; + struct textual_run *runs = alloca_array (struct textual_run, len); + int nruns, text_storage_len; + int i; + struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex); + +#ifdef THIS_IS_X + int use_x_font = 1; /* #### bogus!! + The logic of this function needs review! */ +#endif +#ifdef USE_XFT + Colormap cmap = DEVICE_X_COLORMAP (d); + Visual *visual = DEVICE_X_VISUAL (d); + static XftColor fg, bg; + XftDraw *xftDraw; + + /* Lazily initialize frame's xftDraw member. */ + if (!FRAME_X_XFTDRAW (f)) { + FRAME_X_XFTDRAW (f) = XftDrawCreate (dpy, x_win, visual, cmap); + } + xftDraw = FRAME_X_XFTDRAW (f); + + /* #### This will probably cause asserts when passed a Lisp integer for a + color. See ca. line 759 this file. + #### Maybe xft_convert_color should take an XColor, not a pixel. */ +#define XFT_FROB_LISP_COLOR(color, dim) \ + xft_convert_color_1 (dpy, cmap, visual, \ + &(XCOLOR_INSTANCE_X_COLOR (color)), (dim)) +#endif /* USE_XFT */ + + if (width < 0) + width = XLIKE_text_width (f, cachel, buf, len); + + /* Regularize the variables passed in. */ + clip_start = min (clip_start, xpos); + clip_end = xpos + width; + if (clip_start >= clip_end) + /* It's all clipped out. */ + return; + + xpos -= xoffset; + + /* make sure the area we are about to display is subwindow free. */ + redisplay_unmap_subwindows_maybe (f, clip_start, ypos, + clip_end - clip_start, height); + + cursor_clip = (cursor_start >= clip_start && + cursor_start < clip_end); + + /* This cursor code is really a mess. */ + if (!NILP (w->text_cursor_visible_p) + && (cursor + || cursor_clip + || (cursor_width + && (cursor_start + cursor_width >= clip_start) + && !NILP (bar_cursor_value)))) + { + /* These have to be in separate statements in order to avoid a + compiler bug. */ + face_index sucks = get_builtin_face_cache_index (w, Vtext_cursor_face); + cursor_cachel = WINDOW_FACE_CACHEL (w, sucks); + + /* We have to reset this since any call to WINDOW_FACE_CACHEL + may cause the cache to resize and any pointers to it to + become invalid. */ + cachel = WINDOW_FACE_CACHEL (w, findex); + } + +#ifdef HAVE_XIM + if (cursor && focus && (cursor_start == clip_start) && cursor_height) + XIM_SetSpotLocation (f, xpos - 2, dl->ypos + dl->descent - 2); +#endif /* HAVE_XIM */ + + bg_pmap = cachel->background_pixmap; + if (!IMAGE_INSTANCEP (bg_pmap) + || !IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (bg_pmap))) + bg_pmap = Qnil; + + if ((cursor && focus && NILP (bar_cursor_value) + && !NILP (w->text_cursor_visible_p)) || NILP (bg_pmap)) + bgc = 0; + else + { + /* Clear the cursor location? */ + bgc = XLIKE_get_gc (f, Qnil, cachel->background, cachel->background, + bg_pmap, cachel->background_placement, Qnil); + XFillRectangle (dpy, x_win, bgc, clip_start, ypos, + clip_end - clip_start, height); + } + + ALLOCATE_RUNS_TEXT (text_storage, text_storage_len, buf, len); + + nruns = separate_textual_runs (WINDOW_XBUFFER (w), text_storage, runs, + buf, len, cachel); + + USED (text_storage_len); + + for (i = 0; i < nruns; i++) + { + Lisp_Object font = FACE_CACHEL_FONT (cachel, runs[i].charset); + Lisp_Font_Instance *fi = XFONT_INSTANCE (font); + int this_width; + int need_clipping; + + if (EQ (font, Vthe_null_font_instance)) + continue; + + this_width = x_text_width_single_run (dpy, cachel, runs + i); + need_clipping = (dl->clip || clip_start > xpos || + clip_end < xpos + this_width); + + /* XDrawImageString only clears the area equal to the height of + the given font. It is possible that a font is being displayed + on a line taller than it is, so this would cause us to fail to + clear some areas. */ + if ((int) fi->height < (int) (height + dl->clip + + XLIKE_DISPLAY_LINE_TOP_CLIP (dl))) + { + int clear_start = max (xpos, clip_start); + int clear_end = min (xpos + this_width, clip_end); + + if (cursor) + { + int ypos1_line, ypos1_string, ypos2_line, ypos2_string; + + ypos1_string = dl->ypos - fi->ascent; + ypos2_string = dl->ypos + fi->descent; + ypos1_line = ypos; + ypos2_line = ypos1_line + height; + + /* Make sure we don't clear below the real bottom of the + line. */ + ypos1_string = min (ypos1_string, ypos2_line); + ypos2_string = min (ypos2_string, ypos2_line); + + if (ypos1_line < ypos1_string) + { + redisplay_clear_region (window, findex, clear_start, ypos1_line, + clear_end - clear_start, + ypos1_string - ypos1_line); + } + + if (ypos2_line > ypos2_string) + { + redisplay_clear_region (window, findex, clear_start, ypos2_string, + clear_end - clear_start, + ypos2_line - ypos2_string); + } + } + else + { + redisplay_clear_region (window, findex, clear_start, + ypos, clear_end - clear_start, + height); + } + } + + if (cursor && cursor_cachel && focus && NILP (bar_cursor_value)) + { +#ifdef USE_XFT + fg = XFT_FROB_LISP_COLOR (cursor_cachel->foreground, 0); + bg = XFT_FROB_LISP_COLOR (cursor_cachel->background, 0); +#endif + gc = XLIKE_get_gc (f, font, cursor_cachel->foreground, + cursor_cachel->background, Qnil, Qnil, Qnil); + } + else if (cachel->dim) + { + /* Ensure the gray bitmap exists */ + if (DEVICE_X_GRAY_PIXMAP (d) == None) + { + DEVICE_X_GRAY_PIXMAP (d) + = XCreateBitmapFromData (dpy, x_win, (char *)gray_bits, + gray_width, gray_height); + } + + /* Request a GC with the gray stipple pixmap to draw dimmed text */ +#ifdef USE_XFT + fg = XFT_FROB_LISP_COLOR (cachel->foreground, 1); + bg = XFT_FROB_LISP_COLOR (cachel->background, 0); +#endif + gc = XLIKE_get_gc (f, font, cachel->foreground, cachel->background, + bg_pmap, cachel->background_placement, Qnil); + } + else + { +#ifdef USE_XFT + fg = XFT_FROB_LISP_COLOR (cachel->foreground, 0); + bg = XFT_FROB_LISP_COLOR (cachel->background, 0); +#endif + gc = XLIKE_get_gc (f, font, cachel->foreground, cachel->background, + Qnil, Qnil, Qnil); + } +#ifdef USE_XFT + { + XftFont *rf = FONT_INSTANCE_X_XFTFONT (fi); + + if (rf) + { + use_x_font = 0; + if (need_clipping) + { + Region clip_reg = XCreateRegion(); + XRectangle clip_box = { clip_start, ypos, + clip_end - clip_start, height }; + + XUnionRectWithRegion (&clip_box, clip_reg, clip_reg); + XftDrawSetClip (xftDraw, clip_reg); + XDestroyRegion (clip_reg); + } + + if (!bgc) + { + /* #### Neither rect_height nor XftTextExtents as computed + below handles the vertical space taken up by antialiasing, + which for some fonts (eg, Bitstream Vera Sans Mono-16 on + my Mac PowerBook G4) leaves behind orphaned dots on + insertion or deletion earlier in the line, especially in + the case of the underscore character. + Interestingly, insertion or deletion of a single character + immediately after a refresh does not leave any droppings, + but any further insertions or deletions do. + While adding a pixel to rect_height (mostly) takes care of + this, it trashes aggressively laid-out elements like the + modeline (overwriting part of the bevel). + OK, unconditionally redraw the bevel, and increment + rect_height by 1. See x_output_display_block. -- sjt */ + struct textual_run *run = &runs[i]; + int rect_width + = x_text_width_single_run (dpy, cachel, run); +#ifndef USE_XFTTEXTENTS_TO_AVOID_FONT_DROPPINGS + int rect_height = FONT_INSTANCE_ASCENT (fi) + + FONT_INSTANCE_DESCENT (fi) + 1; +#else + int rect_height = FONT_INSTANCE_ASCENT (fi) + + FONT_INSTANCE_DESCENT (fi); + XGlyphInfo gi; + + XftTextExtents16 (dpy, FONT_INSTANCE_X_XFTFONT (fi), + (const XftChar16 *) run->ptr, run->len, + &gi); + rect_height = max (rect_height, gi.height); +#endif + + XftDrawRect (xftDraw, &bg, + xpos, ypos, rect_width, rect_height); + } + + assert (runs[i].dimension == 2); + + XftDrawString16 (xftDraw, &fg, rf, xpos, dl->ypos, + (const XftChar16 *) runs[i].ptr, runs[i].len); + } + } +#endif /* USE_XFT */ + + if (use_x_font) + { + if (need_clipping) + { + XRectangle clip_box; + + clip_box.x = 0; + clip_box.y = 0; + clip_box.width = clip_end - clip_start; + clip_box.height = height; + + XLIKE_SET_CLIP_RECTANGLE (dpy, gc, clip_start, ypos, &clip_box); + } + + if (runs[i].dimension == 1) + (bgc ? XDrawString : XDrawImageString) + (dpy, x_win, gc, xpos, dl->ypos, + (char *) runs[i].ptr, runs[i].len); + else + (bgc ? XDrawString16 : XDrawImageString16) + (dpy, x_win, gc, xpos, dl->ypos, + (XChar2b *) runs[i].ptr, runs[i].len); + } + + /* We draw underlines in the same color as the text. */ + if (cachel->underline) + { + int upos, uthick; + unsigned long upos_ext, uthick_ext; + XFontStruct *fs = + use_x_font ? FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font)) : 0; + /* #### the logic of the next two may be suboptimal: we may want + to use the POSITION and/or THICKNESS information with Xft */ + if (fs && XGetFontProperty (fs, XA_UNDERLINE_POSITION, &upos_ext)) + upos = (int) upos_ext; + else + upos = dl->descent / 2; + if (fs && XGetFontProperty (fs, XA_UNDERLINE_THICKNESS, &uthick_ext)) + uthick = (int) uthick_ext; + else + uthick = 1; + + if (dl->ypos + upos < dl->ypos + dl->descent - dl->clip) + { + if (dl->ypos + upos + uthick > dl->ypos + dl->descent - dl->clip) + uthick = dl->descent - dl->clip - upos; + + if (uthick == 1) + { + XDrawLine (dpy, x_win, gc, xpos, dl->ypos + upos, + xpos + this_width, dl->ypos + upos); + } + else if (uthick > 1) + { + XFillRectangle (dpy, x_win, gc, xpos, dl->ypos + upos, + this_width, uthick); + } + } + } + + if (cachel->strikethru) + { + int ascent, descent, upos, uthick; + unsigned long ascent_ext, descent_ext, uthick_ext; + XFontStruct *fs = FONT_INSTANCE_X_FONT (fi); + + if (!use_x_font) + { + ascent = dl->ascent; + descent = dl->descent; + uthick = 1; + } + else + { + if (!XGetFontProperty (fs, XA_STRIKEOUT_ASCENT, &ascent_ext)) + ascent = fs->ascent; + else + ascent = (int) ascent_ext; + if (!XGetFontProperty (fs, XA_STRIKEOUT_DESCENT, &descent_ext)) + descent = fs->descent; + else + descent = (int) descent_ext; + if (!XGetFontProperty (fs, XA_UNDERLINE_THICKNESS, &uthick_ext)) + uthick = 1; + else + uthick = (int) uthick_ext; + } + upos = ascent - ((ascent + descent) / 2) + 1; + + /* Generally, upos will be positive (above the baseline),so + subtract */ + if (dl->ypos - upos < dl->ypos + dl->descent - dl->clip) + { + if (dl->ypos - upos + uthick > dl->ypos + dl->descent - dl->clip) + uthick = dl->descent - dl->clip + upos; + + if (uthick == 1) + XDrawLine (dpy, x_win, gc, xpos, dl->ypos - upos, + xpos + this_width, dl->ypos - upos); + else if (uthick > 1) + XFillRectangle (dpy, x_win, gc, xpos, dl->ypos + upos, + this_width, uthick); + } + } + /* Restore the GC */ + if (need_clipping) + { +#ifdef USE_XFT + if (!use_x_font) + { + XftDrawSetClip (xftDraw, 0); + } + else +#endif + XLIKE_CLEAR_CLIP_MASK (dpy, gc); + } + + /* If we are actually superimposing the cursor then redraw with just + the appropriate section highlighted. */ + if (cursor_clip && !cursor && focus && cursor_cachel) + { +#ifdef USE_XFT + if (!use_x_font) /* Xft */ + { + XftFont *rf = FONT_INSTANCE_X_XFTFONT (fi); + + { /* set up clipping */ + Region clip_reg = XCreateRegion(); + XRectangle clip_box = { cursor_start, ypos, + cursor_width, height }; + + XUnionRectWithRegion (&clip_box, clip_reg, clip_reg); + XftDrawSetClip (xftDraw, clip_reg); + XDestroyRegion (clip_reg); + } + { /* draw background rectangle & draw text */ + int rect_height = FONT_INSTANCE_ASCENT (fi) + + FONT_INSTANCE_DESCENT (fi); + int rect_width + = x_text_width_single_run (dpy, cachel, &runs[i]); + XftColor xft_color; + + xft_color = XFT_FROB_LISP_COLOR (cursor_cachel->background, 0); + XftDrawRect (xftDraw, &xft_color, + xpos, ypos, rect_width, rect_height); + + xft_color = XFT_FROB_LISP_COLOR (cursor_cachel->foreground, 0); + assert (runs[i].dimension == 2); + + XftDrawString16 (xftDraw, &xft_color, rf, xpos, dl->ypos, + (XftChar16 *) runs[i].ptr, runs[i].len); + } + + XftDrawSetClip (xftDraw, 0); + } + else /* core font, not Xft */ +#endif /* USE_XFT */ + { + XRectangle clip_box; + GC cgc; + cgc = XLIKE_get_gc (f, font, cursor_cachel->foreground, + cursor_cachel->background, Qnil, Qnil, Qnil); + + clip_box.x = 0; + clip_box.y = 0; + clip_box.width = cursor_width; + clip_box.height = height; + + XLIKE_SET_CLIP_RECTANGLE (dpy, cgc, cursor_start, ypos, + &clip_box); + if (runs[i].dimension == 1) + XDrawImageString (dpy, x_win, cgc, xpos, dl->ypos, + (char *) runs[i].ptr, runs[i].len); + else + XDrawImageString16 (dpy, x_win, cgc, xpos, dl->ypos, + (XChar2b *) runs[i].ptr, runs[i].len); + + XLIKE_CLEAR_CLIP_MASK (dpy, cgc); + } + } + + xpos += this_width; + } + + /* Draw the non-focus box or bar-cursor as needed. */ + /* Can't this logic be simplified? */ + if (cursor_cachel + && ((cursor && !focus && NILP (bar_cursor_value)) + || (cursor_width + && (cursor_start + cursor_width >= clip_start) + && !NILP (bar_cursor_value)))) + { + int tmp_height, tmp_y; + int bar_width = EQ (bar_cursor_value, Qt) ? 1 : 2; + int need_clipping = (cursor_start < clip_start + || clip_end < cursor_start + cursor_width); + + /* #### This value is correct (as far as I know) because + all of the times we need to draw this cursor, we will + be called with exactly one character, so we know we + can always use runs[0]. + + This is bogus as all hell, however. The cursor handling in + this function is way bogus and desperately needs to be + cleaned up. (In particular, the drawing of the cursor should + really really be separated out of this function. This may be + a bit tricky now because this function itself does way too + much stuff, a lot of which needs to be moved into + redisplay.c.) This is the only way to be able to easily add + new cursor types or (e.g.) make the bar cursor be able to + span two characters instead of overlaying just one. */ + int bogusly_obtained_ascent_value = + XFONT_INSTANCE (FACE_CACHEL_FONT (cachel, runs[0].charset))->ascent; + + if (!NILP (bar_cursor_value)) + { + gc = XLIKE_get_gc (f, Qnil, cursor_cachel->background, Qnil, + Qnil, Qnil, + make_fixnum (bar_width)); + } + else + { + gc = XLIKE_get_gc (f, Qnil, cursor_cachel->background, + Qnil, Qnil, Qnil, Qnil); + } + tmp_y = dl->ypos - bogusly_obtained_ascent_value; + + tmp_height = cursor_height; + if (tmp_y + tmp_height > (int) (ypos + height)) + { + tmp_y = ypos + height - tmp_height; + tmp_y = min (tmp_y, ypos); + tmp_height = ypos + height - tmp_y; + } + + if (need_clipping) + { + XRectangle clip_box; + clip_box.x = 0; + clip_box.y = 0; + clip_box.width = clip_end - clip_start; + clip_box.height = tmp_height; + XLIKE_SET_CLIP_RECTANGLE (dpy, gc, clip_start, tmp_y, &clip_box); + } + + if (!focus && NILP (bar_cursor_value)) + { + XLIKE_DRAW_RECTANGLE (dpy, x_win, gc, cursor_start, tmp_y, + cursor_width - 1, tmp_height - 1); + } + else if (focus && !NILP (bar_cursor_value)) + { + XDrawLine (dpy, x_win, gc, cursor_start + bar_width - 1, tmp_y, + cursor_start + bar_width - 1, tmp_y + tmp_height - 1); + } + + /* Restore the GC */ + if (need_clipping) + { + XLIKE_CLEAR_CLIP_MASK (dpy, gc); + } + } + +#ifdef USE_XFT +#undef XFT_FROB_LISP_COLOR +#endif +} diff -r 9bdc40b8fb78 -r a5b21ebab055 src/redisplay-xlike-inc.c --- a/src/redisplay-xlike-inc.c Sun Dec 17 12:20:06 2017 +0000 +++ b/src/redisplay-xlike-inc.c Mon Dec 18 22:04:46 2017 +0000 ＠＠ -102,12 +102,10 ＠＠ #define console_type_create_redisplay_XLIKE XLIKE_PASTE (console_type_create_redisplay, XLIKE_NAME) #define XLIKE_get_gc XFUN (get_gc) #define XLIKE_output_blank XFUN (output_blank) -#define XLIKE_text_width_single_run XFUN (text_width_single_run) #define XLIKE_output_horizontal_line XFUN (output_horizontal_line) #define XLIKE_output_eol_cursor XFUN (output_eol_cursor) #define XLIKE_clear_frame_window XFUN (clear_frame_window) #define XLIKE_clear_frame_windows XFUN (clear_frame_windows) -#define XLIKE_text_width XFUN (text_width) static int XLIKE_text_width (struct frame *f, struct face_cachel *cachel, const Ibyte *str, Bytecount len); ＠＠ -149,452 +147,6 ＠＠ static void XLIKE_window_output_end (struct window *w); #endif /* THIS_IS_X */ - -/****************************************************************************/ -/* */ -/* Separate textual runs */ -/* */ -/****************************************************************************/ - - - /* Note: We do not use the Xmb*() functions and XFontSets, nor the - Motif XFontLists and CompoundStrings. - Those functions are generally losing for a number of reasons. - Most important, they only support one locale (e.g. you could - display Japanese and ASCII text, but not mixed Japanese/Chinese - text). You could maybe call setlocale() frequently to try to deal - with this, but that would generally fail because an XFontSet is - tied to one locale and won't have the other character sets in it. - - fontconfig (the font database for Xft) has some specifier-like - properties, but it's not sufficient (witness the existence of - Pango). Pango might do the trick, but it's not a cross-platform - solution; it would need significant advantages to be worth the - effort. - */ - -struct textual_run -{ - Lisp_Object charset; - Extbyte *ptr; - int len; - int dimension; -}; - -/* Separate out the text in STR of length LEN into a series of runs, stored in - RUN_STORAGE. RUN_STORAGE is guaranteed to hold enough space for all runs - that could be generated from this text. Each run points to the a stretch - of text given simply by the position codes TEXT_STORAGE into a series of - textual runs of a particular charset. Also convert the characters as - necessary into the format needed by XDrawImageString(), - XDrawImageString16(), et al. This means converting to one or two byte - format, possibly tweaking the high bits, and possibly running a CCL - program. You must pre-allocate the space used and pass in a pointer, - TEXT_STORAGE, and the ALLOCATE_RUNS_TEXT () macro is provided to do this - using stack space. Some of the window-system-specific implementations take - advantage of this step to do coding sytem translation, and the specific - amount of space needed depends on the window system. - - bufchar might not be fixed width (in the case of UTF-8). - - Returns the number of runs actually used. */ - -/* Notes on Xft implementation - - - With Unicode, we're no longer going to have repertoires reified as - charsets. (Not that we ever really did, what with corporate variants, - and so on.) So we really should be querying the face for the desired - font, rather than the character for the charset, and that's what would - determine the separation into runs. - - The widechar versions of fontconfig (and therefore Xft) functions - seem to be just bigendian Unicode. So there's actually no need to use - the 8-bit versions in computing runs and runes, it would seem. -*/ - -#if !defined(THIS_IS_GTK) -#if !defined(USE_XFT) && !defined(MULE) - -#define ALLOCATE_RUNS_TEXT(storage, storage_len, str, len) \ - (storage = alloca_extbytes (len)) - -static int -separate_textual_runs_nomule (struct buffer * UNUSED (buf), - Extbyte *text_storage, - struct textual_run *run_storage, - const Ibyte *str, Bytecount len, - struct face_cachel *UNUSED(cachel)) -{ - if (!len) - return 0; - - run_storage[0].ptr = text_storage; - run_storage[0].len = len; - run_storage[0].dimension = 1; - run_storage[0].charset = Qnil; - - memcpy (text_storage, str, len); - - return 1; -} -#endif - -#ifdef USE_XFT -#ifdef WORDS_BIGENDIAN -#define ALLOCATE_RUNS_TEXT(storage, storage_len, str, len) \ - TO_EXTERNAL_FORMAT (DATA, (str, len), \ - ALLOCA, (storage, storage_len), \ - Qutf_16) -#else -extern Lisp_Object Qutf_16_little_endian; -#define ALLOCATE_RUNS_TEXT(storage, storage_len, str, len) \ - TO_EXTERNAL_FORMAT (DATA, (str, len), \ - ALLOCA, (storage, storage_len), \ - Qutf_16_little_endian) -#endif -#endif /* USE_XFT */ - -#if defined (USE_XFT) && !defined (MULE) -/* - Note that in this configuration the "Croatian hack" of using an 8-bit, - non-Latin-1 font to get localized display without Mule simply isn't - available. That's by design -- Unicode does not aid or abet that kind - of punning. - This means that the cast to XftChar16 gives the correct "conversion" to - UCS-2. */ -static int -separate_textual_runs_xft_nomule (struct buffer * UNUSED (buf), - Extbyte *text_storage, - struct textual_run *run_storage, - const Ibyte *str, Bytecount len, - struct face_cachel *UNUSED (cachel)) -{ - int i; - if (!len) - return 0; - - run_storage[0].ptr = text_storage; - run_storage[0].len = len; - run_storage[0].dimension = 2; - run_storage[0].charset = Qnil; - - return 1; -} -#endif - -#if defined (USE_XFT) && defined (MULE) -static int -separate_textual_runs_xft_mule (struct buffer *buf, - Extbyte *text_storage, - struct textual_run *run_storage, - const Ibyte *str, Bytecount len, - struct face_cachel *UNUSED (cachel)) -{ - Lisp_Object prev_charset = Qunbound; - const Ibyte *end = str + len; - Elemcount runs_so_far = 0; - - run_storage[0].ptr = text_storage; - run_storage[0].len = len; - run_storage[0].dimension = 2; - run_storage[0].charset = Qnil; - - while (str < end) - { - Ichar ch = itext_ichar (str); - Lisp_Object charset; - int byte1, byte2; - - /* ＠＠#### This use of CONVERR_SUBSTITUTE is somewhat bogus. - It will substitute a '?' if we can't convert. Not clear whether - this will work or not. Problem is that we really shouldn't - be doing things on a charset level. */ - buffer_ichar_to_charset_codepoint (ch, buf, &charset, &byte1, &byte2, - CONVERR_SUBSTITUTE); - - if (!EQ (charset, prev_charset)) - { - if (runs_so_far) - run_storage[runs_so_far-1].len = - (text_storage - run_storage[runs_so_far-1].ptr) >> 1; - run_storage[runs_so_far].ptr = text_storage; - run_storage[runs_so_far].dimension = 2; - run_storage[runs_so_far].charset = charset; - prev_charset = charset; - runs_so_far++; - } - - if (valid_unicode_leading_surrogate (*((XftChar16 *) (text_storage)))) - { - text_storage += sizeof (XftChar16); - } - text_storage += sizeof (XftChar16); - INC_IBYTEPTR (str); - } - - if (runs_so_far) - run_storage[runs_so_far-1].len = - (text_storage - run_storage[runs_so_far-1].ptr) >> 1; - return runs_so_far; -} -#endif - -#if !defined(USE_XFT) && defined(MULE) - -#define ALLOCATE_RUNS_TEXT(storage, storage_len, str, len) \ - (storage = alloca_extbytes ((storage_len = (2 * len)))) - -/* - This is the most complex function of this group, due to the various - indexing schemes used by different fonts. For our purposes, they - fall into three classes. Some fonts are indexed compatibly with ISO - 2022; those fonts just use the Mule internal representation directly - (typically the high bit must be reset; this is determined by the `graphic' - flag). Some fonts are indexed by Unicode, specifically by UCS-2. These - are all translated using `ichar_to_unicode'. Finally some fonts have - irregular indexes, and must be translated ad hoc. In XEmacs ad hoc - translations are accomplished with CCL programs. */ -static Elemcount -separate_textual_runs_mule (struct buffer *buf, - Extbyte *text_storage, - struct textual_run *run_storage, - const Ibyte *str, Bytecount len, - struct face_cachel *cachel) -{ - Lisp_Object prev_charset = Qunbound, ccl_prog; - int runs_so_far = 0; - const Ibyte *end = str + len; - int dimension = 1, need_ccl_conversion = 0; - struct ccl_program char_converter; - - int translate_to_ucs_2 = 0; - - while (str < end) - { - Ichar ch = itext_ichar (str); - Lisp_Object charset; - int byte1, byte2; - - buffer_ichar_to_charset_codepoint (ch, buf, &charset, &byte1, &byte2, - CONVERR_FAIL); - - /* If we can't convert, substitute a '~' (CANT_DISPLAY_CHAR). */ - /* ＠＠#### This is extremely bogus. We want it to substitute the - Unicode replacement character, but there's no charset for this. - We really shouldn't be doing things on a charset level. */ - if (NILP (charset)) - { - charset = Vcharset_ascii; - byte1 = 0; - byte2 = CANT_DISPLAY_CHAR; - } - - /* NOTE: Formerly we used to retrieve the XCHARSET_GRAPHIC() here - and use it below to determine whether to push the bytes into - the 128-255 range. This is now handled automatically by the - `offset' property of charsets, which should agree with `graphic'. - Logically, the `offset' property describes the numeric indices - of the characters, such as when they are used to index an array - or font, while the `graphic' property indicates which register - to select when encoding using iso2022. */ - - if (!EQ (charset, prev_charset)) - { - int offs; - - /* At this point, dimension' and `prev_charset' refer to just- - completed run. `runs_so_far' and `text_storage' refer to the - run about to start. */ - if (runs_so_far) - { - /* Update metadata for previous run. */ - run_storage[runs_so_far - 1].len = - text_storage - run_storage[runs_so_far - 1].ptr; - if (2 == dimension) run_storage[runs_so_far - 1].len >>= 1; - } - - /* Compute metadata for current run. - First, classify font. - If the font is indexed by UCS-2, set `translate_to_ucs_2'. - Else if the charset has a CCL program, set `need_ccl_conversion'. - These flags are almost mutually exclusive, but we're sloppy - about resetting "shadowed" flags. So the flags must be checked - in the proper order in computing byte1 and byte2, below. */ - - offs = FACE_CACHEL_OFFSET_ENSURE (cachel, charset); - - translate_to_ucs_2 = Stynarr_at (cachel->font_final_stage, offs); - if (translate_to_ucs_2) - { - dimension = 2; - } - else - { - dimension = XCHARSET_DIMENSION (charset); - - /* Check for CCL charset. - If setup_ccl_program fails, we'll get a garbaged display. - This should never happen, and even if it does, it should - be harmless (unless the X server has buggy handling of - characters undefined in the font). It may be marginally - more useful to users and debuggers than substituting a - fixed replacement character. */ - ccl_prog = XCHARSET_CCL_PROGRAM (charset); - if ((!NILP (ccl_prog)) - && (setup_ccl_program (&char_converter, ccl_prog) >= 0)) - { - need_ccl_conversion = 1; - } - /* Else, the charset must have an ISO 2022-compatible font index. - */ - } - - /* Initialize metadata for current run. */ - run_storage[runs_so_far].ptr = text_storage; - run_storage[runs_so_far].charset = charset; - run_storage[runs_so_far].dimension = dimension; - - /* Update loop variables. */ - prev_charset = charset; - runs_so_far++; - } - - /* Must check flags in this order. See comment above. */ - if (translate_to_ucs_2) - { - int ucs = ichar_to_unicode (ch, CONVERR_SUBSTITUTE); - /* If UCS is less than zero or greater than 0xFFFF, set ucs2 to - REPLACEMENT CHARACTER. */ - ucs = (ucs & ~0xFFFF) ? UNICODE_REPLACEMENT_CHAR : ucs; - - byte1 = ucs >> 8; - byte2 = ucs & 0xFF; - } - else if (need_ccl_conversion) - { - internal_to_external_charset_codepoint (charset, byte1, byte2, - &byte1, &byte2, 1); - char_converter.reg[0] = XCHARSET_ID (charset); - char_converter.reg[1] = byte1; - char_converter.reg[2] = byte2; - ccl_driver (&char_converter, 0, buf, 0, 0, 0, CCL_MODE_ENCODING); - byte1 = char_converter.reg[1]; - byte2 = char_converter.reg[2]; - get_external_charset_codepoint (charset, make_fixnum (byte1), - make_fixnum (byte2), - &byte1, &byte2, 1); - } - else if (EQ (charset, Vcharset_ascii) && byte2 != CANT_DISPLAY_CHAR) - { - const Ibyte *nonascii; - - nonascii = skip_ascii (str, end); - memcpy (text_storage, str, nonascii - str); - text_storage += nonascii - str; - str = nonascii; - continue; - } - - if (2 == dimension) - { - *text_storage++ = (Extbyte) byte1; - } - - *text_storage++ = (Extbyte) byte2; - INC_IBYTEPTR (str); - } - - if (runs_so_far) - { - run_storage[runs_so_far - 1].len = - text_storage - run_storage[runs_so_far - 1].ptr; - /* Dimension retains the relevant value for the run before it. */ - if (2 == dimension) - run_storage[runs_so_far - 1].len >>= 1; - } - - assert (runs_so_far < 0xFFFF); - - return runs_so_far; -} -#endif - -static int -separate_textual_runs (struct buffer *buf, - Extbyte *text_storage, - struct textual_run *run_storage, - const Ibyte *str, Bytecount len, - struct face_cachel *cachel) -{ -#if defined (USE_XFT) && defined (MULE) - return separate_textual_runs_xft_mule (buf, text_storage, run_storage, - str, len, cachel); -#endif -#if defined (USE_XFT) && !defined (MULE) - return separate_textual_runs_xft_nomule (buf, text_storage, run_storage, - str, len, cachel); -#endif -#if !defined (USE_XFT) && defined (MULE) - return separate_textual_runs_mule (buf, text_storage, run_storage, - str, len, cachel); -#endif -#if !defined (USE_XFT) && !defined (MULE) - return separate_textual_runs_nomule (buf, text_storage, run_storage, - str, len, cachel); -#endif -} - -/* !THIS_IS_GTK */ -#endif - -/****************************************************************************/ -/* */ -/* Xlike output routines */ -/* */ -/****************************************************************************/ -#ifndef THIS_IS_GTK -static int -XLIKE_text_width_single_run (struct frame * USED_IF_XFT (f), - struct face_cachel *cachel, - struct textual_run *run) -{ - Lisp_Object font_inst = FACE_CACHEL_FONT (cachel, run->charset); - Lisp_Font_Instance *fi = XFONT_INSTANCE (font_inst); - - if (!fi->proportional_p) - return fi->width * run->len; -#ifdef USE_XFT - else if (FONT_INSTANCE_X_XFTFONT (fi)) - { - static XGlyphInfo glyphinfo; - - assert (run->dimension == 2); - - XftTextExtents16 (dpy, FONT_INSTANCE_X_XFTFONT (fi), - (XftChar16 *) run->ptr, run->len, &glyphinfo); - - return glyphinfo.xOff; - } -#endif - else if (FONT_INSTANCE_XLIKE_FONT (fi)) - { - if (run->dimension == 2) - { - /* stderr_out ("Measuring wide characters\n"); */ - return XLIKE_TEXT_WIDTH_WIDE (FONT_INSTANCE_XLIKE_FONT (fi), - run->ptr, run->len); - } - else - { - return XLIKE_TEXT_WIDTH (FONT_INSTANCE_XLIKE_FONT (fi), - run->ptr, run->len); - } - } - else - abort(); - return 0; /* shut up GCC */ -} -#endif - /***************************************************************************** XLIKE_divider_height ＠＠ -1005,594 +557,6 ＠＠ #endif -/***************************************************************************** - XLIKE_output_string - - Given a string and a starting position, output that string in the - given face. If cursor is true, draw a cursor around the string. - Correctly handles multiple charsets in the string. - - The meaning of the parameters is something like this: - - W Window that the text is to be displayed in. - DL Display line that this text is on. The values in the - structure are used to determine the vertical position and - clipping range of the text. - BUF Pointer to those Ibytes to be output. - LEN Number of those Ibytes to be output - XPOS X position in pixels where the text should start being drawn. - XOFFSET Number of pixels to be chopped off the left side of the - text. The effect is as if the text were shifted to the - left this many pixels and clipped at XPOS. - CLIP_START Clip everything left of this X position. - WIDTH Clip everything right of XPOS + WIDTH. - FINDEX Index for the face cache element describing how to display - the text. - CURSOR #### I don't understand this. There's something - strange and overcomplexified with this variable. - Chuck, explain please? - CURSOR_START Starting X position of cursor. - CURSOR_WIDTH Width of cursor in pixels. - CURSOR_HEIGHT Height of cursor in pixels. - - Starting Y position of cursor is the top of the text line. - The cursor is drawn sometimes whether or not CURSOR is set. ??? - ****************************************************************************/ -#ifndef THIS_IS_GTK -void -XLIKE_output_string (struct window *w, struct display_line *dl, - const Ibyte *buf, Bytecount len, - int xpos, int xoffset, int clip_start, - int width, face_index findex, int cursor, - int cursor_start, int cursor_width, int cursor_height) -{ - /* General variables */ - struct frame *f = XFRAME (w->frame); - struct device *d = XDEVICE (f->device); - XLIKE_DISPLAY dpy = GET_XLIKE_X_DISPLAY (d); - XLIKE_WINDOW x_win = GET_XLIKE_WINDOW (f); - Lisp_Object window = wrap_window (w); - - int clip_end; - - /* Cursor-related variables */ - int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d)); - int cursor_clip; - Lisp_Object bar_cursor_value = symbol_value_in_buffer (Qbar_cursor, - WINDOW_BUFFER (w)); - struct face_cachel *cursor_cachel = 0; - - /* Text-related variables */ - Lisp_Object bg_pmap; - XLIKE_GC gc, bgc; - int height = XLIKE_DISPLAY_LINE_HEIGHT (dl); - int ypos = XLIKE_DISPLAY_LINE_YPOS (dl); - Extbyte *text_storage; - struct textual_run *runs = alloca_array (struct textual_run, len); - int nruns, text_storage_len; - int i; - struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex); - -#ifdef THIS_IS_X - int use_x_font = 1; /* #### bogus!! - The logic of this function needs review! */ -#endif -#ifdef USE_XFT - Colormap cmap = DEVICE_X_COLORMAP (d); - Visual *visual = DEVICE_X_VISUAL (d); - static XftColor fg, bg; - XftDraw *xftDraw; - - /* Lazily initialize frame's xftDraw member. */ - if (!FRAME_X_XFTDRAW (f)) { - FRAME_X_XFTDRAW (f) = XftDrawCreate (dpy, x_win, visual, cmap); - } - xftDraw = FRAME_X_XFTDRAW (f); - - /* #### This will probably cause asserts when passed a Lisp integer for a - color. See ca. line 759 this file. - #### Maybe xft_convert_color should take an XColor, not a pixel. */ -#define XFT_FROB_LISP_COLOR(color, dim) \ - xft_convert_color_1 (dpy, cmap, visual, \ - &(XCOLOR_INSTANCE_X_COLOR (color)), (dim)) -#endif /* USE_XFT */ - - if (width < 0) - width = XLIKE_text_width (f, cachel, buf, len); - - /* Regularize the variables passed in. */ - clip_start = min (clip_start, xpos); - clip_end = xpos + width; - if (clip_start >= clip_end) - /* It's all clipped out. */ - return; - - xpos -= xoffset; - - /* make sure the area we are about to display is subwindow free. */ - redisplay_unmap_subwindows_maybe (f, clip_start, ypos, - clip_end - clip_start, height); - - cursor_clip = (cursor_start >= clip_start && - cursor_start < clip_end); - - /* This cursor code is really a mess. */ - if (!NILP (w->text_cursor_visible_p) - && (cursor - || cursor_clip - || (cursor_width - && (cursor_start + cursor_width >= clip_start) - && !NILP (bar_cursor_value)))) - { - /* These have to be in separate statements in order to avoid a - compiler bug. */ - face_index sucks = get_builtin_face_cache_index (w, Vtext_cursor_face); - cursor_cachel = WINDOW_FACE_CACHEL (w, sucks); - - /* We have to reset this since any call to WINDOW_FACE_CACHEL - may cause the cache to resize and any pointers to it to - become invalid. */ - cachel = WINDOW_FACE_CACHEL (w, findex); - } - -#ifdef HAVE_XIM - if (cursor && focus && (cursor_start == clip_start) && cursor_height) - XIM_SetSpotLocation (f, xpos - 2, dl->ypos + dl->descent - 2); -#endif /* HAVE_XIM */ - - bg_pmap = cachel->background_pixmap; - if (!IMAGE_INSTANCEP (bg_pmap) - || !IMAGE_INSTANCE_PIXMAP_TYPE_P (XIMAGE_INSTANCE (bg_pmap))) - bg_pmap = Qnil; - - if ((cursor && focus && NILP (bar_cursor_value) - && !NILP (w->text_cursor_visible_p)) || NILP (bg_pmap)) - bgc = 0; - else - { - /* Clear the cursor location? */ - bgc = XLIKE_get_gc (f, Qnil, cachel->background, cachel->background, - bg_pmap, cachel->background_placement, Qnil); - XLIKE_FILL_RECTANGLE (dpy, x_win, bgc, clip_start, - ypos, clip_end - clip_start, - height); - } - - ALLOCATE_RUNS_TEXT (text_storage, text_storage_len, buf, len); - - nruns = separate_textual_runs (WINDOW_XBUFFER (w), text_storage, runs, - buf, len, cachel); - - USED (text_storage_len); - - for (i = 0; i < nruns; i++) - { - Lisp_Object font = FACE_CACHEL_FONT (cachel, runs[i].charset); - Lisp_Font_Instance *fi = XFONT_INSTANCE (font); - int this_width; - int need_clipping; - - if (EQ (font, Vthe_null_font_instance)) - continue; - - this_width = XLIKE_text_width_single_run (f, cachel, runs + i); - need_clipping = (dl->clip || clip_start > xpos || - clip_end < xpos + this_width); - - /* XDrawImageString only clears the area equal to the height of - the given font. It is possible that a font is being displayed - on a line taller than it is, so this would cause us to fail to - clear some areas. */ - if ((int) fi->height < (int) (height + dl->clip + - XLIKE_DISPLAY_LINE_TOP_CLIP (dl))) - { - int clear_start = max (xpos, clip_start); - int clear_end = min (xpos + this_width, clip_end); - - if (cursor) - { - int ypos1_line, ypos1_string, ypos2_line, ypos2_string; - - ypos1_string = dl->ypos - fi->ascent; - ypos2_string = dl->ypos + fi->descent; - ypos1_line = ypos; - ypos2_line = ypos1_line + height; - - /* Make sure we don't clear below the real bottom of the - line. */ - ypos1_string = min (ypos1_string, ypos2_line); - ypos2_string = min (ypos2_string, ypos2_line); - - if (ypos1_line < ypos1_string) - { - redisplay_clear_region (window, findex, clear_start, ypos1_line, - clear_end - clear_start, - ypos1_string - ypos1_line); - } - - if (ypos2_line > ypos2_string) - { - redisplay_clear_region (window, findex, clear_start, ypos2_string, - clear_end - clear_start, - ypos2_line - ypos2_string); - } - } - else - { - redisplay_clear_region (window, findex, clear_start, - ypos, clear_end - clear_start, - height); - } - } - - if (cursor && cursor_cachel && focus && NILP (bar_cursor_value)) - { -#ifdef USE_XFT - fg = XFT_FROB_LISP_COLOR (cursor_cachel->foreground, 0); - bg = XFT_FROB_LISP_COLOR (cursor_cachel->background, 0); -#endif - gc = XLIKE_get_gc (f, font, cursor_cachel->foreground, - cursor_cachel->background, Qnil, Qnil, Qnil); - } - else if (cachel->dim) - { - /* Ensure the gray bitmap exists */ - if (DEVICE_XLIKE_GRAY_PIXMAP (d) == XLIKE_NONE) - DEVICE_XLIKE_GRAY_PIXMAP (d) = - XCreateBitmapFromData (dpy, x_win, (char *)gray_bits, - gray_width, gray_height); - - /* Request a GC with the gray stipple pixmap to draw dimmed text */ -#ifdef USE_XFT - fg = XFT_FROB_LISP_COLOR (cachel->foreground, 1); - bg = XFT_FROB_LISP_COLOR (cachel->background, 0); -#endif - gc = XLIKE_get_gc (f, font, cachel->foreground, cachel->background, - bg_pmap, cachel->background_placement, Qnil); - } - else - { -#ifdef USE_XFT - fg = XFT_FROB_LISP_COLOR (cachel->foreground, 0); - bg = XFT_FROB_LISP_COLOR (cachel->background, 0); -#endif - gc = XLIKE_get_gc (f, font, cachel->foreground, cachel->background, - Qnil, Qnil, Qnil); - } -#ifdef USE_XFT - { - XftFont *rf = FONT_INSTANCE_X_XFTFONT (fi); - - if (rf) - { - use_x_font = 0; - if (need_clipping) - { - Region clip_reg = XCreateRegion(); - XRectangle clip_box = { clip_start, ypos, - clip_end - clip_start, height }; - - XUnionRectWithRegion (&clip_box, clip_reg, clip_reg); - XftDrawSetClip (xftDraw, clip_reg); - XDestroyRegion (clip_reg); - } - - if (!bgc) - { - /* #### Neither rect_height nor XftTextExtents as computed - below handles the vertical space taken up by antialiasing, - which for some fonts (eg, Bitstream Vera Sans Mono-16 on - my Mac PowerBook G4) leaves behind orphaned dots on - insertion or deletion earlier in the line, especially in - the case of the underscore character. - Interestingly, insertion or deletion of a single character - immediately after a refresh does not leave any droppings, - but any further insertions or deletions do. - While adding a pixel to rect_height (mostly) takes care of - this, it trashes aggressively laid-out elements like the - modeline (overwriting part of the bevel). - OK, unconditionally redraw the bevel, and increment - rect_height by 1. See x_output_display_block. -- sjt */ - struct textual_run *run = &runs[i]; - int rect_width - = XLIKE_text_width_single_run (f, cachel, run); -#ifndef USE_XFTTEXTENTS_TO_AVOID_FONT_DROPPINGS - int rect_height = FONT_INSTANCE_ASCENT (fi) - + FONT_INSTANCE_DESCENT (fi) + 1; -#else - int rect_height = FONT_INSTANCE_ASCENT (fi) - + FONT_INSTANCE_DESCENT (fi); - XGlyphInfo gi; - - XftTextExtents16 (dpy, FONT_INSTANCE_X_XFTFONT (fi), - (const XftChar16 *) run->ptr, run->len, - &gi); - rect_height = max (rect_height, gi.height); -#endif - - XftDrawRect (xftDraw, &bg, - xpos, ypos, rect_width, rect_height); - } - - assert (runs[i].dimension == 2); - - XftDrawString16 (xftDraw, &fg, rf, xpos, dl->ypos, - (const XftChar16 *) runs[i].ptr, runs[i].len); - } - } -#endif /* USE_XFT */ - - if (use_x_font) - { - if (need_clipping) - { - XLIKE_RECTANGLE clip_box; - - clip_box.x = 0; - clip_box.y = 0; - clip_box.width = clip_end - clip_start; - clip_box.height = height; - - XLIKE_SET_CLIP_RECTANGLE (dpy, gc, clip_start, ypos, &clip_box); - } - - if (runs[i].dimension == 1) - (bgc ? XDrawString : XDrawImageString) - (dpy, x_win, gc, xpos, dl->ypos, - (char *) runs[i].ptr, runs[i].len); - else - (bgc ? XDrawString16 : XDrawImageString16) - (dpy, x_win, gc, xpos, dl->ypos, - (XChar2b *) runs[i].ptr, runs[i].len); - } - - /* We draw underlines in the same color as the text. */ - if (cachel->underline) - { - int upos, uthick; - unsigned long upos_ext, uthick_ext; - XFontStruct *fs = - use_x_font ? FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font)) : 0; - /* #### the logic of the next two may be suboptimal: we may want - to use the POSITION and/or THICKNESS information with Xft */ - if (fs && XGetFontProperty (fs, XA_UNDERLINE_POSITION, &upos_ext)) - upos = (int) upos_ext; - else - upos = dl->descent / 2; - if (fs && XGetFontProperty (fs, XA_UNDERLINE_THICKNESS, &uthick_ext)) - uthick = (int) uthick_ext; - else - uthick = 1; - - if (dl->ypos + upos < dl->ypos + dl->descent - dl->clip) - { - if (dl->ypos + upos + uthick > dl->ypos + dl->descent - dl->clip) - uthick = dl->descent - dl->clip - upos; - - if (uthick == 1) - { - XLIKE_DRAW_LINE (dpy, x_win, gc, xpos, dl->ypos + upos, - xpos + this_width, dl->ypos + upos); - } - else if (uthick > 1) - { - XLIKE_FILL_RECTANGLE (dpy, x_win, gc, xpos, - dl->ypos + upos, this_width, uthick); - } - } - } - - if (cachel->strikethru) - { - int ascent, descent, upos, uthick; - unsigned long ascent_ext, descent_ext, uthick_ext; - XFontStruct *fs = FONT_INSTANCE_X_FONT (fi); - - if (!use_x_font) - { - ascent = dl->ascent; - descent = dl->descent; - uthick = 1; - } - else - { - if (!XGetFontProperty (fs, XA_STRIKEOUT_ASCENT, &ascent_ext)) - ascent = fs->ascent; - else - ascent = (int) ascent_ext; - if (!XGetFontProperty (fs, XA_STRIKEOUT_DESCENT, &descent_ext)) - descent = fs->descent; - else - descent = (int) descent_ext; - if (!XGetFontProperty (fs, XA_UNDERLINE_THICKNESS, &uthick_ext)) - uthick = 1; - else - uthick = (int) uthick_ext; - } - upos = ascent - ((ascent + descent) / 2) + 1; - - /* Generally, upos will be positive (above the baseline),so - subtract */ - if (dl->ypos - upos < dl->ypos + dl->descent - dl->clip) - { - if (dl->ypos - upos + uthick > dl->ypos + dl->descent - dl->clip) - uthick = dl->descent - dl->clip + upos; - - if (uthick == 1) - XLIKE_DRAW_LINE (dpy, x_win, gc, xpos, dl->ypos - upos, - xpos + this_width, dl->ypos - upos); - else if (uthick > 1) - XLIKE_FILL_RECTANGLE (dpy, x_win, gc, xpos, dl->ypos + upos, - this_width, uthick); - } - } - /* Restore the GC */ - if (need_clipping) - { -#ifdef USE_XFT - if (!use_x_font) - { - XftDrawSetClip (xftDraw, 0); - } - else -#endif - XLIKE_CLEAR_CLIP_MASK (dpy, gc); - } - - /* If we are actually superimposing the cursor then redraw with just - the appropriate section highlighted. */ - if (cursor_clip && !cursor && focus && cursor_cachel) - { -#ifdef USE_XFT - if (!use_x_font) /* Xft */ - { - XftFont *rf = FONT_INSTANCE_X_XFTFONT (fi); - - { /* set up clipping */ - Region clip_reg = XCreateRegion(); - XRectangle clip_box = { cursor_start, ypos, - cursor_width, height }; - - XUnionRectWithRegion (&clip_box, clip_reg, clip_reg); - XftDrawSetClip (xftDraw, clip_reg); - XDestroyRegion (clip_reg); - } - { /* draw background rectangle & draw text */ - int rect_height = FONT_INSTANCE_ASCENT (fi) - + FONT_INSTANCE_DESCENT (fi); - int rect_width - = XLIKE_text_width_single_run (f, cachel, &runs[i]); - XftColor xft_color; - - xft_color = XFT_FROB_LISP_COLOR (cursor_cachel->background, 0); - XftDrawRect (xftDraw, &xft_color, - xpos, ypos, rect_width, rect_height); - - xft_color = XFT_FROB_LISP_COLOR (cursor_cachel->foreground, 0); - assert (runs[i].dimension == 2); - - XftDrawString16 (xftDraw, &xft_color, rf, xpos, dl->ypos, - (XftChar16 *) runs[i].ptr, runs[i].len); - } - - XftDrawSetClip (xftDraw, 0); - } - else /* core font, not Xft */ -#endif /* USE_XFT */ - { - XLIKE_RECTANGLE clip_box; - XLIKE_GC cgc; - cgc = XLIKE_get_gc (f, font, cursor_cachel->foreground, - cursor_cachel->background, Qnil, Qnil, Qnil); - - clip_box.x = 0; - clip_box.y = 0; - clip_box.width = cursor_width; - clip_box.height = height; - - XLIKE_SET_CLIP_RECTANGLE (dpy, cgc, cursor_start, ypos, - &clip_box); - if (runs[i].dimension == 1) - XDrawImageString (dpy, x_win, cgc, xpos, dl->ypos, - (char *) runs[i].ptr, runs[i].len); - else - XDrawImageString16 (dpy, x_win, cgc, xpos, dl->ypos, - (XChar2b *) runs[i].ptr, runs[i].len); - - XLIKE_CLEAR_CLIP_MASK (dpy, cgc); - } - } - - xpos += this_width; - } - - /* Draw the non-focus box or bar-cursor as needed. */ - /* Can't this logic be simplified? */ - if (cursor_cachel - && ((cursor && !focus && NILP (bar_cursor_value)) - || (cursor_width - && (cursor_start + cursor_width >= clip_start) - && !NILP (bar_cursor_value)))) - { - int tmp_height, tmp_y; - int bar_width = EQ (bar_cursor_value, Qt) ? 1 : 2; - int need_clipping = (cursor_start < clip_start - || clip_end < cursor_start + cursor_width); - - /* #### This value is correct (as far as I know) because - all of the times we need to draw this cursor, we will - be called with exactly one character, so we know we - can always use runs[0]. - - This is bogus as all hell, however. The cursor handling in - this function is way bogus and desperately needs to be - cleaned up. (In particular, the drawing of the cursor should - really really be separated out of this function. This may be - a bit tricky now because this function itself does way too - much stuff, a lot of which needs to be moved into - redisplay.c.) This is the only way to be able to easily add - new cursor types or (e.g.) make the bar cursor be able to - span two characters instead of overlaying just one. */ - int bogusly_obtained_ascent_value = - XFONT_INSTANCE (FACE_CACHEL_FONT (cachel, runs[0].charset))->ascent; - - if (!NILP (bar_cursor_value)) - { - gc = XLIKE_get_gc (f, Qnil, cursor_cachel->background, Qnil, - Qnil, Qnil, - make_fixnum (bar_width)); - } - else - { - gc = XLIKE_get_gc (f, Qnil, cursor_cachel->background, - Qnil, Qnil, Qnil, Qnil); - } - tmp_y = dl->ypos - bogusly_obtained_ascent_value; - - tmp_height = cursor_height; - if (tmp_y + tmp_height > (int) (ypos + height)) - { - tmp_y = ypos + height - tmp_height; - tmp_y = min (tmp_y, ypos); - tmp_height = ypos + height - tmp_y; - } - - if (need_clipping) - { - XLIKE_RECTANGLE clip_box; - clip_box.x = 0; - clip_box.y = 0; - clip_box.width = clip_end - clip_start; - clip_box.height = tmp_height; - XLIKE_SET_CLIP_RECTANGLE (dpy, gc, clip_start, tmp_y, &clip_box); - } - - if (!focus && NILP (bar_cursor_value)) - { - XLIKE_DRAW_RECTANGLE (dpy, x_win, gc, cursor_start, tmp_y, - cursor_width - 1, tmp_height - 1); - } - else if (focus && !NILP (bar_cursor_value)) - { - XLIKE_DRAW_LINE (dpy, x_win, gc, cursor_start + bar_width - 1, tmp_y, - cursor_start + bar_width - 1, - tmp_y + tmp_height - 1); - } - - /* Restore the GC */ - if (need_clipping) - { - XLIKE_CLEAR_CLIP_MASK (dpy, gc); - } - } - -#ifdef USE_XFT -#undef XFT_FROB_LISP_COLOR -#endif -} -/* not THIS_IS_GTK */ -#endif - static void XLIKE_output_pixmap (struct window *w, Lisp_Object image_instance, struct display_box *db, struct display_glyph_area *dga, -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

[COMMIT] Get the GTK2 code building with recent trunk changes. 7 years

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1513513206 0 # Sun Dec 17 12:20:06 2017 +0000 # Node ID 9bdc40b8fb78fe1b9605e4e5129b4002b3a9835a # Parent f26c76a815e2c987d495d484566647fbff0c4e1e Get the GTK2 code building with recent trunk changes. src/ChangeLog addition: 2017-12-17 Aidan Kehoe <kehoea(a)parhasard.net> * console-gtk.c (gtk_perhaps_init_unseen_key_defaults): Remove a buffer dependence here, use the default unicode precedence list when converting a keysym's Unicode code point to an XEmacs character. * device-gtk.c (gtk_init_device): On versions of GTK > 2.8.0, if gdk_screen_get_rgba_visual() failed, try with gdk_visual_get_best(). When examining Vselection_converter_out_alist, Fsafe_length() is no longer available. Use Flist_length instead. * emacs.c (main_1): Remove complex_vars_of_event_gtk(), there's no need for it. * event-gtk.c: * event-gtk.c (handle_map_event): Check for possible resizing on the map event too. * event-gtk.c (gtk_keysym_to_emacs_keysym): Use unicode_to_ichar(), rather than Funicode_to_char() with the wrong number of arguments. * event-gtk.c (gtk_event_to_emacs_event): * event-gtk.c (register_event_name): Don't strdup into the heap. Assert that every character in NAME is ASCII, use build_ascstring() with the result of the transformation, using Qutf_8 is an issue very early in the build. * event-gtk.c (register_event_names): Return Vgdk_event_names from this function, so the return value can be used in vars_of_event_gtk(). * event-gtk.c (vars_of_event_gtk): Use register_event_names() here. * event-gtk.c (complex_vars_of_event_gtk): Removed, no need for this, the relevant vars aren't actually complex. * faces.c (complex_vars_of_faces): Make some comments here a little more complete. * frame-gtk.c: * frame-gtk.c (gtk_recompute_cell_sizes): Make this take WIDTH_INCR and HEIGHT_INCR pointer output arguments, so callers can find out the effective character dimensions. * frame-gtk.c (gtk_set_initial_frame_size): Use this. * frame-gtk.c (gtk_set_frame_size): Use this. * frame-gtk.c (gtk_update_frame_external_traits): Use this. * frame.c: * frame.c (change_frame_size_1): Correct some comments here. * redisplay-gtk.c (XLIKE_output_eol_cursor): Some GTK version compatibility changes here. * redisplay-xlike-inc.c (XLIKE_text_width): Remove this completely, with Pango GTK and X11 have diverged sufficiently this doesn't help any more. * symsinit.h: Remove complex_vars_of_event_gtk() from this. diff -r f26c76a815e2 -r 9bdc40b8fb78 src/ChangeLog --- a/src/ChangeLog Sun Dec 17 11:05:35 2017 +0000 +++ b/src/ChangeLog Sun Dec 17 12:20:06 2017 +0000 ＠＠ -1,3 +1,55 ＠＠ +2017-12-17 Aidan Kehoe <kehoea(a)parhasard.net> + + * console-gtk.c (gtk_perhaps_init_unseen_key_defaults): + Remove a buffer dependence here, use the default unicode + precedence list when converting a keysym's Unicode code point to + an XEmacs character. + * device-gtk.c (gtk_init_device): + On versions of GTK > 2.8.0, if gdk_screen_get_rgba_visual() + failed, try with gdk_visual_get_best(). + When examining Vselection_converter_out_alist, Fsafe_length() is + no longer available. Use Flist_length instead. + * emacs.c (main_1): + Remove complex_vars_of_event_gtk(), there's no need for it. + * event-gtk.c: + * event-gtk.c (handle_map_event): + Check for possible resizing on the map event too. + * event-gtk.c (gtk_keysym_to_emacs_keysym): + Use unicode_to_ichar(), rather than Funicode_to_char() with the + wrong number of arguments. + * event-gtk.c (gtk_event_to_emacs_event): + * event-gtk.c (register_event_name): + Don't strdup into the heap. + Assert that every character in NAME is ASCII, use + build_ascstring() with the result of the transformation, using + Qutf_8 is an issue very early in the build. + * event-gtk.c (register_event_names): + Return Vgdk_event_names from this function, so the return value + can be used in vars_of_event_gtk(). + * event-gtk.c (vars_of_event_gtk): + Use register_event_names() here. + * event-gtk.c (complex_vars_of_event_gtk): Removed, no need for + this, the relevant vars aren't actually complex. + * faces.c (complex_vars_of_faces): + Make some comments here a little more complete. + * frame-gtk.c: + * frame-gtk.c (gtk_recompute_cell_sizes): + Make this take WIDTH_INCR and HEIGHT_INCR pointer output + arguments, so callers can find out the effective character dimensions. + * frame-gtk.c (gtk_set_initial_frame_size): Use this. + * frame-gtk.c (gtk_set_frame_size): Use this. + * frame-gtk.c (gtk_update_frame_external_traits): Use this. + * frame.c: + * frame.c (change_frame_size_1): + Correct some comments here. + * redisplay-gtk.c (XLIKE_output_eol_cursor): + Some GTK version compatibility changes here. + * redisplay-xlike-inc.c (XLIKE_text_width): Remove this + completely, with Pango GTK and X11 have diverged sufficiently this + doesn't help any more. + * symsinit.h: + Remove complex_vars_of_event_gtk() from this. + 2017-12-12 Aidan Kehoe <kehoea(a)parhasard.net> * process-unix.c (unix_init_process_io_handles): diff -r f26c76a815e2 -r 9bdc40b8fb78 src/console-gtk.c --- a/src/console-gtk.c Sun Dec 17 11:05:35 2017 +0000 +++ b/src/console-gtk.c Sun Dec 17 12:20:06 2017 +0000 ＠＠ -129,12 +129,11 ＠＠ gchar *symbol_name = LISP_STRING_TO_EXTERNAL (XSYMBOL_NAME (key), Qutf_8); char_to_associate #ifdef __GDK_KEYS_H__ - = make_char (buffer_unicode_to_ichar + = make_char (filtered_unicode_to_ichar (gdk_keyval_to_unicode (gdk_keyval_from_name (symbol_name)), - /* ＠＠#### need to get some sort of buffer to compute - this off; only applies in the old-Mule world */ - current_buffer, CONVERR_SUCCEED)); + Vdefault_unicode_precedence_array, NULL, + CONVERR_SUCCEED)); #else /* GTK 1.whatever doesn't. Use the X11 map. */ = gtk_keysym_to_character(gdk_keyval_from_name(symbol_name)); #endif diff -r f26c76a815e2 -r 9bdc40b8fb78 src/device-gtk.c --- a/src/device-gtk.c Sun Dec 17 11:05:35 2017 +0000 +++ b/src/device-gtk.c Sun Dec 17 12:20:06 2017 +0000 ＠＠ -259,9 +259,13 ＠＠ /* Always search for the best visual */ #if GTK_CHECK_VERSION(2, 8, 0) visual = gdk_screen_get_rgba_visual (gdk_screen_get_default ()); -#else - visual = gdk_visual_get_best(); - #endif +#endif + + if (NULL == visual) + { + visual = gdk_visual_get_best(); + } + DEVICE_GTK_VISUAL (d) = visual; #if GTK_CHECK_VERSION(2,22,1) ＠＠ -309,7 +313,9 ＠＠ available; this isn't the case under GTK, the set is examined once at startup. */ { - guint target_count = XFIXNUM (Fsafe_length (Vselection_converter_out_alist)); + Lisp_Object tcount + = Flist_length (Vselection_converter_out_alist); + guint target_count = NILP (tcount) ? 0 : XFIXNUM (tcount); GtkTargetEntry *targets = alloca_array (GtkTargetEntry, target_count); Lisp_Object tail = Vselection_converter_out_alist; DECLARE_EISTRING(ei_symname); diff -r f26c76a815e2 -r 9bdc40b8fb78 src/emacs.c --- a/src/emacs.c Sun Dec 17 11:05:35 2017 +0000 +++ b/src/emacs.c Sun Dec 17 12:20:06 2017 +0000 ＠＠ -2488,7 +2488,6 ＠＠ variables initialized above. */ #ifdef HAVE_GTK complex_vars_of_glyphs_gtk (); - complex_vars_of_event_gtk (); #endif #ifdef HAVE_X_WINDOWS complex_vars_of_glyphs_x (); diff -r f26c76a815e2 -r 9bdc40b8fb78 src/event-gtk.c --- a/src/event-gtk.c Sun Dec 17 11:05:35 2017 +0000 +++ b/src/event-gtk.c Sun Dec 17 12:20:06 2017 +0000 ＠＠ -39,6 +39,7 ＠＠ #include "process.h" #include "redisplay.h" #include "window.h" +#include "text.h" #include "console-tty.h" ＠＠ -206,6 +207,24 ＠＠ { FRAME_GTK_TOTALLY_VISIBLE_P (f) = 1; change_frame_visibility (f, 1); + + if (event->any.window == + gtk_widget_get_window (FRAME_GTK_SHELL_WIDGET (f))) + { + GtkAllocation galloc; + int rows, columns; + + gtk_widget_get_allocation (FRAME_GTK_SHELL_WIDGET (f), &galloc); + + FRAME_PIXWIDTH (f) = galloc.width; + FRAME_PIXHEIGHT (f) = galloc.height; + + pixel_to_frame_unit_size (f, galloc.width, galloc.height, &columns, + &rows); + /* #### We possibly don't have to do this if the character height + #### and width haven't changed. */ + change_frame_size (f, columns, rows, 1); + } } else { ＠＠ -504,7 +523,13 ＠＠ if (unicode != 0) { - return Funicode_to_char (make_fixnum ((EMACS_INT) unicode), Qnil); + Ichar ich = unicode_to_ichar (unicode, + Vdefault_unicode_precedence_array, + CONVERR_FAIL); + if (ich >= 0) + { + return make_char (ich); + } } /* All of the names in gdkkeysms-compat.h are ASCII-only, and if keysym ＠＠ -1515,6 +1540,7 ＠＠ gdk_window_get_pointer (ev->window, &x, &y, &mask); #endif #ifdef HAVE_GTK3 + assert (GDK_IS_WINDOW (ev->window)); gdk_window_get_device_position (ev->window, ev->device, &x, &y, &mask); #endif ＠＠ -1728,24 +1754,6 ＠＠ } void -vars_of_event_gtk (void) -{ - DEFVAR_BOOL ("gtk-allow-sendevents", &gtk_allow_sendevents /* -*Non-nil means to allow synthetic events. Nil means they are ignored. -Beware: allowing emacs to process SendEvents opens a big security hole. -*/ ); - gtk_allow_sendevents = 0; - - last_quit_check_signal_tick_count = 0; - - DEFVAR_LISP ("gdk-event-names", &Vgdk_event_names /* -An alist of Gdk event types to names. -Do NOT modify. -*/); - Vgdk_event_names = Qnil; -} - -void init_event_gtk_late (void) /* called when already initialized */ { timeout_id_tick = 1; ＠＠ -2076,28 +2084,42 ＠＠ #endif static void -register_event_name(const char *name, int value) +register_event_name (const char *name, int value) { - char *nm = xstrdup(name); - char *ptr = nm; - while (*ptr) { - if (*ptr == '_') - *ptr = '-'; - else - *ptr = tolower(*ptr); - ++ptr; + Ascbyte *nm = alloca_ascbytes (strlen (name) + 1), *beg = nm; + const Extbyte *ptr = name; + + while (*ptr) + { + if (*ptr == '_') + { + *nm = '-'; + } + else if (*ptr < 0x80) + { + *nm = tolower (*ptr); + } + else + { + assert (*ptr < 0x80); /* None of the event names below are non-ASCII, + and we're called sufficiently early that we + may not be able to handle non-ASCII. */ + *nm = *ptr; + } + + ++ptr, ++nm; } - Vgdk_event_names = Facons (build_extstring (nm, Qutf_8), - make_fixnum (value), + *nm = '\0'; + + Vgdk_event_names = Facons (build_ascstring (beg), make_fixnum (value), Vgdk_event_names); - xfree (nm); } -static void +static Lisp_Object register_event_names (void) { if (!NILP (Vgdk_event_names)) - return; + return Vgdk_event_names; #define FROB_EVENT_NAME(name) register_event_name(#name, name) FROB_EVENT_NAME(GDK_NOTHING); FROB_EVENT_NAME(GDK_DELETE); ＠＠ -2141,10 +2163,25 ＠＠ FROB_EVENT_NAME(GDK_DAMAGE); #undef FROB_EVENT_NAME Vgdk_event_names = Fnreverse (Vgdk_event_names); + + return Vgdk_event_names; } void -complex_vars_of_event_gtk() +vars_of_event_gtk (void) { - register_event_names(); + DEFVAR_BOOL ("gtk-allow-sendevents", &gtk_allow_sendevents /* +*Non-nil means to allow synthetic events. Nil means they are ignored. +Beware: allowing emacs to process SendEvents opens a big security hole. +*/ ); + gtk_allow_sendevents = 0; + + last_quit_check_signal_tick_count = 0; + + DEFVAR_LISP ("gdk-event-names", &Vgdk_event_names /* +An alist of Gdk event types to names. +Do NOT modify. +*/); + Vgdk_event_names = register_event_names (); } + diff -r f26c76a815e2 -r 9bdc40b8fb78 src/event-msw.c --- a/src/event-msw.c Sun Dec 17 11:05:35 2017 +0000 +++ b/src/event-msw.c Sun Dec 17 12:20:06 2017 +0000 ＠＠ -3408,8 +3408,8 ＠＠ FRAME_PIXWIDTH (frame) = rect.right; FRAME_PIXHEIGHT (frame) = rect.bottom; - pixel_to_frame_unit_size (frame, rect.right, rect.bottom, &columns, - &rows); + pixel_to_frame_unit_size (frame, rect.right, rect.bottom, + &columns, &rows); change_frame_size (frame, columns, rows, 1); /* If we are inside frame creation, we have to apply geometric diff -r f26c76a815e2 -r 9bdc40b8fb78 src/faces.c --- a/src/faces.c Sun Dec 17 11:05:35 2017 +0000 +++ b/src/faces.c Sun Dec 17 12:20:06 2017 +0000 ＠＠ -2399,7 +2399,7 ＠＠ "-*-*-medium-r-*-*-*-170-*-*-c-*-*-*", #endif }; -#endif /* defined (HAVE_XFT) || defined (MULE) */ +#endif /* defined (HAVE_XFT) || defined (HAVE_GTK) || defined (MULE) */ #ifdef MULE ＠＠ -2438,7 +2438,7 ＠＠ build_cistring (*fontptr)), inst_list); -#else /* !HAVE_XFT */ +#else /* !HAVE_XFT && !HAVE_GTK */ inst_list = Fcons (Fcons ＠＠ -2499,6 +2499,7 ＠＠ build_ascstring ("-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1")), inst_list); +#endif /* not HAVE_GTK */ #endif /* not UNICODE_INTERNAL */ #endif /* MULE */ diff -r f26c76a815e2 -r 9bdc40b8fb78 src/frame-gtk.c --- a/src/frame-gtk.c Sun Dec 17 11:05:35 2017 +0000 +++ b/src/frame-gtk.c Sun Dec 17 12:20:06 2017 +0000 ＠＠ -234,6 +234,8 ＠＠ return XFRAME (frame); } +static void gtk_recompute_cell_sizes (struct frame *, int *width_incr, + int *height_incr); /************************************************************************/ /* window-manager interactions */ ＠＠ -410,15 +412,8 ＠＠ if (GTK_IS_WINDOW (shell)) { - GdkWindowHints geometry_mask = GDK_HINT_RESIZE_INC; - /* Deal with the cell size */ - default_face_width_and_height (wrap_frame (f), &geometry.width_inc, &geometry.height_inc); - - gtk_window_set_geometry_hints (GTK_WINDOW (shell), - FRAME_GTK_TEXT_WIDGET (f), - &geometry, geometry_mask); - gtk_window_move (GTK_WINDOW (shell), x, y); - gtk_window_set_resizable (GTK_WINDOW (shell), TRUE); + int pixw, pixh; + gtk_recompute_cell_sizes (f, &pixw, &pixh); } FRAME_HEIGHT (f) = h; ＠＠ -1271,35 +1266,19 ＠＠ GdkGeometry geometry; GtkRequisition req; - if (GTK_IS_WINDOW (shell)) - { - GdkWindowHints geometry_mask = GDK_HINT_RESIZE_INC; + assert (GTK_IS_WINDOW (shell)); - /* Update the cell size */ - default_face_width_and_height (wrap_frame (f), &geometry.width_inc, - &geometry.height_inc); - - gtk_window_set_geometry_hints (GTK_WINDOW (shell), - FRAME_GTK_TEXT_WIDGET (f), &geometry, geometry_mask); - } + { + int pixw, pixh; - change_frame_size (f, cols, rows, 0); -#ifdef HAVE_GTK2 - gtk_widget_size_request (FRAME_GTK_SHELL_WIDGET (f), &req); -#endif -#ifdef HAVE_GTK3 - { - GtkRequisition min; - gtk_widget_get_preferred_size (FRAME_GTK_SHELL_WIDGET (f), &min, &req); - } -#endif - gtk_widget_set_size_request (FRAME_GTK_SHELL_WIDGET (f), req.width, req.height); - - if (GTK_IS_WINDOW (shell)) - { - gtk_window_set_default_size (GTK_WINDOW (shell), req.width, req.height); - /* gtk_window_set_default_geometry (GTK_WINDOW (shell), req.width, req.height); */ - } + change_frame_size (f, cols, rows, 0); + gtk_recompute_cell_sizes (f, &pixw, &pixh); + + gtk_window_set_default_size (GTK_WINDOW (shell), pixw, pixh); + FRAME_PIXWIDTH (f) = pixw; + FRAME_PIXHEIGHT (f) = pixh; /* These values will be corrected when + the window is mapped. */ + } } static void ＠＠ -1462,22 +1441,27 ＠＠ } static void -gtk_recompute_cell_sizes (struct frame *frm) +gtk_recompute_cell_sizes (struct frame *frm, int *width_incr, int *height_incr) { if (GTK_IS_WINDOW (FRAME_GTK_SHELL_WIDGET (frm))) { GtkWindow *w = GTK_WINDOW (FRAME_GTK_SHELL_WIDGET (frm)); GdkGeometry geometry; GdkWindowHints geometry_mask; - gint width_inc = 10; - gint height_inc = 10; + *width_incr = 10; + *height_incr = 10; + + default_face_width_and_height (wrap_frame (frm), width_incr, height_incr); - default_face_width_and_height (wrap_frame (frm), &width_inc, &height_inc); - geometry_mask = GDK_HINT_RESIZE_INC; - geometry.width_inc = width_inc; - geometry.height_inc = height_inc; + geometry_mask + = GDK_HINT_RESIZE_INC | GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE; + geometry.width_inc = geometry.base_width + = geometry.min_width = *width_incr; + geometry.height_inc = geometry.base_height + = geometry.min_height = *height_incr; - gtk_window_set_geometry_hints (w, FRAME_GTK_TEXT_WIDGET (frm), &geometry, geometry_mask); + gtk_window_set_geometry_hints (w, FRAME_GTK_TEXT_WIDGET (frm), + &geometry, geometry_mask); } } ＠＠ -1576,7 +1560,10 ＠＠ /* Set window manager resize increment hints according to the new character size */ if (EQ (name, Qfont) && FRAME_GTK_TOP_LEVEL_FRAME_P (frm)) - gtk_recompute_cell_sizes (frm); + { + int pixw, pixh; + gtk_recompute_cell_sizes (frm, &pixw, &pixh); + } } diff -r f26c76a815e2 -r 9bdc40b8fb78 src/frame.c --- a/src/frame.c Sun Dec 17 11:05:35 2017 +0000 +++ b/src/frame.c Sun Dec 17 12:20:06 2017 +0000 ＠＠ -3620,9 +3620,9 ＠＠ /* */ /**************************************************************************/ -/* Change the frame height and/or width. Values passed in are in - frame units (character cells on X/GTK, displayable-area pixels - on MS Windows or generally on pixelated-geometry window systems). */ +/* Change the frame height and/or width. Values passed in are in frame units + character cells on all systems, both TTYs and pixel-oriented window + systems. */ static void change_frame_size_1 (struct frame *f, int newwidth, int newheight) { ＠＠ -3757,9 +3757,8 ＠＠ which is the device method that is called (from internal_set_frame_size()) when `set-frame-size' or similar function is called. - Values passed in are in frame units (character cells on X/GTK, - displayable-area pixels on MS Windows or generally on pixelated-geometry - window systems). See discussion at top of file. + Values passed in are in character cells, both on TTYs and on pixel-oriented + window systems. See discussion at top of file. See also internal_set_frame_size() and adjust_frame_size(). */ diff -r f26c76a815e2 -r 9bdc40b8fb78 src/redisplay-gtk.c --- a/src/redisplay-gtk.c Sun Dec 17 11:05:35 2017 +0000 +++ b/src/redisplay-gtk.c Sun Dec 17 12:20:06 2017 +0000 ＠＠ -474,15 +474,12 ＠＠ GtkWidget *widget = FRAME_GTK_TEXT_WIDGET (f); GdkWindow *win = gtk_widget_get_window (widget); #if GTK_CHECK_VERSION(3, 22, 0) - cairo_region_t *region = gdk_window_get_visible_region (win); - /* We should be able to avoid the next call, but the GTK documentation - * doesn't explain how to get the drawing context. */ - GdkDrawingContext *ctx = gdk_window_begin_draw_frame (win, - region); - cairo_t *cr = gdk_drawing_context_get_cairo_context (ctx); -#else - cairo_t *cr = gdk_cairo_create (win); + /* Can't initialise REGION, CTX and CR until we have called + redisplay_clear_region(). */ + cairo_region_t *region; + GdkDrawingContext *ctx; #endif + cairo_t *cr; struct device *d = XDEVICE (f->device); Lisp_Object window; ＠＠ -505,6 +502,16 ＠＠ if (NILP (w->text_cursor_visible_p)) return; +#if GTK_CHECK_VERSION(3, 22, 0) + region = gdk_window_get_visible_region (win); + /* We should be able to avoid the next call, but the GTK documentation + doesn't explain how to get the drawing context. */ + ctx = gdk_window_begin_draw_frame (win, region); + cr = gdk_drawing_context_get_cairo_context (ctx); +#else + cr = gdk_cairo_create (win); +#endif + default_face_font_info (window, &defascent, 0, 0, &defheight, 0); /* make sure the cursor is entirely contained between y and y+height */ diff -r f26c76a815e2 -r 9bdc40b8fb78 src/redisplay-xlike-inc.c --- a/src/redisplay-xlike-inc.c Sun Dec 17 11:05:35 2017 +0000 +++ b/src/redisplay-xlike-inc.c Sun Dec 17 12:20:06 2017 +0000 ＠＠ -595,37 +595,6 ＠＠ } #endif - -/* - XLIKE_text_width - - Given a string and a merged face, return the string's length in pixels - when displayed in the fonts associated with the face. - */ - -static int -XLIKE_text_width (struct frame *f, struct face_cachel *cachel, - const Ibyte *str, Bytecount len) -{ - Extbyte *text_storage = NULL; - int width_so_far = 0, text_storage_len = 0; - struct textual_run *runs = alloca_array (struct textual_run, len); - XLIKE_DISPLAY dpy = GET_XLIKE_DISPLAY (XDEVICE (f->device)); - int nruns; - int i; - - ALLOCATE_RUNS_TEXT (text_storage, text_storage_len, str, len); - nruns = separate_textual_runs (WINDOW_XBUFFER (FRAME_SELECTED_XWINDOW (f)), - text_storage, runs, str, len, cachel); - - USED (text_storage_len); - - for (i = 0; i < nruns; i++) - width_so_far += XLIKE_text_width_single_run (dpy, cachel, runs + i); - - return width_so_far; -} - /***************************************************************************** XLIKE_divider_height diff -r f26c76a815e2 -r 9bdc40b8fb78 src/symsinit.h --- a/src/symsinit.h Sun Dec 17 11:05:35 2017 +0000 +++ b/src/symsinit.h Sun Dec 17 12:20:06 2017 +0000 ＠＠ -550,7 +550,6 ＠＠ void complex_vars_of_console (void); void reinit_complex_vars_of_console_runtime_only (void); void complex_vars_of_emacs (void); -void complex_vars_of_event_gtk (void); void complex_vars_of_faces (void); void complex_vars_of_file_coding (void); void complex_vars_of_font_mgr (void); -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

[COMMIT 21.4] Check for and disable ASLR, compiler compat fixes, 21.4 7 years

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net> # Date 1512912861 0 # Sun Dec 10 13:34:21 2017 +0000 # Node ID a78cba619f5628585d1a7ac19d0aaee698296c19 # Parent e2da872593c042c581759ca9c753f5b87a5be37d Check for and disable ASLR, compiler compat fixes, 21.4 ChangeLog addition: 2017-12-10 Aidan Kehoe <kehoea(a)parhasard.net> * configure.in: Detect and disable ASLR as necessary, code from 21.5. * configure: Rebuild. src/ChangeLog addition: 2017-12-10 Aidan Kehoe <kehoea(a)parhasard.net> * lisp.h (max_align_t): Only make this type available if not offered by the compiler. * config.h.in (INLINE_HEADER): Update this to support C99. diff -r e2da872593c0 -r a78cba619f56 ChangeLog --- a/ChangeLog Tue Mar 24 22:15:53 2015 -0400 +++ b/ChangeLog Sun Dec 10 13:34:21 2017 +0000 ＠＠ -1,3 +1,9 ＠＠ +2017-12-10 Aidan Kehoe <kehoea(a)parhasard.net> + + * configure.in: Detect and disable ASLR as necessary, code from + 21.5. + * configure: Rebuild. + 2015-03-24 Vin Shelton <acs(a)xemacs.org> * XEmacs 21.4.24 is released diff -r e2da872593c0 -r a78cba619f56 configure --- a/configure Tue Mar 24 22:15:53 2015 -0400 +++ b/configure Sun Dec 10 13:34:21 2017 +0000 ＠＠ -5088,9 +5088,69 ＠＠ fi fi +echo $ac_n "checking whether ASLR needs to be disabled]""... $ac_c" 1>&6 +echo "configure:5093: checking whether ASLR needs to be disabled]" >&5 +cat > conftest.$ac_ext <<EOF +#line 5095 "configure" +#include "confdefs.h" +#include <stdio.h> +static int test_func(void) { return 42; } +int main (int c, char **v) { if (--c) { printf ("%p", &test_func); } return 0; } +EOF +if { (eval echo configure:5101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +then + test_func_address=`./conftest t` +if test "$test_func_address" = `./conftest t` \ + -a "$test_func_address" = `./conftest t` \ + -a "$test_func_address" = `./conftest t` \ + -a "$test_func_address" = `./conftest t`; then + echo "$ac_t""no" 1>&6 + else + for try_no_pie in "-no-pie" "-Wl,-no_pie" "-nopie"; do + xe_check_libs="${try_no_pie}" + cat > conftest.$ac_ext <<EOF +#line 5113 "configure" +#include "confdefs.h" +#include <stdio.h> +static int test_func(void) { return 42; } +int main (int c, char **v) { if (--c) { printf ("%p", &test_func); } return 0; } +EOF +if { (eval echo configure:5119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +then + test_func_address=`./conftest t` + if test "$test_func_address" = `./conftest t` \ + -a "$test_func_address" = `./conftest t` \ + -a "$test_func_address" = `./conftest t` \ + -a "$test_func_address" = `./conftest t`; then + no_pie="${try_no_pie}" + fi +else + conftest_rc="$?" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -fr conftest* + xe_check_libs="" + if test -n "$no_pie"; then + start_flags="$start_flags $no_pie" && if test "$extra_verbose" = "yes"; then echo " Appending \"$no_pie\" to \$start_flags"; fi + break; + fi + done + if test -z "$no_pie"; then + { echo "configure: error: don't know how to disable ASLR on $ac_cv_build" 1>&2; exit 1; } + fi + echo "$ac_t""yes" 1>&6 + fi +else + conftest_rc="$?" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -fr conftest* + echo "checking "for specified window system"" 1>&6 -echo "configure:5094: checking "for specified window system"" >&5 +echo "configure:5154: checking "for specified window system"" >&5 GNOME_CONFIG=no ＠＠ -5098,7 +5158,7 ＠＠ if test "$with_gnome" != "no"; then echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6 -echo "configure:5102: checking for GNOME configuration script" >&5 +echo "configure:5162: checking for GNOME configuration script" >&5 for possible in gnome-config do possible_version=`${possible} --version 2> /dev/null` ＠＠ -5129,7 +5189,7 ＠＠ if test "$with_gtk" != "no";then echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6 -echo "configure:5133: checking for GTK configuration script" >&5 +echo "configure:5193: checking for GTK configuration script" >&5 for possible in gtk12-config gtk14-config gtk-config do possible_version=`${possible} --version 2> /dev/null` ＠＠ -5151,18 +5211,18 ＠＠ if test "${GTK_CONFIG}" != "no"; then echo $ac_n "checking gtk version""... $ac_c" 1>&6 -echo "configure:5155: checking gtk version" >&5 +echo "configure:5215: checking gtk version" >&5 GTK_VERSION=`${GTK_CONFIG} --version` echo "$ac_t""${GTK_VERSION}" 1>&6 echo $ac_n "checking gtk libs""... $ac_c" 1>&6 -echo "configure:5160: checking gtk libs" >&5 +echo "configure:5220: checking gtk libs" >&5 GTK_LIBS=`${GTK_CONFIG} --libs` libs_gtk="$libs_gtk ${GTK_LIBS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi echo "$ac_t""${GTK_LIBS}" 1>&6 echo $ac_n "checking gtk cflags""... $ac_c" 1>&6 -echo "configure:5166: checking gtk cflags" >&5 +echo "configure:5226: checking gtk cflags" >&5 GTK_CFLAGS=`${GTK_CONFIG} --cflags` if test "$GCC" = "yes"; then GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow" ＠＠ -5172,19 +5232,19 ＠＠ echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6 -echo "configure:5176: checking for main in -lgdk_imlib" >&5 +echo "configure:5236: checking for main in -lgdk_imlib" >&5 ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdk_imlib " cat > conftest.$ac_ext <<EOF -#line 5181 "configure" +#line 5241 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5206,12 +5266,12 ＠＠ echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6 -echo "configure:5210: checking for Imlib_init in -lImlib" >&5 +echo "configure:5270: checking for Imlib_init in -lImlib" >&5 ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'` xe_check_libs=" -lImlib " cat > conftest.$ac_ext <<EOF -#line 5215 "configure" +#line 5275 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -5222,7 +5282,7 ＠＠ Imlib_init() ; return 0; } EOF -if { (eval echo configure:5226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5245,10 +5305,10 ＠＠ for ac_func in gdk_imlib_init do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5249: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5252 "configure" +echo "configure:5309: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5312 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -5271,7 +5331,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:5275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -5350,15 +5410,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5354: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5357 "configure" +echo "configure:5414: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5417 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -5389,19 +5449,19 ＠＠ echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6 -echo "configure:5393: checking for main in -lxml" >&5 +echo "configure:5453: checking for main in -lxml" >&5 ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lxml " cat > conftest.$ac_ext <<EOF -#line 5398 "configure" +#line 5458 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5423,19 +5483,19 ＠＠ echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6 -echo "configure:5427: checking for main in -lglade" >&5 +echo "configure:5487: checking for main in -lglade" >&5 ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lglade " cat > conftest.$ac_ext <<EOF -#line 5432 "configure" +#line 5492 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5457,19 +5517,19 ＠＠ echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6 -echo "configure:5461: checking for main in -lglade-gnome" >&5 +echo "configure:5521: checking for main in -lglade-gnome" >&5 ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lglade-gnome " cat > conftest.$ac_ext <<EOF -#line 5466 "configure" +#line 5526 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5490,7 +5550,7 ＠＠ cat > conftest.$ac_ext <<EOF -#line 5494 "configure" +#line 5554 "configure" #include "confdefs.h" #include <glade/glade-xml.h> EOF ＠＠ -5549,7 +5609,7 ＠＠ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5553: checking for X" >&5 +echo "configure:5613: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then ＠＠ -5609,12 +5669,12 ＠＠ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 5613 "configure" +#line 5673 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -5683,14 +5743,14 ＠＠ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 5687 "configure" +#line 5747 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:5694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. ＠＠ -5799,17 +5859,17 ＠＠ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:5803: checking whether -R must be followed by a space" >&5 +echo "configure:5863: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 5806 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:5813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +#line 5866 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:5873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else ＠＠ -5825,14 +5885,14 ＠＠ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 5829 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:5836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +#line 5889 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:5896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else ＠＠ -5868,12 +5928,12 ＠＠ else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:5872: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:5932: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet " cat > conftest.$ac_ext <<EOF -#line 5877 "configure" +#line 5937 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -5884,7 +5944,7 ＠＠ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:5888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5908,12 +5968,12 ＠＠ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:5912: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:5972: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet_stub " cat > conftest.$ac_ext <<EOF -#line 5917 "configure" +#line 5977 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -5924,7 +5984,7 ＠＠ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:5928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5953,10 +6013,10 ＠＠ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey(a)clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5957: checking for gethostbyname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5960 "configure" +echo "configure:6017: checking for gethostbyname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6020 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ ＠＠ -5979,7 +6039,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:5983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else ＠＠ -6000,12 +6060,12 ＠＠ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:6004: checking for gethostbyname in -lnsl" >&5 +echo "configure:6064: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` xe_check_libs=" -lnsl " cat > conftest.$ac_ext <<EOF -#line 6009 "configure" +#line 6069 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6016,7 +6076,7 ＠＠ gethostbyname() ; return 0; } EOF -if { (eval echo configure:6020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6046,10 +6106,10 ＠＠ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:6050: checking for connect" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6053 "configure" +echo "configure:6110: checking for connect" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6113 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ ＠＠ -6072,7 +6132,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else ＠＠ -6095,12 +6155,12 ＠＠ xe_msg_checking="for connect in -lsocket" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6099: checking "$xe_msg_checking"" >&5 +echo "configure:6159: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocket $X_EXTRA_LIBS" cat > conftest.$ac_ext <<EOF -#line 6104 "configure" +#line 6164 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6111,7 +6171,7 ＠＠ connect() ; return 0; } EOF -if { (eval echo configure:6115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6135,10 +6195,10 ＠＠ # gomez(a)mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:6139: checking for remove" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6142 "configure" +echo "configure:6199: checking for remove" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6202 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ ＠＠ -6161,7 +6221,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else ＠＠ -6182,12 +6242,12 ＠＠ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:6186: checking for remove in -lposix" >&5 +echo "configure:6246: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` xe_check_libs=" -lposix " cat > conftest.$ac_ext <<EOF -#line 6191 "configure" +#line 6251 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6198,7 +6258,7 ＠＠ remove() ; return 0; } EOF -if { (eval echo configure:6202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6222,10 +6282,10 ＠＠ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:6226: checking for shmat" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6229 "configure" +echo "configure:6286: checking for shmat" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6289 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ ＠＠ -6248,7 +6308,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else ＠＠ -6269,12 +6329,12 ＠＠ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:6273: checking for shmat in -lipc" >&5 +echo "configure:6333: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` xe_check_libs=" -lipc " cat > conftest.$ac_ext <<EOF -#line 6278 "configure" +#line 6338 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6285,7 +6345,7 ＠＠ shmat() ; return 0; } EOF -if { (eval echo configure:6289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6321,12 +6381,12 ＠＠ xe_msg_checking="for IceConnectionNumber in -lICE" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6325: checking "$xe_msg_checking"" >&5 +echo "configure:6385: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` xe_check_libs=" -lICE $X_EXTRA_LIBS" cat > conftest.$ac_ext <<EOF -#line 6330 "configure" +#line 6390 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6337,7 +6397,7 ＠＠ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:6341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6383,15 +6443,15 ＠＠ ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:6387: checking for Xm/Xm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6390 "configure" +echo "configure:6447: checking for Xm/Xm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6450 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -6408,12 +6468,12 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:6412: checking for XmStringFree in -lXm" >&5 +echo "configure:6472: checking for XmStringFree in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 6417 "configure" +#line 6477 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6424,7 +6484,7 ＠＠ XmStringFree() ; return 0; } EOF -if { (eval echo configure:6428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6576,7 +6636,7 ＠＠ echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:6580: checking for X defines extracted by xmkmf" >&5 +echo "configure:6640: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir ＠＠ -6625,15 +6685,15 ＠＠ ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:6629: checking for X11/Intrinsic.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6632 "configure" +echo "configure:6689: checking for X11/Intrinsic.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6692 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -6657,12 +6717,12 ＠＠ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:6661: checking for XOpenDisplay in -lX11" >&5 +echo "configure:6721: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 6666 "configure" +#line 6726 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6673,7 +6733,7 ＠＠ XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:6677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6698,12 +6758,12 ＠＠ xe_msg_checking="for XGetFontProperty in -lX11" test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6702: checking "$xe_msg_checking"" >&5 +echo "configure:6762: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 -b i486-linuxaout" cat > conftest.$ac_ext <<EOF -#line 6707 "configure" +#line 6767 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6714,7 +6774,7 ＠＠ XGetFontProperty() ; return 0; } EOF -if { (eval echo configure:6718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6741,12 +6801,12 ＠＠ echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:6745: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:6805: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` xe_check_libs=" -lXext " cat > conftest.$ac_ext <<EOF -#line 6750 "configure" +#line 6810 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6757,7 +6817,7 ＠＠ XShapeSelectInput() ; return 0; } EOF -if { (eval echo configure:6761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6780,12 +6840,12 ＠＠ echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:6784: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:6844: checking for XtOpenDisplay in -lXt" >&5 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lXt " cat > conftest.$ac_ext <<EOF -#line 6789 "configure" +#line 6849 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6796,7 +6856,7 ＠＠ XtOpenDisplay() ; return 0; } EOF -if { (eval echo configure:6800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6819,14 +6879,14 ＠＠ echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:6823: checking the version of X11 being used" >&5 +echo "configure:6883: checking the version of X11 being used" >&5 cat > conftest.$ac_ext <<EOF -#line 6825 "configure" +#line 6885 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:6830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:6890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest foobar; x11_release=$? else ＠＠ -6857,10 +6917,10 ＠＠ for ac_func in XConvertCase XtRegisterDrawable do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6861: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6864 "configure" +echo "configure:6921: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6924 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -6883,7 +6943,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -6915,15 +6975,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6919: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6922 "configure" +echo "configure:6979: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6982 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -6956,10 +7016,10 ＠＠ for ac_func in XRegisterIMInstantiateCallback do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6960: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6963 "configure" +echo "configure:7020: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7023 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -6982,7 +7042,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -7010,9 +7070,9 ＠＠ done echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6 -echo "configure:7014: checking for standard XRegisterIMInstantiateCallback prototype" >&5 +echo "configure:7074: checking for standard XRegisterIMInstantiateCallback prototype" >&5 cat > conftest.$ac_ext <<EOF -#line 7016 "configure" +#line 7076 "configure" #include "confdefs.h" #define NeedFunctionPrototypes 1 ＠＠ -7024,7 +7084,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:7028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else ＠＠ -7045,12 +7105,12 ＠＠ test -z "$with_xmu" && { echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6 -echo "configure:7049: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 +echo "configure:7109: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'` xe_check_libs=" -lXmu " cat > conftest.$ac_ext <<EOF -#line 7054 "configure" +#line 7114 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7061,7 +7121,7 ＠＠ XmuReadBitmapDataFromFile() ; return 0; } EOF -if { (eval echo configure:7065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7100,19 +7160,19 ＠＠ echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:7104: checking for main in -lXbsd" >&5 +echo "configure:7164: checking for main in -lXbsd" >&5 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lXbsd " cat > conftest.$ac_ext <<EOF -#line 7109 "configure" +#line 7169 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7136,7 +7196,7 ＠＠ if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then if test "$GCC" = "yes"; then echo $ac_n "checking for name of AIX gcc threads option""... $ac_c" 1>&6 -echo "configure:7140: checking for name of AIX gcc threads option" >&5 +echo "configure:7200: checking for name of AIX gcc threads option" >&5 case `$CC -v --help 2>&1` in *-mthreads*) aix_threads=-mthreads ;; *) aix_threads=-pthread ;; ＠＠ -7150,10 +7210,10 ＠＠ xe_save_CC="$CC" CC="${CC}_r" echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:7154: checking size of short" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7157 "configure" +echo "configure:7214: checking size of short" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7217 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/types.h> ＠＠ -7165,7 +7225,7 ＠＠ exit(0); } EOF -if { (eval echo configure:7169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else ＠＠ -7194,22 +7254,22 ＠＠ fi if test "$with_msw" != "no"; then echo "checking for MS-Windows" 1>&6 -echo "configure:7198: checking for MS-Windows" >&5 +echo "configure:7258: checking for MS-Windows" >&5 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:7201: checking for main in -lgdi32" >&5 +echo "configure:7261: checking for main in -lgdi32" >&5 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdi32 " cat > conftest.$ac_ext <<EOF -#line 7206 "configure" +#line 7266 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7282,12 +7342,12 ＠＠ fi fi cat > conftest.$ac_ext <<EOF -#line 7286 "configure" +#line 7346 "configure" #include "confdefs.h" #include <fcntl.h> int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; } EOF -if { (eval echo configure:7291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then need_event_unixoid=yes; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MSG_SELECT ＠＠ -7351,15 +7411,15 ＠＠ if test "$with_x11" = "yes"; then ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6 -echo "configure:7355: checking for X11/extensions/shape.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7358 "configure" +echo "configure:7415: checking for X11/extensions/shape.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7418 "configure" #include "confdefs.h" #include <X11/extensions/shape.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7411,7 +7471,7 ＠＠ esac echo "checking for WM_COMMAND option" 1>&6 -echo "configure:7415: checking for WM_COMMAND option" >&5; +echo "configure:7475: checking for WM_COMMAND option" >&5; if test "$with_wmcommand" != "no"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_WMCOMMAND ＠＠ -7426,15 +7486,15 ＠＠ test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6 -echo "configure:7430: checking for X11/Xauth.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7433 "configure" +echo "configure:7490: checking for X11/Xauth.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7493 "configure" #include "confdefs.h" #include <X11/Xauth.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7457,12 +7517,12 ＠＠ } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:7461: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:7521: checking for XauGetAuthByAddr in -lXau" >&5 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'` xe_check_libs=" -lXau " cat > conftest.$ac_ext <<EOF -#line 7466 "configure" +#line 7526 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7473,7 +7533,7 ＠＠ XauGetAuthByAddr() ; return 0; } EOF -if { (eval echo configure:7477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7518,15 +7578,15 ＠＠ for dir in "" "Tt/" "desktop/" ; do ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6 -echo "configure:7522: checking for ${dir}tt_c.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7525 "configure" +echo "configure:7582: checking for ${dir}tt_c.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7585 "configure" #include "confdefs.h" #include <${dir}tt_c.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7562,12 +7622,12 ＠＠ xe_msg_checking="for tt_message_create in -ltt" test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7566: checking "$xe_msg_checking"" >&5 +echo "configure:7626: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'` xe_check_libs=" -ltt $extra_libs" cat > conftest.$ac_ext <<EOF -#line 7571 "configure" +#line 7631 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7578,7 +7638,7 ＠＠ tt_message_create() ; return 0; } EOF -if { (eval echo configure:7582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7635,15 +7695,15 ＠＠ test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6 -echo "configure:7639: checking for Dt/Dt.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7642 "configure" +echo "configure:7699: checking for Dt/Dt.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7702 "configure" #include "confdefs.h" #include <Dt/Dt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7666,12 +7726,12 ＠＠ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:7670: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:7730: checking for DtDndDragStart in -lDtSvc" >&5 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lDtSvc " cat > conftest.$ac_ext <<EOF -#line 7675 "configure" +#line 7735 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7682,7 +7742,7 ＠＠ DtDndDragStart() ; return 0; } EOF -if { (eval echo configure:7686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7755,7 +7815,7 ＠＠ if test "$with_dragndrop" != "no" ; then echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6 -echo "configure:7759: checking if drag and drop API is needed" >&5 +echo "configure:7819: checking if drag and drop API is needed" >&5 if test -n "$dragndrop_proto" ; then with_dragndrop=yes echo "$ac_t""yes (${dragndrop_proto} )" 1>&6 ＠＠ -7775,18 +7835,18 ＠＠ fi echo "checking for LDAP" 1>&6 -echo "configure:7779: checking for LDAP" >&5 +echo "configure:7839: checking for LDAP" >&5 test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ldap.h""... $ac_c" 1>&6 -echo "configure:7782: checking for ldap.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7785 "configure" +echo "configure:7842: checking for ldap.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7845 "configure" #include "confdefs.h" #include <ldap.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7809,15 +7869,15 ＠＠ } test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for lber.h""... $ac_c" 1>&6 -echo "configure:7813: checking for lber.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7816 "configure" +echo "configure:7873: checking for lber.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7876 "configure" #include "confdefs.h" #include <lber.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7842,10 +7902,10 ＠＠ if test . != "${ldap_libs+.}";then ldap_libs= echo $ac_n "checking for ldap_open""... $ac_c" 1>&6 -echo "configure:7846: checking for ldap_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7849 "configure" +echo "configure:7906: checking for ldap_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7909 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char ldap_open(); below. */ ＠＠ -7868,7 +7928,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:7872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_ldap_open=yes" else ＠＠ -7888,12 +7948,12 ＠＠ echo "$ac_t""no" 1>&6 echo $ac_n "checking for ldap_open in -lldap""... $ac_c" 1>&6 -echo "configure:7892: checking for ldap_open in -lldap" >&5 +echo "configure:7952: checking for ldap_open in -lldap" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap " cat > conftest.$ac_ext <<EOF -#line 7897 "configure" +#line 7957 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7904,7 +7964,7 ＠＠ ldap_open() ; return 0; } EOF -if { (eval echo configure:7908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7926,12 +7986,12 ＠＠ xe_msg_checking="for ldap_open in -lldap" test -n "$ldap_other_libs" && xe_msg_checking="$xe_msg_checking using extra libs $ldap_other_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7930: checking "$xe_msg_checking"" >&5 +echo "configure:7990: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap $ldap_other_libs" cat > conftest.$ac_ext <<EOF -#line 7935 "configure" +#line 7995 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7942,7 +8002,7 ＠＠ ldap_open() ; return 0; } EOF -if { (eval echo configure:7946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7964,12 +8024,12 ＠＠ xe_msg_checking="for ldap_open in -lldap" test -n "$ldap_other_libs" && xe_msg_checking="$xe_msg_checking using extra libs $ldap_other_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7968: checking "$xe_msg_checking"" >&5 +echo "configure:8028: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap $ldap_other_libs" cat > conftest.$ac_ext <<EOF -#line 7973 "configure" +#line 8033 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7980,7 +8040,7 ＠＠ ldap_open() ; return 0; } EOF -if { (eval echo configure:7984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -8002,12 +8062,12 ＠＠ xe_msg_checking="for ldap_open in -lldap" test -n "$ldap_other_libs" && xe_msg_checking="$xe_msg_checking using extra libs $ldap_other_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:8006: checking "$xe_msg_checking"" >&5 +echo "configure:8066: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap $ldap_other_libs" cat > conftest.$ac_ext <<EOF -#line 8011 "configure" +#line 8071 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -8018,7 +8078,7 ＠＠ ldap_open() ; return 0; } EOF -if { (eval echo configure:8022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -8050,10 +8110,10 ＠＠ if test yes = "$with_ldap" -a yes != "$ldap_needs_lber";then echo $ac_n "checking for LDAP_OPT_ON definition""... $ac_c" 1>&6 -echo "configure:8054: checking for LDAP_OPT_ON definition" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8057 "configure" +echo "configure:8114: checking for LDAP_OPT_ON definition" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8117 "configure" #include "confdefs.h" #include <lber.h> #include <ldap.h> ＠＠ -8067,7 +8127,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:8071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* xe_cv_have_LDAP_OPT_ON=yes else ＠＠ -8081,12 +8141,12 ＠＠ echo "$ac_t""$xe_cv_have_LDAP_OPT_ON" 1>&6 if test yes = "$xe_cv_have_LDAP_OPT_ON";then echo $ac_n "checking LDAP_OPT_ON linking""... $ac_c" 1>&6 -echo "configure:8085: checking LDAP_OPT_ON linking" >&5 +echo "configure:8145: checking LDAP_OPT_ON linking" >&5 xe_save_LIBS="$LIBS" LIBS="-lldap $LIBS" cat > conftest.$ac_ext <<EOF -#line 8090 "configure" +#line 8150 "configure" #include "confdefs.h" #include <lber.h> #include <ldap.h> ＠＠ -8095,7 +8155,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:8099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xe_cv_LDAP_OPT_ON_links=yes else ＠＠ -8111,12 +8171,12 ＠＠ if test yes != "$xe_cv_LDAP_OPT_ON_links";then ldap_needs_lber=yes ldap_other_libs=-llber echo $ac_n "checking LDAP_OPT_ON linking with -llber""... $ac_c" 1>&6 -echo "configure:8115: checking LDAP_OPT_ON linking with -llber" >&5 +echo "configure:8175: checking LDAP_OPT_ON linking with -llber" >&5 xe_save_LIBS="$LIBS" LIBS="-lldap $ldap_other_libs $LIBS" cat > conftest.$ac_ext <<EOF -#line 8120 "configure" +#line 8180 "configure" #include "confdefs.h" #include <lber.h> #include <ldap.h> ＠＠ -8125,7 +8185,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:8129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xe_cv_LDAP_OPT_ON_links_w_lber=yes else ＠＠ -8161,10 +8221,10 ＠＠ else save_LIBS="$LIBS" LIBS="$ldap_libs $LIBS" echo $ac_n "checking for ldap_open""... $ac_c" 1>&6 -echo "configure:8165: checking for ldap_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8168 "configure" +echo "configure:8225: checking for ldap_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8228 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char ldap_open(); below. */ ＠＠ -8187,7 +8247,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:8191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_ldap_open=yes" else ＠＠ -8227,10 +8287,10 ＠＠ for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8231: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8234 "configure" +echo "configure:8291: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8294 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -8253,7 +8313,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:8257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -8284,20 +8344,20 ＠＠ if test "$with_postgresql" != "no"; then echo "checking for PostgreSQL" 1>&6 -echo "configure:8288: checking for PostgreSQL" >&5 +echo "configure:8348: checking for PostgreSQL" >&5 for header_dir in "" "pgsql/" "postgresql/"; do ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6 -echo "configure:8293: checking for ${header_dir}libpq-fe.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8296 "configure" +echo "configure:8353: checking for ${header_dir}libpq-fe.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8356 "configure" #include "confdefs.h" #include <${header_dir}libpq-fe.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -8321,12 +8381,12 ＠＠ test -n "$libpq_fe_h_file" && { echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6 -echo "configure:8325: checking for PQconnectdb in -lpq" >&5 +echo "configure:8385: checking for PQconnectdb in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <<EOF -#line 8330 "configure" +#line 8390 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -8337,7 +8397,7 ＠＠ PQconnectdb() ; return 0; } EOF -if { (eval echo configure:8341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -8370,12 +8430,12 ＠＠ echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6 -echo "configure:8374: checking for PQconnectStart in -lpq" >&5 +echo "configure:8434: checking for PQconnectStart in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <<EOF -#line 8379 "configure" +#line 8439 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -8386,7 +8446,7 ＠＠ PQconnectStart() ; return 0; } EOF -if { (eval echo configure:8390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -8434,7 +8494,7 ＠＠ if test "$window_system" != "none"; then echo "checking for graphics libraries" 1>&6 -echo "configure:8438: checking for graphics libraries" >&5 +echo "configure:8498: checking for graphics libraries" >&5 libpath_xpm= incpath_xpm= ＠＠ -8461,10 +8521,10 ＠＠ CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6 -echo "configure:8465: checking for Xpm - no older than 3.4f" >&5 +echo "configure:8525: checking for Xpm - no older than 3.4f" >&5 xe_check_libs="$libname_xpm" cat > conftest.$ac_ext <<EOF -#line 8468 "configure" +#line 8528 "configure" #include "confdefs.h" #define XPM_NUMBERS #include <X11/xpm.h> ＠＠ -8473,7 +8533,7 ＠＠ XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:8477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:8537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; xpm_status=$?; if test "$xpm_status" = "0"; then ＠＠ -8517,17 +8577,17 ＠＠ libs_x=""$libname_xpm" $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libname_xpm"\" to \$libs_x"; fi CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6 -echo "configure:8521: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:8581: checking for \"FOR_MSW\" xpm" >&5 xe_check_libs="$libname_xpm" cat > conftest.$ac_ext <<EOF -#line 8524 "configure" +#line 8584 "configure" #include "confdefs.h" int main() { XpmCreatePixmapFromData() ; return 0; } EOF -if { (eval echo configure:8531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xpm_for_msw=no else ＠＠ -8553,15 +8613,15 ＠＠ test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:8557: checking for compface.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8560 "configure" +echo "configure:8617: checking for compface.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8620 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -8584,12 +8644,12 ＠＠ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:8588: checking for UnGenFace in -lcompface" >&5 +echo "configure:8648: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <<EOF -#line 8593 "configure" +#line 8653 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -8600,7 +8660,7 ＠＠ UnGenFace() ; return 0; } EOF -if { (eval echo configure:8604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -8652,12 +8712,12 ＠＠ if test "$with_png $with_tiff" != "no no"; then echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6 -echo "configure:8656: checking for inflate in -lc" >&5 +echo "configure:8716: checking for inflate in -lc" >&5 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <<EOF -#line 8661 "configure" +#line 8721 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -8668,7 +8728,7 ＠＠ inflate() ; return 0; } EOF -if { (eval echo configure:8672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -8687,12 +8747,12 ＠＠ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:8691: checking for inflate in -lz" >&5 +echo "configure:8751: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lz " cat > conftest.$ac_ext <<EOF -#line 8696 "configure" +#line 8756 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -8703,7 +8763,7 ＠＠ inflate() ; return 0; } EOF -if { (eval echo configure:8707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -8722,12 +8782,12 ＠＠ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:8726: checking for inflate in -lgz" >&5 +echo "configure:8786: checking for inflate in -lgz" >&5 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lgz " cat > conftest.$ac_ext <<EOF -#line 8731 "configure" +#line 8791 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -8738,7 +8798,7 ＠＠ inflate() ; return 0; } EOF -if { (eval echo configure:8742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -8768,15 +8828,15 ＠＠ test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:8772: checking for jpeglib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8775 "configure" +echo "configure:8832: checking for jpeglib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8835 "configure" #include "confdefs.h" #include <jpeglib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -8799,12 +8859,12 ＠＠ } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:8803: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:8863: checking for jpeg_destroy_decompress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'` xe_check_libs=" -ljpeg " cat > conftest.$ac_ext <<EOF -#line 8808 "configure" +#line 8868 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -8815,7 +8875,7 ＠＠ jpeg_destroy_decompress() ; return 0; } EOF -if { (eval echo configure:8819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -8851,10 +8911,10 ＠＠ png_problem="" test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:8855: checking for pow" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8858 "configure" +echo "configure:8915: checking for pow" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8918 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pow(); below. */ ＠＠ -8877,7 +8937,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:8881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pow=yes" else ＠＠ -8898,15 +8958,15 ＠＠ } test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:8902: checking for png.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8905 "configure" +echo "configure:8962: checking for png.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8965 "configure" #include "confdefs.h" #include <png.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -8929,12 +8989,12 ＠＠ } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:8933: checking for png_read_image in -lpng" >&5 +echo "configure:8993: checking for png_read_image in -lpng" >&5 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'` xe_check_libs=" -lpng " cat > conftest.$ac_ext <<EOF -#line 8938 "configure" +#line 8998 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -8945,7 +9005,7 ＠＠ png_read_image() ; return 0; } EOF -if { (eval echo configure:8949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -8968,10 +9028,10 ＠＠ } if test -z "$with_png"; then echo $ac_n "checking for workable png version information""... $ac_c" 1>&6 -echo "configure:8972: checking for workable png version information" >&5 +echo "configure:9032: checking for workable png version information" >&5 xe_check_libs="-lpng -lz" cat > conftest.$ac_ext <<EOF -#line 8975 "configure" +#line 9035 "configure" #include "confdefs.h" #include <png.h> int main(int c, char **v) { ＠＠ -8979,7 +9039,7 ＠＠ if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1; return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;} EOF -if { (eval echo configure:8983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; png_status=$?; if test "$png_status" = "0"; then ＠＠ -9022,15 +9082,15 ＠＠ test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:9026: checking for tiffio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9029 "configure" +echo "configure:9086: checking for tiffio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9089 "configure" #include "confdefs.h" #include <tiffio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9053,12 +9113,12 ＠＠ } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:9057: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:9117: checking for TIFFClientOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'` xe_check_libs=" -ltiff " cat > conftest.$ac_ext <<EOF -#line 9062 "configure" +#line 9122 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9069,7 +9129,7 ＠＠ TIFFClientOpen() ; return 0; } EOF -if { (eval echo configure:9073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9108,15 +9168,15 ＠＠ if test "$with_gtk" = "yes"; then test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:9112: checking for compface.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9115 "configure" +echo "configure:9172: checking for compface.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9175 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9120: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9139,12 +9199,12 ＠＠ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:9143: checking for UnGenFace in -lcompface" >&5 +echo "configure:9203: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <<EOF -#line 9148 "configure" +#line 9208 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9155,7 +9215,7 ＠＠ UnGenFace() ; return 0; } EOF -if { (eval echo configure:9159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9194,12 +9254,12 ＠＠ if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:9198: checking for X11 graphics libraries" >&5 +echo "configure:9258: checking for X11 graphics libraries" >&5 fi if test "$with_x11" = "yes"; then echo "checking for the Athena widgets" 1>&6 -echo "configure:9203: checking for the Athena widgets" >&5 +echo "configure:9263: checking for the Athena widgets" >&5 case "$with_athena" in "xaw" | "") athena_variant=Xaw athena_3d=no ;; ＠＠ -9215,12 +9275,12 ＠＠ if test "$athena_3d" = "no"; then echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:9219: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 +echo "configure:9279: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 9224 "configure" +#line 9284 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9231,7 +9291,7 ＠＠ XawScrollbarSetThumb() ; return 0; } EOF -if { (eval echo configure:9235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9247,12 +9307,12 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:9251: checking for $athena_3d_function in -l$athena_variant" >&5 +echo "configure:9311: checking for $athena_3d_function in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'$athena_3d_function | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 9256 "configure" +#line 9316 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9263,7 +9323,7 ＠＠ $athena_3d_function() ; return 0; } EOF -if { (eval echo configure:9267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9294,12 +9354,12 ＠＠ else echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:9298: checking for $athena_3d_function in -l$athena_variant" >&5 +echo "configure:9358: checking for $athena_3d_function in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'$athena_3d_function | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 9303 "configure" +#line 9363 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9310,7 +9370,7 ＠＠ $athena_3d_function() ; return 0; } EOF -if { (eval echo configure:9314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9328,12 +9388,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for $athena_3d_function in -lXaw""... $ac_c" 1>&6 -echo "configure:9332: checking for $athena_3d_function in -lXaw" >&5 +echo "configure:9392: checking for $athena_3d_function in -lXaw" >&5 ac_lib_var=`echo Xaw'_'$athena_3d_function | sed 'y%./+-%__p_%'` xe_check_libs=" -lXaw " cat > conftest.$ac_ext <<EOF -#line 9337 "configure" +#line 9397 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9344,7 +9404,7 ＠＠ $athena_3d_function() ; return 0; } EOF -if { (eval echo configure:9348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9375,15 +9435,15 ＠＠ if test "$athena_3d" = "no"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9379: checking for X11/Xaw/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9382 "configure" +echo "configure:9439: checking for X11/Xaw/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9442 "configure" #include "confdefs.h" #include <X11/Xaw/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9403,15 +9463,15 ＠＠ echo "$ac_t""no" 1>&6 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6 -echo "configure:9407: checking for X11/Xaw/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9410 "configure" +echo "configure:9467: checking for X11/Xaw/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9470 "configure" #include "confdefs.h" #include <X11/Xaw/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9437,15 +9497,15 ＠＠ else ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:9441: checking for X11/$athena_variant/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9444 "configure" +echo "configure:9501: checking for X11/$athena_variant/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9504 "configure" #include "confdefs.h" #include <X11/$athena_variant/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9462,15 +9522,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9466: checking for X11/$athena_variant/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9469 "configure" +echo "configure:9526: checking for X11/$athena_variant/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9529 "configure" #include "confdefs.h" #include <X11/$athena_variant/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9498,15 +9558,15 ＠＠ if test -z "$athena_h_path"; then ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:9502: checking for $athena_variant/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9505 "configure" +echo "configure:9562: checking for $athena_variant/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9565 "configure" #include "confdefs.h" #include <$athena_variant/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9523,15 +9583,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9527: checking for $athena_variant/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9530 "configure" +echo "configure:9587: checking for $athena_variant/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9590 "configure" #include "confdefs.h" #include <$athena_variant/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9560,15 +9620,15 ＠＠ if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:9564: checking for X11/Xaw3d/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9567 "configure" +echo "configure:9624: checking for X11/Xaw3d/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9627 "configure" #include "confdefs.h" #include <X11/Xaw3d/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9585,15 +9645,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9589: checking for X11/Xaw3d/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9592 "configure" +echo "configure:9649: checking for X11/Xaw3d/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9652 "configure" #include "confdefs.h" #include <X11/Xaw3d/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9625,15 +9685,15 ＠＠ if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:9629: checking for Xaw3d/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9632 "configure" +echo "configure:9689: checking for Xaw3d/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9692 "configure" #include "confdefs.h" #include <Xaw3d/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9650,15 +9710,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9654: checking for Xaw3d/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9657 "configure" +echo "configure:9714: checking for Xaw3d/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9717 "configure" #include "confdefs.h" #include <Xaw3d/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9690,15 +9750,15 ＠＠ if test -z "$athena_h_path"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9694: checking for X11/Xaw/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9697 "configure" +echo "configure:9754: checking for X11/Xaw/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9757 "configure" #include "confdefs.h" #include <X11/Xaw/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9732,10 +9792,10 ＠＠ save_libs_x=$libs_x libs_x="-lXaw3d $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXaw3d\" to \$libs_x"; fi echo $ac_n "checking for "international" resource in Xaw3d SimpleWidget""... $ac_c" 1>&6 -echo "configure:9736: checking for "international" resource in Xaw3d SimpleWidget" >&5 +echo "configure:9796: checking for "international" resource in Xaw3d SimpleWidget" >&5 cat > conftest.$ac_ext <<EOF -#line 9739 "configure" +#line 9799 "configure" #include "confdefs.h" #include <stdlib.h> #include <string.h> ＠＠ -9749,7 +9809,7 ＠＠ exit(0); exit(253);} EOF -if { (eval echo configure:9753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; xaw_intl_status=$?; if test "$xaw_intl_status" = "0"; then ＠＠ -9776,15 +9836,15 ＠＠ if test "$with_x11" = "yes"; then ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:9780: checking for Xm/Xm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9783 "configure" +echo "configure:9840: checking for Xm/Xm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9843 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9801,12 +9861,12 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:9805: checking for XmStringFree in -lXm" >&5 +echo "configure:9865: checking for XmStringFree in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 9810 "configure" +#line 9870 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9817,7 +9877,7 ＠＠ XmStringFree() ; return 0; } EOF -if { (eval echo configure:9821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9846,9 +9906,9 ＠＠ if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:9850: checking for Lesstif" >&5 +echo "configure:9910: checking for Lesstif" >&5 cat > conftest.$ac_ext <<EOF -#line 9852 "configure" +#line 9912 "configure" #include "confdefs.h" #include <Xm/Xm.h> #ifdef LESSTIF_VERSION ＠＠ -10304,7 +10364,7 ＠＠ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:10308: checking for Mule-related features" >&5 +echo "configure:10368: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF ＠＠ -10329,15 +10389,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10333: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10336 "configure" +echo "configure:10393: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10396 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10368,12 +10428,12 ＠＠ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:10372: checking for strerror in -lintl" >&5 +echo "configure:10432: checking for strerror in -lintl" >&5 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'` xe_check_libs=" -lintl " cat > conftest.$ac_ext <<EOF -#line 10377 "configure" +#line 10437 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10384,7 +10444,7 ＠＠ strerror() ; return 0; } EOF -if { (eval echo configure:10388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10417,18 +10477,18 ＠＠ echo "checking for Mule input methods" 1>&6 -echo "configure:10421: checking for Mule input methods" >&5 +echo "configure:10481: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:10424: checking for XIM" >&5 +echo "configure:10484: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:10427: checking for XOpenIM in -lX11" >&5 +echo "configure:10487: checking for XOpenIM in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 10432 "configure" +#line 10492 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10439,7 +10499,7 ＠＠ XOpenIM() ; return 0; } EOF -if { (eval echo configure:10443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10463,12 +10523,12 ＠＠ if test "$need_motif $have_lesstif" = "yes no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:10467: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:10527: checking for XmImMbLookupString in -lXm" >&5 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 10472 "configure" +#line 10532 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10479,7 +10539,7 ＠＠ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:10483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10502,12 +10562,12 ＠＠ elif test "$have_motif $have_lesstif $with_xim" = "yes no no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:10506: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:10566: checking for XmImMbLookupString in -lXm" >&5 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 10511 "configure" +#line 10571 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10518,7 +10578,7 ＠＠ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:10522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10583,15 +10643,15 ＠＠ if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:10587: checking for XFontSet" >&5 +echo "configure:10647: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:10590: checking for XmbDrawString in -lX11" >&5 +echo "configure:10650: checking for XmbDrawString in -lX11" >&5 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 10595 "configure" +#line 10655 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10602,7 +10662,7 ＠＠ XmbDrawString() ; return 0; } EOF -if { (eval echo configure:10606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10642,15 +10702,15 ＠＠ test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6 -echo "configure:10646: checking for wnn/jllib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10649 "configure" +echo "configure:10706: checking for wnn/jllib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10709 "configure" #include "confdefs.h" #include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10673,15 +10733,15 ＠＠ } test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6 -echo "configure:10677: checking for wnn/commonhd.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10680 "configure" +echo "configure:10737: checking for wnn/commonhd.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10740 "configure" #include "confdefs.h" #include <wnn/commonhd.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10706,10 +10766,10 ＠＠ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10710: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10713 "configure" +echo "configure:10770: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10773 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -10732,7 +10792,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:10736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -10761,12 +10821,12 ＠＠ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:10765: checking for crypt in -lcrypt" >&5 +echo "configure:10825: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` xe_check_libs=" -lcrypt " cat > conftest.$ac_ext <<EOF -#line 10770 "configure" +#line 10830 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10777,7 +10837,7 ＠＠ crypt() ; return 0; } EOF -if { (eval echo configure:10781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10812,12 +10872,12 ＠＠ if test -z "$with_wnn" -o "$with_wnn" = "yes"; then echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:10816: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:10876: checking for jl_dic_list_e in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <<EOF -#line 10821 "configure" +#line 10881 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10828,7 +10888,7 ＠＠ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:10832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10846,12 +10906,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6 -echo "configure:10850: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:10910: checking for jl_dic_list_e in -lwnn4" >&5 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn4 " cat > conftest.$ac_ext <<EOF -#line 10855 "configure" +#line 10915 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10862,7 +10922,7 ＠＠ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:10866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10880,12 +10940,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6 -echo "configure:10884: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:10944: checking for jl_dic_list_e in -lwnn6" >&5 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6 " cat > conftest.$ac_ext <<EOF -#line 10889 "configure" +#line 10949 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10896,7 +10956,7 ＠＠ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:10900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10914,12 +10974,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6 -echo "configure:10918: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:10978: checking for dic_list_e in -lwnn6_fromsrc" >&5 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6_fromsrc " cat > conftest.$ac_ext <<EOF -#line 10923 "configure" +#line 10983 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10930,7 +10990,7 ＠＠ dic_list_e() ; return 0; } EOF -if { (eval echo configure:10934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10978,12 +11038,12 ＠＠ if test "$with_wnn6" != "no"; then echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6 -echo "configure:10982: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:11042: checking for jl_fi_dic_list in -l$libwnn" >&5 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'` xe_check_libs=" -l$libwnn " cat > conftest.$ac_ext <<EOF -#line 10987 "configure" +#line 11047 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10994,7 +11054,7 ＠＠ jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:10998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11029,15 +11089,15 ＠＠ if test "$with_canna" != "no"; then ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:11033: checking for canna/jrkanji.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11036 "configure" +echo "configure:11093: checking for canna/jrkanji.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11096 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -11064,15 +11124,15 ＠＠ c_switch_site="$c_switch_site -I/usr/local/canna/include" ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:11068: checking for canna/jrkanji.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11071 "configure" +echo "configure:11128: checking for canna/jrkanji.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11131 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -11100,15 +11160,15 ＠＠ test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6 -echo "configure:11104: checking for canna/RK.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11107 "configure" +echo "configure:11164: checking for canna/RK.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11167 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -11131,12 +11191,12 ＠＠ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:11135: checking for RkBgnBun in -lRKC" >&5 +echo "configure:11195: checking for RkBgnBun in -lRKC" >&5 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'` xe_check_libs=" -lRKC " cat > conftest.$ac_ext <<EOF -#line 11140 "configure" +#line 11200 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11147,7 +11207,7 ＠＠ RkBgnBun() ; return 0; } EOF -if { (eval echo configure:11151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11170,12 +11230,12 ＠＠ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:11174: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:11234: checking for jrKanjiControl in -lcanna" >&5 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'` xe_check_libs=" -lcanna " cat > conftest.$ac_ext <<EOF -#line 11179 "configure" +#line 11239 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11186,7 +11246,7 ＠＠ jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:11190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11235,12 +11295,12 ＠＠ libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6 -echo "configure:11239: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:11299: checking for layout_object_getvalue in -li18n" >&5 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'` xe_check_libs=" -li18n " cat > conftest.$ac_ext <<EOF -#line 11244 "configure" +#line 11304 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11251,7 +11311,7 ＠＠ layout_object_getvalue() ; return 0; } EOF -if { (eval echo configure:11255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11338,10 +11398,10 ＠＠ for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11342: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11345 "configure" +echo "configure:11402: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11405 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -11364,7 +11424,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:11368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -11405,10 +11465,10 ＠＠ for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11409: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11412 "configure" +echo "configure:11469: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11472 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -11431,7 +11491,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:11435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -11460,10 +11520,10 ＠＠ echo $ac_n "checking for openpty""... $ac_c" 1>&6 -echo "configure:11464: checking for openpty" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11467 "configure" +echo "configure:11524: checking for openpty" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11527 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char openpty(); below. */ ＠＠ -11486,7 +11546,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:11490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_openpty=yes" else ＠＠ -11505,12 +11565,12 ＠＠ echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:11509: checking for openpty in -lutil" >&5 +echo "configure:11569: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` xe_check_libs=" -lutil " cat > conftest.$ac_ext <<EOF -#line 11514 "configure" +#line 11574 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11521,7 +11581,7 ＠＠ openpty() ; return 0; } EOF -if { (eval echo configure:11525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11556,15 +11616,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11560: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11563 "configure" +echo "configure:11620: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11623 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -11600,15 +11660,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11604: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11607 "configure" +echo "configure:11664: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11667 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -11641,10 +11701,10 ＠＠ for ac_func in isastream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11645: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11648 "configure" +echo "configure:11705: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11708 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -11667,7 +11727,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:11671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -11698,15 +11758,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11702: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11705 "configure" +echo "configure:11762: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11765 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11770: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -11743,10 +11803,10 ＠＠ for ac_func in getloadavg do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11747: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11750 "configure" +echo "configure:11807: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11810 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -11769,7 +11829,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:11773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -11802,15 +11862,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11806: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11809 "configure" +echo "configure:11866: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11869 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -11846,12 +11906,12 ＠＠ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:11850: checking for kstat_open in -lkstat" >&5 +echo "configure:11910: checking for kstat_open in -lkstat" >&5 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lkstat " cat > conftest.$ac_ext <<EOF -#line 11855 "configure" +#line 11915 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11862,7 +11922,7 ＠＠ kstat_open() ; return 0; } EOF -if { (eval echo configure:11866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11897,15 +11957,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11901: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11904 "configure" +echo "configure:11961: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11964 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -11937,12 +11997,12 ＠＠ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:11941: checking for kvm_read in -lkvm" >&5 +echo "configure:12001: checking for kvm_read in -lkvm" >&5 ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'` xe_check_libs=" -lkvm " cat > conftest.$ac_ext <<EOF -#line 11946 "configure" +#line 12006 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11953,7 +12013,7 ＠＠ kvm_read() ; return 0; } EOF -if { (eval echo configure:11957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11987,16 +12047,16 ＠＠ fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:11991: checking whether netdb declares h_errno" >&5 -cat > conftest.$ac_ext <<EOF -#line 11993 "configure" +echo "configure:12051: checking whether netdb declares h_errno" >&5 +cat > conftest.$ac_ext <<EOF +#line 12053 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:12000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF ＠＠ -12016,16 +12076,16 ＠＠ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:12020: checking for sigsetjmp" >&5 -cat > conftest.$ac_ext <<EOF -#line 12022 "configure" +echo "configure:12080: checking for sigsetjmp" >&5 +cat > conftest.$ac_ext <<EOF +#line 12082 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:12029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF ＠＠ -12045,11 +12105,11 ＠＠ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:12049: checking whether localtime caches TZ" >&5 +echo "configure:12109: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 12053 "configure" +#line 12113 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS ＠＠ -12084,7 +12144,7 ＠＠ exit (0); } EOF -if { (eval echo configure:12088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else ＠＠ -12114,9 +12174,9 ＠＠ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:12118: checking whether gettimeofday accepts one or two arguments" >&5 -cat > conftest.$ac_ext <<EOF -#line 12120 "configure" +echo "configure:12178: checking whether gettimeofday accepts one or two arguments" >&5 +cat > conftest.$ac_ext <<EOF +#line 12180 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME ＠＠ -12137,7 +12197,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""two" 1>&6 else ＠＠ -12159,19 +12219,19 ＠＠ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:12163: checking for inline" >&5 +echo "configure:12223: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 12168 "configure" +#line 12228 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:12175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else ＠＠ -12212,17 +12272,17 ＠＠ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:12216: checking for working alloca.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12219 "configure" +echo "configure:12276: checking for working alloca.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12279 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:12226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else ＠＠ -12246,10 +12306,10 ＠＠ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:12250: checking for alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12253 "configure" +echo "configure:12310: checking for alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12313 "configure" #include "confdefs.h" #ifdef __GNUC__ ＠＠ -12277,7 +12337,7 ＠＠ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:12281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else ＠＠ -12316,10 +12376,10 ＠＠ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:12320: checking whether alloca needs Cray hooks" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12323 "configure" +echo "configure:12380: checking whether alloca needs Cray hooks" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12383 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray ＠＠ -12343,10 +12403,10 ＠＠ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12347: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12350 "configure" +echo "configure:12407: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12410 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12369,7 +12429,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -12399,10 +12459,10 ＠＠ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:12403: checking stack direction for C alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12406 "configure" +echo "configure:12463: checking stack direction for C alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12466 "configure" #include "confdefs.h" find_stack_direction () { ＠＠ -12421,7 +12481,7 ＠＠ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:12425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else ＠＠ -12451,15 +12511,15 ＠＠ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:12455: checking for vfork.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12458 "configure" +echo "configure:12515: checking for vfork.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12518 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12487,10 +12547,10 ＠＠ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:12491: checking for working vfork" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12494 "configure" +echo "configure:12551: checking for working vfork" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12554 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> ＠＠ -12585,7 +12645,7 ＠＠ } } EOF -if { (eval echo configure:12589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_vfork_works=yes else ＠＠ -12611,10 +12671,10 ＠＠ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:12615: checking for working strcoll" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12618 "configure" +echo "configure:12675: checking for working strcoll" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12678 "configure" #include "confdefs.h" #include <string.h> main () ＠＠ -12624,7 +12684,7 ＠＠ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:12628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else ＠＠ -12652,10 +12712,10 ＠＠ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12656: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12659 "configure" +echo "configure:12716: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12719 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12678,7 +12738,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -12706,10 +12766,10 ＠＠ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:12710: checking whether getpgrp takes no argument" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12713 "configure" +echo "configure:12770: checking whether getpgrp takes no argument" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12773 "configure" #include "confdefs.h" /* ＠＠ -12764,7 +12824,7 ＠＠ } EOF -if { (eval echo configure:12768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else ＠＠ -12791,10 +12851,10 ＠＠ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:12795: checking for working mmap" >&5 +echo "configure:12855: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 12798 "configure" +#line 12858 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> ＠＠ -12827,7 +12887,7 ＠＠ return 1; } EOF -if { (eval echo configure:12831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else ＠＠ -12856,9 +12916,9 ＠＠ if test "$rel_alloc $have_mmap" = "default yes"; then if test "$doug_lea_malloc" = "yes"; then echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6 -echo "configure:12860: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:12920: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext <<EOF -#line 12862 "configure" +#line 12922 "configure" #include "confdefs.h" #include <malloc.h> int main() { ＠＠ -12870,7 +12930,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else ＠＠ -12895,15 +12955,15 ＠＠ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:12899: checking for termios.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12902 "configure" +echo "configure:12959: checking for termios.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12962 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12946,15 +13006,15 ＠＠ echo "$ac_t""no" 1>&6 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termio.h""... $ac_c" 1>&6 -echo "configure:12950: checking for termio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12953 "configure" +echo "configure:13010: checking for termio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13013 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12986,10 +13046,10 ＠＠ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:12990: checking for socket" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12993 "configure" +echo "configure:13050: checking for socket" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13053 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ ＠＠ -13012,7 +13072,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else ＠＠ -13027,15 +13087,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 -echo "configure:13031: checking for netinet/in.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13034 "configure" +echo "configure:13091: checking for netinet/in.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13094 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -13052,15 +13112,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6 -echo "configure:13056: checking for arpa/inet.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13059 "configure" +echo "configure:13116: checking for arpa/inet.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13119 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -13085,9 +13145,9 ＠＠ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:13089: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:13149: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 13091 "configure" +#line 13151 "configure" #include "confdefs.h" #include <sys/types.h> ＠＠ -13098,7 +13158,7 ＠＠ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:13102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SOCKADDR_SUN_LEN ＠＠ -13116,9 +13176,9 ＠＠ fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:13120: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:13180: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext <<EOF -#line 13122 "configure" +#line 13182 "configure" #include "confdefs.h" #include <sys/types.h> ＠＠ -13128,7 +13188,7 ＠＠ static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:13132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MULTICAST ＠＠ -13159,10 +13219,10 ＠＠ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:13163: checking for msgget" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13166 "configure" +echo "configure:13223: checking for msgget" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13226 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ ＠＠ -13185,7 +13245,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else ＠＠ -13200,15 +13260,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:13204: checking for sys/ipc.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13207 "configure" +echo "configure:13264: checking for sys/ipc.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13267 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -13225,15 +13285,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -echo "configure:13229: checking for sys/msg.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13232 "configure" +echo "configure:13289: checking for sys/msg.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13292 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -13271,15 +13331,15 ＠＠ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:13275: checking for dirent.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13278 "configure" +echo "configure:13335: checking for dirent.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13338 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -13306,15 +13366,15 ＠＠ echo "$ac_t""no" 1>&6 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6 -echo "configure:13310: checking for sys/dir.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13313 "configure" +echo "configure:13370: checking for sys/dir.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13373 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -13347,15 +13407,15 ＠＠ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:13351: checking for nlist.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13354 "configure" +echo "configure:13411: checking for nlist.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13414 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -13385,22 +13445,22 ＠＠ echo "checking "for sound support"" 1>&6 -echo "configure:13389: checking "for sound support"" >&5 +echo "configure:13449: checking "for sound support"" >&5 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes if test "$with_native_sound" != "no"; then if test -n "$native_sound_lib"; then ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6 -echo "configure:13396: checking for multimedia/audio_device.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13399 "configure" +echo "configure:13456: checking for multimedia/audio_device.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13459 "configure" #include "confdefs.h" #include <multimedia/audio_device.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -13456,12 +13516,12 ＠＠ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:13460: checking for ALopenport in -laudio" >&5 +echo "configure:13520: checking for ALopenport in -laudio" >&5 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <<EOF -#line 13465 "configure" +#line 13525 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -13472,7 +13532,7 ＠＠ ALopenport() ; return 0; } EOF -if { (eval echo configure:13476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -13503,12 +13563,12 ＠＠ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:13507: checking for AOpenAudio in -lAlib" >&5 +echo "configure:13567: checking for AOpenAudio in -lAlib" >&5 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'` xe_check_libs=" -lAlib " cat > conftest.$ac_ext <<EOF -#line 13512 "configure" +#line 13572 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -13519,7 +13579,7 ＠＠ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:13523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -13564,15 +13624,15 ＠＠ for dir in "machine" "sys" "linux"; do ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6 -echo "configure:13568: checking for ${dir}/soundcard.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13571 "configure" +echo "configure:13628: checking for ${dir}/soundcard.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13631 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -13626,15 +13686,15 ＠＠ if test "$with_nas_sound" != "no"; then ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6 -echo "configure:13630: checking for audio/audiolib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13633 "configure" +echo "configure:13690: checking for audio/audiolib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13693 "configure" #include "confdefs.h" #include <audio/audiolib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -13652,12 +13712,12 ＠＠ echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6 -echo "configure:13656: checking for AuOpenServer in -laudio" >&5 +echo "configure:13716: checking for AuOpenServer in -laudio" >&5 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <<EOF -#line 13661 "configure" +#line 13721 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -13668,7 +13728,7 ＠＠ AuOpenServer() ; return 0; } EOF -if { (eval echo configure:13672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -13707,7 +13767,7 ＠＠ fi libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi cat > conftest.$ac_ext <<EOF -#line 13711 "configure" +#line 13771 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF ＠＠ -13738,7 +13798,7 ＠＠ # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13742: checking for $ac_word" >&5 +echo "configure:13802: checking for $ac_word" >&5 if test -n "$have_esd_config"; then ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test. ＠＠ -13767,10 +13827,10 ＠＠ c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$extra_verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi LIBS="`esd-config --libs` $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6 -echo "configure:13771: checking for esd_play_stream" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13774 "configure" +echo "configure:13831: checking for esd_play_stream" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13834 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char esd_play_stream(); below. */ ＠＠ -13793,7 +13853,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_esd_play_stream=yes" else ＠＠ -13844,7 +13904,7 ＠＠ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:13848: checking for TTY-related features" >&5 +echo "configure:13908: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF ＠＠ -13860,12 +13920,12 ＠＠ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:13864: checking for tgetent in -lncurses" >&5 +echo "configure:13924: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lncurses " cat > conftest.$ac_ext <<EOF -#line 13869 "configure" +#line 13929 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -13876,7 +13936,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:13880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -13909,15 +13969,15 ＠＠ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:13913: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13916 "configure" +echo "configure:13973: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13976 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -13939,15 +13999,15 ＠＠ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:13943: checking for ncurses/term.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13946 "configure" +echo "configure:14003: checking for ncurses/term.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14006 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -13977,15 +14037,15 ＠＠ c_switch_site="$c_switch_site -I/usr/include/ncurses" ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:13981: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13984 "configure" +echo "configure:14041: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14044 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14020,12 +14080,12 ＠＠ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:14024: checking for tgetent in -l$lib" >&5 +echo "configure:14084: checking for tgetent in -l$lib" >&5 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -l$lib " cat > conftest.$ac_ext <<EOF -#line 14029 "configure" +#line 14089 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14036,7 +14096,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:14040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14061,12 +14121,12 ＠＠ else if test -n "$libs_termcap" -a "$opsys" = "openbsd"; then echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:14065: checking for tgoto in -ltermcap" >&5 +echo "configure:14125: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` xe_check_libs=" -ltermcap " cat > conftest.$ac_ext <<EOF -#line 14070 "configure" +#line 14130 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14077,7 +14137,7 ＠＠ tgoto() ; return 0; } EOF -if { (eval echo configure:14081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14122,12 +14182,12 ＠＠ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:14126: checking for tgetent in -lcurses" >&5 +echo "configure:14186: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lcurses " cat > conftest.$ac_ext <<EOF -#line 14131 "configure" +#line 14191 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14138,7 +14198,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:14142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14156,12 +14216,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:14160: checking for tgetent in -ltermcap" >&5 +echo "configure:14220: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -ltermcap " cat > conftest.$ac_ext <<EOF -#line 14165 "configure" +#line 14225 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14172,7 +14232,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:14176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14221,15 +14281,15 ＠＠ if test "$with_gpm" != "no"; then ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gpm.h""... $ac_c" 1>&6 -echo "configure:14225: checking for gpm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14228 "configure" +echo "configure:14285: checking for gpm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14288 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14247,12 +14307,12 ＠＠ echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:14251: checking for Gpm_Open in -lgpm" >&5 +echo "configure:14311: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgpm " cat > conftest.$ac_ext <<EOF -#line 14256 "configure" +#line 14316 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14263,7 +14323,7 ＠＠ Gpm_Open() ; return 0; } EOF -if { (eval echo configure:14267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14317,19 +14377,19 ＠＠ fi echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6 -echo "configure:14321: checking for main in -lossaudio" >&5 +echo "configure:14381: checking for main in -lossaudio" >&5 ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lossaudio " cat > conftest.$ac_ext <<EOF -#line 14326 "configure" +#line 14386 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:14333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14359,20 +14419,20 ＠＠ test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:14363: checking for database support" >&5 +echo "configure:14423: checking for database support" >&5 if test "$with_database_gdbm $with_database_dbm" != "no no"; then ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6 -echo "configure:14368: checking for ndbm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14371 "configure" +echo "configure:14428: checking for ndbm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14431 "configure" #include "confdefs.h" #include <ndbm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14402,12 +14462,12 ＠＠ if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:14406: checking for dbm_open in -lgdbm" >&5 +echo "configure:14466: checking for dbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdbm " cat > conftest.$ac_ext <<EOF -#line 14411 "configure" +#line 14471 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14418,7 +14478,7 ＠＠ dbm_open() ; return 0; } EOF -if { (eval echo configure:14422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14446,10 +14506,10 ＠＠ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:14450: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14453 "configure" +echo "configure:14510: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14513 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ ＠＠ -14472,7 +14532,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:14476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else ＠＠ -14491,12 +14551,12 ＠＠ echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:14495: checking for dbm_open in -ldbm" >&5 +echo "configure:14555: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -ldbm " cat > conftest.$ac_ext <<EOF -#line 14500 "configure" +#line 14560 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14507,7 +14567,7 ＠＠ dbm_open() ; return 0; } EOF -if { (eval echo configure:14511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14547,10 +14607,10 ＠＠ echo $ac_n "checking for u_int8_t""... $ac_c" 1>&6 -echo "configure:14551: checking for u_int8_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14554 "configure" +echo "configure:14611: checking for u_int8_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14614 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -14591,10 +14651,10 ＠＠ fi echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6 -echo "configure:14595: checking for u_int16_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14598 "configure" +echo "configure:14655: checking for u_int16_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14658 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -14635,10 +14695,10 ＠＠ fi echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6 -echo "configure:14639: checking for u_int32_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14642 "configure" +echo "configure:14699: checking for u_int32_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14702 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -14679,10 +14739,10 ＠＠ fi echo $ac_n "checking for u_int64_t""... $ac_c" 1>&6 -echo "configure:14683: checking for u_int64_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14686 "configure" +echo "configure:14743: checking for u_int64_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14746 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -14725,12 +14785,12 ＠＠ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:14729: checking for Berkeley db.h" >&5 +echo "configure:14789: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do case "$opsys" in *freebsd*) cat > conftest.$ac_ext <<EOF -#line 14734 "configure" +#line 14794 "configure" #include "confdefs.h" #include <stdlib.h> ＠＠ -14746,7 +14806,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:14750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else ＠＠ -14757,7 +14817,7 ＠＠ ;; *) cat > conftest.$ac_ext <<EOF -#line 14761 "configure" +#line 14821 "configure" #include "confdefs.h" #include <stdlib.h> ＠＠ -14787,7 +14847,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:14791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else ＠＠ -14805,9 +14865,9 ＠＠ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:14809: checking for Berkeley DB version" >&5 +echo "configure:14869: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext <<EOF -#line 14811 "configure" +#line 14871 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 1 ＠＠ -14819,7 +14879,7 ＠＠ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 14823 "configure" +#line 14883 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 2 ＠＠ -14846,10 +14906,10 ＠＠ rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:14850: checking for $dbfunc" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14853 "configure" +echo "configure:14910: checking for $dbfunc" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14913 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $dbfunc(); below. */ ＠＠ -14872,7 +14932,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:14876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$dbfunc=yes" else ＠＠ -14891,12 +14951,12 ＠＠ echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:14895: checking for $dbfunc in -ldb" >&5 +echo "configure:14955: checking for $dbfunc in -ldb" >&5 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <<EOF -#line 14900 "configure" +#line 14960 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14907,7 +14967,7 ＠＠ $dbfunc() ; return 0; } EOF -if { (eval echo configure:14911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14971,12 +15031,12 ＠＠ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:14975: checking for SOCKSinit in -lsocks" >&5 +echo "configure:15035: checking for SOCKSinit in -lsocks" >&5 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocks " cat > conftest.$ac_ext <<EOF -#line 14980 "configure" +#line 15040 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14987,7 +15047,7 ＠＠ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:14991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15042,7 +15102,7 ＠＠ if test "$with_modules" != "no"; then echo "checking for module support" 1>&6 -echo "configure:15046: checking for module support" >&5 +echo "configure:15106: checking for module support" >&5 if test "$with_msw" = "yes"; then have_dl=yes; ＠＠ -15058,15 +15118,15 ＠＠ ;; *) ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:15062: checking for dlfcn.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 15065 "configure" +echo "configure:15122: checking for dlfcn.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 15125 "configure" #include "confdefs.h" #include <dlfcn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -15083,16 +15143,16 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:15087: checking for dlopen in -lc" >&5 +echo "configure:15147: checking for dlopen in -lc" >&5 cat > conftest.$ac_ext <<EOF -#line 15089 "configure" +#line 15149 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:15096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -15101,18 +15161,18 ＠＠ rm -rf conftest* echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:15105: checking for dlopen in -ldl" >&5 +echo "configure:15165: checking for dlopen in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 15109 "configure" +#line 15169 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:15116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -15141,12 +15201,12 ＠＠ else echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:15145: checking for shl_load in -ldld" >&5 +echo "configure:15205: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` xe_check_libs=" -ldld " cat > conftest.$ac_ext <<EOF -#line 15150 "configure" +#line 15210 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15157,7 +15217,7 ＠＠ shl_load() ; return 0; } EOF -if { (eval echo configure:15161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15184,12 +15244,12 ＠＠ echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:15188: checking for dld_init in -ldld" >&5 +echo "configure:15248: checking for dld_init in -ldld" >&5 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'` xe_check_libs=" -ldld " cat > conftest.$ac_ext <<EOF -#line 15193 "configure" +#line 15253 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15200,7 +15260,7 ＠＠ dld_init() ; return 0; } EOF -if { (eval echo configure:15204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15247,7 +15307,7 ＠＠ xealias=$internal_configuration echo "checking how to build dynamic libraries for ${xehost}" 1>&6 -echo "configure:15251: checking how to build dynamic libraries for ${xehost}" >&5 +echo "configure:15311: checking how to build dynamic libraries for ${xehost}" >&5 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; ＠＠ -15275,9 +15335,9 ＠＠ XEGCC=yes else echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:15279: checking checking whether we are using GNU C" >&5 +echo "configure:15339: checking checking whether we are using GNU C" >&5 cat > conftest.$ac_ext <<EOF -#line 15281 "configure" +#line 15341 "configure" #include "confdefs.h" #ifdef __GNUC__ ＠＠ -15299,7 +15359,7 ＠＠ fi echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6 -echo "configure:15303: checking how to produce PIC code" >&5 +echo "configure:15363: checking how to produce PIC code" >&5 wl= can_build_shared=yes ＠＠ -15400,18 +15460,18 ＠＠ # Check to make sure the dll_cflags actually works. echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6 -echo "configure:15404: checking if PIC flag ${dll_cflags} really works" >&5 +echo "configure:15464: checking if PIC flag ${dll_cflags} really works" >&5 save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $dll_cflags -DPIC" cat > conftest.$ac_ext <<EOF -#line 15408 "configure" +#line 15468 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:15415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also ＠＠ -15442,7 +15502,7 ＠＠ xldf= xcldf= echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6 -echo "configure:15446: checking if C compiler can produce shared libraries" >&5 +echo "configure:15506: checking if C compiler can produce shared libraries" >&5 if test "$XEGCC" = yes -o "$__ICC" = yes; then xcldf="-shared" xldf="-shared" ＠＠ -15493,14 +15553,14 ＠＠ xe_libs= ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5' cat > conftest.$ac_ext <<EOF -#line 15497 "configure" +#line 15557 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:15504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cc_produces_so=yes else ＠＠ -15525,7 +15585,7 ＠＠ if test "$XEGCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:15529: checking for ld used by GCC" >&5 +echo "configure:15589: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. ＠＠ -15551,7 +15611,7 ＠＠ esac else echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:15555: checking for GNU ld" >&5 +echo "configure:15615: checking for GNU ld" >&5 fi if test -z "$LTLD"; then ＠＠ -15589,7 +15649,7 ＠＠ # Check to see if it really is or isn't GNU ld. echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6 -echo "configure:15593: checking if the linker is GNU ld" >&5 +echo "configure:15653: checking if the linker is GNU ld" >&5 # I'd rather use --version here, but apparently some GNU ld's only accept -v. if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then xe_gnu_ld=yes ＠＠ -15617,7 +15677,7 ＠＠ # OK - only NOW do we futz about with ld. # See if the linker supports building shared libraries. echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6 -echo "configure:15621: checking whether the linker supports shared libraries" >&5 +echo "configure:15681: checking whether the linker supports shared libraries" >&5 dll_ld=$CC dll_ldflags=$LDFLAGS ld_shlibs=yes ＠＠ -15828,10 +15888,10 ＠＠ for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15832: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 15835 "configure" +echo "configure:15892: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 15895 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -15854,7 +15914,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:15858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -15893,11 +15953,11 ＠＠ fi cat > conftest.$ac_ext <<EOF -#line 15897 "configure" +#line 15957 "configure" #include "confdefs.h" int main(int c,char *v[]){return 0;} EOF -if { (eval echo configure:15901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:15961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else diff -r e2da872593c0 -r a78cba619f56 configure.in --- a/configure.in Tue Mar 24 22:15:53 2015 -0400 +++ b/configure.in Sun Dec 10 13:34:21 2017 +0000 ＠＠ -2590,6 +2590,53 ＠＠ fi fi +dnl Disable ASLR on systems where it breaks pdump. Use start_flags for this +dnl rather than LDFLAGS, so it's only done for the XEmacs binary, and +dnl gnuclient, movemail and so on get ASLR if the system defaults to it. +AC_MSG_CHECKING(whether ASLR needs to be disabled]) +AC_TRY_RUN([#include <stdio.h> +static int test_func(void) { return 42; } +int main (int c, char **v) { if (--c) { printf ("%p", &test_func); } return 0; }], +[test_func_address=`./conftest t` +if test "$test_func_address" = `./conftest t` \ + -a "$test_func_address" = `./conftest t` \ + -a "$test_func_address" = `./conftest t` \ + -a "$test_func_address" = `./conftest t`; then + dnl If your implementation of ASLR gives the same address for the same + dnl function five times in a row within the lifetime of the universe, + dnl your implementation of ASLR needs significant revision. + dnl (Yes, yes, if someone sat down and ran ./configure a huge number of + dnl times on XEmacs code with the intention of making this give the wrong + dnl answer, they might manage it, but there is no payoff for doing this.) + AC_MSG_RESULT(no) + else + for try_no_pie in "-no-pie" "-Wl,-no_pie" "-nopie"; do + xe_check_libs="${try_no_pie}" + AC_TRY_RUN([#include <stdio.h> +static int test_func(void) { return 42; } +int main (int c, char **v) { if (--c) { printf ("%p", &test_func); } return 0; }], + [test_func_address=`./conftest t` + if test "$test_func_address" = `./conftest t` \ + -a "$test_func_address" = `./conftest t` \ + -a "$test_func_address" = `./conftest t` \ + -a "$test_func_address" = `./conftest t`; then + no_pie="${try_no_pie}" + fi]) + xe_check_libs="" + if test -n "$no_pie"; then + dnl Don't be tempted to apply XE_PROTECT_LINKER_FLAGS() to this. + dnl On Debian 9.2 Stretch the linker does not recognise -no-pie, it + dnl needs to be handled by the GCC invocation. + XE_APPEND($no_pie, start_flags) + break; + fi + done + if test -z "$no_pie"; then + AC_MSG_ERROR(don't know how to disable ASLR on $ac_cv_build) + fi + AC_MSG_RESULT(yes, disabling address space layout randomization with $no_pie, xemacs binary) + fi]) + dnl ---------------------- dnl Choose a window system dnl ---------------------- diff -r e2da872593c0 -r a78cba619f56 src/ChangeLog --- a/src/ChangeLog Tue Mar 24 22:15:53 2015 -0400 +++ b/src/ChangeLog Sun Dec 10 13:34:21 2017 +0000 ＠＠ -1,3 +1,10 ＠＠ +2017-12-10 Aidan Kehoe <kehoea(a)parhasard.net> + + * lisp.h (max_align_t): Only make this type available if not + offered by the compiler. + * config.h.in (INLINE_HEADER): + Update this to support C99. + 2015-03-24 Vin Shelton <acs(a)xemacs.org> * XEmacs 21.4.24 is released diff -r e2da872593c0 -r a78cba619f56 src/config.h.in --- a/src/config.h.in Tue Mar 24 22:15:53 2015 -0400 +++ b/src/config.h.in Sun Dec 10 13:34:21 2017 +0000 ＠＠ -853,7 +853,9 ＠＠ /* Does the keyword `inline' exist? */ #undef inline -#if defined (__cplusplus) || ! defined (__GNUC__) +#if (defined ( __STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ + || defined (__cplusplus) || ! defined (__GNUC__) || ! defined(emacs) +# define INLINE_HEADERS_ARE_STATIC # define INLINE_HEADER inline static #elif defined (DONT_EXTERN_INLINE_HEADER_FUNCTIONS) # define INLINE_HEADER inline diff -r e2da872593c0 -r a78cba619f56 src/lisp.h --- a/src/lisp.h Tue Mar 24 22:15:53 2015 -0400 +++ b/src/lisp.h Sun Dec 10 13:34:21 2017 +0000 ＠＠ -193,6 +193,8 ＠＠ # endif /* GNUC */ #endif +#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) && \ + (!defined (__cplusplus) || __cplusplus < 201103L) /* No type has a greater alignment requirement than max_align_t. (except perhaps for types we don't use, like long double) */ typedef union ＠＠ -202,6 +204,7 ＠＠ struct { void (*f)(void); } f; struct { double d; } d; } max_align_t; +#endif #ifndef ALIGNOF # if defined (__GNUC__) && (__GNUC__ >= 2) -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches December 2017