X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fglyphs-msw.c;h=72902aa3ea00d669311306feb43284b66251cce5;hb=5d0cf827247def2db200614bf5d3ab700776d641;hp=39bb3f44c72df9986a9418f57ead2425356aa89c;hpb=571a24e2bfea15d37c3503414674f59e89ec9652;p=chise%2Fxemacs-chise.git.1

diff --git a/src/glyphs-msw.c b/src/glyphs-msw.c
index 39bb3f4..72902aa 100644
--- a/src/glyphs-msw.c
+++ b/src/glyphs-msw.c
@@ -1460,7 +1460,7 @@ in this Software without prior written authorization from the X Consortium.
 
 /* shared data for the image read/parse logic */
 static short hexTable[256];		/* conversion value */
-static int initialized = FALSE;	/* easier to fill in at run time */
+static int hex_initialized = FALSE;	/* easier to fill in at run time */
 
 /*
  *	Table index for the hex values. Initialized once, first time.
@@ -1494,7 +1494,7 @@ initHexTable (void)
     hexTable['}'] = -1;	hexTable['\n'] = -1;
     hexTable['\t'] = -1;
 
-    initialized = TRUE;
+    hex_initialized = TRUE;
 }
 
 /*
@@ -1557,7 +1557,7 @@ int read_bitmap_data (FILE* fstream, unsigned int *width,
 #define Xmalloc(size) malloc(size)
 
     /* first time initialization */
-    if (initialized == FALSE) initHexTable();
+    if (hex_initialized == FALSE) initHexTable();
 
     /* error cleanup and return macro	*/
 #define	RETURN(code) { if (data) free (data); return code; }
@@ -1720,9 +1720,9 @@ xbm_create_bitmap_from_data (HDC hdc, char *data,
 
       for (j=0; j<old_width; j++)
 	{
-	  int byte = offset[j];
+	  int bite = offset[j];
 	  new_offset[j] = ~ (unsigned char)
-	    ((flip_table[byte & 0xf] << 4) + flip_table[byte >> 4]);
+	    ((flip_table[bite & 0xf] << 4) + flip_table[bite >> 4]);
 	}
     }
 
@@ -1903,7 +1903,7 @@ init_image_instance_from_xbm_inline (Lisp_Image_Instance *ii,
       break;
 
     default:
-      abort ();
+      ABORT ();
     }
 }
 
@@ -1977,6 +1977,9 @@ mswindows_xbm_instantiate (Lisp_Object image_instance,
 #ifdef __cplusplus
 extern "C" {
 #endif
+#ifndef __STDC__ /* Needed to avoid prototype warnings */
+#define __STDC__
+#endif
 #include <compface.h>
 #ifdef __cplusplus
 }
@@ -2091,6 +2094,12 @@ extern int debug_widget_instances;
 #endif
 
 static void
+finalize_destroy_window (void *win)
+{
+  DestroyWindow ((HWND) win);
+}
+
+static void
 mswindows_finalize_image_instance (Lisp_Image_Instance *p)
 {
   if (!p->data)
@@ -2107,8 +2116,14 @@ mswindows_finalize_image_instance (Lisp_Image_Instance *p)
 #endif
 	  if (IMAGE_INSTANCE_SUBWINDOW_ID (p))
 	    {
-	      DestroyWindow (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p));
-	      DestroyWindow (IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (p));
+	      /* DestroyWindow is not safe here, as it will send messages
+		 to our window proc. */
+	      register_post_gc_action
+		(finalize_destroy_window,
+		 (void *) (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p)));
+	      register_post_gc_action
+		(finalize_destroy_window,
+		 (void *) (IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (p)));
 	      IMAGE_INSTANCE_SUBWINDOW_ID (p) = 0;
 	    }
 	}
@@ -2264,6 +2279,16 @@ mswindows_map_subwindow (Lisp_Image_Instance *p, int x, int y,
 		    0, 0, 0, 0,
 		    SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE
 		    | SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOACTIVATE);
+
+      /* Doing this once does not seem to be enough, for instance when
+	 mapping the search dialog this gets called four times. If we
+	 only set on the first time through then the subwindow never
+	 gets focus as intended. However, doing this everytime doesn't
+	 seem so bad, after all we only need to redo this after the
+	 focus changes - and if that happens resetting the initial
+	 focus doesn't seem so bad. */
+      if (IMAGE_INSTANCE_WANTS_INITIAL_FOCUS (p))
+	SetFocus (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p));
 #endif
     }
 }
@@ -2346,6 +2371,13 @@ mswindows_redisplay_widget (Lisp_Image_Instance *p)
     }
 }
 
+/* Account for some of the limitations with widget images. */
+static int
+mswindows_widget_border_width (void)
+{
+  return DEFAULT_WIDGET_BORDER_WIDTH;
+}
+
 /* register widgets into our hashtable so that we can cope with the
    callbacks. The hashtable is weak so deregistration is handled
    automatically */
@@ -2576,11 +2608,6 @@ mswindows_widget_instantiate (Lisp_Object image_instance, Lisp_Object instantiat
     SendMessage (wnd, WM_SETFONT,
 		 (WPARAM) mswindows_widget_hfont (ii, domain),
 		 MAKELPARAM (TRUE, 0));
-#if 0
-  /* #### doesn't work.  need to investigate more closely. */
-  if (IMAGE_INSTANCE_WANTS_INITIAL_FOCUS (ii))
-    SetFocus (wnd);
-#endif
 }
 
 /* Instantiate a native layout widget. */
@@ -3061,7 +3088,7 @@ mswindows_combo_box_instantiate (Lisp_Object image_instance, Lisp_Object instant
   default_face_font_info (domain, 0, 0, &height, 0, 0);
   GET_LIST_LENGTH (items, len);
 
-  height = (height + WIDGET_BORDER_HEIGHT * 2 ) * len;
+  height = (height + DEFAULT_WIDGET_BORDER_WIDTH * 2 ) * len;
   IMAGE_INSTANCE_HEIGHT (ii) = height;
 
   /* Now create the widget. */
@@ -3219,6 +3246,7 @@ console_type_create_glyphs_mswindows (void)
   CONSOLE_HAS_METHOD (mswindows, image_instance_hash);
   CONSOLE_HAS_METHOD (mswindows, init_image_instance_from_eimage);
   CONSOLE_HAS_METHOD (mswindows, locate_pixmap_file);
+  CONSOLE_HAS_METHOD (mswindows, widget_border_width);
 
   /* image methods - printer */
   CONSOLE_INHERITS_METHOD (msprinter, mswindows, print_image_instance);