Mercurial > hg > xemacs-beta
view lisp/x-mouse.el @ 5307:c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
src/ChangeLog addition:
2010-11-20 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.c (Fexpand_abbrev):
* alloc.c:
* alloc.c (Fmake_list):
* alloc.c (Fmake_vector):
* alloc.c (Fmake_bit_vector):
* alloc.c (Fmake_byte_code):
* alloc.c (Fmake_string):
* alloc.c (vars_of_alloc):
* bytecode.c (UNUSED):
* bytecode.c (Fbyte_code):
* chartab.c (decode_char_table_range):
* cmds.c (Fself_insert_command):
* data.c (check_integer_range):
* data.c (Fnatnump):
* data.c (Fnonnegativep):
* data.c (Fstring_to_number):
* elhash.c (hash_table_size_validate):
* elhash.c (decode_hash_table_size):
* eval.c (Fbacktrace_frame):
* event-stream.c (lisp_number_to_milliseconds):
* event-stream.c (Faccept_process_output):
* event-stream.c (Frecent_keys):
* event-stream.c (Fdispatch_event):
* events.c (Fmake_event):
* events.c (Fevent_timestamp):
* events.c (Fevent_timestamp_lessp):
* events.h:
* events.h (struct command_builder):
* file-coding.c (gzip_putprop):
* fns.c:
* fns.c (check_sequence_range):
* fns.c (Frandom):
* fns.c (Fnthcdr):
* fns.c (Flast):
* fns.c (Fnbutlast):
* fns.c (Fbutlast):
* fns.c (Fmember):
* fns.c (Ffill):
* fns.c (Freduce):
* fns.c (replace_string_range_1):
* fns.c (Freplace):
* font-mgr.c (Ffc_pattern_get):
* frame-msw.c (msprinter_set_frame_properties):
* glyphs.c (check_valid_xbm_inline):
* indent.c (Fmove_to_column):
* intl-win32.c (mswindows_multibyte_to_unicode_putprop):
* lisp.h:
* lisp.h (ARRAY_DIMENSION_LIMIT):
* lread.c (decode_mode_1):
* mule-ccl.c (ccl_get_compiled_code):
* number.h:
* process-unix.c (unix_open_multicast_group):
* process.c (Fset_process_window_size):
* profile.c (Fstart_profiling):
* unicode.c (Funicode_to_char):
Change NATNUMP to return 1 for positive bignums; changes uses of
it and of CHECK_NATNUM appropriately, usually by checking for an
integer in an appropriate range.
Add array-dimension-limit and use it in #'make-vector,
#'make-string. Add array-total-size-limit, array-rank-limit while
we're at it, for the sake of any Common Lisp-oriented code that
uses these limits.
Rename check_int_range to check_integer_range, have it take
Lisp_Objects (and thus bignums) instead.
Remove bignum_butlast(), just set int_n to an appropriately large
integer if N is a bignum.
Accept bignums in check_sequence_range(), change the functions
that use check_sequence_range() appropriately.
Move the definition of NATNUMP() to number.h; document why it's a
reasonable name, contradicting an old comment.
tests/ChangeLog addition:
2010-11-20 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
* automated/lisp-tests.el (featurep):
* automated/lisp-tests.el (wrong-type-argument):
* automated/mule-tests.el (featurep):
Check for args-out-of-range errors instead of wrong-type-argument
errors in various places when code is handed a large bignum
instead of a fixnum.
Also check for the wrong-type-argument errors when giving the same
code a non-integer value.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 20 Nov 2010 16:49:11 +0000 |
| 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
