Index: src/console.h
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/console.h,v
retrieving revision 1.14
diff -u -r1.14 console.h
--- src/console.h 1998/04/28 00:24:52 1.14
+++ src/console.h 1998/04/30 18:28:58
@@ -210,8 +210,6 @@
 				 Lisp_Object pointer_fg, 
 				 Lisp_Object pointer_bg,
 				 int dest_mask, Lisp_Object domain);
-  Lisp_Object (*xpm_normalize_method)(Lisp_Object inst,
-				      Lisp_Object console_type);
 #endif
   Lisp_Object image_conversion_list;
 
Index: src/event-msw.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/event-msw.c,v
retrieving revision 1.26
diff -u -r1.26 event-msw.c
--- src/event-msw.c 1998/04/26 04:07:22 1.26
+++ src/event-msw.c 1998/04/30 18:29:01
@@ -1613,7 +1613,7 @@
 
 	  if (!NILP(btext))
 	    {
-	      strncpy (tttext->szText, XSTRING_DATA (btext), 80);
+	      strncpy (tttext->szText, XSTRING_DATA (btext), XSTRING_LENGTH(btext)+1);
 	      tttext->lpszText=tttext->szText;
 	    }
 #if 0
Index: src/glyphs-msw.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/glyphs-msw.c,v
retrieving revision 1.9
diff -u -r1.9 glyphs-msw.c
--- src/glyphs-msw.c 1998/04/28 00:24:58 1.9
+++ src/glyphs-msw.c 1998/04/30 18:29:02
@@ -1,5 +1,10 @@
 /* mswindows-specific Lisp objects.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1995 Board of Trustees, University of Illinois.
+   Copyright (C) 1995 Tinker Systems
+   Copyright (C) 1995, 1996 Ben Wing
+   Copyright (C) 1995 Sun Microsystems
+   Copyright (C) 1998 Andy Piper.
    
 This file is part of XEmacs.
 
@@ -430,15 +435,85 @@
  **********************************************************************/
 
 #ifdef HAVE_XPM
+
+struct color_symbol
+{
+  char*		name;
+  COLORREF	color;
+};
+
+static struct color_symbol*
+extract_xpm_color_names (Lisp_Object device,
+			 Lisp_Object domain,
+			 Lisp_Object color_symbol_alist,
+			 int* nsymbols)
+{
+  /* This function can GC */
+  Lisp_Object rest;
+  Lisp_Object results = Qnil;
+  int i, j;
+  struct color_symbol *colortbl;
+  struct gcpro gcpro1, gcpro2;
+
+  GCPRO2 (results, device);
+
+  /* We built up results to be (("name" . #<color>) ...) so that if an
+     error happens we don't lose any malloc()ed data, or more importantly,
+     leave any pixels allocated in the server. */
+  i = 0;
+  LIST_LOOP (rest, color_symbol_alist)
+    {
+      Lisp_Object cons = XCAR (rest);
+      Lisp_Object name = XCAR (cons);
+      Lisp_Object value = XCDR (cons);
+      if (NILP (value))
+	continue;
+      if (STRINGP (value))
+	value =
+	  Fmake_color_instance
+	  (value, device, encode_error_behavior_flag (ERROR_ME_NOT));
+      else
+        {
+          assert (COLOR_SPECIFIERP (value));
+          value = Fspecifier_instance (value, domain, Qnil, Qnil);
+        }
+      if (NILP (value))
+        continue;
+      results = noseeum_cons (noseeum_cons (name, value), results);
+      i++;
+    }
+  UNGCPRO;			/* no more evaluation */
+
+  *nsymbols=i;
+  if (i == 0) return 0;
+
+  colortbl = xnew_array_and_zero (struct color_symbol, i);
+
+  for (j=0; j<i; j++)
+    {
+      Lisp_Object cons = XCAR (results);
+      colortbl[j].color = 
+	COLOR_INSTANCE_MSWINDOWS_COLOR (XCOLOR_INSTANCE (XCDR (cons)));
+
+      colortbl[j].name = (char *) XSTRING_DATA (XCAR (cons));
+      free_cons (XCONS (cons));
+      cons = results;
+      results = XCDR (results);
+      free_cons (XCONS (cons));
+    }
+  return colortbl;
+}
+
 static int xpm_to_eimage (Lisp_Object image, CONST Extbyte *buffer,
 			  unsigned char** data,
 			  int* width, int* height,
 			  int* x_hot, int* y_hot,
-			  COLORREF bg)
+			  COLORREF bg, struct color_symbol* color_symbols,
+			  int nsymbols)
 {
   XpmImage xpmimage;
   XpmInfo xpminfo;
-  int result, i, transp_idx, maskbpline;
+  int result, i, j, transp_idx, maskbpline;
   unsigned char* dptr;
   unsigned int* sptr;
   COLORREF color; /* the american spelling virus hits again .. */
@@ -498,8 +573,30 @@
 
   for (i=0; i<xpmimage.ncolors; i++)
     {
+				/* pick up symbolic colors */
+      if (xpmimage.colorTable[i].c_color == 0 
+	  &&
+	  xpmimage.colorTable[i].symbolic != 0)
+	{
+	  if (!color_symbols)
+	    {
+	      xfree (*data);
+	      xfree (colortbl);
+	      XpmFreeXpmImage (&xpmimage);
+	      XpmFreeXpmInfo (&xpminfo);
+	      return 0;
+	    }
+	  for (j = 0; j<nsymbols; j++)
+	    {
+	      if (!strcmp (xpmimage.colorTable[i].symbolic,
+			   color_symbols[j].name ))
+		{
+		  colortbl[i]=color_symbols[j].color;		  
+		}
+	    }
+	}
 				/* pick up transparencies */
-      if (!strcmp (xpmimage.colorTable[i].c_color,"None"))
+      else if (!strcmp (xpmimage.colorTable[i].c_color,"None"))
 	{
 	  colortbl[i]=bg; /* PALETTERGB(0,0,0); */
 	  transp_idx=i;
@@ -533,12 +630,6 @@
   return TRUE;
 }
 
-static Lisp_Object
-mswindows_xpm_normalize (Lisp_Object inst, Lisp_Object console_type)
-{
-  return simple_image_type_normalize (inst, console_type, Qxpm);
-}
-
 static void
 mswindows_xpm_instantiate (Lisp_Object image_instance,
 			   Lisp_Object instantiator,
@@ -555,8 +646,12 @@
   unsigned char*	bmp_data;
   int			bmp_bits;
   COLORREF		bkcolor;
+  int 			nsymbols=0;
+  struct color_symbol*	color_symbols=NULL;
   
   Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
+  Lisp_Object color_symbol_alist = find_keyword_in_vector (instantiator,
+							   Q_color_symbols);
 
   if (!DEVICE_MSWINDOWS_P (XDEVICE (device)))
     signal_simple_error ("Not an mswindows device", device);
@@ -570,14 +665,21 @@
   bkcolor = COLOR_INSTANCE_MSWINDOWS_COLOR 
     (XCOLOR_INSTANCE (FACE_BACKGROUND (Vdefault_face, domain)));
 
+  /* in case we have color symbols */
+  color_symbols = extract_xpm_color_names (device, domain,
+					   color_symbol_alist, &nsymbols);
+
   /* convert to an eimage to make processing easier */
   if (!xpm_to_eimage (image_instance, bytes, &eimage, &width, &height,
-		      &x_hot, &y_hot, bkcolor))
+		      &x_hot, &y_hot, bkcolor, color_symbols, nsymbols))
     {
       signal_simple_error ("XPM to EImage conversion failed", 
 			   image_instance);
     }
   
+  if (color_symbols)
+    xfree(color_symbols);
+  
   /* build a bitmap from the eimage */
   if (!(bmp_info=convert_EImage_to_DIBitmap (device, width, height, eimage,
 					     &bmp_bits, &bmp_data)))
@@ -789,7 +891,6 @@
   CONSOLE_HAS_METHOD (mswindows, init_image_instance_from_eimage);
   CONSOLE_HAS_METHOD (mswindows, locate_pixmap_file);
 #ifdef HAVE_XPM
-  CONSOLE_HAS_METHOD (mswindows, xpm_normalize);
   CONSOLE_HAS_METHOD (mswindows, xpm_instantiate);
 #endif
 }
Index: src/glyphs-x.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/glyphs-x.c,v
retrieving revision 1.45
diff -u -r1.45 glyphs-x.c
--- src/glyphs-x.c 1998/04/29 06:14:26 1.45
+++ src/glyphs-x.c 1998/04/30 18:29:06
@@ -1280,145 +1280,6 @@
 /**********************************************************************
  *                             XPM                                    *
  **********************************************************************/
-
-static Lisp_Object
-pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid)
-{
-  char **data;
-  int result;
-
-  result = XpmReadFileToData ((char *) XSTRING_DATA (name), &data);
-
-  if (result == XpmSuccess)
-    {
-      Lisp_Object retval = Qnil;
-      struct buffer *old_buffer = current_buffer;
-      Lisp_Object temp_buffer =
-	Fget_buffer_create (build_string (" *pixmap conversion*"));
-      int elt;
-      int height, width, ncolors;
-      struct gcpro gcpro1, gcpro2, gcpro3;
-      int speccount = specpdl_depth ();
-
-      GCPRO3 (name, retval, temp_buffer);
-
-      specbind (Qinhibit_quit, Qt);
-      set_buffer_internal (XBUFFER (temp_buffer));
-      Ferase_buffer (Qnil);
-
-      buffer_insert_c_string (current_buffer, "/* XPM */\r");
-      buffer_insert_c_string (current_buffer, "static char *pixmap[] = {\r");
-
-      sscanf (data[0], "%d %d %d", &height, &width, &ncolors);
-      for (elt = 0; elt <= width + ncolors; elt++)
-	{
-	  buffer_insert_c_string (current_buffer, "\"");
-	  buffer_insert_c_string (current_buffer, data[elt]);
-
-	  if (elt < width + ncolors)
-	    buffer_insert_c_string (current_buffer, "\",\r");
-	  else
-	    buffer_insert_c_string (current_buffer, "\"};\r");
-	}
-
-      retval = Fbuffer_substring (Qnil, Qnil, Qnil);
-      XpmFree (data);
-
-      set_buffer_internal (old_buffer);
-      unbind_to (speccount, Qnil);
-
-      RETURN_UNGCPRO (retval);
-    }
-
-  switch (result)
-    {
-    case XpmFileInvalid:
-      {
-	if (ok_if_data_invalid)
-	  return Qt;
-	signal_image_error ("invalid XPM data in file", name);
-      }
-    case XpmNoMemory:
-      {
-	signal_double_file_error ("Reading pixmap file",
-				  "out of memory", name);
-      }
-    case XpmOpenFailed:
-      {
-	/* should never happen? */
-	signal_double_file_error ("Opening pixmap file",
-				  "no such file or directory", name);
-      }
-    default:
-      {
-	signal_double_file_error_2 ("Parsing pixmap file",
-				    "unknown error code",
-				    make_int (result), name);
-	break;
-      }
-    }
-
-  return Qnil; /* not reached */
-}
-
-static Lisp_Object
-x_xpm_normalize (Lisp_Object inst, Lisp_Object console_type)
-{
-  Lisp_Object file = Qnil;
-  Lisp_Object color_symbols;
-  struct gcpro gcpro1, gcpro2;
-  Lisp_Object alist = Qnil;
-
-  GCPRO2 (file, alist);
-
-  /* Now, convert any file data into inline data.  At the end of this,
-     `data' will contain the inline data (if any) or Qnil, and
-     `file' will contain the name this data was derived from (if
-     known) or Qnil.
-
-     Note that if we cannot generate any regular inline data, we
-     skip out. */
-
-  file = potential_pixmap_file_instantiator (inst, Q_file, Q_data, 
-					     console_type);
-
-  if (CONSP (file)) /* failure locating filename */
-    signal_double_file_error ("Opening pixmap file",
-			      "no such file or directory",
-			      Fcar (file));
-
-  color_symbols = find_keyword_in_vector_or_given (inst, Q_color_symbols,
-						   Qunbound);
-
-  if (NILP (file) && !UNBOUNDP (color_symbols))
-    /* no conversion necessary */
-    RETURN_UNGCPRO (inst);
-
-  alist = tagged_vector_to_alist (inst);
-
-  if (!NILP (file))
-    {
-      Lisp_Object data = pixmap_to_lisp_data (file, 0);
-      alist = remassq_no_quit (Q_file, alist);
-      /* there can't be a :data at this point. */
-      alist = Fcons (Fcons (Q_file, file),
-		     Fcons (Fcons (Q_data, data), alist));
-    }
-
-  if (UNBOUNDP (color_symbols))
-    {
-      color_symbols = evaluate_xpm_color_symbols ();
-      alist = Fcons (Fcons (Q_color_symbols, color_symbols),
-		     alist);
-    }
-
-  {
-    Lisp_Object result = alist_to_tagged_vector (Qxpm, alist);
-    free_alist (alist);
-    RETURN_UNGCPRO (result);
-  }
-}
-
  /* xpm 3.2g and better has XpmCreatePixmapFromBuffer()...
     There was no version number in xpm.h before 3.3, but this should do.
   */
@@ -4496,7 +4357,6 @@
   CONSOLE_HAS_METHOD (x, init_image_instance_from_eimage);
   CONSOLE_HAS_METHOD (x, locate_pixmap_file);
 #ifdef HAVE_XPM
-  CONSOLE_HAS_METHOD (x, xpm_normalize);
   CONSOLE_HAS_METHOD (x, xpm_instantiate);
 #endif
 }
@@ -4512,6 +4372,7 @@
   IIFORMAT_HAS_METHOD (xbm, normalize);
   IIFORMAT_HAS_METHOD (xbm, possible_dest_types);
   IIFORMAT_HAS_METHOD (xbm, instantiate);
+
 
   IIFORMAT_VALID_KEYWORD (xbm, Q_data, check_valid_xbm_inline);
   IIFORMAT_VALID_KEYWORD (xbm, Q_file, check_valid_string);
Index: src/glyphs.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/glyphs.c,v
retrieving revision 1.18
diff -u -r1.18 glyphs.c
--- src/glyphs.c 1998/04/28 00:24:59 1.18
+++ src/glyphs.c 1998/04/30 18:29:09
@@ -1539,6 +1539,86 @@
  *                             XPM                                    *
  **********************************************************************/
 
+Lisp_Object
+pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid)
+{
+  char **data;
+  int result;
+
+  result = XpmReadFileToData ((char *) XSTRING_DATA (name), &data);
+
+  if (result == XpmSuccess)
+    {
+      Lisp_Object retval = Qnil;
+      struct buffer *old_buffer = current_buffer;
+      Lisp_Object temp_buffer =
+	Fget_buffer_create (build_string (" *pixmap conversion*"));
+      int elt;
+      int height, width, ncolors;
+      struct gcpro gcpro1, gcpro2, gcpro3;
+      int speccount = specpdl_depth ();
+
+      GCPRO3 (name, retval, temp_buffer);
+
+      specbind (Qinhibit_quit, Qt);
+      set_buffer_internal (XBUFFER (temp_buffer));
+      Ferase_buffer (Qnil);
+
+      buffer_insert_c_string (current_buffer, "/* XPM */\r");
+      buffer_insert_c_string (current_buffer, "static char *pixmap[] = {\r");
+
+      sscanf (data[0], "%d %d %d", &height, &width, &ncolors);
+      for (elt = 0; elt <= width + ncolors; elt++)
+	{
+	  buffer_insert_c_string (current_buffer, "\"");
+	  buffer_insert_c_string (current_buffer, data[elt]);
+
+	  if (elt < width + ncolors)
+	    buffer_insert_c_string (current_buffer, "\",\r");
+	  else
+	    buffer_insert_c_string (current_buffer, "\"};\r");
+	}
+
+      retval = Fbuffer_substring (Qnil, Qnil, Qnil);
+      XpmFree (data);
+
+      set_buffer_internal (old_buffer);
+      unbind_to (speccount, Qnil);
+
+      RETURN_UNGCPRO (retval);
+    }
+
+  switch (result)
+    {
+    case XpmFileInvalid:
+      {
+	if (ok_if_data_invalid)
+	  return Qt;
+	signal_image_error ("invalid XPM data in file", name);
+      }
+    case XpmNoMemory:
+      {
+	signal_double_file_error ("Reading pixmap file",
+				  "out of memory", name);
+      }
+    case XpmOpenFailed:
+      {
+	/* should never happen? */
+	signal_double_file_error ("Opening pixmap file",
+				  "no such file or directory", name);
+      }
+    default:
+      {
+	signal_double_file_error_2 ("Parsing pixmap file",
+				    "unknown error code",
+				    make_int (result), name);
+	break;
+      }
+    }
+
+  return Qnil; /* not reached */
+}
+
 static void
 check_valid_xpm_color_symbols (Lisp_Object data)
 {
@@ -1598,9 +1678,59 @@
 static Lisp_Object
 xpm_normalize (Lisp_Object inst, Lisp_Object console_type)
 {
-  return MAYBE_LISP_CONTYPE_METH
-    (decode_console_type(console_type, ERROR_ME), 
-     xpm_normalize, (inst, console_type));
+  Lisp_Object file = Qnil;
+  Lisp_Object color_symbols;
+  struct gcpro gcpro1, gcpro2;
+  Lisp_Object alist = Qnil;
+
+  GCPRO2 (file, alist);
+
+  /* Now, convert any file data into inline data.  At the end of this,
+     `data' will contain the inline data (if any) or Qnil, and
+     `file' will contain the name this data was derived from (if
+     known) or Qnil.
+
+     Note that if we cannot generate any regular inline data, we
+     skip out. */
+
+  file = potential_pixmap_file_instantiator (inst, Q_file, Q_data, 
+					     console_type);
+
+  if (CONSP (file)) /* failure locating filename */
+    signal_double_file_error ("Opening pixmap file",
+			      "no such file or directory",
+			      Fcar (file));
+
+  color_symbols = find_keyword_in_vector_or_given (inst, Q_color_symbols,
+						   Qunbound);
+
+  if (NILP (file) && !UNBOUNDP (color_symbols))
+    /* no conversion necessary */
+    RETURN_UNGCPRO (inst);
+  
+  alist = tagged_vector_to_alist (inst);
+
+  if (!NILP (file))
+    {
+      Lisp_Object data = pixmap_to_lisp_data (file, 0);
+      alist = remassq_no_quit (Q_file, alist);
+      /* there can't be a :data at this point. */
+      alist = Fcons (Fcons (Q_file, file),
+		     Fcons (Fcons (Q_data, data), alist));
+    }
+  
+  if (UNBOUNDP (color_symbols))
+    {
+      color_symbols = evaluate_xpm_color_symbols ();
+      alist = Fcons (Fcons (Q_color_symbols, color_symbols),
+		     alist);
+    }
+
+  {
+    Lisp_Object result = alist_to_tagged_vector (Qxpm, alist);
+    free_alist (alist);
+    RETURN_UNGCPRO (result);
+  }
 }
 
 static int
Index: src/glyphs.h
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/glyphs.h,v
retrieving revision 1.15
diff -u -r1.15 glyphs.h
--- src/glyphs.h 1998/04/26 04:07:23 1.15
+++ src/glyphs.h 1998/04/30 18:29:10
@@ -30,6 +30,7 @@
 #ifdef HAVE_XPM
 extern Lisp_Object Q_color_symbols;
 Lisp_Object evaluate_xpm_color_symbols (void);
+Lisp_Object pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid);
 #endif
 
 DOESNT_RETURN signal_image_error (CONST char *, Lisp_Object);
Index: src/toolbar-msw.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/toolbar-msw.c,v
retrieving revision 1.4
diff -u -r1.4 toolbar-msw.c
--- src/toolbar-msw.c 1998/04/24 21:34:26 1.4
+++ src/toolbar-msw.c 1998/04/30 18:29:12
@@ -1,5 +1,9 @@
 /* toolbar implementation -- mswindows interface.
-   Copyright (C) 1998 Free Software Foundation.
+   Copyright (C) 1995 Board of Trustees, University of Illinois.
+   Copyright (C) 1995 Sun Microsystems, Inc.
+   Copyright (C) 1995, 1996 Ben Wing.
+   Copyright (C) 1996 Chuck Thompson.
+   Copyright (C) 1998 Andy Piper.
 
 This file is part of XEmacs.