Mercurial > hg > xemacs-beta
view src/ntplay.c @ 5634:2014ff433daf
Support hash COLLECTIONs, #'{all,try}-completion{s,}; add #'test-completion
src/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
Add #'test-completion, API from GNU.
Accept hash table COLLECTIONs in it and in the other
completion-oriented functions, #'try-completion,
#'all-completions, and those Lisp functions implemented in terms
of them.
* lisp.h: Update the prototype of map_obarray(), making FN
compatible with the FUNCTION argument of elisp_maphash();
* abbrev.c (abbrev_match_mapper):
* abbrev.c (record_symbol):
* doc.c (verify_doc_mapper):
* symbols.c (mapatoms_1):
* symbols.c (apropos_mapper):
Update these mapper functions to reflect the new argument to
map_obarray().
* symbols.c (map_obarray):
Call FN with two arguments, the string name of the symbol, and the
symbol itself, for API (mapper) compatibility with
elisp_maphash().
* minibuf.c (map_completion): New. Map a maphash_function_t across
a non function COLLECTION, as appropriate for #'try-completion and
friends.
* minibuf.c (map_completion_list): New. Map a maphash_function_t
across a pseudo-alist, as appropriate for the completion
functions.
* minibuf.c (ignore_completion_p): PRED needs to be called with
two args if and only if the collection is a hash table. Implement
this.
* minibuf.c (try_completion_mapper): New. The loop body of
#'try-completion, refactored out.
* minibuf.c (Ftry_completion): Use try_completion_mapper(),
map_completion().
* minibuf.c (all_completions_mapper): New. The loop body of
#'all-completions, refactored out.
* minibuf.c (Fall_completions): Use all_completions_mapper(),
map_completion().
* minibuf.c (test_completion_mapper): New. The loop body of
#'test-completion.
* minibuf.c (Ftest_completion): New, API from GNU.
* minibuf.c (syms_of_minibuf): Make Ftest_completion available.
tests/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
* automated/completion-tests.el: New.
Test #'try-completion, #'all-completion and #'test-completion with
list, vector and hash-table COLLECTION arguments.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 01 Jan 2012 15:18:52 +0000 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
/* Sound in windows nt XEmacs. Copyright (C) 1998 Andy Piper. Copyright (C) 2001 Ben Wing. 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. */ /* This file Mule-ized by Ben Wing, 5-15-01. */ #include <config.h> #include "lisp.h" #include "sound.h" #include "syswindows.h" #include "sysfile.h" static int play_sound_data_1 (Binbyte *data, int length, int volume, int convert); void nt_play_sound_file (Lisp_Object path, int UNUSED (volume)) { DWORD flags = SND_ASYNC | SND_NODEFAULT | SND_FILENAME; Lisp_Object fname = Ffile_name_nondirectory (path); Extbyte *fnameext; fnameext = LISP_STRING_TO_TSTR (fname); if (qxeSearchPath (NULL, fnameext, NULL, 0, NULL, NULL) == 0) { /* file isn't in the path so read it as data */ int size; Binbyte *data; int ofd = qxe_open (XSTRING_DATA (path), O_RDONLY | OPEN_BINARY, 0); if (ofd < 0) return; size = lseek (ofd, 0, SEEK_END); data = xnew_binbytes (size); lseek (ofd, 0, SEEK_SET); if (!data) { retry_close (ofd); return; } if (retry_read (ofd, data, size) != size) { retry_close (ofd); xfree (data); return; } retry_close (ofd); play_sound_data_1 (data, size, 100, FALSE); } else qxePlaySound (fnameext, NULL, flags); } /* mswindows can't cope with playing a sound from alloca space so we have to convert if necessary */ static int play_sound_data_1 (Binbyte *data, int length, int UNUSED (volume), int convert_to_malloc) { DWORD flags = SND_ASYNC | SND_MEMORY | SND_NODEFAULT; static Binbyte *sound_data = 0; if (sound_data) { qxePlaySound (NULL, NULL, flags); xfree (sound_data); sound_data = 0; } if (convert_to_malloc) { sound_data = xnew_binbytes (length); memcpy (sound_data, data, length); } else sound_data = data; qxePlaySound ((Extbyte *) sound_data, NULL, flags); /* #### Error handling? */ return 1; } int play_sound_data (Binbyte *data, int length, int volume) { return play_sound_data_1 (data, length, volume, TRUE); }