Mercurial > hg > xemacs-beta

comparison src/text.h @ 793:e38acbeb1cae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-29 04:46:17 by ben] lots o' fixes etc/ChangeLog: New file. Separated out all entries for etc/ into their own ChangeLog. Includes entries for the following files: etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad, etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL, etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS, etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL, etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se, etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh, etc/custom/example-themes/europe-theme.el, etc/custom/example-themes/ex-custom-file, etc/custom/example-themes/example-theme.el, etc/e/eterm.ti, etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1, etc/gnuserv.README, etc/package-index.LATEST.gpg, etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm, etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs, etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E, etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm, etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm, etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar, etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1, etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL, etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el, etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\* unicode/unicode-consortium/8859-16.TXT: New file. mule/english.el: Define this charset now, since a bug was fixed that formerly prevented it. mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be integers. Makefile.in.in: Always include gui.c, to fix compile error when TTY-only. EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo(). Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate nearly all uses of Lisp_String * in favor of Lisp_Object, and correct macros so most of them favor Lisp_Object. Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings, but at level `debug' (usually ignored). Use it when instantiating specifiers, so problems can be debugged. Move log-warning-minimum-level into C so that we can optimize ERROR_ME_DEBUG_WARN. Fix warning levels consistent with new definitions. Add default_ and parent fields to char table; not yet implemented. New fun Dynarr_verify(); use for further error checking on Dynarrs. Rearrange code at top of lisp.h in conjunction with dynarr changes. Fix eifree(). Use Eistrings in various places (format_event_object(), where_is_to_char(), and callers thereof) to avoid fixed-size strings buffers. New fun write_eistring(). Reindent and fix GPM code to follow standards. Set default MS Windows font to Lucida Console (same size as Courier New but less interline spacing, so more lines fit). Increase default frame size on Windows to 50 lines. (If that's too big for the workspace, the frame will be shrunk as necessary.) Fix problem with text files with no newlines (). (Change `convert-eol' coding system to use `nil' for autodetect, consistent with make-coding-system.) Correct compile warnings in vm-limit.c. Fix handling of reverse-direction charsets to avoid errors when opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el. Recode some object printing methods to use write_fmt_string() instead of a fixed buffer and sprintf. Turn on display of png comments as warnings (level `info'), now that they're unobtrusive. Revamped the sound documentation. Fixed bug in redisplay w.r.t. hscroll/truncation/continuation glyphs causing jumping up and down of the lines, since they're bigger than the line size. (It was seen most obviously when there's a horizontal scroll bar, e.g. do C-h a glyph or something like that.) The problem was that the glyph-contrib-p setting on glyphs was ignored even if it was set properly, which it wasn't until now.
author ben
date Fri, 29 Mar 2002 04:49:13 +0000
parents 026c5bf9c134
children a5954632b187
comparison
equal deleted inserted replaced
792:4e83fdb13eb9 793:e38acbeb1cae
480 internally-formatted strings of data. It provides operations similar 480 internally-formatted strings of data. It provides operations similar
481 in feel to the standard strcpy(), strcat(), strlen(), etc., but 481 in feel to the standard strcpy(), strcat(), strlen(), etc., but
482 482
483 (a) it is Mule-correct 483 (a) it is Mule-correct
484 (b) it does dynamic allocation so you never have to worry about size 484 (b) it does dynamic allocation so you never have to worry about size
485 restrictions (and all allocation is stack-local using alloca(), so 485 restrictions
486 there is no need to explicitly clean up) 486 (c) it comes in an alloca() variety (all allocation is stack-local,
487 (c) it knows its own length, so it does not suffer from standard null 487 so there is no need to explicitly clean up) as well as a malloc()
488 byte brain-damage 488 variety
489 (d) it provides a much more powerful set of operations and knows about 489 (d) it knows its own length, so it does not suffer from standard null
490 byte brain-damage -- but it null-terminates the data anyway, so
491 it can be passed to standard routines
492 (e) it provides a much more powerful set of operations and knows about
490 all the standard places where string data might reside: Lisp_Objects, 493 all the standard places where string data might reside: Lisp_Objects,
491 other Eistrings, Intbyte * data with or without an explicit length, 494 other Eistrings, Intbyte * data with or without an explicit length,
492 ASCII strings, Emchars, etc. 495 ASCII strings, Emchars, etc.
493 (e) it provides easy operations to convert to/from externally-formatted 496 (f) it provides easy operations to convert to/from externally-formatted
494 data, and is much easier to use than the standard TO_INTERNAL_FORMAT 497 data, and is easier to use than the standard TO_INTERNAL_FORMAT
495 and TO_EXTERNAL_FORMAT macros. (An Eistring can store both the internal 498 and TO_EXTERNAL_FORMAT macros. (An Eistring can store both the internal
496 and external version of its data, but the external version is only 499 and external version of its data, but the external version is only
497 initialized or changed when you call eito_external().) 500 initialized or changed when you call eito_external().)
498 501
499 The idea is to make it as easy to write Mule-correct string 502 The idea is to make it as easy to write Mule-correct string manipulation
500 manipulation code as it is to write normal string manipulation 503 code as it is to write normal string manipulation code. We also make
501 code. We also make the API sufficiently general that it can handle 504 the API sufficiently general that it can handle multiple internal data
502 multiple internal data formats (e.g. some fixed-width optimizing 505 formats (e.g. some fixed-width optimizing formats and a default variable
503 formats and a default variable width format) and allows for *ANY* 506 width format) and allows for *ANY* data format we might choose in the
504 data format we might choose in the future for the default format, 507 future for the default format, including UCS2. (In other words, we can't
505 including UCS2. (In other words, we can't assume that the internal 508 assume that the internal format is ASCII-compatible and we can't assume
506 format is ASCII-compatible and we can't assume it doesn't have 509 it doesn't have embedded null bytes. We do assume, however, that any
507 embedded null bytes. We do assume, however, that any chosen format 510 chosen format will have the concept of null-termination.) All of this is
508 will have the concept of null-termination.) All of this is hidden 511 hidden from the user.
509 from the user.
510 512
511 #### It is really too bad that we don't have a real object-oriented 513 #### It is really too bad that we don't have a real object-oriented
512 language, or at least a language with polymorphism! 514 language, or at least a language with polymorphism!
513 515
514 516
527 DECLARE_EISTRING_MALLOC (name); 529 DECLARE_EISTRING_MALLOC (name);
528 Declare a new Eistring, which uses malloc()ed instead of alloca()ed 530 Declare a new Eistring, which uses malloc()ed instead of alloca()ed
529 data. This is a standard local variable declaration and can go 531 data. This is a standard local variable declaration and can go
530 anywhere in the variable declaration section. Once you initialize 532 anywhere in the variable declaration section. Once you initialize
531 the Eistring, you will have to free it using eifree() to avoid 533 the Eistring, you will have to free it using eifree() to avoid
532 memory leaks. 534 memory leaks. You will need to use this form if you are passing
535 an Eistring to any function that modifies it (otherwise, the
536 modified data may be in stack space and get overwritten when the
537 function returns).
533 538
534 or use 539 or use
535 540
536 Eistring name; 541 Eistring ei;
537 void eiinit (Eistring name); 542 void eiinit (Eistring *ei);
538 void eiinit_malloc (Eistring name); 543 void eiinit_malloc (Eistring *einame);
539 If you need to put an Eistring elsewhere than in a local variable 544 If you need to put an Eistring elsewhere than in a local variable
540 declaration (e.g. in a structure), declare it as shown and then 545 declaration (e.g. in a structure), declare it as shown and then
541 call one of the init macros. 546 call one of the init macros.
542 547
543 Also note: 548 Also note:
544 549
545 void eifree (Eistring ei); 550 void eifree (Eistring *ei);
546 If you declared an Eistring to use malloc() to hold its data, 551 If you declared an Eistring to use malloc() to hold its data,
547 or converted it to the heap using eito_malloc(), then this 552 or converted it to the heap using eito_malloc(), then this
548 releases any data in it and afterwards resets the Eistring 553 releases any data in it and afterwards resets the Eistring
549 using eiinit_malloc(). Otherwise, it just resets the Eistring 554 using eiinit_malloc(). Otherwise, it just resets the Eistring
550 using eiinit(). 555 using eiinit().
572 void eicpy_ei (Eistring *eistr, Eistring *eistr2); 577 void eicpy_ei (Eistring *eistr, Eistring *eistr2);
573 ... from another Eistring. 578 ... from another Eistring.
574 void eicpy_lstr (Eistring *eistr, Lisp_Object lisp_string); 579 void eicpy_lstr (Eistring *eistr, Lisp_Object lisp_string);
575 ... from a Lisp_Object string. 580 ... from a Lisp_Object string.
576 void eicpy_ch (Eistring *eistr, Emchar ch); 581 void eicpy_ch (Eistring *eistr, Emchar ch);
577 ... from an Emchar. 582 ... from an Emchar (this can be a conventional C character).
578 583
579 void eicpy_lstr_off (Eistring *eistr, Lisp_Object lisp_string, 584 void eicpy_lstr_off (Eistring *eistr, Lisp_Object lisp_string,
580 Bytecount off, Charcount charoff, 585 Bytecount off, Charcount charoff,
581 Bytecount len, Charcount charlen); 586 Bytecount len, Charcount charlen);
582 ... from a section of a Lisp_Object string. 587 ... from a section of a Lisp_Object string.
634 void eicpyout_alloca (Eistring *eistr, LVALUE: Intbyte *ptr_out, 639 void eicpyout_alloca (Eistring *eistr, LVALUE: Intbyte *ptr_out,
635 LVALUE: Bytecount len_out); 640 LVALUE: Bytecount len_out);
636 Make an alloca() copy of the data in the Eistring, using the 641 Make an alloca() copy of the data in the Eistring, using the
637 default internal format. Due to the nature of alloca(), this 642 default internal format. Due to the nature of alloca(), this
638 must be a macro, with all lvalues passed in as parameters. 643 must be a macro, with all lvalues passed in as parameters.
639 A pointer to the alloca()ed data is stored in PTR_OUT, and 644 (More specifically, not all compilers correctly handle using
640 the length of the data (not including the terminating zero) 645 alloca() as the argument to a function call -- GCC on x86
641 is stored in LEN_OUT. 646 didn't used to, for example.) A pointer to the alloca()ed data
647 is stored in PTR_OUT, and the length of the data (not including
648 the terminating zero) is stored in LEN_OUT.
642 649
643 void eicpyout_alloca_fmt (Eistring *eistr, LVALUE: Intbyte *ptr_out, 650 void eicpyout_alloca_fmt (Eistring *eistr, LVALUE: Intbyte *ptr_out,
644 LVALUE: Bytecount len_out, 651 LVALUE: Bytecount len_out,
645 Internal_Format intfmt); 652 Internal_Format intfmt);
646 Like eicpyout_alloca(), but converts to the specified internal 653 Like eicpyout_alloca(), but converts to the specified internal
1015 Eistring __ ## name ## __storage__ = the_eistring_malloc_zero_init; \ 1022 Eistring __ ## name ## __storage__ = the_eistring_malloc_zero_init; \
1016 Eistring *name = & __ ## name ## __storage__ 1023 Eistring *name = & __ ## name ## __storage__
1017 1024
1018 #define eiinit(ei) \ 1025 #define eiinit(ei) \
1019 do { \ 1026 do { \
1020 (ei) = the_eistring_zero_init; \ 1027 *(ei) = the_eistring_zero_init; \
1021 } while (0) 1028 } while (0)
1022 1029
1023 #define eiinit_malloc(ei) \ 1030 #define eiinit_malloc(ei) \
1024 do { \ 1031 do { \
1025 (ei) = the_eistring_malloc_zero_init; \ 1032 *(ei) = the_eistring_malloc_zero_init; \
1026 } while (0) 1033 } while (0)
1027 1034
1028 1035
1029 /* ----- Utility ----- */ 1036 /* ----- Utility ----- */
1030 1037
1268 *ei23lenout = (eistr)->bytelen_; \ 1275 *ei23lenout = (eistr)->bytelen_; \
1269 *ei23ptrout = alloca_array (Intbyte, (eistr)->bytelen_ + 1); \ 1276 *ei23ptrout = alloca_array (Intbyte, (eistr)->bytelen_ + 1); \
1270 memcpy (*ei23ptrout, (eistr)->data_, (eistr)->bytelen_ + 1); \ 1277 memcpy (*ei23ptrout, (eistr)->data_, (eistr)->bytelen_ + 1); \
1271 } while (0) 1278 } while (0)
1272 1279
1273
1274 /* ----- Moving to the heap ----- */ 1280 /* ----- Moving to the heap ----- */
1275 1281
1276 #define eifree(ei) \ 1282 #define eifree(ei) \
1277 do { \ 1283 do { \
1278 if ((ei)->mallocp_) \ 1284 if ((ei)->mallocp_) \