diff pidgin/gtkwebview.c @ 32133:8e1ec44ede75

Clean up this WebKit stuff. Fix up broken merging, mark unfinished work with FIXME/TODO, and fix this ungodly formatting.

--- a/pidgin/gtkwebview.c	Thu Sep 08 05:13:53 2011 +0000
+++ b/pidgin/gtkwebview.c	Thu Sep 08 22:04:35 2011 +0000
@@ -10,7 +10,7 @@
  * source distribution.
  *
  * This program is free software; you can redistribute it and/or modify
- * under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
@@ -53,82 +53,85 @@
 	GTimer *scroll_time;
 };
 
-GtkWidget* gtk_webview_new (void)
+GtkWidget *
+gtk_webview_new(void)
 {
-	GtkWebView* ret = GTK_WEBVIEW (g_object_new(gtk_webview_get_type(), NULL));
-	return GTK_WIDGET (ret);
+	GtkWebView* ret = GTK_WEBVIEW(g_object_new(gtk_webview_get_type(), NULL));
+	return GTK_WIDGET(ret);
 }
 
-static char*
-get_image_filename_from_id (GtkWebView* view, int id)
+static char *
+get_image_filename_from_id(GtkWebView* view, int id)
 {
 	char *filename = NULL;
 	FILE *file;
 	PurpleStoredImage* img;
 
 	if (!view->priv->images)
-		view->priv->images = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
-	
-	filename = (char*) g_hash_table_lookup (view->priv->images, GINT_TO_POINTER (id));
-	if (filename) return filename;
-			
+		view->priv->images = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_free);
+
+	filename = (char *)g_hash_table_lookup(view->priv->images, GINT_TO_POINTER(id));
+	if (filename)
+		return filename;
+
 	/* else get from img store */
-	file = purple_mkstemp (&filename, TRUE);
+	file = purple_mkstemp(&filename, TRUE);
 
-	img = purple_imgstore_find_by_id (id);
+	img = purple_imgstore_find_by_id(id);
 
-	fwrite (purple_imgstore_get_data (img), purple_imgstore_get_size (img), 1, file);
-	g_hash_table_insert (view->priv->images, GINT_TO_POINTER (id), filename);
-	fclose (file);
+	fwrite(purple_imgstore_get_data(img), purple_imgstore_get_size(img), 1, file);
+	g_hash_table_insert(view->priv->images, GINT_TO_POINTER(id), filename);
+	fclose(file);
 	return filename;
 }
 
 static void
-clear_single_image (gpointer key, gpointer value, gpointer userdata)
+clear_single_image(gpointer key, gpointer value, gpointer userdata)
 {
-	g_unlink ((char*) value);
+	g_unlink((char *)value);
 }
 
 static void
-clear_images (GtkWebView* view)
+clear_images(GtkWebView *view)
 {
-	if (!view->priv->images) return;
-	g_hash_table_foreach (view->priv->images, clear_single_image, NULL);
-	g_hash_table_unref (view->priv->images);
+	if (!view->priv->images)
+		return;
+	g_hash_table_foreach(view->priv->images, clear_single_image, NULL);
+	g_hash_table_unref(view->priv->images);
 }
 
 /*
  * Replace all <img id=""> tags with <img src="">. I hoped to never
- * write any HTML parsing code, but I'm forced to do this, until 
+ * write any HTML parsing code, but I'm forced to do this, until
  * purple changes the way it works.
  */
-static char*
-replace_img_id_with_src (GtkWebView *view, const char* html)
+static char *
+replace_img_id_with_src(GtkWebView *view, const char *html)
 {
-	GString *buffer = g_string_sized_new (strlen (html));
+	GString *buffer = g_string_sized_new(strlen(html));
 	const char* cur = html;
 	char *id;
 	int nid;
 
 	while (*cur) {
-		const char* img = strstr (cur, "<img");
+		const char *img = strstr(cur, "<img");
 		if (!img) {
-			g_string_append (buffer, cur);
+			g_string_append(buffer, cur);
 			break;
 		} else
-			g_string_append_len (buffer, cur, img - cur);
+			g_string_append_len(buffer, cur, img - cur);
 
-		cur = strstr (img, "/>");
+		cur = strstr(img, "/>");
 		if (!cur)
-			cur = strstr (img, ">");
+			cur = strstr(img, ">");
 
 		if (!cur) { /* invalid html? */
-			g_string_printf (buffer, "%s", html);
+			g_string_printf(buffer, "%s", html);
 			break;
 		}
 
-		if (strstr (img, "src=") || !strstr (img, "id=")) {
-			g_string_printf (buffer, "%s", html);
+		if (strstr(img, "src=") || !strstr(img, "id=")) {
+			g_string_printf(buffer, "%s", html);
 			break;
 		}
 
@@ -138,46 +141,46 @@
 		 * '=' cannot appear in parameters.
 		 */
 
-		id = strstr (img, "id=") + 3; 
+		id = strstr(img, "id=") + 3;
 
 		/* *id can't be \0, since a ">" appears after this */
-		if (isdigit (*id)) 
-			nid = atoi (id);
-		else 
-			nid = atoi (id+1);
+		if (isdigit(*id))
+			nid = atoi(id);
+		else
+			nid = atoi(id + 1);
 
 		/* let's dump this, tag and then dump the src information */
-		g_string_append_len (buffer, img, cur - img);
+		g_string_append_len(buffer, img, cur - img);
 
-		g_string_append_printf (buffer, " src='file://%s' ", get_image_filename_from_id (view, nid));
+		g_string_append_printf(buffer, " src='file://%s' ", get_image_filename_from_id(view, nid));
 	}
 
-	return g_string_free (buffer, FALSE);
+	return g_string_free(buffer, FALSE);
 }
 
 static void
-gtk_webview_finalize (GObject *view)
+gtk_webview_finalize(GObject *view)
 {
 	gpointer temp;
-	
-	while ((temp = g_queue_pop_head (GTK_WEBVIEW(view)->priv->js_queue)))
-		g_free (temp);
-	g_queue_free (GTK_WEBVIEW(view)->priv->js_queue);
 
-	clear_images (GTK_WEBVIEW (view));
-	g_free (GTK_WEBVIEW(view)->priv);
-	G_OBJECT_CLASS (parent_class)->finalize (G_OBJECT(view));
+	while ((temp = g_queue_pop_head(GTK_WEBVIEW(view)->priv->js_queue)))
+		g_free(temp);
+	g_queue_free(GTK_WEBVIEW(view)->priv->js_queue);
+
+	clear_images(GTK_WEBVIEW(view));
+	g_free(GTK_WEBVIEW(view)->priv);
+	G_OBJECT_CLASS(parent_class)->finalize(G_OBJECT(view));
 }
 
 static void
-gtk_webview_class_init (GtkWebViewClass *klass, gpointer userdata)
+gtk_webview_class_init(GtkWebViewClass *klass, gpointer userdata)
 {
-	parent_class = g_type_class_ref (webkit_web_view_get_type ());
-	G_OBJECT_CLASS (klass)->finalize = gtk_webview_finalize;
+	parent_class = g_type_class_ref(webkit_web_view_get_type());
+	G_OBJECT_CLASS(klass)->finalize = gtk_webview_finalize;
 }
 
 static gboolean
-webview_link_clicked (WebKitWebView *view,
+webview_link_clicked(WebKitWebView *view,
 		      WebKitWebFrame *frame,
 		      WebKitNetworkRequest *request,
 		      WebKitWebNavigationAction *navigation_action,
@@ -186,13 +189,13 @@
 	const gchar *uri;
 	WebKitWebNavigationReason reason;
 
-	uri = webkit_network_request_get_uri (request);
+	uri = webkit_network_request_get_uri(request);
 	reason = webkit_web_navigation_action_get_reason(navigation_action);
 
 	if (reason == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) {
 		/* the gtk imhtml way was to create an idle cb, not sure
 		 * why, so right now just using purple_notify_uri directly */
-		purple_notify_uri (NULL, uri);
+		purple_notify_uri(NULL, uri);
 	}
 
 	webkit_web_policy_decision_use(policy_decision);
@@ -201,129 +204,131 @@
 }
 
 static gboolean
-process_js_script_queue (GtkWebView *view)
+process_js_script_queue(GtkWebView *view)
 {
 	char *script;
-	if (view->priv->is_loading) return FALSE; /* we will be called when loaded */
-	if (!view->priv->js_queue || g_queue_is_empty (view->priv->js_queue))
+	if (view->priv->is_loading)
+		return FALSE; /* we will be called when loaded */
+	if (!view->priv->js_queue || g_queue_is_empty(view->priv->js_queue))
 		return FALSE; /* nothing to do! */
 
-	script = g_queue_pop_head (view->priv->js_queue);
-	webkit_web_view_execute_script (WEBKIT_WEB_VIEW(view), script);
-	g_free (script);
+	script = g_queue_pop_head(view->priv->js_queue);
+	webkit_web_view_execute_script(WEBKIT_WEB_VIEW(view), script);
+	g_free(script);
 
 	return TRUE; /* there may be more for now */
 }
 
 static void
-webview_load_started (WebKitWebView *view,
+webview_load_started(WebKitWebView *view,
 		      WebKitWebFrame *frame,
 		      gpointer userdata)
 {
 	/* is there a better way to test for is_loading? */
-	GTK_WEBVIEW(view)->priv->is_loading = true;
+	GTK_WEBVIEW(view)->priv->is_loading = TRUE;
 }
 
 static void
-webview_load_finished (WebKitWebView *view,
+webview_load_finished(WebKitWebView *view,
 		       WebKitWebFrame *frame,
 		       gpointer userdata)
 {
-	GTK_WEBVIEW(view)->priv->is_loading = false;
-	g_idle_add ((GSourceFunc) process_js_script_queue, view);
+	GTK_WEBVIEW(view)->priv->is_loading = FALSE;
+	g_idle_add((GSourceFunc)process_js_script_queue, view);
 }
 
 void
-gtk_webview_safe_execute_script (GtkWebView *view, const char* script)
+gtk_webview_safe_execute_script(GtkWebView *view, const char *script)
 {
-	g_queue_push_tail (view->priv->js_queue, g_strdup (script));
-	g_idle_add ((GSourceFunc)process_js_script_queue, view);
+	g_queue_push_tail(view->priv->js_queue, g_strdup(script));
+	g_idle_add((GSourceFunc)process_js_script_queue, view);
 }
 
 static void
-gtk_webview_init (GtkWebView *view, gpointer userdata)
+gtk_webview_init(GtkWebView *view, gpointer userdata)
 {
-	view->priv = g_new0 (struct GtkWebViewPriv, 1);
-	g_signal_connect (view, "navigation-policy-decision-requested",
-			  G_CALLBACK (webview_link_clicked),
+	view->priv = g_new0(struct GtkWebViewPriv, 1);
+	g_signal_connect(view, "navigation-policy-decision-requested",
+			  G_CALLBACK(webview_link_clicked),
 			  view);
 
-	g_signal_connect (view, "load-started",
-			  G_CALLBACK (webview_load_started),
+	g_signal_connect(view, "load-started",
+			  G_CALLBACK(webview_load_started),
 			  view);
 
-	g_signal_connect (view, "load-finished",
-			  G_CALLBACK (webview_load_finished),
+	g_signal_connect(view, "load-finished",
+			  G_CALLBACK(webview_load_finished),
 			  view);
 
 	view->priv->empty = TRUE;
-	view->priv->js_queue = g_queue_new ();
+	view->priv->js_queue = g_queue_new();
 }
 
 
 void
-gtk_webview_load_html_string_with_imgstore (GtkWebView* view, const char* html)
+gtk_webview_load_html_string_with_imgstore(GtkWebView *view, const char *html)
 {
-	char* html_imged;
-	
-	clear_images (view);
-	html_imged = replace_img_id_with_src (view, html);
-	printf ("%s\n", html_imged);
-	webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (view), html_imged, "file:///");
-	g_free (html_imged);
+	char *html_imged;
+
+	clear_images(view);
+	html_imged = replace_img_id_with_src(view, html);
+	webkit_web_view_load_html_string(WEBKIT_WEB_VIEW(view), html_imged, "file:///");
+	g_free(html_imged);
 }
 
-char *gtk_webview_quote_js_string(const char *text)
+char *
+gtk_webview_quote_js_string(const char *text)
 {
-        GString *str = g_string_new("\"");
-        const char *cur = text;
+	GString *str = g_string_new("\"");
+	const char *cur = text;
 
-        while (cur && *cur) {
-                switch (*cur) {
-                case '\\':
-                        g_string_append(str, "\\\\");
-                        break;
-                case '\"':
-                        g_string_append(str, "\\\"");
-                        break;
-                case '\r':
-                        g_string_append(str, "<br/>");
-                        break;
-                case '\n':
-                        break;
-                default:
-			g_string_append_c(str, *cur);
+	while (cur && *cur) {
+		switch (*cur) {
+			case '\\':
+				g_string_append(str, "\\\\");
+				break;
+			case '\"':
+				g_string_append(str, "\\\"");
+				break;
+			case '\r':
+				g_string_append(str, "<br/>");
+				break;
+			case '\n':
+				break;
+			default:
+				g_string_append_c(str, *cur);
 		}
-		cur ++;
+		cur++;
 	}
-	g_string_append_c (str, '"');
-	return g_string_free (str, FALSE);
+	g_string_append_c(str, '"');
+	return g_string_free(str, FALSE);
 }
 
-void gtk_webview_set_vadjustment(GtkWebView *webview, GtkAdjustment *vadj)
+void
+gtk_webview_set_vadjustment(GtkWebView *webview, GtkAdjustment *vadj)
 {
 	webview->priv->vadj = vadj;
 }
 
-/* this is a "hack", my plan is to eventually handle this 
+/* this is a "hack", my plan is to eventually handle this
  * correctly using a signals and a plugin: the plugin will have
  * the information as to what javascript function to call. It seems
  * wrong to hardcode that here.
  */
 void
-gtk_webview_append_html (GtkWebView* view, const char* html)
+gtk_webview_append_html(GtkWebView *view, const char *html)
 {
-	char* escaped = gtk_webview_quote_js_string (html);
-	char* script = g_strdup_printf ("document.write(%s)", escaped);
-	printf ("script: %s\n", script);
-	webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view), script);
+	char *escaped = gtk_webview_quote_js_string(html);
+	char *script = g_strdup_printf("document.write(%s)", escaped);
+	webkit_web_view_execute_script(WEBKIT_WEB_VIEW(view), script);
 	view->priv->empty = FALSE;
 	gtk_webview_scroll_to_end(view, TRUE);
-	g_free (script);
-	g_free (escaped);
+	g_free(script);
+	g_free(escaped);
 }
 
-gboolean gtk_webview_is_empty (GtkWebView *view)
+gboolean
+gtk_webview_is_empty(GtkWebView *view)
 {
 	return view->priv->empty;
 }
@@ -336,7 +341,8 @@
  *
  * @return TRUE if the window needs to be scrolled further, FALSE if we're at the bottom.
  */
-static gboolean smooth_scroll_cb(gpointer data)
+static gboolean
+smooth_scroll_cb(gpointer data)
 {
 	struct GtkWebViewPriv *priv = data;
 	GtkAdjustment *adj = priv->vadj;
@@ -360,18 +366,20 @@
 	return TRUE;
 }
 
-static gboolean scroll_idle_cb(gpointer data)
+static gboolean
+scroll_idle_cb(gpointer data)
 {
 	struct GtkWebViewPriv *priv = data;
 	GtkAdjustment *adj = priv->vadj;
-	if(adj) {
+	if (adj) {
 		gtk_adjustment_set_value(adj, adj->upper - adj->page_size);
 	}
 	priv->scroll_src = 0;
 	return FALSE;
 }
 
-void gtk_webview_scroll_to_end(GtkWebView *webview, gboolean smooth)
+void
+gtk_webview_scroll_to_end(GtkWebView *webview, gboolean smooth)
 {
 	struct GtkWebViewPriv *priv = webview->priv;
 	if (priv->scroll_time)
@@ -387,24 +395,26 @@
 	}
 }
 
-GType gtk_webview_get_type (void)
+GType
+gtk_webview_get_type(void)
 {
 	static GType mview_type = 0;
-	if (G_UNLIKELY (mview_type == 0)) {
+	if (G_UNLIKELY(mview_type == 0)) {
 		static const GTypeInfo mview_info = {
-			sizeof (GtkWebViewClass),
+			sizeof(GtkWebViewClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) gtk_webview_class_init,
 			NULL,
 			NULL,
-			sizeof (GtkWebView),
+			sizeof(GtkWebView),
 			0,
 			(GInstanceInitFunc) gtk_webview_init,
 			NULL
 		};
-		mview_type = g_type_register_static(webkit_web_view_get_type (),
+		mview_type = g_type_register_static(webkit_web_view_get_type(),
 				"GtkWebView", &mview_info, 0);
 	}
 	return mview_type;
 }
+