Mercurial > hg > xemacs-beta
view lisp/x-win-sun.el @ 4906:6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* cl-extra.el:
* cl-extra.el (cl-string-vector-equalp): Removed.
* cl-extra.el (cl-bit-vector-vector-equalp): Removed.
* cl-extra.el (cl-vector-array-equalp): Removed.
* cl-extra.el (cl-hash-table-contents-equalp): Removed.
* cl-extra.el (equalp): Removed.
* cl-extra.el (cl-mapcar-many):
Comment out the whole `equalp' implementation for the moment;
remove once we're sure the C implementation works.
* cl-macs.el:
* cl-macs.el (equalp):
Simplify the compiler-macro for `equalp' -- once it's in C,
we don't need to try so hard to expand it.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* abbrev.c (abbrev_match_mapper):
* buffer.h (CANON_TABLE_OF):
* buffer.h:
* editfns.c (Fchar_equal):
* minibuf.c (scmp_1):
* text.c (qxestrcasecmp_i18n):
* text.c (qxestrncasecmp_i18n):
* text.c (qxetextcasecmp):
* text.c (qxetextcasecmp_matching):
Create new macro CANONCASE that converts to a canonical mapping
and use it to do caseless comparisons instead of DOWNCASE.
* alloc.c:
* alloc.c (cons_equal):
* alloc.c (vector_equal):
* alloc.c (string_equal):
* bytecode.c (compiled_function_equal):
* chartab.c (char_table_entry_equal):
* chartab.c (char_table_equal):
* data.c (weak_list_equal):
* data.c (weak_box_equal):
* data.c (ephemeron_equal):
* device-msw.c (equal_devmode):
* elhash.c (hash_table_equal):
* events.c (event_equal):
* extents.c (properties_equal):
* extents.c (extent_equal):
* faces.c:
* faces.c (face_equal):
* faces.c (face_hash):
* floatfns.c (float_equal):
* fns.c:
* fns.c (bit_vector_equal):
* fns.c (plists_differ):
* fns.c (Fplists_eq):
* fns.c (Fplists_equal):
* fns.c (Flax_plists_eq):
* fns.c (Flax_plists_equal):
* fns.c (internal_equal):
* fns.c (internal_equalp):
* fns.c (internal_equal_0):
* fns.c (syms_of_fns):
* glyphs.c (image_instance_equal):
* glyphs.c (glyph_equal):
* glyphs.c (glyph_hash):
* gui.c (gui_item_equal):
* lisp.h:
* lrecord.h (struct lrecord_implementation):
* marker.c (marker_equal):
* number.c (bignum_equal):
* number.c (ratio_equal):
* number.c (bigfloat_equal):
* objects.c (color_instance_equal):
* objects.c (font_instance_equal):
* opaque.c (equal_opaque):
* opaque.c (equal_opaque_ptr):
* rangetab.c (range_table_equal):
* specifier.c (specifier_equal):
Add a `foldcase' param to the equal() method and use it to implement
`equalp' comparisons. Also add to plists_differ(), although we
don't currently use it here.
Rewrite internal_equalp(). Implement cross-type vector comparisons.
Don't implement our own handling of numeric promotion -- just use
the `=' primitive.
Add internal_equal_0(), which takes a `foldcase' param and calls
either internal_equal() or internal_equalp().
* buffer.h:
When given a 0 for buffer (which is the norm when functions don't
have a specific buffer available), use the current buffer's table,
not `standard-case-table'; otherwise the current settings are
ignored.
* casetab.c:
* casetab.c (set_case_table):
When handling old-style vectors of 256 in `set-case-table' don't
overwrite the existing table! Instead create a new table and
populate.
* device-msw.c (sync_printer_with_devmode):
* lisp.h:
* text.c (lisp_strcasecmp_ascii):
Rename lisp_strcasecmp to lisp_strcasecmp_ascii and use
lisp_strcasecmp_i18n for caseless comparisons in some places.
* elhash.c:
Delete unused lisp_string_hash and lisp_string_equal().
* events.h:
* keymap-buttons.h:
* keymap.h:
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_store):
* keymap.c (FROB):
* keymap.c (key_desc_list_to_event):
* keymap.c (describe_map_mapper):
* keymap.c (INCLUDE_BUTTON_ZERO):
New file keymap-buttons.h; use to handle buttons 1-26 in place of
duplicating code 26 times.
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-msw.c (mswindows_init_frame_1):
Fix some comments about internal_equal() in redisplay that don't
apply any more.
* keymap-slots.h:
* keymap.c:
New file keymap-slots.h. Use it to notate the slots in a keymap
structure, similar to frameslots.h or coding-system-slots.h.
* keymap.c (MARKED_SLOT):
* keymap.c (keymap_equal):
* keymap.c (keymap_hash):
Implement.
tests/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* automated/case-tests.el:
* automated/case-tests.el (uni-mappings):
* automated/search-tests.el:
Delete old pristine-case-table code. Rewrite the Unicode torture
test to take into account whether overlapping mappings exist for
more than one character, and not doing the upcase/downcase
comparisons in such cases.
* automated/lisp-tests.el (foo):
* automated/lisp-tests.el (string-variable):
* automated/lisp-tests.el (featurep):
Replace Assert (equal ... with Assert-equal; same for other types
of equality. Replace some awkward equivalents of Assert-equalp
with Assert-equalp. Add lots of equalp tests.
* automated/case-tests.el:
* automated/regexp-tests.el:
* automated/search-tests.el:
Fix up the comments at the top of the files. Move rules about where
to put tests into case-tests.el.
* automated/test-harness.el:
* automated/test-harness.el (test-harness-aborted-summary-template): New.
* automated/test-harness.el (test-harness-from-buffer):
* automated/test-harness.el (batch-test-emacs):
Fix Assert-test-not. Create Assert-not-equal and variants.
Delete the doc strings from all these convenience functions to avoid
excessive repetition; instead use one copy in a comment.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 01:02:40 -0600 |
parents | e3ef34f57070 |
children | 91b3aa59f49b |
line wrap: on
line source
;;; x-win-sun.el --- runtime initialization for Sun X servers and keyboards ;; Copyright (C) 1993, 1994 Free Software Foundation, Inc. ;; Authors: jwz, ben, martin ;; Keywords: terminals ;; 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 2, 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; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; This file is loaded by x-win.el at run-time when we are sure that XEmacs ;; is running on the display of a Sun. ;; The Sun X server (both the MIT and OpenWindows varieties) have extremely ;; stupid names for their keypad and function keys. For example, the key ;; labeled 3 / PgDn, with R15 written on the front, is actually called F35. ;; There are 3 methods of dealing with the Sun key brokenness: ;; ;; - Use xmodmap to give all keys more sensible names for all apps: ;; I use this shell script: ;; ;; for i in 0 1 2 3 4 5 6 7 8 9 Add Subtract Multiply Divide Decimal ; do ;; echo "keysym KP-$i = KP-$i" ;; done | xmodmap ;; ;; Clearly, as a good X11 citizen, we can't do this. ;; ;; - Use keyboard-translate-table to remap the keybindings at a low level. ;; This approach is taken in the function `sun-x11-keyboard-translate'. ;; This is like running xmodmap within XEmacs only. ;; This is not the default, however, so that legacy keybindings in users' ;; .emacs files like (global-set-key [(f35)] 'foo) continue to work ;; ;; - Use keyboard macros to provide indirection for keybindings. ;; If we do (global-set-key [(f35)] [(kp-3)]), then the user's keybindings ;; work whether he uses `f35' or `kp-3'. ;; This is also compatible with FSF Emacs and other X11 apps. ;; Although this has the disadvantage that these remappings ;; only work with the global key map, we use this as the default. ;; ;; - The Right Way to do this remains to be written... ;; OK, here's another try at doing things the right way. ;; We use function-key-map, which honors explicit key-bindings for the ;; stupid Sun names, but also allows indirection if no explicit ;; key-binding exists. ;;; Code: (globally-declare-fboundp '(x-keysym-on-keyboard-sans-modifiers-p)) ;;;###autoload (defun x-win-init-sun (device) ;; help is ok ;; num_lock is ok ;; up is ok ;; left is ok ;; right is ok ;; kp-add is ok ;; down is ok ;; insert is ok ;; delete is ok ;; kp-enter is ok ;; Sun Function keys (loop for (from-key to-key) in `((f21 pause) (f22 print) (f23 scroll_lock) ;; X11 R6 mappings (SunProps props) (SunFront front) (SunOpen open) (SunFind find) (cancel stop) (Undo undo) (SunCopy copy) (SunPaste paste) (SunCut cut) (f13 props) (f14 undo) (f15 front) (f16 copy) (f17 open) (f18 paste) (f19 find) (f20 cut) (f25 kp-divide) (f26 kp-multiply) (f31 kp-5) ;; Map f33 and r13 to end or kp-end ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'end device)) '((f33 end) (r13 end))) ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-end device)) '((f33 kp-end) (r13 kp-end)))) ,@(when (x-keysym-on-keyboard-sans-modifiers-p 'f36 device) '((f36 stop) (f37 again))) ;; Type 4 keyboards have a real kp-subtract and a f24 labelled `=' ;; Type 5 keyboards have no key labelled `=' and a f24 labelled `-' ,@(when (x-keysym-on-keyboard-sans-modifiers-p 'f24 device) `((f24 ,(if (x-keysym-on-keyboard-sans-modifiers-p 'kp-subtract device) 'kp-equal 'kp-subtract)))) ;; Map f27 to home or kp-home, as appropriate ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'home device)) '((f27 home))) ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-home device)) '((f27 kp-home)))) ;; Map f29 to prior or kp-prior, as appropriate ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'prior device)) '((f29 prior))) ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-prior device)) '((f29 kp-prior)))) ;; Map f35 to next or kp-next, as appropriate ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'next device)) '((f35 next))) ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-next device)) '((f35 kp-next)))) ,@(cond ((x-keysym-on-keyboard-sans-modifiers-p 'apRead device) ; SunOS 4.1.1 '((apRead f11) (apEdit f12))) ((x-keysym-on-keyboard-sans-modifiers-p 'SunF36 device) ; SunOS 5 '((SunF36 f11) (SunF37 f12) (f11 stop) (f12 again)))) ) ;; Get the correct value for function-key-map with function-key-map = (symbol-value-in-console 'function-key-map (device-console device) function-key-map) do (when (x-keysym-on-keyboard-sans-modifiers-p from-key device) (dolist (prefix '(() (shift) (control) (meta) (alt) (shift control) (shift alt) (shift meta) (control alt) (control meta) (alt meta) (shift control alt) (shift control meta) (shift alt meta) (control alt meta) (shift control alt meta))) (define-key function-key-map (append prefix (list from-key)) (vector (append prefix (list to-key))))))) ;; for each element in the left column of the above table, alias it ;; to the thing in the right column. Then do the same for many, but ;; not all, modifier combinations. ;; ;; (Well, we omit hyper and super. #### Handle this some other way!) ;; (while mapping ;; (let ((mods '(() (shift) (control) (meta) (alt)))) ;; (while mods ;; (let ((k1 (vector (append (car mods) (list (car (car mapping)))))) ;; (k2 (vector (append (car mods) (list (cdr (car mapping))))))) ;; (define-key global-map k1 k2)) ;; (setq mods (cdr mods)))) ;; (setq mapping (cdr mapping)))) ;;; I've extended keyboard-translate-table to work over keysyms. ;;; [FSF Emacs has something called `system-key-alist' that is ;;; supposed to accomplish approximately the same thing. Unfortunately, ;;; it's brain-dead in the typically FSF way, and associates *numbers* ;;; (who knows where the hell they come from?) with symbols.] --ben ;;; And I've made it into a function which is NOT called by default --martin (defun sun-x11-keyboard-translate () "Remap Sun's X11 keyboard. Keys with names like `f35' are remapped, at a low level, to more mnemonic ones,like `kp-3'." (interactive) (keyboard-translate 'f11 'stop ; the type4 keyboard Sun/MIT name 'f36 'stop ; the type5 keyboard Sun name 'cancel 'stop ; R6 binding 'f12 'again ; the type4 keyboard Sun/MIT name 'f37 'again ; the type5 keyboard Sun name 'f13 'props ; 'SunProps 'props ; R6 binding 'f14 'undo ; 'f15 'front ; 'SunFront 'front ; R6 binding 'f16 'copy ; 'SunCopy 'copy ; R6 binding 'f17 'open ; 'SunOpen 'open ; R6 binding 'f18 'paste ; 'SunPaste 'paste ; R6 binding 'f19 'find ; 'f20 'cut ; 'SunCut 'cut ; R6 binding ;; help is ok 'f21 'pause 'f22 'prsc 'f23 'scroll ;; num_lock is ok ;;'f24 'kp-equal) ; type4 only! 'f25 'kp-divide ; 'f26 'kp-multiply ; 'f24 'kp-subtract ; type5 only! 'f27 'kp-7 ; ;; up is ok 'f29 'kp-9 ;; left is ok 'f31 'kp-5 ;; right is ok ;; kp-add is ok 'f33 'kp-1 ; the Sun name 'r13 'end ; the MIT name ;; down is ok 'f35 'kp-3 ;; insert is ok ;; delete is ok ;; kp-enter is ok 'SunF36 'f11 ; Type 5 keyboards 'SunF37 'f12 ; Used to be Stop & Again )) ;; Initialise the information needed for processing of function keys on ;; keyboards without Roman-alpabet characters available. This keyboard ;; description was taken from gkb-new/xmodmap.sun/xmodmap.us in the ;; gnome-applets 2.12.0 distribution. (setq x-us-keymap-first-keycode 37 x-us-keymap-description [[?1 ?!] [?2 ?@] [?3 ?\#] [?4 ?$] [?5 ?%] [?6 ?^] [?7 ?&] [?8 ?*] [?9 ?\(] [?0 ?\)] [?- ?_] [?= ?+] [?\` ?~] nil nil nil ?/ ?* nil nil ?\. nil nil ?\t [?q ?Q] [?w ?W] [?e ?E] [?r ?R] [?t ?T] [?y ?Y] [?u ?U] [?i ?I] [?o ?O] [?p ?P] [?\[ ?{] [?\] ?}] nil nil ?7 ?8 ?9 ?- nil nil nil nil nil [?a ?A] [?s ?S] [?d ?D] [?f ?F] [?g ?G] [?h ?H] [?j ?J] [?k ?K] [?l ?L] [?\; ?:] [?\' ?\"] [?\\ ?|] nil nil ?4 ?5 ?6 ?0 nil nil nil nil nil [?z ?Z] [?x ?X] [?c ?C] [?v ?V] [?b ?B] [?n ?N] [?m ?M] [?\, ?<] [?\. ?>] [?/ ?\?] nil nil ?1 ?2 ?3 nil nil nil nil nil nil ?\ nil nil nil ?+]) ;;; OpenWindows-like "find" processing. ;;; As far as I know, the `find' key is a Sunism, so we do that binding ;;; here. This is the only Sun-specific keybinding. (The functions ;;; themselves are in x-win.el in case someone wants to use them when ;;; not running on a Sun display.) (or (lookup-key global-map 'find) (define-key global-map 'find 'ow-find)) (or (lookup-key global-map '(shift find)) (define-key global-map '(shift find) 'ow-find-backward)) ) ;;; x-win-sun.el ends here