xemacs-beta: src/glyphs-gtk.c comparison

comparison src/glyphs-gtk.c @ 4252:8475ff9c49ea

[xemacs-hg @ 2007-11-05 14:59:20 by didierv] Fix recent image related crashes

author	didierv
date	Mon, 05 Nov 2007 14:59:24 +0000
parents	dbd2a866e38a
children	1bf48c59700e

comparison

equal deleted inserted replaced

-:b45f331a659d
+:8475ff9c49ea
 /*                      image instance methods                          */
 /************************************************************************/
 /************************************************************************/
 /* convert from a series of RGB triples to an XImage formated for the   */
-/* proper display 							*/
+/* proper display							*/
 /************************************************************************/
 static GdkImage *
 convert_EImage_to_GDKImage (Lisp_Object device, int width, int height,
 			    unsigned char *pic, unsigned long **pixtbl,
 			    int *npixels)
 if (!data)
 {
 gdk_image_destroy (outimg);
 return NULL;
 }
 if (vis->type == GDK_VISUAL_PSEUDO_COLOR)
 {
 unsigned long pixarray[256];
 int pixcount, n;
 /* use our quantize table to allocate the colors */
 n = *npixels;
 for (i = 0; i < qtable->num_active_colors; i++)
 	{
 	  GdkColor color;
 	  int res;
 	  color.red = qtable->rm[i] ? qtable->rm[i] << 8 : 0;
 	  color.green = qtable->gm[i] ? qtable->gm[i] << 8 : 0;
 	  color.blue = qtable->bm[i] ? qtable->bm[i] << 8 : 0;
 	  res = allocate_nearest_color (cmap, vis, &color);
 	  if (res > 0 && res < 3)
 	      else
 		for (q = 0; q < byte_cnt; q++) *dp++ = conv.cp[q];
 #endif
 	    }
 	}
 }
 return outimg;
 }
 static void
 gtk_print_image_instance (struct Lisp_Image_Instance *p,
 static void
 gtk_init_image_instance_from_eimage (struct Lisp_Image_Instance *ii,
 				     int width, int height,
 				     int slices,
 				     unsigned char *eimage,
 				     int dest_mask,
 				     Lisp_Object instantiator,
 				     Lisp_Object pointer_fg,
 				     Lisp_Object pointer_bg,
 				     Lisp_Object UNUSED (domain))
 if (STRINGP (value))
 	value =
 	  Fmake_color_instance
 	  (value, device, encode_error_behavior_flag (ERROR_ME_DEBUG_WARN));
 else
-{
+	{
-assert (COLOR_SPECIFIERP (value));
+	  assert (COLOR_SPECIFIERP (value));
-value = Fspecifier_instance (value, domain, Qnil, Qnil);
+	  value = Fspecifier_instance (value, domain, Qnil, Qnil);
-}
+	}
 if (NILP (value))
-continue;
+	continue;
 results = noseeum_cons (noseeum_cons (name, value), results);
 i++;
 }
 UNGCPRO;			/* no more evaluation */
 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_GTK_COLOR (XCOLOR_INSTANCE (XCDR (cons)));
 colortbl[j].name = XSTRING_DATA (XCAR (cons));
 free_cons (cons);
 cons = results;
 	/* #### Gtk does not give us access to the hotspots of a pixmap */
 	IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii) = 1;
 	IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii) = 1;
 image_instance_convert_to_pointer (ii, instantiator, pointer_fg,
 					 pointer_bg);
 break;
 default:
 **********************************************************************/
 static void
 gtk_resource_validate (Lisp_Object instantiator)
 {
 if ((NILP (find_keyword_in_vector (instantiator, Q_file))
 &&
 NILP (find_keyword_in_vector (instantiator, Q_resource_id)))
 ||
 NILP (find_keyword_in_vector (instantiator, Q_resource_type)))
 sferror ("Must supply :file, :resource-id and :resource-type",
 			 instantiator);
 }
 #if 0
 if (dest_mask & IMAGE_POINTER_MASK && type == IMAGE_POINTER_MASK)
 iitype = IMAGE_POINTER;
 else if (dest_mask & IMAGE_COLOR_PIXMAP_MASK)
 iitype = IMAGE_COLOR_PIXMAP;
 else
 incompatible_image_types (instantiator, dest_mask,
 			      IMAGE_COLOR_PIXMAP_MASK | IMAGE_POINTER_MASK);
 #endif
 /* mess with the keyword info we were provided with */
 gtk_initialize_pixmap_image_instance (ii, 1, type);
 c = gdk_cursor_new ((GdkCursorType) resource_name_to_resource (resource_id, type));
 IMAGE_INSTANCE_GTK_CURSOR (ii) = c;
 IMAGE_INSTANCE_PIXMAP_FILENAME (ii) = resource_id;
 			   alist);
 	  if (yhot != -1)
 	    alist = Fcons (Fcons (Q_hotspot_y, make_int (yhot)),
 			   alist);
-	  alist = xbm_mask_file_munging (alist, filename, Qnil, console_type);
+	  alist = xbm_mask_file_munging (alist, filename, Qt, console_type);
 	  {
 	    Lisp_Object result = alist_to_tagged_vector (Qxbm, alist);
 	    free_alist (alist);
 	    RETURN_UNGCPRO (result);
 TO_EXTERNAL_FORMAT (LISP_STRING, data,
 			  C_STRING_ALLOCA, name_ext,
 			  Qfile_name);
 if (cursor_name_to_index (name_ext) != -1)
-{
+	{
-result = alist_to_tagged_vector (Qcursor_font, alist);
+	  result = alist_to_tagged_vector (Qcursor_font, alist);
-is_cursor_font = 1;
+	  is_cursor_font = 1;
-}
+	}
 }
 if (!is_cursor_font)
 result = alist_to_tagged_vector (Qstring, alist);
 free_alist (alist);
 if (!the_gdk_cursors[GDK_BASED_ARROW_UP])
 {
 	/* Need to initialize the array */
 	/* Supposedly since this array is static it should be
-initialized to NULLs for us, but I'm very paranoid. */
+	   initialized to NULLs for us, but I'm very paranoid. */
 	for (i = 0; i < GDK_NUM_GLYPHS; i++)
 	{
 	    the_gdk_cursors[i] = NULL;
 	}
 GtkStyle *style = gtk_widget_get_style (w);
 Lisp_Object pixel = Qnil;
 GdkColor *fcolor, *bcolor;
 style = gtk_style_copy (style);
 /* Update the foreground. */
 pixel = FACE_FOREGROUND (IMAGE_INSTANCE_WIDGET_FACE (ii), domain);
 fcolor = COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (pixel));
 /* Update the background. */
 /* It is possible for a widget action to cause it to get out of
 	 sync with its instantiator. Thus it is necessary to signal
 	 this possibility. */
 if (IMAGE_INSTANCEP (image_instance))
 	XIMAGE_INSTANCE_WIDGET_ACTION_OCCURRED (image_instance) = 1;
 if (!NILP (callback_ex) && !UNBOUNDP (callback_ex))
 	{
 	  event = Fmake_event (Qnil, Qnil);
 	  XSET_EVENT_TYPE (event, misc_user_event);
 IMAGE_INSTANCE_PIXMAP_FG (p) = foreground;
 IMAGE_INSTANCE_PIXMAP_BG (p) = background;
 return 1;
 }
 }

Mercurial > hg > xemacs-beta

comparison src/glyphs-gtk.c @ 4252:8475ff9c49ea