- rediff patches

[packages/xchat.git] / xchat-long-delimiter.patch

diff -urNp -x '*.orig' xchat-2.8.8.org/src/fe-gtk/xtext.c xchat-2.8.8/src/fe-gtk/xtext.c
--- xchat-2.8.8.org/src/fe-gtk/xtext.c	2021-05-07 23:46:39.862941602 +0200
+++ xchat-2.8.8/src/fe-gtk/xtext.c	2021-05-07 23:46:40.166281587 +0200
@@ -76,9 +76,16 @@
 #endif
 
 /* is delimiter */
-#define is_del(c) \
-	(c == ' ' || c == '\n' || c == ')' || c == '(' || \
-	 c == '>' || c == '<' || c == ATTR_RESET || c == ATTR_BOLD || c == 0)
+int is_del(const char *c) {
+	int ret;
+	ret = 0;
+	ret = (c[0] == ' ' || c[0] == '\n' || c[0] == ')' || c[0] == '(' || 
+	 c[0] == '>' || c[0] == '<' || c[0] == ATTR_RESET || c[0] == ATTR_BOLD || c == 0);
+	if(!ret) {
+		ret = strncmp(c, "“", 3) == 0 || strncmp(c, "”", 3) == 0;
+	}
+	return ret;
+}
 
 #ifdef SCROLL_HACK
 /* force scrolling off */
@@ -1836,6 +1843,7 @@ gtk_xtext_get_word (GtkXText * xtext, in
 	int offset;
 	unsigned char *str;
 	unsigned char *word;
+	unsigned char *nstr;
 	int len;
 	int out_of_bounds = 0;
 
@@ -1856,16 +1864,17 @@ gtk_xtext_get_word (GtkXText * xtext, in
 
 	str = ent->str + offset;
 
-	while (!is_del (*str) && str != ent->str)
-		str--;
-	word = str + 1;
+	while (!is_del(str))
+		str = g_utf8_prev_char(str);
+	word = g_utf8_next_char(str);
 
 	len = 0;
 	str = word;
-	while (!is_del (*str) && len != ent->str_len)
+	while (!is_del(str) && len != ent->str_len)
 	{
-		str++;
-		len++;
+		nstr = g_utf8_next_char(str);
+		len += nstr - str;
+		str = nstr;
 	}
 
 	/* ignore trailing dots and commas. */
@@ -3976,7 +3985,7 @@ find_next_wrap (GtkXText * xtext, texten
 				}
 
 				/* keep a record of the last space, for wordwrapping */
-				if (is_del (*str))
+				if (g_unichar_isspace(g_utf8_get_char(str)))
 				{
 					last_space = str;
 					limit_offset = 0;