Mercurial > hg > xemacs-beta
view lisp/x-mouse.el @ 5191:71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
tests/ChangeLog addition:
2010-04-05 Aidan Kehoe <kehoea@parhasard.net>
* automated/hash-table-tests.el:
Test the new built-in #'equalp hash table test. Test
#'define-hash-table-test.
* automated/lisp-tests.el:
When asserting that two objects are #'equalp, also assert that
their #'equalp-hash is identical.
man/ChangeLog addition:
2010-04-03 Aidan Kehoe <kehoea@parhasard.net>
* lispref/hash-tables.texi (Introduction to Hash Tables):
Document that we now support #'equalp as a hash table test by
default, and mention #'define-hash-table-test.
(Working With Hash Tables): Document #'define-hash-table-test.
src/ChangeLog addition:
2010-04-05 Aidan Kehoe <kehoea@parhasard.net>
* elhash.h:
* elhash.c (struct Hash_Table_Test, lisp_object_eql_equal)
(lisp_object_eql_hash, lisp_object_equal_equal)
(lisp_object_equal_hash, lisp_object_equalp_hash)
(lisp_object_equalp_equal, lisp_object_general_hash)
(lisp_object_general_equal, Feq_hash, Feql_hash, Fequal_hash)
(Fequalp_hash, define_hash_table_test, Fdefine_hash_table_test)
(init_elhash_once_early, mark_hash_table_tests, string_equalp_hash):
* glyphs.c (vars_of_glyphs):
Add a new hash table test in C, #'equalp.
Make it possible to specify new hash table tests with functions
define_hash_table_test, #'define-hash-table-test.
Use define_hash_table_test() in glyphs.c.
Expose the hash functions (besides that used for #'equal) to Lisp,
for people writing functions to be used with #'define-hash-table-test.
Call define_hash_table_test() very early in temacs, to create the
built-in hash table tests.
* ui-gtk.c (emacs_gtk_boxed_hash):
* specifier.h (struct specifier_methods):
* specifier.c (specifier_hash):
* rangetab.c (range_table_entry_hash, range_table_hash):
* number.c (bignum_hash, ratio_hash, bigfloat_hash):
* marker.c (marker_hash):
* lrecord.h (struct lrecord_implementation):
* keymap.c (keymap_hash):
* gui.c (gui_item_id_hash, gui_item_hash):
* glyphs.c (image_instance_hash, glyph_hash):
* glyphs-x.c (x_image_instance_hash):
* glyphs-msw.c (mswindows_image_instance_hash):
* glyphs-gtk.c (gtk_image_instance_hash):
* frame-msw.c (mswindows_set_title_from_ibyte):
* fontcolor.c (color_instance_hash, font_instance_hash):
* fontcolor-x.c (x_color_instance_hash):
* fontcolor-tty.c (tty_color_instance_hash):
* fontcolor-msw.c (mswindows_color_instance_hash):
* fontcolor-gtk.c (gtk_color_instance_hash):
* fns.c (bit_vector_hash):
* floatfns.c (float_hash):
* faces.c (face_hash):
* extents.c (extent_hash):
* events.c (event_hash):
* data.c (weak_list_hash, weak_box_hash):
* chartab.c (char_table_entry_hash, char_table_hash):
* bytecode.c (compiled_function_hash):
* alloc.c (vector_hash):
Change the various object hash methods to take a new EQUALP
parameter, hashing appropriately for #'equalp if it is true.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Mon, 05 Apr 2010 13:03:35 +0100 |
parents | 7039e6323819 |
children | 308d34e9f07d |
line wrap: on
line source
;;; x-mouse.el --- Mouse support for X window system. ;; Copyright (C) 1985, 1992-4, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: mouse, dumped ;; 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. ;;; Synched up with: Not synched. ;;; Commentary: ;; This file is dumped with XEmacs (when X support is compiled in). ;;; Code: (globally-declare-fboundp '(x-store-cutbuffer x-get-resource)) ;;(define-key global-map 'button2 'x-set-point-and-insert-selection) ;; This is reserved for use by Hyperbole. ;;(define-key global-map '(shift button2) 'x-mouse-kill) (define-key global-map '(control button2) 'x-set-point-and-move-selection) (define-obsolete-function-alias 'x-insert-selection 'insert-selection) (defun x-mouse-kill (event) "Kill the text between the point and mouse and copy it to the clipboard and to the cut buffer." (interactive "@e") (let ((old-point (point))) (mouse-set-point event) (let ((s (buffer-substring old-point (point)))) (own-clipboard s) (x-store-cutbuffer s)) (kill-region old-point (point)))) (make-obsolete 'x-set-point-and-insert-selection 'mouse-yank) (defun x-set-point-and-insert-selection (event) "Set point where clicked and insert the primary selection or the cut buffer." (interactive "e") (let ((mouse-yank-at-point nil)) (mouse-yank event))) (defun x-set-point-and-move-selection (event) "Set point where clicked and move the selected text to that location." (interactive "e") ;; Don't try to move the selection if x-kill-primary-selection if going ;; to fail; just let the appropriate error message get issued. (We need ;; to insert the selection and set point first, or the selection may ;; get inserted at the wrong place.) (and (selection-owner-p) primary-selection-extent (insert-selection t event)) (kill-primary-selection)) (defun mouse-track-and-copy-to-cutbuffer (event) "Make a selection like `mouse-track', but also copy it to the cutbuffer." (interactive "e") (mouse-track event) (cond ((null primary-selection-extent) nil) ((consp primary-selection-extent) (save-excursion (set-buffer (extent-object (car primary-selection-extent))) (x-store-cutbuffer (mapconcat #'identity (extract-rectangle (extent-start-position (car primary-selection-extent)) (extent-end-position (car (reverse primary-selection-extent)))) "\n")))) (t (save-excursion (set-buffer (extent-object primary-selection-extent)) (x-store-cutbuffer (buffer-substring (extent-start-position primary-selection-extent) (extent-end-position primary-selection-extent))))))) (defvar x-pointers-initialized nil) (defun x-init-pointer-shape (device) "Initialize the mouse-pointers of DEVICE from the X resource database." (if x-pointers-initialized ; only do it when the first device is created nil (set-glyph-image text-pointer-glyph (or (x-get-resource "textPointer" "Cursor" 'string device nil 'warn) [cursor-font :data "xterm"])) (set-glyph-image selection-pointer-glyph (or (x-get-resource "selectionPointer" "Cursor" 'string device nil 'warn) [cursor-font :data "top_left_arrow"])) (set-glyph-image nontext-pointer-glyph (or (x-get-resource "spacePointer" "Cursor" 'string device nil 'warn) [cursor-font :data "xterm"])) ; was "crosshair" (set-glyph-image modeline-pointer-glyph (or (x-get-resource "modeLinePointer" "Cursor" 'string device nil 'warn) ;; "fleur")) [cursor-font :data "sb_v_double_arrow"])) (set-glyph-image gc-pointer-glyph (or (x-get-resource "gcPointer" "Cursor" 'string device nil 'warn) [cursor-font :data "watch"])) (when (featurep 'scrollbar) (set-glyph-image scrollbar-pointer-glyph (or (x-get-resource "scrollbarPointer" "Cursor" 'string device nil 'warn) ;; bizarrely if we don't specify the specific locale (x) this ;; gets instantiated on the stream device. Bad puppy. [cursor-font :data "top_left_arrow"]) 'global '(default x))) (set-glyph-image busy-pointer-glyph (or (x-get-resource "busyPointer" "Cursor" 'string device nil 'warn) [cursor-font :data "watch"])) (set-glyph-image toolbar-pointer-glyph (or (x-get-resource "toolBarPointer" "Cursor" 'string device nil 'warn) [cursor-font :data "left_ptr"])) (set-glyph-image divider-pointer-glyph (or (x-get-resource "dividerPointer" "Cursor" 'string device nil 'warn) [cursor-font :data "sb_h_double_arrow"])) (let ((fg (x-get-resource "pointerColor" "Foreground" 'string device nil 'warn))) (and fg (set-face-foreground 'pointer fg))) (let ((bg (x-get-resource "pointerBackground" "Background" 'string device nil 'warn))) (and bg (set-face-background 'pointer bg))) (setq x-pointers-initialized t)) nil) ;;; x-mouse.el ends here