Changeset 8167346

Timestamp:

2018-03-11T19:28:38Z (7 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

a949b43

Parents:

16ea00d

git-author:

dequis <dx@…> (11-03-18 09:13:45)

git-committer:

dequis <dx@…> (11-03-18 19:28:38)

Message:

Try to join long spaceless lines in paste_buffer without a newline

Fixes trac ticket 1302

The main use case for this is pasting long URLs and not breaking them

File:

• irc_im.c (modified) (2 diffs)

irc_im.c

@@ -446 +446 @@
 }
 
+#define PASTEBUF_LONG_SPACELESS_LINE_LENGTH 350
+
+/* Returns FALSE if the last line of the message is near the typical irc length
+ * limit and the message has no spaces, indicating that it's probably desirable
+ * to join messages without the newline.
+ *
+ * The main use case for this is pasting long URLs and not breaking them */
+static gboolean bee_irc_pastebuf_should_start_with_newline(const char *msg)
+{
+        int i;
+        const char *last_line = strrchr(msg, '\n') ? : msg;
+
+        if (*last_line == '\n') {
+                last_line++;
+        }
+
+        for (i = 0; last_line[i]; i++) {
+                if (g_ascii_isspace(last_line[i])) {
+                        return TRUE;
+                }
+        }
+
+        if (i < PASTEBUF_LONG_SPACELESS_LINE_LENGTH) {
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
 /* IRC->IM calls */
 
@@ -470 +499 @@
         } else {
                 b_event_remove(iu->pastebuf_timer);
-                g_string_append_printf(iu->pastebuf, "\n%s", msg);
+                if (bee_irc_pastebuf_should_start_with_newline(iu->pastebuf->str)) {
+                        g_string_append_c(iu->pastebuf, '\n');
+                }
+                g_string_append(iu->pastebuf, msg);
         }