diff src/glyphs-widget.c @ 1318:b531bf8658e9

[xemacs-hg @ 2003-02-21 06:56:46 by ben] redisplay fixes et al. PROBLEMS: Add comment about Cygwin, unexec and sysmalloc. Move some non-general stuff out of general. Make a section for x86. configure.in: Add check for broken alloca in funcalls. mule/mule-cmds.el: Alias file-name to native not vice-versa. Do set EOL of native but not of process output to fix various problems and be consistent with code-init.el. code-cmds.el: Return a name not a coding system. code-init.el: Reindent. Remove `file-name' since it should always be the same as native. unicode.el: Rename to load-unicode-mapping-table as suggested by the anonymous (but rather Turnbullian) comment in unicode.c. xemacs.dsp: Add /k to default build. alloc.c: Make gc_currently_forbidden static. config.h.in, lisp.h: Move some stuff to lisp.h. console-gtk.h, console-impl.h, console-msw.h, console-x.h, event-Xt.c, event-msw.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, gtk-xemacs.c: Remove duplicated code to redraw exposed area. Add deadbox method needed by the generalized redraw code. Defer redrawing if already in redisplay. frame-msw.c, event-stream.c, frame.c: Add comments about calling Lisp. debug.c, general-slots.h: Move generalish symbols to general-slots.h. doprnt.c: reindent. lisp.h, dynarr.c: Add debug code for locking a dynarr to catch invalid mods. Use in redisplay.c. eval.c: file-coding.c: Define file-name as alias for native not vice-versa. frame-gtk.c, frame-x.c: Move Qwindow_id to general-slots. dialog-msw.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, gui.c, gui.h, menubar-msw.c, menubar.c: Ensure that various glyph functions that eval within redisplay protect the evals. Same for calls to internal_equal(). Modify various functions, e.g. gui_item_*(), to protect evals within redisplay, taking an in_redisplay parameter if it's possible for them to be called both inside and outside of redisplay. gutter.c: Defer specifier-changed updating till after redisplay, if necessary, since we need to enter redisplay to do it. gutter.c: Do nothing if in redisplay. lisp.h: Add version of alloca() for use in function calls. lisp.h: Add XCAD[D+]R up to 6 D's, and aliases X1ST, X2ND, etc. frame.c, frame.h, redisplay.c, redisplay.h, signal.c, toolbar.c: Redo critical-section code and move from frame.c to redisplay.c. Require that every place inside of redisplay catch errors itself, not at the edge of the critical section (thereby bypassing the rest of redisplay and leaving things in an inconsistent state). Introduce separate means of holding frame-size changes without entering a complete critical section. Introduce "post-redisplay" methods for deferring things till after redisplay. Abort if we enter redisplay reentrantly. Disable all quit checking in redisplay since it's too dangerous. Ensure that all calls to QUIT trigger an abort if unprotected. redisplay.c, scrollbar-gtk.c, scrollbar-x.c, scrollbar.c: Create enter/exit_redisplay_critical_section_maybe() for code that needs to ensure it's in a critical section but doesn't interfere with an existing critical section. sysdep.c: Use _wexecve() when under Windows NT for Unicode correctness. text.c, text.h: Add new_dfc() functions, which return an alloca()ed value rather than requiring an lvalue. (Not really used yet; used in another workspace, to come.) Add some macros for SIZED_EXTERNAL. Update the encoding aliases after involved scrutinization of the X manual. unicode.c: Answer the anonymous but suspiciously Turnbullian questions. Rename parse-unicode-translation-table to load-unicode-mapping-table, as suggested.
author ben
date Fri, 21 Feb 2003 06:57:21 +0000
parents 9d75b4fe084c
children 7473844a83d3
line wrap: on
line diff
--- a/src/glyphs-widget.c	Thu Feb 20 22:52:51 2003 +0000
+++ b/src/glyphs-widget.c	Fri Feb 21 06:57:21 2003 +0000
@@ -1,5 +1,6 @@
 /* Widget-specific glyph objects.
    Copyright (C) 1998, 1999, 2000, 2002 Andy Piper.
+   Copyright (C) 2003 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -670,7 +671,8 @@
      #### should just normalize the data. */
   if (!NILP (glyph))
     {
-      substitute_keyword_value (inst, Q_image, glyph_instantiator_to_glyph (glyph));
+      substitute_keyword_value (inst, Q_image,
+				glyph_instantiator_to_glyph (glyph));
     }
 
   return inst;
@@ -989,8 +991,10 @@
 }
 
 /* Determine whether only the order has changed for a tab. */
-int tab_control_order_only_changed (Lisp_Object image_instance)
+int
+tab_control_order_only_changed (Lisp_Object image_instance)
 {
+  /* Called within redisplay */
   Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
   int found = 0, len, pending_len;
   Lisp_Object rest;
@@ -1013,7 +1017,7 @@
 		     XCDR (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (ii)))
 	    {
 	      if (gui_item_equal_sans_selected (XCAR (rest),
-						XCAR (pending_rest), 0))
+						XCAR (pending_rest), 0, 1))
 		{
 		  found = 1;
 		  break;
@@ -1362,49 +1366,51 @@
 
   /* Work out minimum space we need to fit all the items. This could
      have been fixed by the user. */
-  if (IMAGE_INSTANCE_SUBWINDOW_H_RESIZEP (ii)) {
+  if (IMAGE_INSTANCE_SUBWINDOW_H_RESIZEP (ii))
+    {
       if (!NILP (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii)))
-      {
+	{
           Lisp_Object dynamic_width =
-              Feval (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii));
+	    eval_within_redisplay (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii));
           if (INTP (dynamic_width))
-              *width = XINT (dynamic_width);
-      }
+	    *width = XINT (dynamic_width);
+	}
       else if (IMAGE_INSTANCE_SUBWINDOW_ORIENT (ii) == LAYOUT_HORIZONTAL) 
-      {
+	{
           *width = maxpw + ((nitems + 1) * widget_instance_border_width (ii) +
                             IMAGE_INSTANCE_MARGIN_WIDTH (ii)) * 2;
-      }
+	}
       else
-      {
+	{
           *width = maxpw + 2 * (widget_instance_border_width (ii) * 2 +
                                 IMAGE_INSTANCE_MARGIN_WIDTH (ii));
-      }
+	}
   }
  
   /* Work out vertical spacings. */
-  if (IMAGE_INSTANCE_SUBWINDOW_V_RESIZEP (ii)) {
+  if (IMAGE_INSTANCE_SUBWINDOW_V_RESIZEP (ii))
+    {
       if (!NILP (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii)))
-      {
+	{
           Lisp_Object dynamic_height =
-              Feval (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii));
+	    eval_within_redisplay (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii));
           if (INTP (dynamic_height))
-              *height = XINT (dynamic_height);
-      }
+	    *height = XINT (dynamic_height);
+	}
       else if (IMAGE_INSTANCE_SUBWINDOW_LOGICAL_LAYOUT (ii))
-      {
+	{
           *height = nitems * luh + ph_adjust;
-      }
+	}
       else if (IMAGE_INSTANCE_SUBWINDOW_ORIENT (ii) == LAYOUT_VERTICAL)
-      {
+	{
           *height = maxph + ((nitems + 1) * widget_instance_border_width (ii) +
                              IMAGE_INSTANCE_MARGIN_WIDTH (ii)) * 2 + ph_adjust;
-      }
+	}
       else
-      {
+	{
           *height = maxph + (2 * widget_instance_border_width (ii) +
                              IMAGE_INSTANCE_MARGIN_WIDTH (ii)) * 2 + ph_adjust;
-      }
+	}
   }
 #ifdef DEBUG_WIDGET_OUTPUT
   stderr_out ("layout wants %dx%d\n", *width, *height);