comparison src/glyphs-x.c @ 2367:ecf1ebac70d8

[xemacs-hg @ 2004-11-04 23:05:23 by ben] commit mega-patch configure.in: Turn off -Winline and -Wchar-subscripts. Use the right set of cflags when compiling modules. Rewrite ldap configuration to separate the inclusion of lber (needed in recent Cygwin) from the basic checks for the needed libraries. add a function for MAKE_JUNK_C; initially code was added to generate xemacs.def using this, but it will need to be rewritten. add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto an existing file. Sort list of auto-detected functions and eliminate unused checks for stpcpy, setlocale and getwd. Add autodetection of Cygwin scanf problems BETA: Rewrite section on configure to indicate what flags are important and what not. digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main(). make-msgfile.c: Document that this is old junk. Move proposal to text.c. make-msgfile.lex: Move proposal to text.c. make-mswin-unicode.pl: Convert error-generating code so that the entire message will be seen as a single unrecognized token. mule/mule-ccl.el: Update docs. lispref/mule.texi: Update CCL docs. ldap/eldap.c: Mule-ize. Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP. * XEmacs 21.5.18 "chestnut" is released. --------------------------------------------------------------- MULE-RELATED WORK: --------------------------------------------------------------- --------------------------- byte-char conversion --------------------------- buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken previous version. Track the char position of the gap. Add functions to do char-byte conversion downwards as well as upwards. Move comments about algorithm workings to internals manual. --------------------------- work on types --------------------------- alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all the basic semantics of `char' that I have so far identified, so that its semantics can always be identified for the purposes of proper Mule-safe code, and the raw use of `char' always avoided. (1) More type renaming, for consistency of naming. Char_ASCII -> Ascbyte UChar_ASCII -> UAscbyte Char_Binary -> CBinbyte UChar_Binary -> Binbyte SChar_Binary -> SBinbyte (2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and Bitbyte and use them. (3) New types Itext, Wexttext and Textcount for separating out the concepts of bytes and textual units (different under UTF-16 and UTF-32, which are potential internal encodings). (4) qxestr*_c -> qxestr*_ascii. lisp.h: New; goes with other qxe() functions. #### Maybe goes in a different section. lisp.h: Group generic int-type defs together with EMACS_INT defs. lisp.h: * lisp.h (WEXTTEXT_IS_WIDE) New defns. lisp.h: New type to replace places where int occurs as a boolean. It's signed because occasionally people may want to use -1 as an error value, and because unsigned ints are viral -- see comments in the internals manual against using them. dynarr.c: int -> Bytecount. --------------------------- Mule-izing --------------------------- device-x.c: Partially Mule-ize. dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*(). sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be Unicode (e.g. startup code under Windows). emacs.c: Mule-ize. Properly deal with argv in external encoding. Use wext_*() and Wexttext. Use Rawbyte. #if 0 some old junk on SCO that is unlikely to be correct. Rewrite allocation code in run-temacs. emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to initialize mswindows_9x_p even earlier, for use in startup code (XEUNICODE_P). process.c: Use _wenviron not environ under Windows, to get Unicode environment variables. event-Xt.c: Mule-ize drag-n-drop related stuff. dragdrop.c, dragdrop.h, frame-x.c: Mule-ize. text.h: Add some more stand-in defines for particular kinds of conversion; use in Mule-ization work in frame-x.c etc. --------------------------- Freshening --------------------------- intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate. --------------------------- Unicode-work --------------------------- intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc() and convert_unicode_to_multibyte_dynarr() and use. Add stuff for alloca() conversion of multibyte/unicode. alloc.c: Use dfc_external_data_len() in case of unicode coding system. alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up dump-time loading. Anyway, either we load them at dump time or run time, never both. unicode.c: Dump the blank tables as well. --------------------------------------------------------------- DOCUMENTATION, MOSTLY MULE-RELATED: --------------------------------------------------------------- EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed. text.h: Add more documentation describing why DFC routines were not written to return their value. Add some other DFC documentation. console-msw.c, console-msw.h: Add pointer to docs in win32.c. emacs.c: Add comments on sources of doc info. text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and internationalization, and proposals for work to be done, in text.c or Internals manual, stuff related to specific textual API's in text.h, and stuff related to internal implementation of Unicode conversion in unicode.c. Put lots of pointers to the comments to make them easier to find. s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of builds and environments under Windows and how they work. Collect this info in win32.c. Add pointers to these docs in the relevant s/* files. emacs.c: Document places with long comments. Remove comment about exiting, move to internals manual, put in pointer. event-stream.c: Move docs about event queues and focus to internals manual, put in pointer. events.h: Move docs about event stream callbacks to internals manual, put in pointer. profile.c, redisplay.c, signal.c: Move documentation to the Internals manual. process-nt.c: Add pointer to comment in win32-native.el. lisp.h: Add comments about some comment conventions. lisp.h: Add comment about the second argument. device-msw.c, redisplay-msw.c: @@#### comments are out-of-date. --------------------------------------------------------------- PDUMP WORK (MOTIVATED BY UNICODE CHANGES) --------------------------------------------------------------- alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP: Properly implement dump_add_root_block(), which never worked before, and is necessary for dumping Unicode tables. Pdump name changes for accuracy: XD_STRUCT_PTR -> XD_BLOCK_PTR. XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY. XD_C_STRING -> XD_ASCII_STRING. *_structure_* -> *_block_*. lrecord.h: some comments added about dump_add_root_block() vs dump_add_root_block_ptr(). extents.c: remove incorrect comment about pdump problems with gap array. --------------------------------------------------------------- ALLOCATION --------------------------------------------------------------- abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for more convenient allocation of these commonly requested items. Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes, xnew_ibytes, etc. also XREALLOC_ARRAY, xnew. alloc.c: Rewrite the allocation functions to factor out repeated code. Add assertions for freeing dumped data. lisp.h: Moved down and consolidated with other allocation stuff. lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in LIFO order. lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs. text.h, lisp.h: Fill out convenience routines for allocating various kinds of bytes and put them in lisp.h. Use them in place of xmalloc(), ALLOCA(). text.h: Fill out the convenience functions so the _MALLOC() kinds match the alloca() kinds. --------------------------------------------------------------- ERROR-CHECKING --------------------------------------------------------------- text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN() from similar Eistring checkers and change the Eistring checkers to use them instead. --------------------------------------------------------------- MACROS IN LISP.H --------------------------------------------------------------- lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can be used to generate any kind of gcpro sets -- regular, ngcpro, nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2. buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities. Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3 or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2 (new macro). Removed/redid comments on EXTERNAL_LIST_LOOP. --------------------------------------------------------------- SPACING FIXES --------------------------------------------------------------- callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes. --------------------------------------------------------------- FIX FOR GEOMETRY PROBLEM IN FIRST FRAME --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows. will be overridden by my other ws. --------------------------------------------------------------- FIX FOR LEAKING PROCESS HANDLES: --------------------------------------------------------------- process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner <adrian@xemacs.org>. --------------------------------------------------------------- FIX FOR CYGWIN BUG (Unicode-related): --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. --------------------------------------------------------------- WARNING FIXES: --------------------------------------------------------------- console-stream.c: `reinit' is unused. compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got. regex.c: Gather includes together to avoid warning. --------------------------------------------------------------- CHANGES TO INITIALIZATION ROUTINES: --------------------------------------------------------------- buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity. Factor out some redundant init code. Move disallowed stuff that had crept into vars_of_glyphs() into complex_vars_of_glyphs(). Call init_eval_semi_early() from eval.c not in the middle of vars_of_() in emacs.c since there should be no order dependency in the latter calls. --------------------------------------------------------------- ARMAGEDDON: --------------------------------------------------------------- alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to inhibit_non_essential_conversion_operations. text.c: Assert on !inhibit_non_essential_conversion_operations. console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT in places where problems would arise. --------------------------------------------------------------- CHANGES TO THE BUILD PROCEDURE: --------------------------------------------------------------- config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file. Rearrange everything to follow this -- put all #undefs together and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA, BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE. m/gec63.h: Deleted; totally broken, not used at all, not in FSF. m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION, BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected. When in doubt, I followed recent FSF sources, which also have these things deleted.
author ben
date Thu, 04 Nov 2004 23:08:28 +0000
parents 04bc9d2f42c7
children ab71ad6ff3dd
comparison
equal deleted inserted replaced
2366:2a392e0c390a 2367:ecf1ebac70d8
1 /* X-specific Lisp objects. 1 /* X-specific Lisp objects.
2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc.
3 Copyright (C) 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 1995 Tinker Systems 4 Copyright (C) 1995 Tinker Systems
5 Copyright (C) 1995, 1996, 2001, 2002, 2003 Ben Wing 5 Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004 Ben Wing
6 Copyright (C) 1995 Sun Microsystems 6 Copyright (C) 1995 Sun Microsystems
7 Copyright (C) 1999, 2000, 2002 Andy Piper 7 Copyright (C) 1999, 2000, 2002 Andy Piper
8 8
9 This file is part of XEmacs. 9 This file is part of XEmacs.
10 10
161 /* convert from a series of RGB triples to an XImage formated for the */ 161 /* convert from a series of RGB triples to an XImage formated for the */
162 /* proper display */ 162 /* proper display */
163 /************************************************************************/ 163 /************************************************************************/
164 static XImage * 164 static XImage *
165 convert_EImage_to_XImage (Lisp_Object device, int width, int height, 165 convert_EImage_to_XImage (Lisp_Object device, int width, int height,
166 UChar_Binary *pic, unsigned long **pixtbl, 166 Binbyte *pic, unsigned long **pixtbl,
167 int *npixels) 167 int *npixels)
168 { 168 {
169 Display *dpy; 169 Display *dpy;
170 Colormap cmap; 170 Colormap cmap;
171 Visual *vis; 171 Visual *vis;
172 XImage *outimg; 172 XImage *outimg;
173 int depth, bitmap_pad, bits_per_pixel, byte_cnt, i, j; 173 int depth, bitmap_pad, bits_per_pixel, byte_cnt, i, j;
174 int rd,gr,bl,q; 174 int rd,gr,bl,q;
175 UChar_Binary *data, *ip, *dp; 175 Binbyte *data, *ip, *dp;
176 quant_table *qtable = 0; 176 quant_table *qtable = 0;
177 union { 177 union {
178 UINT_32_BIT val; 178 UINT_32_BIT val;
179 char cp[4]; 179 char cp[4];
180 } conv; 180 } conv;
209 if (!outimg) return NULL; 209 if (!outimg) return NULL;
210 210
211 bits_per_pixel = outimg->bits_per_pixel; 211 bits_per_pixel = outimg->bits_per_pixel;
212 byte_cnt = bits_per_pixel >> 3; 212 byte_cnt = bits_per_pixel >> 3;
213 213
214 data = (UChar_Binary *) xmalloc (outimg->bytes_per_line * height); 214 data = xnew_binbytes (outimg->bytes_per_line * height);
215 if (!data) 215 if (!data)
216 { 216 {
217 XDestroyImage (outimg); 217 XDestroyImage (outimg);
218 return NULL; 218 return NULL;
219 } 219 }
841 841
842 static void 842 static void
843 x_init_image_instance_from_eimage (Lisp_Image_Instance *ii, 843 x_init_image_instance_from_eimage (Lisp_Image_Instance *ii,
844 int width, int height, 844 int width, int height,
845 int slices, 845 int slices,
846 UChar_Binary *eimage, 846 Binbyte *eimage,
847 int dest_mask, 847 int dest_mask,
848 Lisp_Object instantiator, 848 Lisp_Object instantiator,
849 Lisp_Object UNUSED (domain)) 849 Lisp_Object UNUSED (domain))
850 { 850 {
851 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); 851 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
891 /* Given inline data for a mono pixmap, create and return the 891 /* Given inline data for a mono pixmap, create and return the
892 corresponding X object. */ 892 corresponding X object. */
893 893
894 static Pixmap 894 static Pixmap
895 pixmap_from_xbm_inline (Lisp_Object device, int width, int height, 895 pixmap_from_xbm_inline (Lisp_Object device, int width, int height,
896 Char_Binary *bits) 896 CBinbyte *bits)
897 { 897 {
898 return XCreatePixmapFromBitmapData (DEVICE_X_DISPLAY (XDEVICE (device)), 898 return XCreatePixmapFromBitmapData (DEVICE_X_DISPLAY (XDEVICE (device)),
899 XtWindow (DEVICE_XT_APP_SHELL 899 XtWindow (DEVICE_XT_APP_SHELL
900 (XDEVICE (device))), 900 (XDEVICE (device))),
901 bits, width, height, 901 bits, width, height,
906 image instance accordingly. */ 906 image instance accordingly. */
907 907
908 static void 908 static void
909 init_image_instance_from_xbm_inline (Lisp_Image_Instance *ii, 909 init_image_instance_from_xbm_inline (Lisp_Image_Instance *ii,
910 int width, int height, 910 int width, int height,
911 Char_Binary *bits, 911 CBinbyte *bits,
912 Lisp_Object instantiator, 912 Lisp_Object instantiator,
913 Lisp_Object pointer_fg, 913 Lisp_Object pointer_fg,
914 Lisp_Object pointer_bg, 914 Lisp_Object pointer_bg,
915 int dest_mask, 915 int dest_mask,
916 Pixmap mask, 916 Pixmap mask,
993 happen. */ 993 happen. */
994 IMAGE_INSTANCE_PIXMAP_FG (ii) = foreground; 994 IMAGE_INSTANCE_PIXMAP_FG (ii) = foreground;
995 IMAGE_INSTANCE_PIXMAP_BG (ii) = background; 995 IMAGE_INSTANCE_PIXMAP_BG (ii) = background;
996 IMAGE_INSTANCE_X_PIXMAP (ii) = 996 IMAGE_INSTANCE_X_PIXMAP (ii) =
997 XCreatePixmapFromBitmapData (dpy, draw, 997 XCreatePixmapFromBitmapData (dpy, draw,
998 (Char_Binary *) bits, width, height, 998 (CBinbyte *) bits, width, height,
999 fg, bg, d); 999 fg, bg, d);
1000 IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = d; 1000 IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = d;
1001 } 1001 }
1002 break; 1002 break;
1003 1003
1008 1008
1009 check_pointer_sizes (scr, width, height, instantiator); 1009 check_pointer_sizes (scr, width, height, instantiator);
1010 1010
1011 source = 1011 source =
1012 XCreatePixmapFromBitmapData (dpy, draw, 1012 XCreatePixmapFromBitmapData (dpy, draw,
1013 (Char_Binary *) bits, width, height, 1013 (CBinbyte *) bits, width, height,
1014 1, 0, 1); 1014 1, 0, 1);
1015 1015
1016 if (NILP (foreground)) 1016 if (NILP (foreground))
1017 foreground = pointer_fg; 1017 foreground = pointer_fg;
1018 if (NILP (background)) 1018 if (NILP (background))
1043 1043
1044 static void 1044 static void
1045 xbm_instantiate_1 (Lisp_Object image_instance, Lisp_Object instantiator, 1045 xbm_instantiate_1 (Lisp_Object image_instance, Lisp_Object instantiator,
1046 Lisp_Object pointer_fg, Lisp_Object pointer_bg, 1046 Lisp_Object pointer_fg, Lisp_Object pointer_bg,
1047 int dest_mask, int width, int height, 1047 int dest_mask, int width, int height,
1048 Char_Binary *bits) 1048 CBinbyte *bits)
1049 { 1049 {
1050 Lisp_Object mask_data = find_keyword_in_vector (instantiator, Q_mask_data); 1050 Lisp_Object mask_data = find_keyword_in_vector (instantiator, Q_mask_data);
1051 Lisp_Object mask_file = find_keyword_in_vector (instantiator, Q_mask_file); 1051 Lisp_Object mask_file = find_keyword_in_vector (instantiator, Q_mask_file);
1052 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); 1052 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
1053 Pixmap mask = 0; 1053 Pixmap mask = 0;
1054 1054
1055 if (!NILP (mask_data)) 1055 if (!NILP (mask_data))
1056 { 1056 {
1057 Char_Binary *ext_data; 1057 CBinbyte *ext_data;
1058 1058
1059 LISP_STRING_TO_EXTERNAL (XCAR (XCDR (XCDR (mask_data))), ext_data, 1059 LISP_STRING_TO_EXTERNAL (XCAR (XCDR (XCDR (mask_data))), ext_data,
1060 Qbinary); 1060 Qbinary);
1061 mask = pixmap_from_xbm_inline (IMAGE_INSTANCE_DEVICE (ii), 1061 mask = pixmap_from_xbm_inline (IMAGE_INSTANCE_DEVICE (ii),
1062 XINT (XCAR (mask_data)), 1062 XINT (XCAR (mask_data)),
1075 x_xbm_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, 1075 x_xbm_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
1076 Lisp_Object pointer_fg, Lisp_Object pointer_bg, 1076 Lisp_Object pointer_fg, Lisp_Object pointer_bg,
1077 int dest_mask, Lisp_Object UNUSED (domain)) 1077 int dest_mask, Lisp_Object UNUSED (domain))
1078 { 1078 {
1079 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); 1079 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
1080 Char_Binary *ext_data; 1080 CBinbyte *ext_data;
1081 1081
1082 assert (!NILP (data)); 1082 assert (!NILP (data));
1083 1083
1084 LISP_STRING_TO_EXTERNAL (XCAR (XCDR (XCDR (data))), ext_data, Qbinary); 1084 LISP_STRING_TO_EXTERNAL (XCAR (XCDR (XCDR (data))), ext_data, Qbinary);
1085 1085
1560 Lisp_Object pointer_fg, Lisp_Object pointer_bg, 1560 Lisp_Object pointer_fg, Lisp_Object pointer_bg,
1561 int dest_mask, Lisp_Object UNUSED (domain)) 1561 int dest_mask, Lisp_Object UNUSED (domain))
1562 { 1562 {
1563 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); 1563 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
1564 int i, stattis; 1564 int i, stattis;
1565 UChar_Binary *p, *bits, *bp; 1565 Binbyte *p, *bits, *bp;
1566 const CIbyte * volatile emsg = 0; 1566 const CIbyte * volatile emsg = 0;
1567 const UChar_Binary * volatile dstring; 1567 const Binbyte * volatile dstring;
1568 1568
1569 assert (!NILP (data)); 1569 assert (!NILP (data));
1570 1570
1571 TO_EXTERNAL_FORMAT (LISP_STRING, data, 1571 TO_EXTERNAL_FORMAT (LISP_STRING, data,
1572 C_STRING_ALLOCA, dstring, 1572 C_STRING_ALLOCA, dstring,
1573 Qbinary); 1573 Qbinary);
1574 1574
1575 if ((p = (UChar_Binary *) strchr ((char *) dstring, ':'))) 1575 if ((p = (Binbyte *) strchr ((char *) dstring, ':')))
1576 { 1576 {
1577 dstring = p + 1; 1577 dstring = p + 1;
1578 } 1578 }
1579 1579
1580 /* Must use setjmp not SETJMP because we used jmp_buf above not JMP_BUF */ 1580 /* Must use setjmp not SETJMP because we used jmp_buf above not JMP_BUF */
1598 } 1598 }
1599 1599
1600 if (emsg) 1600 if (emsg)
1601 signal_image_error_2 (emsg, data, Qimage); 1601 signal_image_error_2 (emsg, data, Qimage);
1602 1602
1603 bp = bits = (UChar_Binary *) ALLOCA (PIXELS / 8); 1603 bp = bits = alloca_binbytes (PIXELS / 8);
1604 1604
1605 /* the compface library exports char F[], which uses a single byte per 1605 /* the compface library exports char F[], which uses a single byte per
1606 pixel to represent a 48x48 bitmap. Yuck. */ 1606 pixel to represent a 48x48 bitmap. Yuck. */
1607 for (i = 0, p = (UChar_Binary *) F; i < (PIXELS / 8); ++i) 1607 for (i = 0, p = (Binbyte *) F; i < (PIXELS / 8); ++i)
1608 { 1608 {
1609 int n, b; 1609 int n, b;
1610 /* reverse the bit order of each byte... */ 1610 /* reverse the bit order of each byte... */
1611 for (b = n = 0; b < 8; ++b) 1611 for (b = n = 0; b < 8; ++b)
1612 { 1612 {
1613 n |= ((*p++) << b); 1613 n |= ((*p++) << b);
1614 } 1614 }
1615 *bp++ = (UChar_Binary) n; 1615 *bp++ = (Binbyte) n;
1616 } 1616 }
1617 1617
1618 xbm_instantiate_1 (image_instance, instantiator, pointer_fg, 1618 xbm_instantiate_1 (image_instance, instantiator, pointer_fg,
1619 pointer_bg, dest_mask, 48, 48, (Char_Binary *) bits); 1619 pointer_bg, dest_mask, 48, 48, (CBinbyte *) bits);
1620 } 1620 }
1621 1621
1622 #endif /* HAVE_XFACE */ 1622 #endif /* HAVE_XFACE */
1623 1623
1624 1624