comparison src/glyphs.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 13a418960a88
children 3d8143fc88e1
comparison
equal deleted inserted replaced
2366:2a392e0c390a 2367:ecf1ebac70d8
301 newly-added instantiators. Existing instantiators in glyphs and image 301 newly-added instantiators. Existing instantiators in glyphs and image
302 specifiers will not be affected. 302 specifiers will not be affected.
303 */ 303 */
304 (console_type, list)) 304 (console_type, list))
305 { 305 {
306 Lisp_Object tail;
307 Lisp_Object *imlist = get_image_conversion_list (console_type); 306 Lisp_Object *imlist = get_image_conversion_list (console_type);
308 307
309 /* Check the list to make sure that it only has valid entries. */ 308 /* Check the list to make sure that it only has valid entries. */
310 309
311 EXTERNAL_LIST_LOOP (tail, list) 310 EXTERNAL_LIST_LOOP_2 (mapping, list)
312 { 311 {
313 Lisp_Object mapping = XCAR (tail);
314
315 /* Mapping form should be (STRING VECTOR) or (STRING VECTOR INTEGER) */ 312 /* Mapping form should be (STRING VECTOR) or (STRING VECTOR INTEGER) */
316 if (!CONSP (mapping) || 313 if (!CONSP (mapping) ||
317 !CONSP (XCDR (mapping)) || 314 !CONSP (XCDR (mapping)) ||
318 (!NILP (XCDR (XCDR (mapping))) && 315 (!NILP (XCDR (XCDR (mapping))) &&
319 (!CONSP (XCDR (XCDR (mapping))) || 316 (!CONSP (XCDR (XCDR (mapping))) ||
876 static const struct sized_memory_description subwindow_image_instance_description = { 873 static const struct sized_memory_description subwindow_image_instance_description = {
877 sizeof (struct subwindow_image_instance), subwindow_image_instance_description_1 874 sizeof (struct subwindow_image_instance), subwindow_image_instance_description_1
878 }; 875 };
879 876
880 static const struct memory_description image_instance_data_description_1 [] = { 877 static const struct memory_description image_instance_data_description_1 [] = {
881 { XD_STRUCT_ARRAY, IMAGE_TEXT, 878 { XD_BLOCK_ARRAY, IMAGE_TEXT,
882 1, &text_image_instance_description }, 879 1, &text_image_instance_description },
883 { XD_STRUCT_ARRAY, IMAGE_MONO_PIXMAP, 880 { XD_BLOCK_ARRAY, IMAGE_MONO_PIXMAP,
884 1, &pixmap_image_instance_description }, 881 1, &pixmap_image_instance_description },
885 { XD_STRUCT_ARRAY, IMAGE_COLOR_PIXMAP, 882 { XD_BLOCK_ARRAY, IMAGE_COLOR_PIXMAP,
886 1, &pixmap_image_instance_description }, 883 1, &pixmap_image_instance_description },
887 { XD_STRUCT_ARRAY, IMAGE_WIDGET, 884 { XD_BLOCK_ARRAY, IMAGE_WIDGET,
888 1, &subwindow_image_instance_description }, 885 1, &subwindow_image_instance_description },
889 { XD_END } 886 { XD_END }
890 }; 887 };
891 888
892 static const struct sized_memory_description image_instance_data_description = { 889 static const struct sized_memory_description image_instance_data_description = {
1383 } 1380 }
1384 1381
1385 static int 1382 static int
1386 decode_image_instance_type_list (Lisp_Object list) 1383 decode_image_instance_type_list (Lisp_Object list)
1387 { 1384 {
1388 Lisp_Object rest;
1389 int mask = 0; 1385 int mask = 0;
1390 1386
1391 if (NILP (list)) 1387 if (NILP (list))
1392 return ~0; 1388 return ~0;
1393 1389
1396 enum image_instance_type type = 1392 enum image_instance_type type =
1397 decode_image_instance_type (list, ERROR_ME); 1393 decode_image_instance_type (list, ERROR_ME);
1398 return image_instance_type_to_mask (type); 1394 return image_instance_type_to_mask (type);
1399 } 1395 }
1400 1396
1401 EXTERNAL_LIST_LOOP (rest, list) 1397 {
1402 { 1398 EXTERNAL_LIST_LOOP_2 (elt, list)
1403 enum image_instance_type type = 1399 {
1404 decode_image_instance_type (XCAR (rest), ERROR_ME); 1400 enum image_instance_type type =
1405 mask |= image_instance_type_to_mask (type); 1401 decode_image_instance_type (elt, ERROR_ME);
1406 } 1402 mask |= image_instance_type_to_mask (type);
1403 }
1404 }
1407 1405
1408 return mask; 1406 return mask;
1409 } 1407 }
1410 1408
1411 static Lisp_Object 1409 static Lisp_Object
2666 Lisp_Object 2664 Lisp_Object
2667 bitmap_to_lisp_data (Lisp_Object name, int *xhot, int *yhot, 2665 bitmap_to_lisp_data (Lisp_Object name, int *xhot, int *yhot,
2668 int ok_if_data_invalid) 2666 int ok_if_data_invalid)
2669 { 2667 {
2670 int w, h; 2668 int w, h;
2671 UChar_Binary *data; 2669 Binbyte *data;
2672 int result; 2670 int result;
2673 2671
2674 result = read_bitmap_data_from_file (name, &w, &h, &data, xhot, yhot); 2672 result = read_bitmap_data_from_file (name, &w, &h, &data, xhot, yhot);
2675 2673
2676 if (result == BitmapSuccess) 2674 if (result == BitmapSuccess)
5262 }; 5260 };
5263 5261
5264 static const struct memory_description iife_description_1[] = { 5262 static const struct memory_description iife_description_1[] = {
5265 { XD_LISP_OBJECT, offsetof (image_instantiator_format_entry, symbol) }, 5263 { XD_LISP_OBJECT, offsetof (image_instantiator_format_entry, symbol) },
5266 { XD_LISP_OBJECT, offsetof (image_instantiator_format_entry, device) }, 5264 { XD_LISP_OBJECT, offsetof (image_instantiator_format_entry, device) },
5267 { XD_STRUCT_PTR, offsetof (image_instantiator_format_entry, meths), 1, &iim_description }, 5265 { XD_BLOCK_PTR, offsetof (image_instantiator_format_entry, meths), 1, &iim_description },
5268 { XD_END } 5266 { XD_END }
5269 }; 5267 };
5270 5268
5271 static const struct sized_memory_description iife_description = { 5269 static const struct sized_memory_description iife_description = {
5272 sizeof (image_instantiator_format_entry), 5270 sizeof (image_instantiator_format_entry),
5284 }; 5282 };
5285 5283
5286 static const struct memory_description iim_description_1[] = { 5284 static const struct memory_description iim_description_1[] = {
5287 { XD_LISP_OBJECT, offsetof (struct image_instantiator_methods, symbol) }, 5285 { XD_LISP_OBJECT, offsetof (struct image_instantiator_methods, symbol) },
5288 { XD_LISP_OBJECT, offsetof (struct image_instantiator_methods, device) }, 5286 { XD_LISP_OBJECT, offsetof (struct image_instantiator_methods, device) },
5289 { XD_STRUCT_PTR, offsetof (struct image_instantiator_methods, keywords), 1, &iiked_description }, 5287 { XD_BLOCK_PTR, offsetof (struct image_instantiator_methods, keywords), 1, &iiked_description },
5290 { XD_STRUCT_PTR, offsetof (struct image_instantiator_methods, consoles), 1, &cted_description }, 5288 { XD_BLOCK_PTR, offsetof (struct image_instantiator_methods, consoles), 1, &cted_description },
5291 { XD_END } 5289 { XD_END }
5292 }; 5290 };
5293 5291
5294 const struct sized_memory_description iim_description = { 5292 const struct sized_memory_description iim_description = {
5295 sizeof (struct image_instantiator_methods), 5293 sizeof (struct image_instantiator_methods),
5305 Dynarr_new (image_instantiator_format_entry); 5303 Dynarr_new (image_instantiator_format_entry);
5306 5304
5307 Vimage_instantiator_format_list = Qnil; 5305 Vimage_instantiator_format_list = Qnil;
5308 staticpro (&Vimage_instantiator_format_list); 5306 staticpro (&Vimage_instantiator_format_list);
5309 5307
5310 dump_add_root_struct_ptr (&the_image_instantiator_format_entry_dynarr, &iifed_description); 5308 dump_add_root_block_ptr (&the_image_instantiator_format_entry_dynarr, &iifed_description);
5311 5309
5312 INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (nothing, "nothing"); 5310 INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (nothing, "nothing");
5313 5311
5314 IIFORMAT_HAS_METHOD (nothing, possible_dest_types); 5312 IIFORMAT_HAS_METHOD (nothing, possible_dest_types);
5315 IIFORMAT_HAS_METHOD (nothing, instantiate); 5313 IIFORMAT_HAS_METHOD (nothing, instantiate);
5416 5414
5417 5415
5418 void 5416 void
5419 vars_of_glyphs (void) 5417 vars_of_glyphs (void)
5420 { 5418 {
5421 reinit_vars_of_glyphs ();
5422
5423 Vthe_nothing_vector = vector1 (Qnothing); 5419 Vthe_nothing_vector = vector1 (Qnothing);
5424 staticpro (&Vthe_nothing_vector); 5420 staticpro (&Vthe_nothing_vector);
5425 5421
5426 /* image instances */ 5422 /* image instances */
5427 5423
5433 /* glyphs */ 5429 /* glyphs */
5434 5430
5435 Vglyph_type_list = list3 (Qbuffer, Qpointer, Qicon); 5431 Vglyph_type_list = list3 (Qbuffer, Qpointer, Qicon);
5436 staticpro (&Vglyph_type_list); 5432 staticpro (&Vglyph_type_list);
5437 5433
5438 /* The octal-escape glyph, control-arrow-glyph and
5439 invisible-text-glyph are completely initialized in glyphs.el */
5440
5441 DEFVAR_LISP ("octal-escape-glyph", &Voctal_escape_glyph /*
5442 What to prefix character codes displayed in octal with.
5443 */);
5444 Voctal_escape_glyph = allocate_glyph (GLYPH_BUFFER, redisplay_glyph_changed);
5445
5446 DEFVAR_LISP ("control-arrow-glyph", &Vcontrol_arrow_glyph /*
5447 What to use as an arrow for control characters.
5448 */);
5449 Vcontrol_arrow_glyph = allocate_glyph (GLYPH_BUFFER,
5450 redisplay_glyph_changed);
5451
5452 DEFVAR_LISP ("invisible-text-glyph", &Vinvisible_text_glyph /*
5453 What to use to indicate the presence of invisible text.
5454 This is the glyph that is displayed when an ellipsis is called for
5455 \(see `selective-display-ellipses' and `buffer-invisibility-spec').
5456 Normally this is three dots ("...").
5457 */);
5458 Vinvisible_text_glyph = allocate_glyph (GLYPH_BUFFER,
5459 redisplay_glyph_changed);
5460
5461 /* Partially initialized in glyphs.el */
5462 DEFVAR_LISP ("hscroll-glyph", &Vhscroll_glyph /*
5463 What to display at the beginning of horizontally scrolled lines.
5464 */);
5465 Vhscroll_glyph = allocate_glyph (GLYPH_BUFFER, redisplay_glyph_changed);
5466 #ifdef HAVE_WINDOW_SYSTEM 5434 #ifdef HAVE_WINDOW_SYSTEM
5467 Fprovide (Qxbm); 5435 Fprovide (Qxbm);
5468 #endif 5436 #endif
5469 #ifdef HAVE_XPM 5437 #ifdef HAVE_XPM
5470 Fprovide (Qxpm); 5438 Fprovide (Qxpm);
5573 DEFVAR_LISP ("continuation-glyph", &Vcontinuation_glyph /* 5541 DEFVAR_LISP ("continuation-glyph", &Vcontinuation_glyph /*
5574 What to display at the end of wrapped lines. 5542 What to display at the end of wrapped lines.
5575 */ ); 5543 */ );
5576 Vcontinuation_glyph = allocate_glyph (GLYPH_BUFFER, redisplay_glyph_changed); 5544 Vcontinuation_glyph = allocate_glyph (GLYPH_BUFFER, redisplay_glyph_changed);
5577 5545
5546 /* The octal-escape glyph, control-arrow-glyph and
5547 invisible-text-glyph are completely initialized in glyphs.el */
5548
5549 DEFVAR_LISP ("octal-escape-glyph", &Voctal_escape_glyph /*
5550 What to prefix character codes displayed in octal with.
5551 */);
5552 Voctal_escape_glyph = allocate_glyph (GLYPH_BUFFER, redisplay_glyph_changed);
5553
5554 DEFVAR_LISP ("control-arrow-glyph", &Vcontrol_arrow_glyph /*
5555 What to use as an arrow for control characters.
5556 */);
5557 Vcontrol_arrow_glyph = allocate_glyph (GLYPH_BUFFER,
5558 redisplay_glyph_changed);
5559
5560 DEFVAR_LISP ("invisible-text-glyph", &Vinvisible_text_glyph /*
5561 What to use to indicate the presence of invisible text.
5562 This is the glyph that is displayed when an ellipsis is called for
5563 \(see `selective-display-ellipses' and `buffer-invisibility-spec').
5564 Normally this is three dots ("...").
5565 */);
5566 Vinvisible_text_glyph = allocate_glyph (GLYPH_BUFFER,
5567 redisplay_glyph_changed);
5568
5569 /* Partially initialized in glyphs.el */
5570 DEFVAR_LISP ("hscroll-glyph", &Vhscroll_glyph /*
5571 What to display at the beginning of horizontally scrolled lines.
5572 */);
5573 Vhscroll_glyph = allocate_glyph (GLYPH_BUFFER, redisplay_glyph_changed);
5574
5578 /* Partially initialized in glyphs-x.c, glyphs.el */ 5575 /* Partially initialized in glyphs-x.c, glyphs.el */
5579 DEFVAR_LISP ("xemacs-logo", &Vxemacs_logo /* 5576 DEFVAR_LISP ("xemacs-logo", &Vxemacs_logo /*
5580 The glyph used to display the XEmacs logo at startup. 5577 The glyph used to display the XEmacs logo at startup.
5581 */ ); 5578 */ );
5582 Vxemacs_logo = allocate_glyph (GLYPH_BUFFER, 0); 5579 Vxemacs_logo = allocate_glyph (GLYPH_BUFFER, 0);