Mercurial > hg > xemacs-beta

diff src/glyphs.c @ 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 943eaba38521
children a5954632b187
line wrap: on
line diff
--- a/src/glyphs.c	Sat Mar 23 05:08:52 2002 +0000
+++ b/src/glyphs.c	Fri Mar 29 04:49:13 2002 +0000
@@ -1,7 +1,7 @@
 /* Generic glyph/image implementation + display tables
    Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
    Copyright (C) 1995 Tinker Systems
-   Copyright (C) 1995, 1996, 2000, 2001 Ben Wing
+   Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing
    Copyright (C) 1995 Sun Microsystems
    Copyright (C) 1998, 1999, 2000 Andy Piper
 
@@ -655,9 +655,8 @@
 void
 check_window_subwindow_cache (struct window* w)
 {
-  Lisp_Object window;
-
-  XSETWINDOW (window, w);
+  Lisp_Object window = wrap_window (w);
+
 
   assert (!NILP (w->subwindow_instance_cache));
   elisp_maphash (check_instance_cache_mapper,
@@ -1286,7 +1285,7 @@
   lp->layout_changed = 1;
   lp->initialized = 0;
 
-  XSETIMAGE_INSTANCE (val, lp);
+  val = wrap_image_instance (lp);
   MARK_GLYPHS_CHANGED;
 
   return val;
@@ -1418,6 +1417,7 @@
 {
   if (NILP (noerror))        return ERROR_ME;
   else if (EQ (noerror, Qt)) return ERROR_ME_NOT;
+  else if (EQ (noerror, Qdebug)) return ERROR_ME_DEBUG_WARN;
   else                       return ERROR_ME_WARN;
 }
 
@@ -1428,6 +1428,8 @@
     return Qnil;
   else if (ERRB_EQ (errb, ERROR_ME_NOT))
     return Qt;
+  else if (ERRB_EQ (errb, ERROR_ME_DEBUG_WARN))
+    return Qdebug;
   else
     {
       assert (ERRB_EQ (errb, ERROR_ME_WARN));
@@ -2116,9 +2118,10 @@
 
       if (GLYPHP (glyph_or_ii))
 	{
-	  Lisp_Object window;
-	  XSETWINDOW (window, w);
-	  image = glyph_image_instance (glyph_or_ii, window, ERROR_ME_NOT, 1);
+	  Lisp_Object window = wrap_window (w);
+
+	  image = glyph_image_instance (glyph_or_ii, window,
+					ERROR_ME_DEBUG_WARN, 1);
 	}
 
       if (TEXT_IMAGE_INSTANCEP (image))
@@ -3453,7 +3456,7 @@
       Lisp_Object contype = XCAR (rest);
       Lisp_Object newinst = call_with_suspended_errors
 	((lisp_fn_t) normalize_image_instantiator,
-	 Qnil, Qimage, ERROR_ME_NOT, 3, instantiator, contype,
+	 Qnil, Qimage, ERROR_ME_DEBUG_WARN, 3, instantiator, contype,
 	 make_int (XIMAGE_SPECIFIER_ALLOWED (specifier)));
 
       if (!NILP (newinst))
@@ -3749,7 +3752,7 @@
     g->face = Qnil;
     g->plist = Qnil;
     g->after_change = after_change;
-    XSETGLYPH (obj, g);
+    obj = wrap_glyph (g);
 
     set_image_attached_to (g->image, obj, Qimage);
     UNGCPRO;
@@ -3881,7 +3884,8 @@
   Lisp_Object instance = glyph_or_image;
 
   if (GLYPHP (glyph_or_image))
-    instance = glyph_image_instance (glyph_or_image, window, ERROR_ME_NOT, 1);
+    instance = glyph_image_instance (glyph_or_image, window,
+				     ERROR_ME_DEBUG_WARN, 1);
 
   return instance;
 }
@@ -3917,7 +3921,7 @@
 */
        (glyph, window))
 {
-  XSETWINDOW (window, decode_window (window));
+  window = wrap_window (decode_window (window));
   CHECK_GLYPH (glyph);
 
   return make_int (glyph_width (glyph, window));
@@ -3989,7 +3993,7 @@
 */
        (glyph, window))
 {
-  XSETWINDOW (window, decode_window (window));
+  window = wrap_window (decode_window (window));
   CHECK_GLYPH (glyph);
 
   return make_int (glyph_ascent (glyph, window));
@@ -4002,7 +4006,7 @@
 */
        (glyph, window))
 {
-  XSETWINDOW (window, decode_window (window));
+  window = wrap_window (decode_window (window));
   CHECK_GLYPH (glyph);
 
   return make_int (glyph_descent (glyph, window));
@@ -4016,7 +4020,7 @@
 */
        (glyph, window))
 {
-  XSETWINDOW (window, decode_window (window));
+  window = wrap_window (decode_window (window));
   CHECK_GLYPH (glyph);
 
   return make_int (glyph_height (glyph, window));
@@ -4032,7 +4036,7 @@
       if (GLYPHP (glyph_or_image))
 	{
 	  instance = glyph_image_instance (glyph_or_image, window,
-					   ERROR_ME_NOT, 1);
+					   ERROR_ME_DEBUG_WARN, 1);
 	  XGLYPH_DIRTYP (glyph_or_image) = dirty;
 	}
 
@@ -4070,8 +4074,8 @@
     {
       Lisp_Object retval =
 	specifier_instance_no_quit (GLYPH_BASELINE (XGLYPH (glyph)),
-				    /* #### look into ERROR_ME_NOT */
-				    Qunbound, domain, ERROR_ME_NOT,
+				    /* #### look into error flag */
+				    Qunbound, domain, ERROR_ME_DEBUG_WARN,
 				    0, Qzero);
       if (!NILP (retval) && !INTP (retval))
 	retval = Qnil;
@@ -4101,8 +4105,8 @@
   else
     return !NILP (specifier_instance_no_quit
 		  (GLYPH_CONTRIB_P (XGLYPH (glyph)), Qunbound, domain,
-		   /* #### look into ERROR_ME_NOT */
-		   ERROR_ME_NOT, 0, Qzero));
+		   /* #### look into error flag */
+		   ERROR_ME_DEBUG_WARN, 0, Qzero));
 }
 
 static void
@@ -4120,7 +4124,8 @@
   Lisp_Object instance = glyph_or_image;
 
   if (GLYPHP (glyph_or_image))
-    instance = glyph_image_instance (glyph_or_image, domain, ERROR_ME_NOT, 1);
+    instance = glyph_image_instance (glyph_or_image, domain,
+				     ERROR_ME_DEBUG_WARN, 1);
 
   image_instance_query_geometry (instance, width, height, disp, domain);
 }
@@ -4132,7 +4137,8 @@
   Lisp_Object instance = glyph_or_image;
 
   if (GLYPHP (glyph_or_image))
-    instance = glyph_image_instance (glyph_or_image, domain, ERROR_ME_NOT, 1);
+    instance = glyph_image_instance (glyph_or_image, domain,
+				     ERROR_ME_DEBUG_WARN, 1);
 
   image_instance_layout (instance, width, height, xoffset, yoffset, domain);
 }
@@ -4178,12 +4184,12 @@
     {
       Lisp_Object window, instance;
 
-      XSETWINDOW (window, w);
+      window = wrap_window (w);
 
       cachel->glyph   = glyph;
       /* Speed things up slightly by grabbing the glyph instantiation
 	 and passing it to the size functions. */
-      instance = glyph_image_instance (glyph, window, ERROR_ME_NOT, 1);
+      instance = glyph_image_instance (glyph, window, ERROR_ME_DEBUG_WARN, 1);
 
       if (!IMAGE_INSTANCEP (instance))
 	return;
@@ -4283,8 +4289,8 @@
 mark_glyph_cachels_as_clean (struct window* w)
 {
   int elt;
-  Lisp_Object window;
-  XSETWINDOW (window, w);
+  Lisp_Object window = wrap_window (w);
+
   for (elt = 0; elt < Dynarr_length (w->glyph_cachels); elt++)
     {
       struct glyph_cachel *cachel = Dynarr_atp (w->glyph_cachels, elt);
@@ -4312,7 +4318,7 @@
 
 
 /*****************************************************************************
- *                     subwindow cachel functions                         	     *
+ *                     subwindow cachel functions                     	     *
  *****************************************************************************/
 /* Subwindows are curious in that you have to physically unmap them to
    not display them. It is problematic deciding what to do in
@@ -4641,7 +4647,8 @@
 }
 
 /* remove a subwindow from its frame */
-void unmap_subwindow (Lisp_Object subwindow)
+void
+unmap_subwindow (Lisp_Object subwindow)
 {
   Lisp_Image_Instance* ii = XIMAGE_INSTANCE (subwindow);
   struct frame* f;
@@ -4671,8 +4678,9 @@
 }
 
 /* show a subwindow in its frame */
-void map_subwindow (Lisp_Object subwindow, int x, int y,
-		    struct display_glyph_area *dga)
+void
+map_subwindow (Lisp_Object subwindow, int x, int y,
+	       struct display_glyph_area *dga)
 {
   Lisp_Image_Instance* ii = XIMAGE_INSTANCE (subwindow);
   struct frame* f;
@@ -4907,9 +4915,9 @@
     }
 }
 
-/*****************************************************************************
- *                              timeouts for animated glyphs                      *
- *****************************************************************************/
+/****************************************************************************
+ *                        timeouts for animated glyphs                      *
+ ****************************************************************************/
 static Lisp_Object Qglyph_animated_timeout_handler;
 
 DEFUN ("glyph-animated-timeout-handler", Fglyph_animated_timeout_handler, 1, 1, 0, /*
@@ -4952,7 +4960,8 @@
   return Qnil;
 }
 
-Lisp_Object add_glyph_animated_timeout (EMACS_INT tickms, Lisp_Object image)
+Lisp_Object
+add_glyph_animated_timeout (EMACS_INT tickms, Lisp_Object image)
 {
   Lisp_Object ret = Qnil;
 
@@ -4974,12 +4983,10 @@
   return ret;
 }
 
-void disable_glyph_animated_timeout (int i)
-{
-  Lisp_Object id;
-  XSETINT (id, i);
-
-  Fdisable_timeout (id);
+void
+disable_glyph_animated_timeout (int i)
+{
+  Fdisable_timeout (make_int (i));
 }