Mercurial > hg > xemacs-beta

diff src/glyphs.c @ 800:a5954632b187

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-31 08:27:14 by ben] more fixes, first crack at finishing behavior implementation TODO.ben-mule-21-5: Update. configure.in: Fix for new error-checking types. make-mswin-unicode.pl: Don't be fucked up by CRLF. Output code to force errors when nonintercepted Windows calls issued. behavior.el, dumped-lisp.el, menubar-items.el: Add support for saving using custom. Load into a dumped XEmacs. Correct :title to :short-doc in accordance with behavior-defs.el. Add a submenu under Options for turning on/off behaviors. cl-macs.el: Properly document `loop'. Fix a minor bug in keymap iteration and add support for bit-vector iteration. lisp-mode.el: Rearrange and add items for macro expanding. menubar-items.el: Document connection between these two functions. window.el: Port stuff from GNU 21.1. config.inc.samp, xemacs.mak: Separate out and add new variable for controlling error-checking. s/windowsnt.h: Use new ERROR_CHECK_ALL; not related to DEBUG_XEMACS. alloc.c, backtrace.h, buffer.c, buffer.h, bytecode.c, callproc.c, casetab.c, charset.h, chartab.c, cmdloop.c, config.h.in, console-msw.c, console-stream.c, console-tty.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dired-msw.c, dired.c, dumper.c, editfns.c, eldap.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, file-coding.h, fileio.c, frame-msw.c, frame.c, frame.h, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, insdel.c, intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, intl-win32.c, keymap.c, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-x.c, menubar.c, mule-coding.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, opaque.c, print.c, process-nt.c, process-unix.c, process.c, rangetab.c, redisplay-msw.c, redisplay-output.c, redisplay.c, regex.c, scrollbar-msw.c, select-msw.c, signal.c, specifier.c, specifier.h, symbols.c, sysdep.c, syswindows.h, text.c, text.h, toolbar-msw.c, tooltalk.c, ui-gtk.c, unicode.c, window.c: Redo error-checking macros: ERROR_CHECK_TYPECHECK -> ERROR_CHECK_TYPES, ERROR_CHECK_CHARBPOS -> ERROR_CHECK_TEXT, add ERROR_CHECK_DISPLAY, ERROR_CHECK_STRUCTURES. Document these in config.h.in. Fix code to follow docs. Fix *_checking_assert() in accordance with new names. Attempt to fix periodic redisplay crash freeing display line structures. Add first implementation of sledgehammer redisplay check. Redo print_*() to use write_fmt_string(), write_fmt_string_lisp(). Fix bug in md5 handling. Rename character-to-unicode to char-to-unicode; same for unicode-to-char{acter}. Move chartab documentation to `make-char-table'. Some header cleanup. Clean up remaining places where nonintercepted Windows calls are being used. automated/mule-tests.el: Fix for new Unicode support.
author ben
date Sun, 31 Mar 2002 08:30:17 +0000
parents e38acbeb1cae
children 2b676dc88c66
line wrap: on
line diff
--- a/src/glyphs.c	Sat Mar 30 04:46:48 2002 +0000
+++ b/src/glyphs.c	Sun Mar 31 08:30:17 2002 +0000
@@ -38,6 +38,7 @@
 #include "faces.h"
 #include "frame.h"
 #include "glyphs.h"
+#include "gui.h"
 #include "insdel.h"
 #include "objects.h"
 #include "opaque.h"
@@ -903,23 +904,16 @@
 print_image_instance (Lisp_Object obj, Lisp_Object printcharfun,
 		      int escapeflag)
 {
-  char buf[100];
   Lisp_Image_Instance *ii = XIMAGE_INSTANCE (obj);
 
   if (print_readably)
     printing_unreadable_object ("#<image-instance 0x%x>",
            ii->header.uid);
-  write_c_string ("#<image-instance (", printcharfun);
-  print_internal (Fimage_instance_type (obj), printcharfun, 0);
-  write_c_string (") ", printcharfun);
+  write_fmt_string_lisp (printcharfun, "#<image-instance (%s) ", 1,
+			 Fimage_instance_type (obj));
   if (!NILP (ii->name))
-    {
-      print_internal (ii->name, printcharfun, 1);
-      write_c_string (" ", printcharfun);
-    }
-  write_c_string ("on ", printcharfun);
-  print_internal (ii->domain, printcharfun, 0);
-  write_c_string (" ", printcharfun);
+    write_fmt_string_lisp (printcharfun, "%S ", 1, ii->name);
+  write_fmt_string_lisp (printcharfun, "on %s ", 1, ii->domain);
   switch (IMAGE_INSTANCE_TYPE (ii))
     {
     case IMAGE_NOTHING:
@@ -943,30 +937,27 @@
 	    print_internal (filename, printcharfun, 1);
 	}
       if (IMAGE_INSTANCE_PIXMAP_DEPTH (ii) > 1)
-	sprintf (buf, " %dx%dx%d", IMAGE_INSTANCE_PIXMAP_WIDTH (ii),
-		 IMAGE_INSTANCE_PIXMAP_HEIGHT (ii),
-		 IMAGE_INSTANCE_PIXMAP_DEPTH (ii));
+	write_fmt_string (printcharfun, " %dx%dx%d",
+			  IMAGE_INSTANCE_PIXMAP_WIDTH (ii),
+			  IMAGE_INSTANCE_PIXMAP_HEIGHT (ii),
+			  IMAGE_INSTANCE_PIXMAP_DEPTH (ii));
       else
-	sprintf (buf, " %dx%d", IMAGE_INSTANCE_PIXMAP_WIDTH (ii),
-		 IMAGE_INSTANCE_PIXMAP_HEIGHT (ii));
-      write_c_string (buf, printcharfun);
+	write_fmt_string (printcharfun, " %dx%d",
+			  IMAGE_INSTANCE_PIXMAP_WIDTH (ii),
+			  IMAGE_INSTANCE_PIXMAP_HEIGHT (ii));
       if (!NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)) ||
 	  !NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)))
 	{
 	  write_c_string (" @", printcharfun);
 	  if (!NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)))
-	    {
-	      long_to_string (buf, XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)));
-	      write_c_string (buf, printcharfun);
-	    }
+	    write_fmt_string (printcharfun, "%ld",
+			      XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii)));
 	  else
 	    write_c_string ("??", printcharfun);
 	  write_c_string (",", printcharfun);
 	  if (!NILP (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)))
-	    {
-	      long_to_string (buf, XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)));
-	      write_c_string (buf, printcharfun);
-	    }
+	    write_fmt_string (printcharfun, "%ld",
+			      XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)));
 	  else
 	    write_c_string ("??", printcharfun);
 	}
@@ -995,23 +986,17 @@
       print_internal (IMAGE_INSTANCE_WIDGET_TYPE (ii), printcharfun, 0);
 
       if (GUI_ITEMP (IMAGE_INSTANCE_WIDGET_ITEM (ii)))
-	{
-	  write_c_string (" ", printcharfun);
-	  print_internal (IMAGE_INSTANCE_WIDGET_TEXT (ii), printcharfun, 1);
-	}
+	write_fmt_string_lisp (printcharfun, " %S", 1,
+			       IMAGE_INSTANCE_WIDGET_TEXT (ii));
 
       if (!NILP (IMAGE_INSTANCE_WIDGET_FACE (ii)))
-	{
-	  write_c_string (" face=", printcharfun);
-	  print_internal
-	    (IMAGE_INSTANCE_WIDGET_FACE (ii), printcharfun, 0);
-	}
+	write_fmt_string_lisp (printcharfun, " face=%s", 1,
+			       IMAGE_INSTANCE_WIDGET_FACE (ii));
       /* fallthrough */
 
     case IMAGE_SUBWINDOW:
-      sprintf (buf, " %dx%d", IMAGE_INSTANCE_WIDTH (ii),
-	       IMAGE_INSTANCE_HEIGHT (ii));
-      write_c_string (buf, printcharfun);
+      write_fmt_string (printcharfun, " %dx%d", IMAGE_INSTANCE_WIDTH (ii),
+			IMAGE_INSTANCE_HEIGHT (ii));
 
       /* This is stolen from frame.c.  Subwindows are strange in that they
 	 are specific to a particular frame so we want to print in their
@@ -1028,8 +1013,8 @@
 			  printcharfun);
       }
       write_c_string ("-frame>", printcharfun);
-      sprintf (buf, " 0x%p", IMAGE_INSTANCE_SUBWINDOW_ID (ii));
-      write_c_string (buf, printcharfun);
+      write_fmt_string (printcharfun, " 0x%p",
+			IMAGE_INSTANCE_SUBWINDOW_ID (ii));
 
       break;
 
@@ -1039,8 +1024,7 @@
 
   MAYBE_DEVMETH (DOMAIN_XDEVICE (ii->domain), print_image_instance,
 		 (ii, printcharfun, escapeflag));
-  sprintf (buf, " 0x%x>", ii->header.uid);
-  write_c_string (buf, printcharfun);
+  write_fmt_string (printcharfun, " 0x%x>", ii->header.uid);
 }
 
 static void
@@ -3576,17 +3560,13 @@
 print_glyph (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 {
   Lisp_Glyph *glyph = XGLYPH (obj);
-  char buf[20];
 
   if (print_readably)
     printing_unreadable_object ("#<glyph 0x%x>", glyph->header.uid);
 
-  write_c_string ("#<glyph (", printcharfun);
-  print_internal (Fglyph_type (obj), printcharfun, 0);
-  write_c_string (") ", printcharfun);
-  print_internal (glyph->image, printcharfun, 1);
-  sprintf (buf, "0x%x>", glyph->header.uid);
-  write_c_string (buf, printcharfun);
+  write_fmt_string_lisp (printcharfun, "#<glyph (%s", 1, Fglyph_type (obj));
+  write_fmt_string_lisp (printcharfun, ") %S", 1, glyph->image);
+  write_fmt_string (printcharfun, "0x%x>", glyph->header.uid);
 }
 
 /* Glyphs are equal if all of their display attributes are equal.  We