Mercurial > hg > xemacs-beta
view lisp/sound.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 | e38acbeb1cae |
children | 2a54dfbe434f 308d34e9f07d |
line wrap: on
line source
;;; sound.el --- Loading sound files in XEmacs ;; Copyright (C) 1985, 1986, 1992, 1993, 1994 Free Software Foundation, Inc. ;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp. ;; Copyright (C) 2002 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: internal ;; 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;;; Code: (defgroup sound nil "Configure XEmacs sounds and properties" :group 'environment) (defcustom sound-default-alist '((default :sound bass) (undefined-key :sound drum) (undefined-click :sound drum) ;; beginning-of-buffer or end-of-buffer errors. (buffer-bound :sound drum) ;; buffer-read-only error (read-only :sound drum) ;; any error other than those handled by undefined-key, ;; undefined-click, buffer-bound, read-only (command-error :sound bass) (y-or-n-p :sound quiet) (yes-or-no-p :sound quiet) (auto-save-error :sound whip :volume 100) (no-completion :sound whip) (isearch-failed :sound quiet) (isearch-quit :sound bass) ;; QUIT: sound generated by ^G and its variants. (quit :sound quiet :volume 75) ;; READY: time-consuming task has completed... compile, ;; cvs-update, etc. (ready :sound cuckoo) ;; WARP: XEmacs has changed the selected-window or frame ;; asynchronously... Especially when it's done by an ;; asynchronous process filter. Perhaps by a debugger breakpoint ;; has been hit? (warp :sound yeep :volume 75) ;; ALARM: used for reminders... (alarm :sound cuckoo :volume 100) ) "The alist of sounds and associated error symbols. Used to set sound-alist in load-default-sounds." :group 'sound :type '(repeat (group (symbol :tag "Name") (checklist :inline t :greedy t (group :inline t (const :format "" :value :sound) (symbol :tag "Sound")) (group :inline t (const :format "" :value :volume) (integer :tag "Volume")) (group :inline t (const :format "" :value :pitch) (integer :tag "Pitch")) (group :inline t (const :format "" :value :duration) (integer :tag "Duration")))))) (defcustom sound-load-list '((load-sound-file "drum-beep" 'drum) (load-sound-file "quiet-beep" 'quiet) (load-sound-file "bass-snap" 'bass 80) (load-sound-file "whip" 'whip 70) (load-sound-file "cuckoo" 'cuckoo) (load-sound-file "yeep" 'yeep) (load-sound-file "hype" 'hype 100) ) "A list of calls to load-sound-file to be processed by load-default-sounds. Reference load-sound-file for more information." :group 'sound :type '(repeat (sexp :tag "Sound") )) (defcustom default-sound-directory (locate-data-directory "sounds") "Default directory to load a sound file from." :group 'sound :type 'directory ) ;; #### This should really be a list. --hniksic (defcustom sound-extension-list (cond ((or (eq system-type 'cygwin32) (eq system-type 'windows-nt)) ".wav:") ((eq system-type 'linux) ".wav:.au:") (t ".au:")) "Filename extensions to complete sound file name with. If more than one extension is used, they should be separated by \":\". " :group 'sound :type 'string) (defcustom default-sound-directory-list (locate-data-directory-list "sounds") "List of directories which to search for sound files" :group 'sound :type '(repeat directory ) ) ;;;###autoload (or sound-alist ;; these should be silent until sounds are loaded (setq sound-alist '((ready nil) (warp nil)))) ;;;###autoload (defun load-sound-file (filename sound-name &optional volume) "Read in an audio-file and add it to the sound-alist. FILENAME can either be absolute or relative, in which case the file will be searched in the directories given by `default-sound-directory-list'. When looking for the file, the extensions given by `sound-extension-list' are also tried in the given order. You can only play sound files if you are running on display 0 of the console of a machine with native sound support or running a NetAudio or ESD server and XEmacs has the necessary sound support compiled in. The sound file must be in the Sun/NeXT U-LAW format, except on Linux and MS Windows, where .wav files are also supported by the sound card drivers." (interactive "fSound file name: \n\ SSymbol to name this sound: \n\ nVolume (0 for default): ") (unless (symbolp sound-name) (error "sound-name not a symbol")) (unless (or (null volume) (integerp volume)) (error "volume not an integer or nil")) (let ((file ;; For absolute file names, we don't have on choice on the ;; location, but sound extensions however can still be tried (locate-file filename (if (file-name-absolute-p filename) (list (file-name-directory filename)) default-sound-directory-list) (split-string sound-extension-list ":"))) buf data) (unless file (error "Couldn't load sound file %s" filename)) (unwind-protect (save-excursion (set-buffer (setq buf (get-buffer-create " *sound-tmp*"))) (buffer-disable-undo (current-buffer)) (erase-buffer) (let ((coding-system-for-read 'binary)) (insert-file-contents file)) (setq data (buffer-string)) (erase-buffer)) (and buf (kill-buffer buf))) (let ((old (assq sound-name sound-alist))) ;; some conses in sound-alist might have been dumped with emacs. (if old (setq sound-alist (delq old (copy-sequence sound-alist))))) (setq sound-alist (cons (nconc (list sound-name) (if (and volume (not (eq 0 volume))) (list ':volume volume)) (list ':sound data)) sound-alist))) sound-name) ;;;###autoload (defun load-default-sounds () "Load and install some sound files as beep-types, using `load-sound-file'. This only works if you're on display 0 of the console of a machine with native sound support or running a NetAudio server and XEmacs has the necessary sound support compiled in." (interactive) ;; #### - this should do NOTHING if the sounds can't be played. (message "Loading sounds...") (setq sound-alist nil) ;; this is where the calls to load-sound-file get done (mapc 'eval sound-load-list) (setq sound-alist (append sound-default-alist sound-alist)) (message "Loading sounds...done") ;; (beep nil 'quiet) ) ;;; sound.el ends here.