Mercurial > hg > xemacs-beta
annotate src/miscplay.h @ 4908:b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* compiler.h:
Create a USED() macro to force unused-var warnings to go away,
in certain cases where it's inconvenient to do otherwise (e.g.
when THIS_IS_GTK in redisplay-xlike-inc.c).
* console-x.h:
Remove unneeded decls, make some static.
* redisplay-xlike-inc.c:
* console-xlike-inc.h: New file. Include defns from
redisplay-xlike-inc.c that may be useful in other XLIKE files.
Correct the handling of colors and font-style setting functions
in the xlike defns. Lots of fixes in the GTK-specific defns.
* depend: Regenerate.
* event-xlike-inc.c:
* event-xlike-inc.c (USE_UNICODE_MAP):
* event-xlike-inc.c (endif):
* gccache-gtk.c:
* gtk-glue.c (xemacs_list_to_gtklist):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-glue.c (FROB):
* gtk-glue.c (face_to_gc):
* gtk-glue.c (face_to_style):
* gtk-glue.c (gdk_event_to_emacs_event):
* gtk-xemacs.h (struct _GtkXEmacs):
* gtk-xemacs.h (struct _GtkXEmacsClass):
* objects-xlike-inc.c:
Cosmetic, comment fixes.
* glyphs.c (pixmap_to_lisp_data):
Unused var fixes.
* gtk-glue.c:
* gccache-gtk.c:
* gtk-xemacs.c:
* gtk-xemacs.h:
* objects-xlike-inc.c:
* ui-gtk.c:
* ui-gtk.h:
* xgccache.c:
* xgccache.c (GC_CACHE_SIZE):
* xgccache.h:
Misc include-file fixes.
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xlistfonts_checking_charset):
Combine some ifdeffed stuff using defs in console-xlike-inc.h.
* redisplay-gtk.c:
* redisplay-gtk.c (THIS_IS_GTK):
* redisplay-gtk.c (XLIKE_bevel_area):
* redisplay-gtk.c (XLIKE_ring_bell):
* redisplay-gtk.c (gdk_draw_text_image):
Fix numerous compile problems. Delete gtk_output_shadows(),
which mostly duplicates generic bevel_modeline(). Fix up
gtk_bevel_modeline() into XLIKE_bevel_area() and make use of
the style var properly to set the appropriate GTK constant.
* redisplay-x.c:
* redisplay-x.c (XLIKE_window_output_begin):
* redisplay-x.c (XLIKE_window_output_end):
* redisplay-x.c (XLIKE_bevel_area):
* redisplay-x.c (x_output_shadows):
* redisplay-x.c (XLIKE_ring_bell):
Make x_output_shadows be static. Change the defn of various
functions to look like XLIKE_foo() so it matches the calling
convention elsewhere.
* redisplay-xlike-inc.c:
* redisplay-xlike-inc.c (NEED_GCCACHE_H):
* redisplay-xlike-inc.c (XLIKE_text_width):
* redisplay-xlike-inc.c (XLIKE_get_gc):
* redisplay-xlike-inc.c (XLIKE_text_width_single_run):
* redisplay-xlike-inc.c (XFT_FROB_LISP_COLOR):
* redisplay-xlike-inc.c (XLIKE_output_xlike_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_vertical_divider):
* redisplay-xlike-inc.c (XLIKE_flash):
Lots of header fixes. Lots of stuff moved to console-xlike-inc.h.
Use XFUN() to generate function names instead of directly
calling XLIKE_PASTE(). Remove unnecessary prototypes.
Unify calls to text_width funs. Make XLIKE_get_gc non-static
since it's called from gtk. Change the color-function calls
and fill-style-setting calls to match the changes in
console-xlike-inc.h. Use USED() to avoid some warnings.
* symsinit.h:
Sort the prototypes, and add a fun `sort-symsinit' in a comment
that does the sorting (using sort-regexp-fields).
* symsinit.h (init_number):
* sysgtk.h: New file, wraps the various GTK headers.
* sysgdkx.h: New file, wraps <gtk/gdkx.h>. Keep this separate to
* event-gtk.h: Delete. Combine stuff into console-gtk.h.
help isolate X-specific code from GTK.
* device-gtk.c:
* event-gtk.c:
* console-gtk.h:
* frame-gtk.c:
* gccache-gtk.c:
* gccache-gtk.h:
* glyphs-gtk.c (gtk_colorize_image_instance):
* glyphs-gtk.h:
* gtk-xemacs.h:
* objects-gtk.c:
* objects-gtk.c (MAX_FONT_COUNT):
* ui-gtk.h:
Use sysgtk.h or sysgdkx.h instead of directly including GTK
headers. Don't include event-gtk.h.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 01 Feb 2010 02:15:28 -0600 |
| parents | ecf1ebac70d8 |
| children |
| rev | line source |
|---|---|
| 428 | 1 /* miscplay.h - general routines related to playing sounds |
| 2 ** | |
| 3 ** Copyright (C) 1995,96 by Markus Gutschke (gutschk@math.uni-muenster.de) | |
| 4 ** This was sawed out from version 1.3 of linuxplay.c by | |
| 5 ** Robert Bihlmeyer <robbe@orcus.priv.at>. | |
| 6 ** | |
| 7 ** Parts of this code were inspired by sunplay.c, which is copyright 1989 by | |
| 8 ** Jef Poskanzer and 1991,92 by Jamie Zawinski; c.f. sunplay.c for further | |
| 9 ** information. | |
| 10 ** | |
| 11 ** Permission to use, copy, modify, and distribute this software and its | |
| 12 ** documentation for any purpose and without fee is hereby granted, provided | |
| 13 ** that the above copyright notice appear in all copies and that both that | |
| 14 ** copyright notice and this permission notice appear in supporting | |
| 15 ** documentation. This software is provided "as is" without express or | |
| 16 ** implied warranty. | |
| 17 */ | |
| 18 | |
| 563 | 19 /* Synched up with: Not in FSF. */ |
| 20 | |
| 21 /* This file Mule-ized by Ben Wing, 5-15-01. */ | |
| 22 | |
| 440 | 23 #ifndef INCLUDED_miscplay_h_ |
| 24 #define INCLUDED_miscplay_h_ | |
| 25 | |
| 428 | 26 #define HEADERSZ 256 /* has to be at least as big as the biggest header */ |
| 27 #define SNDBUFSZ 2048 /* has to be at least as big as HEADERSZ */ | |
| 28 | |
| 29 /* Audio data formats from <linux/soundcard.h> */ | |
| 30 #define AFMT_MU_LAW 0x00000001 | |
| 31 #define AFMT_A_LAW 0x00000002 | |
| 32 #define AFMT_IMA_ADPCM 0x00000004 | |
| 33 #define AFMT_U8 0x00000008 | |
| 34 #define AFMT_S16_LE 0x00000010 /* Little endian signed 16*/ | |
| 35 #define AFMT_S16_BE 0x00000020 /* Big endian signed 16 */ | |
| 36 #define AFMT_S8 0x00000040 | |
| 37 #define AFMT_U16_LE 0x00000080 /* Little endian U16 */ | |
| 38 #define AFMT_U16_BE 0x00000100 /* Big endian U16 */ | |
| 39 #define AFMT_MPEG 0x00000200 /* MPEG (2) audio */ | |
| 40 | |
| 41 typedef enum {fmtIllegal,fmtRaw,fmtVoc,fmtWave,fmtSunAudio} fmtType; | |
| 42 | |
| 43 size_t sndcnvnop(void **data,size_t *sz,void **outbuf); | |
| 44 size_t sndcnv8U_2mono(void **data,size_t *sz,void **outbuf); | |
| 45 size_t sndcnv8S_2mono(void **data,size_t *sz,void **outbuf); | |
| 46 size_t sndcnv2monounsigned(void **data,size_t *sz,void **outbuf); | |
| 47 size_t sndcnv2unsigned(void **data,size_t *sz,void **outbuf); | |
| 48 size_t sndcnvULaw_2linear(void **data,size_t *sz,void **outbuf); | |
| 49 size_t sndcnvULaw_2mono(void **data,size_t *sz,void **outbuf); | |
| 50 size_t sndcnv16swap(void **data,size_t *sz,void **outbuf); | |
| 51 size_t sndcnv16_2monoLE(void **data,size_t *sz,void **outbuf); | |
| 52 size_t sndcnv16_2monoBE(void **data,size_t *sz,void **outbuf); | |
| 53 size_t sndcnv2byteLE(void **data,size_t *sz,void **outbuf); | |
| 54 size_t sndcnv2byteBE(void **data,size_t *sz,void **outbuf); | |
| 55 size_t sndcnv2monobyteLE(void **data,size_t *sz,void **outbuf); | |
| 56 size_t sndcnv2monobyteBE(void **data,size_t *sz,void **outbuf); | |
| 57 | |
| 2367 | 58 fmtType analyze_format(Binbyte *format,int *fmt,int *speed, |
| 428 | 59 int *tracks, |
| 60 size_t (**parsesndfile)(void **,size_t *sz, | |
| 61 void **)); | |
| 62 void reset_parsestate(void); | |
| 63 int parse_wave_complete(void); | |
| 440 | 64 |
| 65 #endif /* INCLUDED_miscplay_h_ */ |