Changeset b2b0773 for fmtext.c

Timestamp:

Jun 9, 2003, 10:54:18 AM (22 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:

6bf73ce

Parents:

d559df9

Message:

Changes to help build on OSX

File:

• fmtext.c (modified) (26 diffs)

fmtext.c

@@ -5 +5 @@
 static const char fileIdent[] = "$Id$";
 
+/* initialize an fmtext with no data */
 void owl_fmtext_init_null(owl_fmtext *f)
 {
@@ -15 +16 @@
 }
 
-
+/* Internal function.  Set the attribute 'attr' from index 'first' to
+ * index 'last'
+ */
 void _owl_fmtext_set_attr(owl_fmtext *f, int attr, int first, int last)
 {
@@ -24 +27 @@
 }
 
+/* Internal function.  Add the attribute 'attr' to the existing
+ * attributes from index 'first' to index 'last'
+ */
 void _owl_fmtext_add_attr(owl_fmtext *f, int attr, int first, int last)
 {
@@ -32 +38 @@
 }
 
+/* Internal function.  Set the color to be 'color' from index 'first'
+ * to index 'last
+ */
 void _owl_fmtext_set_color(owl_fmtext *f, int color, int first, int last)
 {
@@ -40 +49 @@
 }
 
-
+/* append text to the end of 'f' with attribute 'attr' and color
+ * 'color'
+ */
 void owl_fmtext_append_attr(owl_fmtext *f, char *text, int attr, int color)
 {
@@ -56 +67 @@
 }
 
-
+/* Append normal, uncolored text 'text' to 'f' */
 void owl_fmtext_append_normal(owl_fmtext *f, char *text)
 {
@@ -62 +73 @@
 }
 
+/* Append normal text 'text' to 'f' with color 'color' */
 void owl_fmtext_append_normal_color(owl_fmtext *f, char *text, int color)
 {
@@ -67 +79 @@
 }
 
-
+/* Append bold text 'text' to 'f' */
 void owl_fmtext_append_bold(owl_fmtext *f, char *text)
 {
@@ -73 +85 @@
 }
 
-
+/* Append reverse video text 'text' to 'f' */
 void owl_fmtext_append_reverse(owl_fmtext *f, char *text)
 {
@@ -79 +91 @@
 }
 
-
+/* Append reversed and bold, uncolored text 'text' to 'f' */
 void owl_fmtext_append_reversebold(owl_fmtext *f, char *text)
 {
@@ -85 +97 @@
 }
 
-
+/* Add the attribute 'attr' to all text in 'f' */
 void owl_fmtext_addattr(owl_fmtext *f, int attr)
 {
@@ -97 +109 @@
 }
 
+/* Anywhere the color is NOT ALREDY SET, set the color to 'color'.
+ * Other colors are left unchanged
+ */
 void owl_fmtext_colorize(owl_fmtext *f, int color)
 {
@@ -108 +123 @@
 }
 
-
+/* Append the text 'text' to 'f' and interpret the zephyr style
+ * formatting syntax to set appropriate attributes.
+ */
 void owl_fmtext_append_ztext(owl_fmtext *f, char *text)
 {
@@ -293 +310 @@
     }
   }
-
-}
-
-/* This is used internally to fmtext.  Use owl_fmtext_append_fmtext()
- * (no initial underscore) externally */
+}
+
+/* Internal function.  Append text from 'in' between index 'start' and
+ * 'stop' to the end of 'f'
+ */
 void _owl_fmtext_append_fmtext(owl_fmtext *f, owl_fmtext *in, int start, int stop)
 {
@@ -316 +333 @@
 }
 
+/* append fmtext 'in' to 'f' */
 void owl_fmtext_append_fmtext(owl_fmtext *f, owl_fmtext *in)
 {
@@ -322 +340 @@
 }
 
+/* Append 'nspaces' number of spaces to the end of 'f' */
 void owl_fmtext_append_spaces(owl_fmtext *f, int nspaces)
 {
@@ -358 +377 @@
 }
 
-
-/* caller is responsible for freeing */
+/* Return a plain version of the fmtext.  Caller is responsible for
+ * freeing the return
+ */
 char *owl_fmtext_print_plain(owl_fmtext *f)
 {
-  return owl_strdup(f->textbuff);
-}
-
-
+  return(owl_strdup(f->textbuff));
+}
+
+/* add the formatted text to the curses window 'w'.  The window 'w'
+ * must already be initiatlized with curses
+ */
 void owl_fmtext_curs_waddstr(owl_fmtext *f, WINDOW *w)
 {
@@ -422 +444 @@
 
 
+/* start with line 'aline' (where the first line is 0) and print
+ * 'lines' number of lines into 'out'
+ */
 int owl_fmtext_truncate_lines(owl_fmtext *in, int aline, int lines, owl_fmtext *out)
 {
-  /* start with line aline (where the first line is 0) and print
-   *  'lines' lines
-   */
   char *ptr1, *ptr2;
   int i, offset;
@@ -445 +467 @@
 
   for (i=0; i<lines; i++) {
-    ptr2=strchr(ptr1, '\n');
     offset=ptr1-in->textbuff;
+    ptr2=strchr(ptr1, '\n'); /* this is a valgrind suspicious line */
     if (!ptr2) {
-      _owl_fmtext_append_fmtext(out, in, offset, in->textlen-1);
+      _owl_fmtext_append_fmtext(out, in, offset, (in->textlen)-1);
       return(-1);
     }
@@ -457 +479 @@
 }
 
-  
-/* the first column is column 0 */
-/* the message is expected to end in a new line for now */
+/* Truncate the message so that each line begins at column 'acol' and
+ * ends at 'bcol' or sooner.  The first column is number 0.  The new
+ * message is placed in 'out'.  The message is * expected to end in a
+ * new line for now
+ */
 void owl_fmtext_truncate_cols(owl_fmtext *in, int acol, int bcol, owl_fmtext *out)
 {
@@ -504 +528 @@
 }
 
-
+/* Return the number of lines in 'f' */
 int owl_fmtext_num_lines(owl_fmtext *f)
 {
@@ -522 +546 @@
 }
 
-
 char *owl_fmtext_get_text(owl_fmtext *f)
 {
@@ -536 +559 @@
 }
 
+/* Free all memory allocated by the object */
 void owl_fmtext_free(owl_fmtext *f)
 {
@@ -543 +567 @@
 }
 
-
+/* Make a copy of the fmtext 'src' into 'dst' */
 void owl_fmtext_copy(owl_fmtext *dst, owl_fmtext *src)
 {
+  int mallocsize;
+
+  if (src->textlen==0) {
+    mallocsize=5;
+  } else {
+    mallocsize=src->textlen+2;
+  }
   dst->textlen=src->textlen;
-  dst->textbuff=owl_malloc(src->textlen+5);
-  dst->fmbuff=owl_malloc(src->textlen+5);
-  dst->colorbuff=owl_malloc(src->textlen+5);
+  dst->textbuff=owl_malloc(mallocsize); /* valgrind suspcious line */
+  dst->fmbuff=owl_malloc(mallocsize);
+  dst->colorbuff=owl_malloc(mallocsize);
   memcpy(dst->textbuff, src->textbuff, src->textlen);
   memcpy(dst->fmbuff, src->fmbuff, src->textlen);
@@ -555 +586 @@
 }
 
-
 /* highlight all instance of "string".  Return the number of
- * instances found.  This is case insensitive.
+ * instances found.  This is a case insensitive search.
  */
 int owl_fmtext_search_and_highlight(owl_fmtext *f, char *string)
@@ -582 +612 @@
 }
 
-/* return 1 if the string is found, 0 if not.  This is case
- *  insensitive
+/* return 1 if the string is found, 0 if not.  This is a case
+ *  insensitive search.
  */
 int owl_fmtext_search(owl_fmtext *f, char *string)