Changeset ab31454

Timestamp:

Jun 25, 2003, 9:34:51 AM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

ceb8cfb

Parents:

ae0a5fc

Message:

Wordwrap incoming AIM messages

Files:

• ChangeLog (modified) (1 diff)
• aim.c (modified) (3 diffs)
• text.c (modified) (6 diffs)

ChangeLog

@@ -23 +23 @@
         Removed libfaim/config.log from CVS
         Fixed some easy fixed-length buffers
+        Wordwrap incoming AIM messages.
 
 2.0.4-pre-1

aim.c

@@ -1197 +1197 @@
   int clienttype = AIM_CLIENTTYPE_UNKNOWN;
   owl_message *m;
-  char *stripmsg, *nz_screenname;
+  char *stripmsg, *nz_screenname, *wrapmsg;
   char realmsg[8192+1] = {""};
   clienttype = aim_fingerprintclient(args->features, args->featureslen);
@@ -1273 +1273 @@
   /* create a message, and put it on the message queue */
   stripmsg=owl_text_htmlstrip(realmsg);
+  wrapmsg=owl_text_wordwrap(stripmsg, 70);
   nz_screenname=owl_aim_normalize_screenname(userinfo->sn);
   m=owl_malloc(sizeof(owl_message));
@@ -1278 +1279 @@
                          nz_screenname,
                          owl_global_get_aim_screenname(&g),
-                         stripmsg,
+                         wrapmsg,
                          OWL_MESSAGE_DIRECTION_IN,
                          0);
   owl_global_messagequeue_addmsg(&g, m);
   owl_free(stripmsg);
+  owl_free(wrapmsg);
   owl_free(nz_screenname);
 

text.c

@@ -6 +6 @@
 static const char fileIdent[] = "$Id$";
 
-int owl_text_truncate_lines(char *out, char *in, int aline, int lines) {
+int owl_text_truncate_lines(char *out, char *in, int aline, int lines)
+{
   /* start with line aline (where the first line is 1) and print
    *  'lines' lines
@@ -43 +44 @@
 }
 
-void owl_text_truncate_cols(char *out, char *in, int acol, int bcol) {
+void owl_text_truncate_cols(char *out, char *in, int acol, int bcol)
+{
   char *ptr1, *ptr2, *tmpbuff, *last;
   int len;
@@ -89 +91 @@
 
 
-void owl_text_indent(char *out, char *in, int n) {
+void owl_text_indent(char *out, char *in, int n)
+{
   char *ptr1, *ptr2, *last;
   int i;
@@ -113 +116 @@
 
 
-int owl_text_num_lines(char *in) {
+int owl_text_num_lines(char *in)
+{
   int lines, i;
 
@@ -129 +133 @@
 
 /* caller must free the return */
-char *owl_text_htmlstrip(char *in) {
+char *owl_text_htmlstrip(char *in)
+{
   char *ptr1, *end, *ptr2, *ptr3, *out;
 
@@ -186 +191 @@
   return(out);
 }
+
+/* caller must free the return */
+char *owl_text_wordwrap(char *in, int col)
+{
+  char *out;
+  int cur, lastspace, len, lastnewline;
+
+  out=owl_strdup(in);
+  len=strlen(in);
+  cur=0;
+  lastspace=-1;
+  lastnewline=-1;
+
+  while (cur<(len-1)) {
+    if (out[cur]==' ') {
+      lastspace=cur;
+      cur++;
+      continue;
+    } else if (out[cur]=='\n') {
+      lastnewline=cur;
+      cur++;
+      continue;
+    }
+
+    /* do we need to wrap? */
+    if ( (cur-(lastnewline+1)) > col ) {
+      if (lastspace==-1 ||
+          (lastnewline>0 && (lastspace<=lastnewline))) {
+        /* we can't help, sorry */
+        cur++;
+        continue;
+      }
+
+      /* turn the last space into a newline */
+      out[lastspace]='\n';
+      lastnewline=lastspace;
+      lastspace=-1;
+      cur++;
+      continue;
+    }
+
+    cur++;
+    continue;
+  }
+  return(out);
+}