comparison src/doprnt.c @ 793:e38acbeb1cae

[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 943eaba38521
children 6728e641994e
comparison
equal deleted inserted replaced
792:4e83fdb13eb9 793:e38acbeb1cae
1 /* Output like sprintf to a buffer of specified size. 1 /* Output like sprintf to a buffer of specified size.
2 Also takes args differently: pass one pointer to an array of strings 2 Also takes args differently: pass one pointer to an array of strings
3 in addition to the format string which is separate. 3 in addition to the format string which is separate.
4 Copyright (C) 1995 Free Software Foundation, Inc. 4 Copyright (C) 1995 Free Software Foundation, Inc.
5 Copyright (C) 2001 Ben Wing. 5 Copyright (C) 2001, 2002 Ben Wing.
6 Rewritten by mly to use varargs.h. 6 Rewritten by mly to use varargs.h.
7 Rewritten from scratch by Ben Wing (February 1995) for Mule; expanded 7 Rewritten from scratch by Ben Wing (February 1995) for Mule; expanded
8 to full printf spec. 8 to full printf spec.
9 9
10 This file is part of XEmacs. 10 This file is part of XEmacs.
22 You should have received a copy of the GNU General Public License 22 You should have received a copy of the GNU General Public License
23 along with XEmacs; see the file COPYING. If not, write to 23 along with XEmacs; see the file COPYING. If not, write to
24 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 24 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA. */ 25 Boston, MA 02111-1307, USA. */
26 26
27 /* Synched up with: Rewritten. Not in FSF. */ 27 /* Synched up with: Rewritten by Ben Wing. Not in FSF. */
28 28
29 #include <config.h> 29 #include <config.h>
30 #include "lisp.h" 30 #include "lisp.h"
31 31
32 #include "buffer.h" 32 #include "buffer.h"
138 if (arg_convert != arg_ptr) 138 if (arg_convert != arg_ptr)
139 *returned_num = atoi ((char *) arg_convert); 139 *returned_num = atoi ((char *) arg_convert);
140 return start; 140 return start;
141 } 141 }
142 142
143 #define NEXT_ASCII_BYTE(ch) \ 143 #define NEXT_ASCII_BYTE(ch) \
144 do { \ 144 do { \
145 if (fmt == fmt_end) \ 145 if (fmt == fmt_end) \
146 syntax_error ("Premature end of format string", Qunbound); \ 146 syntax_error ("Premature end of format string", Qunbound); \
147 ch = *fmt; \ 147 ch = *fmt; \
148 if (ch >= 0200) \ 148 if (ch >= 0200) \
149 syntax_error ("Non-ASCII character in format converter spec", Qunbound); \ 149 syntax_error ("Non-ASCII character in format converter spec", \
150 fmt++; \ 150 Qunbound); \
151 fmt++; \
151 } while (0) 152 } while (0)
152 153
153 #define RESOLVE_FLAG_CONFLICTS(spec) \ 154 #define RESOLVE_FLAG_CONFLICTS(spec) \
154 do { \ 155 do { \
155 if (spec.space_flag && spec.plus_flag) \ 156 if (spec.space_flag && spec.plus_flag) \
526 string_len = strlen ((char *) string); 527 string_len = strlen ((char *) string);
527 } 528 }
528 else 529 else
529 { 530 {
530 Lisp_Object obj = largs[spec->argnum - 1]; 531 Lisp_Object obj = largs[spec->argnum - 1];
531 Lisp_String *ls; 532 Lisp_Object ls;
532 533
533 if (ch == 'S') 534 if (ch == 'S')
534 { 535 {
535 /* For `S', prin1 the argument and then treat like 536 /* For `S', prin1 the argument and then treat like
536 a string. */ 537 a string. */
537 ls = XSTRING (Fprin1_to_string (obj, Qnil)); 538 ls = Fprin1_to_string (obj, Qnil);
538 } 539 }
539 else if (STRINGP (obj)) 540 else if (STRINGP (obj))
540 ls = XSTRING (obj); 541 ls = obj;
541 else if (SYMBOLP (obj)) 542 else if (SYMBOLP (obj))
542 ls = XSYMBOL (obj)->name; 543 ls = XSYMBOL (obj)->name;
543 else 544 else
544 { 545 {
545 /* convert to string using princ. */ 546 /* convert to string using princ. */
546 ls = XSTRING (Fprin1_to_string (obj, Qt)); 547 ls = Fprin1_to_string (obj, Qt);
547 } 548 }
548 string = string_data (ls); 549 string = XSTRING_DATA (ls);
549 string_len = string_length (ls); 550 string_len = XSTRING_LENGTH (ls);
550 } 551 }
551 552
552 doprnt_2 (stream, string, string_len, spec->minwidth, 553 doprnt_2 (stream, string, string_len, spec->minwidth,
553 spec->precision, spec->minus_flag, spec->zero_flag); 554 spec->precision, spec->minus_flag, spec->zero_flag);
554 } 555 }
567 Lisp_Object obj = largs[spec->argnum - 1]; 568 Lisp_Object obj = largs[spec->argnum - 1];
568 if (CHARP (obj)) 569 if (CHARP (obj))
569 obj = make_int (XCHAR (obj)); 570 obj = make_int (XCHAR (obj));
570 if (!INT_OR_FLOATP (obj)) 571 if (!INT_OR_FLOATP (obj))
571 { 572 {
572 syntax_error ("format specifier %%%c doesn't match argument type", 573 syntax_error
573 make_char (ch)); 574 ("format specifier %%%c doesn't match argument type",
575 make_char (ch));
574 } 576 }
575 else if (strchr (double_converters, ch)) 577 else if (strchr (double_converters, ch))
576 arg.d = XFLOATINT (obj); 578 arg.d = XFLOATINT (obj);
577 else 579 else
578 { 580 {
594 Intbyte charbuf[MAX_EMCHAR_LEN]; 596 Intbyte charbuf[MAX_EMCHAR_LEN];
595 597
596 a = (Emchar) arg.l; 598 a = (Emchar) arg.l;
597 599
598 if (!valid_char_p (a)) 600 if (!valid_char_p (a))
599 syntax_error ("invalid character value %d to %%c spec", make_char (a)); 601 syntax_error ("invalid character value %d to %%c spec",
602 make_char (a));
600 603
601 charlen = set_charptr_emchar (charbuf, a); 604 charlen = set_charptr_emchar (charbuf, a);
602 doprnt_2 (stream, charbuf, charlen, spec->minwidth, 605 doprnt_2 (stream, charbuf, charlen, spec->minwidth,
603 -1, spec->minus_flag, spec->zero_flag); 606 -1, spec->minus_flag, spec->zero_flag);
604 } 607 }