pidgin: src/gtkimhtml.c comparison

comparison src/gtkimhtml.c @ 6982:083d1e4a9c78

[gaim-migrate @ 7538] This is Mr. Holland's Opus. And by Mr. Holland I mean Robot101. He rewrote the coreish IM image support so that the binary data gets ripped out in the prpl and put in an imgstore instead of just being passed in the same huge as char string as the actual message. This is good because it's prpl agnostic, or something. It also means we don't have a silly length of "-1" with pretty much every send or receive IM function. It should be crash free, bug free, and memleak free, but additional testing is always a good thing. If you like good stuff then you'll love this patch. But don't take my word for it--ba dun dunt! committer: Tailor Script <tailor@pidgin.im>

author	Mark Doliner <mark@kingant.net>
date	Sat, 27 Sep 2003 19:17:21 +0000
parents	4f8258b2bb8d
children	48cc5d5d5a6c

comparison

equal deleted inserted replaced

-:abd3c684da31
+:083d1e4a9c78
 	VALID_TAG ("/STRONG");
 	VALID_OPT_TAG ("SPAN");
 	VALID_TAG ("/SPAN");
 	VALID_TAG ("BR/"); /* hack until gtkimhtml handles things better */
+	VALID_TAG ("IMG");
 	if (!g_ascii_strncasecmp(string, "!--", strlen ("!--"))) {
 		gchar *e = strstr (string + strlen("!--"), "-->");
 		if (e) {
 			*len = e - string + strlen ("-->");
 								gtk_text_buffer_get_end_iter(imhtml->text_buffer, &iter); \
 } \
-GString* gtk_imhtml_append_text (GtkIMHtml        *imhtml,
+GString* gtk_imhtml_append_text_with_images (GtkIMHtml        *imhtml,
-				 const gchar      *text,
+					     const gchar      *text,
-				 gint              len,
+					     GtkIMHtmlOptions  options,
-				 GtkIMHtmlOptions  options)
+					     GSList           *images)
 {
 	gint pos = 0;
 	GString *str = NULL;
 	GtkTextIter iter, siter;
 	GtkTextMark *mark, *mark2;
 	GtkTextTag *texttag;
 	gchar *ws;
 	gchar *tag;
 	gchar *url = NULL;
 	gchar *bg = NULL;
+	gint len;
 	gint tlen, smilelen, wpos=0;
 	gint type;
 	const gchar *c;
 	gchar amp;
 	GtkIMHtmlScalable *scalable = NULL;
 	g_return_val_if_fail (imhtml != NULL, NULL);
 	g_return_val_if_fail (GTK_IS_IMHTML (imhtml), NULL);
 	g_return_val_if_fail (text != NULL, NULL);
-	g_return_val_if_fail (len != 0, NULL);
 	c = text;
-	if (len == -1)
+	len = strlen(text);
-		len = strlen(text);
 	ws = g_malloc(len + 1);
 	ws[0] = 0;
 	if (options & GTK_IMHTML_RETURN_LOG)
 		str = g_string_new("");
 				case 25:	/* BR */
 				case 58:	/* BR/ */
 					ws[wpos] = '\n';
 					wpos++;
 					NEW_BIT (NEW_TEXT_BIT);
 					break;
 				case 26:        /* HR */
 				case 42:        /* HR (opt) */
 					ws[wpos++] = '\n';
 					scalable = gtk_imhtml_hr_new();
 					NEW_BIT(NEW_SCALABLE_BIT);
 				case 35:	/* BODY */
 				case 36:	/* /BODY */
 				case 37:	/* FONT */
 				case 38:	/* HEAD */
 				case 39:	/* /HEAD */
-					break;
+				case 40:	/* BINARY */
-				case 40:        /* BINARY */
+				case 41:	/* /BINARY */
-					NEW_BIT (NEW_TEXT_BIT);
-					while (pos < len && g_ascii_strncasecmp("</BINARY>", c, strlen("</BINARY>"))) {
-						c++;
-						pos++;
-					}
-					c = c - tlen; /* Because it will add this later */
-					break;
-				case 41:        /* /BINARY */
 					break;
 				case 43:	/* FONT (opt) */
 					{
 						gchar *color, *back, *face, *size, *sml;
 						GtkIMHtmlFontDetail *font, *oldfont = NULL;
 							url = href;
 						}
 					}
 					break;
 				case 46:	/* IMG (opt) */
+				case 59:	/* IMG */
 					{
-						gchar *src = gtk_imhtml_get_html_opt (tag, "SRC=");
+						GdkPixbuf *img = NULL;
-						gchar *id = gtk_imhtml_get_html_opt (tag, "ID=");
+						const gchar *filename = NULL;
-						gchar *datasize = gtk_imhtml_get_html_opt (tag, "DATASIZE=");
-						gint im_len = datasize?atoi(datasize):0;
+						if (images && images->data) {
+							img = images->data;
-						if (src && id && im_len && im_len <= len - pos) {
+							images = images->next;
-							/* This is an embedded IM image, or is it? */
+							filename = g_object_get_data(G_OBJECT(img), "filename");
-							char *tmp = NULL;
+							g_object_ref(G_OBJECT(img));
-							const char *alltext;
+						} else {
-							guchar *imagedata = NULL;
+							img = gtk_widget_render_icon(GTK_WIDGET(imhtml),
+							    GTK_STOCK_MISSING_IMAGE, GTK_ICON_SIZE_BUTTON,
-							GdkPixbufLoader *load;
+							    "gtkimhtml-missing-image");
-							GdkPixbuf *imagepb = NULL;
-							GError *error = NULL;
-							tmp = g_strdup_printf("<DATA ID=\"%s\" SIZE=\"%s\">", id, datasize);
-							alltext = strstr(c, tmp);
-							imagedata = g_memdup(alltext + strlen(tmp), im_len);
-							g_free(tmp);
-							load = gdk_pixbuf_loader_new();
-							if (!gdk_pixbuf_loader_write(load, imagedata, im_len, &error)){
-								fprintf(stderr, "IM Image corrupted or unreadable.: %s\n", error->message);
-							} else {
-								imagepb = gdk_pixbuf_loader_get_pixbuf(load);
-								if (imagepb) {
-									scalable = gtk_imhtml_image_new(imagepb, g_strdup(src));
-									NEW_BIT(NEW_SCALABLE_BIT);
-									g_object_unref(imagepb);
-								}
-							}
-							gdk_pixbuf_loader_close(load, NULL);
-							g_free(imagedata);
-							g_free(id);
-							g_free(datasize);
-							g_free(src);
-							break;
 						}
-						g_free(id);
-						g_free(datasize);
+						scalable = gtk_imhtml_image_new(img, filename);
-						g_free(src);
+						NEW_BIT(NEW_SCALABLE_BIT);
+						g_object_unref(G_OBJECT(img));
 					}
 				case 47:	/* P (opt) */
 				case 48:	/* H3 (opt) */
 				case 49:	/* HTML (opt) */
 				case 50:	/* CITE */
 				case 51:	/* /CITE */
 				case 56:	/* SPAN */
 				case 57:	/* /SPAN */
 					break;
-				case 59:	/* comment */
+				case 60:	/* comment */
 					NEW_BIT (NEW_TEXT_BIT);
 					if (imhtml->show_comments)
 						wpos = g_snprintf (ws, len, "%s", tag);
 					NEW_BIT (NEW_COMMENT_BIT);
 					break;
 									   rect.y + rect.height);
 	gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(imhtml), &iter, 0, TRUE, 0, 0);
 }
 /* GtkIMHtmlScalable, gtk_imhtml_image, gtk_imhtml_hr */
-GtkIMHtmlScalable *gtk_imhtml_image_new(GdkPixbuf *img, gchar *filename)
+GtkIMHtmlScalable *gtk_imhtml_image_new(GdkPixbuf *img, const gchar *filename)
 {
 	GtkIMHtmlImage *im_image = g_malloc(sizeof(GtkIMHtmlImage));
 	GtkImage *image = GTK_IMAGE(gtk_image_new_from_pixbuf(img));
 	GTK_IMHTML_SCALABLE(im_image)->scale = gtk_imhtml_image_scale;
 	im_image->pixbuf = img;
 	im_image->image = image;
 	im_image->width = gdk_pixbuf_get_width(img);
 	im_image->height = gdk_pixbuf_get_height(img);
 	im_image->mark = NULL;
-	im_image->filename = filename;
+	im_image->filename = filename ? g_strdup(filename) : NULL;
 	g_object_ref(img);
 	return GTK_IMHTML_SCALABLE(im_image);
 }
 static void gtk_imhtml_image_save(GtkWidget *w, GtkIMHtmlImage *image)
 {
 	GtkWidget *sel = gtk_file_selection_new(_("Save Image"));
-	gtk_file_selection_set_filename(GTK_FILE_SELECTION(sel), image->filename);
+	if (image->filename)
+		gtk_file_selection_set_filename(GTK_FILE_SELECTION(sel), image->filename);
 	g_object_set_data(G_OBJECT(sel), "GtkIMHtmlImage", image);
 	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(sel)->ok_button), "clicked",
 					 G_CALLBACK(write_img_to_file), sel);
 	g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(sel)->ok_button), "clicked",
 void gtk_imhtml_image_free(GtkIMHtmlScalable *scale)
 {
 	GtkIMHtmlImage *image = (GtkIMHtmlImage *)scale;
 	g_object_unref(image->pixbuf);
-	g_free(image->filename);
+	if (image->filename)
+		g_free(image->filename);
 	g_free(scale);
 }
 void gtk_imhtml_image_add_to(GtkIMHtmlScalable *scale, GtkIMHtml *imhtml, GtkTextIter *iter)
 {

Mercurial > pidgin

comparison src/gtkimhtml.c @ 6982:083d1e4a9c78