[ViewVC] Diff of: cvs/root-tail/root-tail.c

Comparing root-tail/root-tail.c (file contents):
Revision 1.29 by pcg, Tue Mar 30 21:32:32 2004 UTC vs.
Revision 1.38 by pcg, Wed Mar 31 01:50:24 2004 UTC

       if (offset < miny || offset > maxy)
         continue;
       /* if this line is a different than it was, then it
        * needs displaying */
-      if (refresh_all
+      if (!opt_noflicker
+	  || refresh_all
           || display_line->len != line->len
           || memcmp (display_line->line, line->line, line->len))
         {
+	  /* don't bother updating the record of what has been
+	   * displayed if -noflicker isn't in effect, since we redraw
+	   * the whole display every time anyway */
+	  if (opt_noflicker)
+	    {
-          /* update the record of what has been displayed;
+	      /* update the record of what has been displayed;
-           * first make sure the buffer is big enough */
+	       * first make sure the buffer is big enough */
-          if (display_line->buffer_size <= line->len)
+	      if (display_line->buffer_size <= line->len)
-            {
+		{
-              display_line->buffer_size = line->len + 1;
+		  display_line->buffer_size = line->len + 1;
-              display_line->line = xrealloc (display_line->line, display_line->buffer_size);
+		  display_line->line = xrealloc (display_line->line, display_line->buffer_size);
-            }
+		}
-          display_line->len = line->len;
+	      display_line->len = line->len;
-          memcpy (display_line->line, line->line, line->len);
+	      memcpy (display_line->line, line->line, line->len);
-          if (clear)
+	      if (clear)
-            XClearArea (disp, root, win_x, win_y + offset - font_ascent,
+		XClearArea (disp, root, win_x, win_y + offset - font_ascent,
-                        width + effect_x_space, font_height + effect_y_space, False);
+			    width + effect_x_space, font_height + effect_y_space, False);
+	    }
           if (opt_outline)
             {
               int x, y;
               XSetForeground (disp, WinGC, black_color);
   return r;
 }
 /*
- * This routine should read a single line, no matter how long.
+ * HACK-1: This routine should read a single line, no matter how long.
  */
 int
 lineinput (struct logfile_entry *logfile)
 {
   char buff[1024], *p = buff;
   int ch;
-  /* HACK this - to add on the length of any partial line which we will be appending to */
+  /* HACK-2: add on the length of any partial line which we will be appending to */
   int ofs = logfile->buf ? strlen (logfile->buf) : 0;
   do
     {
       ch = fgetc (logfile->fp);
           sleep (1);
           if (e->fp)
             fclose (e->fp);
           if (openlog (e) == NULL)
             continue;
+          if (fstat (fileno (e->fp), &stats) < 0)
+            continue;
         }
-      /* HACK this - stats can be uninitialised here (if the file
-       * didn't exist when stat() was called, but was recreated during
-       * the sleep(1)) */
       if (stats.st_ino != e->inode)
         {                       /* file renamed? */
           if (e->fp)
             fclose (e->fp);
           if (openlog (e) == NULL)
  */
 static void
 split_line (int idx, const char *str, unsigned long color)
 {
   int l = strlen (str);
+  int last_wrapped = 0;
   const char *p = str;
+  static int continuation_width = -1;
+  static int continuation_length;
+  /* only calculate the continuation's width once */
+  if (continuation_width == -1)
+    {
+      continuation_length = strlen(continuation);
+      continuation_width = XmbTextEscapement (fontset, continuation, continuation_length);
+    }
   do
     {
       const char *beg = p;
+      int w = last_wrapped ? continuation_width : 0;
-      int w = 0, wrapped = 0;
+      int wrapped = 0;
       const char *break_p = NULL;
       while (*p)
         {
 	  /* find the length in bytes of the next multibyte character */
 	  /* find the width in pixels of the next character */
           int cw = XmbTextEscapement (fontset, p, len);
           if (cw + w > width - effect_x_space)
 	    {
+	      if (p == beg)
+		{
+		  fprintf(stderr, "we can't even fit a single character onto the line\n");
+		  if (len == 1) fprintf(stderr, "(the character we couldn't fit was '%c')\n", *p);
+		  exit(1);
+		}
 	      wrapped = 1;
 	      break;
 	    }
 	  if (opt_wordwrap && len == 1 && p[0] == ' ')
 	  l += p - break_p;
 	  p = break_p;
 	}
       {
+	/* HACK-4 - consider inserting the 'continuation string'
+	 * before the rest of the wrapped line */
+	int len = p - beg + (last_wrapped ? continuation_length : 0);
-        char *s = xmalloc (p - beg + 1);
+        char *s = xmalloc (len + 1);
+	if (last_wrapped)
+	  {
+	    memcpy (s, continuation, continuation_length);
+	    memcpy (s + continuation_length, beg, p - beg);
+	  }
+	else
-        memcpy (s, beg, p - beg);
+	    memcpy (s, beg, len);
-        s[p - beg] = 0;
+        s[len] = 0;
         insert_line (idx);
         lines[idx].line = s;
-        lines[idx].len = p - beg;
+        lines[idx].len = len;
         lines[idx].color = color;
       }
       /* if we wrapped at a space, don't display the space */
       if (opt_wordwrap && wrapped && break_p && break_p != beg)
 	{
 	  l--;
 	  p++;
 	}
+      last_wrapped = wrapped;
     }
   while (l);
 }
 /*
               /* print filename if any, and if last line was from
                * different file */
               if (!opt_nofilename && lastprinted != current && current->desc[0])
                 {
-                  char buf[1024]; /* HACK */
+                  char buf[1024]; /* HACK-5 */
                   snprintf (buf, sizeof (buf), "[%s]", current->desc);
                   split_line (listlen - 1, buf, current->color);
                 }
-              /* if this is the same file we showed last, and the
+              /* if we're dealing with partial lines, and the last
-               * last time we showed it, it wasn't finished, then
+               * time we showed the line it wasn't finished ... */
-               * append to the last line shown */
-              if (lastprinted == current && current->lastpartial)
-		append_line (listlen - 1, current->buf);
-              else if (current->lastpartial)
+              if (!opt_whole && current->lastpartial)
 		{
+		  /* if this is the same file we showed last then
+		     append to the last line shown */
+		  if (lastprinted == current)
+		    append_line (listlen - 1, current->buf);
+		  else
+		    {
+		      /* but if a different file has been shown in the
+		       * mean time, make a new line, starting with the
+		       * continuation string */
-                  split_line (listlen - 1, continuation, current->color);
+		      split_line (listlen - 1, continuation, current->color);
-                  append_line (listlen - 1, current->buf);
+		      append_line (listlen - 1, current->buf);
+		    }
 		}
               else
+		/* otherwise just make a plain and simple new line */
 		split_line (listlen - 1, current->buf, current->color);
 	      free (current->buf), current->buf = 0;
               current->index = listlen - 1;
               lastprinted = current;
               e->fname = xstrdup (fname);
               if (openlog (e) == NULL)
                 perror (fname), exit (1);
-              l = strlen (desc);
+              e->desc = xstrdup (desc);
-	      /* HACK on this - width is in pixels now */
-              if (l > width - 2)        /* must account for [ ] */
-                l = width - 2;
-              e->desc = xmalloc (l + 1);
-              memcpy (e->desc, desc, l);
-              *(e->desc + l) = '\0';
             }
           e->color = GetColor (fcolor);
           e->partial = 0;
           e->next = NULL;
     {
       fprintf (stderr, "Specify at most one of -partial and -whole\n");
       exit (1);
     }
-  /* HACK this - do we want to allow both -shade and -outline? */
+  /* HACK-7: do we want to allow both -shade and -outline? */
   if (opt_shade && opt_outline)
     {
       fprintf (stderr, "Specify at most one of -shade and -outline\n");
       exit (1);
     }
   if (opt_partial)
     /* if we specifically requested to see partial lines then don't insist on whole lines */
     opt_whole = 0;
   else if (file_count > 1)
-    /* otherwise, if we've viewing multiple files, default to showing whole lines */
+    /* otherwise, if we're viewing multiple files, default to showing whole lines */
     opt_whole = 1;
 #if HAS_REGEX
   if (transform)
     {

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing root-tail/root-tail.c (file contents): Revision 1.29 by pcg, Tue Mar 30 21:32:32 2004 UTC vs. Revision 1.38 by pcg, Wed Mar 31 01:50:24 2004 UTC

Diff Legend

Comparing root-tail/root-tail.c (file contents):
Revision 1.29 by pcg, Tue Mar 30 21:32:32 2004 UTC vs.
Revision 1.38 by pcg, Wed Mar 31 01:50:24 2004 UTC