Merge lp:~holizz/sakura/sakura into lp:~dabisu/sakura/sakura

[Tom Adams]

[Tom Adams (holizz)]

Fixes bug #329044 and bug #289755.

[lp:~holizz/sakura/sakura]

282. By Tom Adams on 2009-03-16

  * src/sakura.c:
   - Removed unused variable from sakura_concat_uris

283. By Tom Adams on 2009-04-08

  * src/sakura.c:
   - Use sakura_set_size in sakura_show_first_tab

284. By Tom Adams on 2009-04-08

  * src/sakura.c:
   - String changes

[David Gómez (dabisu)]

I forgot this merge request, i'm really sorry. I corrected one string that wasn't corrected yet ("Always show tab bar"). The scrollbar bug still happens so the bug is open. Adding a call to set_size in show_first_tab won't fix it.

review: Abstain

Unmerged revisions

284. By Tom Adams on 2009-04-08

  * src/sakura.c:
   - String changes

283. By Tom Adams on 2009-04-08

  * src/sakura.c:
   - Use sakura_set_size in sakura_show_first_tab

282. By Tom Adams on 2009-03-16

  * src/sakura.c:
   - Removed unused variable from sakura_concat_uris

281. By Tom Adams on 2009-03-15

  * src/sakura.c:
   - Use term's size in sakura_calculate_row_col to get new values

280. By Tom Adams on 2009-03-15

  * src/sakura.c:
   - Use sakura_set_size when toggling scrollbar via context menu too

279. By Tom Adams on 2009-03-13

  * src/sakura.c:
   - Added text/unicode target as workaround for Firefox

278. By Tom Adams on 2009-03-13

  * src/sakura.c:
   - Removed colour, background, and tab targets.

277. By Tom Adams on 2009-03-12

  * src/sakura.c:
   - Strip "file://" from URIs

276. By Tom Adams on 2009-03-10

  * src/sakura.c:
   - Remove sakura_transform_uris_to_quoted_fuse_paths

275. By Tom Adams on 2009-02-04

  * src/sakura.c:
 - Initial support for drag and drop

=== modified file 'src/sakura.c'
--- src/sakura.c	2009-02-03 16:23:52 +0000
+++ src/sakura.c	2009-03-15 13:11:44 +0000
@@ -4,6 +4,7 @@
  *
  *           Copyright (C) 2006-2008  David Gómez <[e-mail]>
  *           Copyright (C) 2008       Hong Jen Yee (PCMan) <[e-mail]>
+ *           Copyright (C) 2009       Tom Adams <[e-mail]>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -199,6 +200,13 @@
 	GtkWidget *label;
 };
 
+enum
+{
+  TARGET_MOZ_URL,
+  TARGET_NETSCAPE_URL,
+  TARGET_UNICODE
+};
+
 
 #define ICON_FILE "terminal-tango.svg"
 #define SCROLL_LINES 4096
@@ -263,6 +271,7 @@
 static void     sakura_show_close_button (GtkWidget *widget, void *data);
 static void		sakura_show_scrollbar(GtkWidget *, void *);
 static void     sakura_closebutton_clicked(GtkWidget *, void *);
+static void     sakura_drag_data_received (GtkWidget *, GdkDragContext *, gint, gint, GtkSelectionData *, guint, guint);
 
 /* Misc */
 static void     sakura_error(const char *, ...);
@@ -279,6 +288,7 @@
 static void     sakura_set_bgimage();
 static void     sakura_key_file_set_key(GKeyFile *, const gchar *, const gchar *, guint);
 static guint    sakura_key_file_get_key(GKeyFile *, const gchar *, const gchar *);
+char * sakura_concat_uris (char **, gsize *);
 
 static const char *option_font;
 static const char *option_execute;
@@ -1044,6 +1054,7 @@
 		else
 			gtk_widget_show(term->scrollbar);
 	}
+	sakura_set_size(sakura.columns, sakura.rows);
 }
 
 
@@ -1135,6 +1146,175 @@
 	}
 }
 
+/* Paste text from DND action
+ * Original function was from terminal-screen.c of gnome-terminal,
+ * Copyright © 2001 Havoc Pennington
+ * Copyright © 2007, 2008 Christian Persch
+ * Adapted by Tom Adams */
+static void
+sakura_drag_data_received (GtkWidget        *widget,
+			   GdkDragContext   *context,
+			   gint              x,
+			   gint              y,
+			   GtkSelectionData *selection_data,
+			   guint             info,
+			   guint             time)
+{
+	VteTerminal *vte = VTE_TERMINAL(widget);
+
+	if (gtk_targets_include_uri (&selection_data->target, 1))
+	{
+		char **uris;
+		char *text;
+		gsize len;
+
+		uris = gtk_selection_data_get_uris (selection_data);
+		if (!uris)
+			return;
+
+		text = sakura_concat_uris (uris, &len);
+		vte_terminal_feed_child (vte, text, len);
+		g_free (text);
+
+		g_strfreev (uris);
+	}
+	else if (gtk_targets_include_text (&selection_data->target, 1))
+	{
+		char *text;
+
+		text = (char *) gtk_selection_data_get_text (selection_data);
+		if (text && text[0])
+			vte_terminal_feed_child (vte, text, strlen (text));
+		g_free (text);
+	}
+	else switch (info)
+	{
+		case TARGET_MOZ_URL:
+			{
+				char *utf8_data, *newline, *text;
+				char *uris[2];
+				gsize len;
+
+				/* MOZ_URL is in UCS-2 but in format 8. BROKEN!
+				 *
+				 * The data contains the URL, a \n, then the
+				 * title of the web page.
+				 */
+				if (selection_data->format != 8 ||
+						selection_data->length == 0 ||
+						(selection_data->length % 2) != 0)
+					return;
+
+				utf8_data = g_utf16_to_utf8 ((const gunichar2*) selection_data->data,
+						selection_data->length / 2,
+						NULL, NULL, NULL);
+				if (!utf8_data)
+					return;
+
+				newline = strchr (utf8_data, '\n');
+				if (newline)
+					*newline = '\0';
+
+				uris[0] = utf8_data;
+				uris[1] = NULL;
+
+				text = sakura_concat_uris (uris, &len);
+				vte_terminal_feed_child (vte, text, len);
+				g_free (text);
+				g_free (uris[0]);
+			}
+			break;
+
+		case TARGET_NETSCAPE_URL:
+			{
+				char *utf8_data, *newline, *text;
+				char *uris[2];
+				gsize len;
+
+				/* The data contains the URL, a \n, then the
+				 * title of the web page.
+				 */
+				if (selection_data->length < 0 || selection_data->format != 8)
+					return;
+
+				utf8_data = g_strndup ((char *) selection_data->data, selection_data->length);
+				newline = strchr (utf8_data, '\n');
+				if (newline)
+					*newline = '\0';
+
+				uris[0] = utf8_data;
+				uris[1] = NULL;
+
+				text = sakura_concat_uris (uris, &len);
+				vte_terminal_feed_child (vte, text, len);
+				g_free (text);
+				g_free (uris[0]);
+			}
+			break;
+
+		case TARGET_UNICODE:
+			{ /* adapted from TARGET_MOZ_URL, as a workaround for
+			     Firefox's text/plain drag source which is
+			     ISO-8859-1 encoded */
+				char *utf8_data;
+
+				if (selection_data->format != 8 ||
+						selection_data->length == 0 ||
+						(selection_data->length % 2) != 0)
+					return;
+
+				utf8_data = g_utf16_to_utf8 ((const gunichar2*) selection_data->data,
+						selection_data->length / 2,
+						NULL, NULL, NULL);
+				if (!utf8_data)
+					return;
+
+				vte_terminal_feed_child (vte, utf8_data, strlen(utf8_data));
+			}
+			break;
+
+		default:
+			g_assert_not_reached ();
+	}
+}
+
+/* Original function was from terminal-util.c of gnome-terminal,
+ * Copyright © 2001, 2002 Havoc Pennington
+ * Copyright © 2002 Red Hat, Inc.
+ * Copyright © 2002 Sun Microsystems
+ * Copyright © 2003 Mariano Suarez-Alvarez
+ * Copyright © 2008 Christian Persch
+ * Adapted by Tom Adams */
+char *
+sakura_concat_uris (char **uris, gsize *length)
+{
+	GString *string;
+	gsize len;
+	guint i, j;
+	char* uri;
+
+	len = 0;
+	for (i = 0; uris[i]; ++i)
+		len += strlen (uris[i]) + 1;
+
+	if (length)
+		*length = len;
+
+	string = g_string_sized_new (len + 1);
+	for (i = 0; uris[i]; ++i)
+	{
+		uri = uris[i];
+		if (strncmp(uris[i], "file://", 7) == 0)
+		{
+			uri += 7;
+			*length -= 7;
+		}
+		g_string_append (string, uri);
+		g_string_append_c (string, ' ');
+	}
+
+	return g_string_free (string, FALSE);
+}
 
 /* Every the window changes its size by an user action (resize, fullscreen), calculate
  * the new values for the number of columns and rows */
@@ -1144,6 +1324,7 @@
 	struct terminal *term;
 	gint x_padding, y_padding;
 	gint n_pages=gtk_notebook_get_n_pages(GTK_NOTEBOOK(sakura.notebook));
+	GtkRequisition term_request;
 
 	if (n_pages==-1) return;
 
@@ -1156,12 +1337,12 @@
 	vte_terminal_get_padding( VTE_TERMINAL(term->vte), &x_padding, &y_padding );
 	sakura.char_width = vte_terminal_get_char_width(VTE_TERMINAL(term->vte));
 	sakura.char_height = vte_terminal_get_char_height(VTE_TERMINAL(term->vte));
+	gtk_widget_size_request (term->vte, &term_request);
 	/* Ignore resize events in sakura window is in fullscreen */
 	if (!sakura.keep_fc) {	
 		/* We cannot trust in vte allocation values, they're unreliable */
-		/* FIXME: Round values properly */
-		sakura.columns = (width/sakura.char_width);
-		sakura.rows = (height/sakura.char_height);
+		sakura.columns = (term_request.width/sakura.char_width);
+		sakura.rows = (term_request.height/sakura.char_height);
 		sakura.keep_fc=false;
 		SAY("new columns %ld and rows %ld", sakura.columns, sakura.rows);
 	}
@@ -1913,6 +2094,14 @@
 	gchar *label_text;
 	gchar *cwd = NULL;
 	gint w, h;
+	const GtkTargetEntry target_table[] = {
+		{ "text/x-moz-url",  0, TARGET_MOZ_URL },
+		{ "_NETSCAPE_URL", 0, TARGET_NETSCAPE_URL },
+		{ "text/unicode",  0, TARGET_UNICODE }
+	};
+	GtkTargetList *target_list;
+	GtkTargetEntry *targets;
+	int n_targets;
 
 
 	term = g_new0( struct terminal, 1 );
@@ -1975,6 +2164,24 @@
 
 	sakura_set_page_term(sakura, index, term );
 
+	/* Setup DND */
+	target_list = gtk_target_list_new (NULL, 0);
+	gtk_target_list_add_uri_targets (target_list, 0);
+	gtk_target_list_add_text_targets (target_list, 0);
+	gtk_target_list_add_table (target_list, target_table, G_N_ELEMENTS (target_table));
+
+	targets = gtk_target_table_new_from_list (target_list, &n_targets);
+
+	gtk_drag_dest_set (GTK_WIDGET (term->vte),
+			GTK_DEST_DEFAULT_MOTION |
+			GTK_DEST_DEFAULT_HIGHLIGHT |
+			GTK_DEST_DEFAULT_DROP,
+			targets, n_targets,
+			GDK_ACTION_COPY | GDK_ACTION_MOVE);
+
+	gtk_target_table_free (targets, n_targets);
+	gtk_target_list_unref (target_list);
+
 	/* vte signals */
     g_signal_connect(G_OBJECT(term->vte), "increase-font-size", G_CALLBACK(sakura_increase_font), NULL);
     g_signal_connect(G_OBJECT(term->vte), "decrease-font-size", G_CALLBACK(sakura_decrease_font), NULL);
@@ -1982,6 +2189,7 @@
     g_signal_connect(G_OBJECT(term->vte), "eof", G_CALLBACK(sakura_eof), NULL);
     g_signal_connect(G_OBJECT(term->vte), "window-title-changed", G_CALLBACK(sakura_title_changed), NULL);
     g_signal_connect_swapped(G_OBJECT(term->vte), "button-press-event", G_CALLBACK(sakura_button_press), sakura.menu);
+    g_signal_connect(G_OBJECT(term->vte), "drag-data-received", G_CALLBACK(sakura_drag_data_received), NULL);
 
 	/* Notebook signals */
 	g_signal_connect(G_OBJECT(sakura.notebook), "page-removed", G_CALLBACK(sakura_page_removed), NULL);