Mercurial > hg > xemacs-beta
annotate src/ntplay.c @ 5013:ae48681c47fa
changes to VOID_TO_LISP et al.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* casetab.c (compute_canon_mapper):
* casetab.c (initialize_identity_mapper):
* casetab.c (compute_up_or_eqv_mapper):
* casetab.c (recompute_case_table):
* casetab.c (set_case_table):
* chartab.c (copy_mapper):
* chartab.c (copy_char_table_range):
* chartab.c (get_range_char_table_1):
* console.c (find_nonminibuffer_frame_not_on_console_predicate):
* console.c (find_nonminibuffer_frame_not_on_console):
* console.c (nuke_all_console_slots):
* device.c:
* device.c (find_nonminibuffer_frame_not_on_device_predicate):
* device.c (find_nonminibuffer_frame_not_on_device):
* dialog-msw.c (dialog_proc):
* dialog-msw.c (handle_question_dialog_box):
* dialog-x.c (maybe_run_dbox_text_callback):
* eval.c:
* eval.c (safe_run_hook_trapping_problems_1):
* eval.c (safe_run_hook_trapping_problems):
* event-msw.c:
* event-msw.c (mswindows_wnd_proc):
* event-msw.c (mswindows_find_frame):
* faces.c (update_face_inheritance_mapper):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_get_mouse_position):
* frame-msw.c (mswindows_get_frame_parent):
* glade.c (connector):
* glade.c (Fglade_xml_signal_connect):
* glade.c (Fglade_xml_signal_autoconnect):
* glade.c (Fglade_xml_textdomain):
* glyphs-msw.c (mswindows_subwindow_instantiate):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs.c (check_instance_cache_mapper):
* glyphs.c (check_window_subwindow_cache):
* glyphs.c (check_image_instance_structure):
* gui-x.c (snarf_widget_value_mapper):
* gui-x.c (popup_selection_callback):
* gui-x.c (button_item_to_widget_value):
* keymap.c (map_keymap_mapper):
* keymap.c (Fmap_keymap):
* menubar-gtk.c (__torn_off_sir):
* menubar-gtk.c (__activate_menu):
* menubar-gtk.c (menu_convert):
* menubar-gtk.c (__generic_button_callback):
* menubar-gtk.c (menu_descriptor_to_widget_1):
* menubar-msw.c:
* menubar-msw.c (EMPTY_ITEM_ID):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* menubar-x.c (pre_activate_callback):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar-x.c (command_builder_find_menu_accelerator):
* print.c (print_internal):
* process-unix.c (close_process_descs_mapfun):
* process.c (get_process_from_usid):
* process.c (init_process_io_handles):
* profile.c (sigprof_handler):
* profile.c (get_profiling_info_timing_maphash):
* profile.c (Fget_profiling_info):
* profile.c (set_profiling_info_timing_maphash):
* profile.c (mark_profiling_info_maphash):
* scrollbar-msw.c (mswindows_create_scrollbar_instance):
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (mswindows_handle_scrollbar_event):
* specifier.c (recompute_cached_specifier_everywhere_mapfun):
* specifier.c (recompute_cached_specifier_everywhere):
* syntax.c (copy_to_mirrortab):
* syntax.c (copy_if_not_already_present):
* syntax.c (update_just_this_syntax_table):
* text.c (new_dfc_convert_now_damn_it):
* text.h (LISP_STRING_TO_EXTERNAL):
* tooltalk.c:
* tooltalk.c (tooltalk_message_callback):
* tooltalk.c (tooltalk_pattern_callback):
* tooltalk.c (Fcreate_tooltalk_message):
* tooltalk.c (Fcreate_tooltalk_pattern):
* ui-byhand.c (__generic_toolbar_callback):
* ui-byhand.c (generic_toolbar_insert_item):
* ui-byhand.c (__emacs_gtk_ctree_recurse_internal):
* ui-byhand.c (Fgtk_ctree_recurse):
* ui-gtk.c (__internal_callback_destroy):
* ui-gtk.c (__internal_callback_marshal):
* ui-gtk.c (Fgtk_signal_connect):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (lisp_to_gtk_type):
* ui-gtk.c (lisp_to_gtk_ret_type):
* lisp-disunion.h:
* lisp-disunion.h (NON_LVALUE):
* lisp-union.h:
* lisp.h (LISP_HASH):
Rename:
LISP_TO_VOID -> STORE_LISP_IN_VOID
VOID_TO_LISP -> GET_LISP_FROM_VOID
These new names are meant to clearly identify that the Lisp object
is the source and void the sink, and that they can't be used the
other way around -- they aren't exact opposites despite the old
names. The names are also important given the new functions
created just below. Also, clarify comments in lisp-union.h and
lisp-disunion.h about the use of the functions.
* lisp.h:
New functions STORE_VOID_IN_LISP and GET_VOID_FROM_LISP. These
are different from the above in that the source is a void *
(previously, you had to use make_opaque_ptr()).
* eval.c (restore_lisp_object):
* eval.c (record_unwind_protect_restoring_lisp_object):
* eval.c (struct restore_int):
* eval.c (restore_int):
* eval.c (record_unwind_protect_restoring_int):
* eval.c (free_pointer):
* eval.c (record_unwind_protect_freeing):
* eval.c (free_dynarr):
* eval.c (record_unwind_protect_freeing_dynarr):
* eval.c (unbind_to_1):
Use STORE_VOID_IN_LISP and GET_VOID_FROM_LISP to eliminate the
use of make_opaque_ptr() and mostly eliminate Lisp consing
entirely in the use of these various record_unwind_protect_*
functions as well as internal_bind_* (e.g. internal_bind_int).
* tests.c:
* tests.c (Ftest_store_void_in_lisp):
* tests.c (syms_of_tests):
* tests.c (vars_of_tests):
Add an C-assert-style test to test STORE_VOID_IN_LISP and
GET_VOID_FROM_LISP to make sure the same value comes back that
was put in.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 08 Feb 2010 06:42:16 -0600 |
| parents | 3c3c1d139863 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Sound in windows nt XEmacs. |
| 2 Copyright (C) 1998 Andy Piper. | |
| 771 | 3 Copyright (C) 2001 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to the Free | |
| 19 Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 20 02111-1307, USA.*/ | |
| 21 | |
| 563 | 22 /* Synched up with: Not in FSF. */ |
| 23 | |
| 24 /* This file Mule-ized by Ben Wing, 5-15-01. */ | |
| 25 | |
| 428 | 26 #include <config.h> |
| 27 #include "lisp.h" | |
| 28 | |
| 563 | 29 #include "sound.h" |
| 771 | 30 #include "syswindows.h" |
| 563 | 31 |
| 32 #include "sysfile.h" | |
| 442 | 33 |
| 2367 | 34 static int play_sound_data_1 (Binbyte *data, int length, |
| 563 | 35 int volume, int convert); |
| 428 | 36 |
| 563 | 37 void |
| 2526 | 38 nt_play_sound_file (Lisp_Object path, int UNUSED (volume)) |
| 428 | 39 { |
| 40 DWORD flags = SND_ASYNC | SND_NODEFAULT | SND_FILENAME; | |
| 2526 | 41 Lisp_Object fname = Ffile_name_nondirectory (path); |
| 563 | 42 Extbyte *fnameext; |
| 428 | 43 |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
2526
diff
changeset
|
44 fnameext = LISP_STRING_TO_TSTR (fname); |
| 563 | 45 |
| 771 | 46 if (qxeSearchPath (NULL, fnameext, NULL, 0, NULL, NULL) == 0) |
| 428 | 47 { |
| 48 /* file isn't in the path so read it as data */ | |
| 49 int size; | |
| 2367 | 50 Binbyte *data; |
| 2526 | 51 int ofd = qxe_open (XSTRING_DATA (path), O_RDONLY | OPEN_BINARY, 0); |
| 428 | 52 |
| 2526 | 53 if (ofd < 0) |
| 428 | 54 return; |
| 55 | |
| 56 size = lseek (ofd, 0, SEEK_END); | |
| 2367 | 57 data = xnew_binbytes (size); |
| 428 | 58 lseek (ofd, 0, SEEK_SET); |
| 59 | |
| 60 if (!data) | |
| 61 { | |
| 771 | 62 retry_close (ofd); |
| 428 | 63 return; |
| 64 } | |
| 65 | |
| 771 | 66 if (retry_read (ofd, data, size) != size) |
| 428 | 67 { |
| 771 | 68 retry_close (ofd); |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
2526
diff
changeset
|
69 xfree (data); |
| 428 | 70 return; |
| 71 } | |
| 771 | 72 retry_close (ofd); |
| 428 | 73 |
| 74 play_sound_data_1 (data, size, 100, FALSE); | |
| 75 } | |
| 76 else | |
| 771 | 77 qxePlaySound (fnameext, NULL, flags); |
| 428 | 78 } |
| 79 | |
| 80 /* mswindows can't cope with playing a sound from alloca space so we | |
| 81 have to convert if necessary */ | |
| 563 | 82 static int |
| 2367 | 83 play_sound_data_1 (Binbyte *data, int length, int UNUSED (volume), |
| 563 | 84 int convert_to_malloc) |
| 428 | 85 { |
| 86 DWORD flags = SND_ASYNC | SND_MEMORY | SND_NODEFAULT; | |
| 2367 | 87 static Binbyte *sound_data = 0; |
| 428 | 88 if (sound_data) |
| 89 { | |
| 771 | 90 qxePlaySound (NULL, NULL, flags); |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
2526
diff
changeset
|
91 xfree (sound_data); |
| 593 | 92 sound_data = 0; |
| 428 | 93 } |
| 94 | |
| 95 if (convert_to_malloc) | |
| 96 { | |
| 2367 | 97 sound_data = xnew_binbytes (length); |
| 428 | 98 memcpy (sound_data, data, length); |
| 99 } | |
| 100 else | |
| 101 sound_data = data; | |
| 102 | |
| 771 | 103 qxePlaySound ((Extbyte *) sound_data, NULL, flags); |
| 428 | 104 |
| 442 | 105 /* #### Error handling? */ |
| 106 return 1; | |
| 428 | 107 } |
| 108 | |
| 563 | 109 int |
| 2367 | 110 play_sound_data (Binbyte *data, int length, int volume) |
| 428 | 111 { |
| 442 | 112 return play_sound_data_1 (data, length, volume, TRUE); |
| 428 | 113 } |