# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 1014506263 0
# Node ID 73f303cb91c14c52842605789b8cf3e4d7ea83c4
# Parent  aebf1d505e1f07b66b90c41e2dac4241af2ee07e
[gaim-migrate @ 2995]
Thanks BMiller! :-)

committer: Tailor Script <tailor@pidgin.im>

diff -r aebf1d505e1f -r 73f303cb91c1 src/gtkimhtml.c
--- a/src/gtkimhtml.c	Sat Feb 23 23:10:39 2002 +0000
+++ b/src/gtkimhtml.c	Sat Feb 23 23:17:43 2002 +0000
@@ -1051,6 +1051,25 @@
 	return new_string;
 }
 
+static void
+chunk_select_words (struct line_info *chunk)
+{
+	char *start, *end;
+
+	start = chunk->sel_start;
+	end = chunk->sel_end;
+
+	if (start != chunk->text)
+		while (start > chunk->text && *(start-1) != ' ')
+			start--;
+	chunk->sel_start = start;
+
+	if (end != NULL)
+		while (*end != '\0' && *end != ' ')
+			end++;
+	chunk->sel_end = end;
+}
+
 #define COORDS_IN_CHUNK(xx, yy) (((xx) < chunk->x + chunk->width) && \
 				 ((yy) < chunk->y + chunk->height))
 
@@ -1068,6 +1087,7 @@
 	      endy   = imhtml->sel_endy;
 	gchar *new_pos;
 	gint selection = 0;
+	guint mode = imhtml->sel_mode;
 	gboolean smileys = imhtml->smileys;
 	gboolean redraw = FALSE;
 	gboolean got_start = FALSE;
@@ -1083,6 +1103,9 @@
 		imhtml->selected_text = g_string_new ("");
 	}
 
+	if (mode == 2)
+		startx = endx = 0;
+
 	bits = imhtml->bits;
 	while (bits) {
 		bit = bits->data;
@@ -1095,7 +1118,7 @@
 			case 0:
 				if (COORDS_IN_CHUNK (startx, starty)) {
 					new_pos = get_position (chunk, startx, smileys);
-					if ( !chunk->selected ||
+					if (!chunk->selected ||
 					    (chunk->sel_start != new_pos) ||
 					    (chunk->sel_end != NULL))
 						redraw = TRUE;
@@ -1104,6 +1127,10 @@
 					chunk->sel_end = NULL;
 					selection++;
 					got_start = TRUE;
+					if (mode == 2)
+						endy += chunk->height;
+					if (mode == 1)
+						chunk_select_words (chunk);
 				}
 
 				if (COORDS_IN_CHUNK (endx, endy)) {
@@ -1119,6 +1146,8 @@
 						selection = 2;
 						imhtml->sel_endchunk = chunk;
 						got_end = TRUE;
+						if (mode == 1)
+							chunk_select_words (chunk);
 					} else {
 						new_pos = get_position (chunk, endx, smileys);
 						if ( !chunk->selected ||
@@ -1131,6 +1160,10 @@
 						selection++;
 						imhtml->sel_endchunk = chunk;
 						got_end = TRUE;
+						if (mode == 2)
+							starty += chunk->height;
+						if (mode == 1)
+							chunk_select_words (chunk);
 					}
 				} else if (!COORDS_IN_CHUNK (startx, starty) && !got_start) {
 					if (chunk->selected)
@@ -1153,6 +1186,8 @@
 					chunk->sel_end = new_pos;
 					selection++;
 					got_start = TRUE;
+					if (mode == 1)
+						chunk_select_words (chunk);
 				} else if (!got_end && COORDS_IN_CHUNK (endx, endy)) {
 					new_pos = get_position (chunk, endx, smileys);
 					if ( !chunk->selected ||
@@ -1165,6 +1200,8 @@
 					selection++;
 					imhtml->sel_endchunk = chunk;
 					got_end = TRUE;
+					if (mode == 1)
+						chunk_select_words (chunk);
 				} else {
 					if ( !chunk->selected ||
 					    (chunk->sel_end != NULL) ||
@@ -1402,7 +1439,8 @@
 			    (x < chunk->x) ||
 			    (x > chunk->x + chunk->width) ||
 			    (y < chunk->y) ||
-			    (y > chunk->y + chunk->height))
+			    (y > chunk->y + chunk->height) ||
+			    (imhtml->sel_mode > 0))
 				gtk_imhtml_select_bits (imhtml);
 			else
 				gtk_imhtml_select_in_chunk (imhtml, chunk);
@@ -1509,10 +1547,19 @@
 	y = event->y + vadj->value;
 
 	if (event->button == 1) {
-		imhtml->sel_startx = x;
-		imhtml->sel_starty = y;
+		imhtml->sel_startx = imhtml->sel_endx = x;
+		imhtml->sel_starty = imhtml->sel_endy = y;
 		imhtml->selection = TRUE;
-		gtk_imhtml_select_none (imhtml);
+		if (event->type == GDK_BUTTON_PRESS) {
+			imhtml->sel_mode = 0; /* select by letter */
+			gtk_imhtml_select_none (imhtml);
+		} else if (event->type == GDK_2BUTTON_PRESS) {
+			imhtml->sel_mode = 1; /* select by word */
+			gtk_imhtml_select_none (imhtml);
+		} else if (event->type == GDK_3BUTTON_PRESS) {
+			imhtml->sel_mode = 2; /* select by line */
+			gtk_imhtml_select_bits (imhtml);
+		}
 	}
 
 	if (event->button == 3) {
@@ -1574,7 +1621,8 @@
 	y = event->y + vadj->value;
 
 	if ((event->button == 1) && imhtml->selection) {
-		if ((x == imhtml->sel_startx) && (y == imhtml->sel_starty)) {
+		if ((x == imhtml->sel_startx) && (y == imhtml->sel_starty) &&
+		    (imhtml->sel_mode == 0)) {
 			imhtml->sel_startx = imhtml->sel_starty = 0;
 			imhtml->selection = FALSE;
 			gtk_imhtml_select_none (imhtml);
diff -r aebf1d505e1f -r 73f303cb91c1 src/gtkimhtml.h
--- a/src/gtkimhtml.h	Sat Feb 23 23:10:39 2002 +0000
+++ b/src/gtkimhtml.h	Sat Feb 23 23:17:43 2002 +0000
@@ -61,6 +61,7 @@
 	guint sel_startx, sel_starty;
 	guint sel_endx, sel_endy;
 	gboolean selection;
+	guint sel_mode;
 	GString *selected_text;
 	struct line_info *sel_endchunk;
 	guint scroll_timer;