ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/root-tail/root-tail.c
(Generate patch)

Comparing root-tail/root-tail.c (file contents):
Revision 1.20 by pcg, Sat Mar 27 20:42:40 2004 UTC vs.
Revision 1.38 by pcg, Wed Mar 31 01:50:24 2004 UTC

1/* 1/*
2 * Copyright 2001 by Marco d'Itri <md@linux.it> 2 * Copyright 2001 by Marco d'Itri <md@linux.it>
3 * 3 * Copyright 2000,2001,2002,2003,2004
4 * Original version by Mike Baker, then maintained by pcg@goof.com. 4 * Marc Lehmann <pcg@goof.com>,
5 * and many others, see README
6 *
7 * Original version by Mike Baker.
5 * 8 *
6 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version. 12 * (at your option) any later version.
… …
31#include <sys/stat.h> 34#include <sys/stat.h>
32#include <sys/types.h> 35#include <sys/types.h>
33#include <locale.h> 36#include <locale.h>
34#include <ctype.h> 37#include <ctype.h>
35#include <stdarg.h> 38#include <stdarg.h>
39#include <X11/Xlib.h>
40#include <X11/Xatom.h>
41#include <X11/Xutil.h>
42
36#if HAS_REGEX 43#if HAS_REGEX
37#include <regex.h> 44#include <regex.h>
38#endif 45#endif
39#include <X11/Xlib.h> 46
40#include <X11/Xatom.h> 47#define SHADE_X 2
41#include <X11/Xutil.h> 48#define SHADE_Y 2
42 49
43/* data structures */ 50/* data structures */
44struct logfile_entry 51struct logfile_entry
45{ 52{
46 struct logfile_entry *next; 53 struct logfile_entry *next;
… …
53 off_t last_size; /* file size at the last check */ 60 off_t last_size; /* file size at the last check */
54 unsigned long color; /* color to be used for printing */ 61 unsigned long color; /* color to be used for printing */
55 int partial; /* true if the last line isn't complete */ 62 int partial; /* true if the last line isn't complete */
56 int lastpartial; /* true if the previous output wasn't complete */ 63 int lastpartial; /* true if the previous output wasn't complete */
57 int index; /* index into linematrix of a partial line */ 64 int index; /* index into linematrix of a partial line */
65 int modified; /* true if line is modified & needs displaying */
58}; 66};
59 67
60struct linematrix 68struct linematrix
61{ 69{
62 char *line; 70 char *line;
63 int len; 71 int len;
64 unsigned long color; 72 unsigned long color;
65}; 73};
66 74
75struct displaymatrix
76{
77 char *line;
78 int len;
79 int buffer_size;
80};
81
67/* global variables */ 82/* global variables */
68struct linematrix *lines; 83struct linematrix *lines;
84struct displaymatrix *display;
69int width = STD_WIDTH, height = STD_HEIGHT, listlen; 85int width = STD_WIDTH, height = STD_HEIGHT, listlen;
70int win_x = LOC_X, win_y = LOC_Y; 86int win_x = LOC_X, win_y = LOC_Y;
71int font_descent, font_height; 87int font_ascent, font_height;
88int effect_x_space, effect_y_space; /* how much space does shading / outlining take up */
89int effect_x_offset, effect_y_offset; /* and how does it offset the usable space */
72int do_reopen; 90int do_reopen;
73struct timeval interval = { 3, 0 }; 91struct timeval interval = { 2, 400000 };
74XFontSet fontset; 92XFontSet fontset;
75 93
76/* command line options */ 94/* command line options */
77int opt_noinitial, opt_shade, opt_frame, opt_reverse, opt_nofilename, 95int opt_noinitial, opt_shade, opt_frame, opt_reverse, opt_nofilename,
78 opt_whole, opt_update, geom_mask, reload = 0; 96 opt_outline, opt_noflicker, opt_whole, opt_update, opt_wordwrap,
97 geom_mask, reload = 0;
79const char *command = NULL, 98const char *command = NULL,
80 *fontname = USE_FONT, *dispname = NULL, *def_color = DEF_COLOR, 99 *fontname = USE_FONT, *dispname = NULL, *def_color = DEF_COLOR,
81 *continuation = "[+]"; 100 *continuation = "[+]";
82 101
83struct logfile_entry *loglist = NULL, *loglist_tail = NULL; 102struct logfile_entry *loglist = NULL, *loglist_tail = NULL;
… …
92 regex_t from; 111 regex_t from;
93 const char *to; 112 const char *to;
94 struct re_list *next; 113 struct re_list *next;
95}; 114};
96struct re_list *re_head, *re_tail; 115struct re_list *re_head, *re_tail;
116char *transform_to = NULL;
117regex_t *transformre;
97#endif 118#endif
98 119
99 120
100/* prototypes */ 121/* prototypes */
101void list_files (int); 122void list_files (int);
… …
103void force_refresh (int); 124void force_refresh (int);
104void blank_window (int); 125void blank_window (int);
105 126
106void InitWindow (void); 127void InitWindow (void);
107unsigned long GetColor (const char *); 128unsigned long GetColor (const char *);
108void redraw (void); 129void redraw (int);
109void refresh (int, int); 130void refresh (int, int, int, int);
110 131
111void transform_line (char *s); 132void transform_line (char *s);
112int lineinput (struct logfile_entry *); 133int lineinput (struct logfile_entry *);
113void reopen (void); 134void reopen (void);
114void check_open_files (void); 135void check_open_files (void);
… …
118void display_version (void); 139void display_version (void);
119void display_help (char *); 140void display_help (char *);
120void install_signal (int, void (*)(int)); 141void install_signal (int, void (*)(int));
121void *xstrdup (const char *); 142void *xstrdup (const char *);
122void *xmalloc (size_t); 143void *xmalloc (size_t);
144void *xrealloc (void *, size_t);
123int daemonize (void); 145int daemonize (void);
124 146
125/* signal handlers */ 147/* signal handlers */
126void 148void
127list_files (int dummy) 149list_files (int dummy)
… …
140} 162}
141 163
142void 164void
143force_refresh (int dummy) 165force_refresh (int dummy)
144{ 166{
145 redraw (); 167 redraw (1);
146} 168}
147 169
148void 170void
149blank_window (int dummy) 171blank_window (int dummy)
150{ 172{
… …
285 307
286 { 308 {
287 XFontSetExtents *xfe = XExtentsOfFontSet (fontset); 309 XFontSetExtents *xfe = XExtentsOfFontSet (fontset);
288 310
289 font_height = xfe->max_logical_extent.height; 311 font_height = xfe->max_logical_extent.height;
290 font_descent = xfe->max_logical_extent.y; 312 font_ascent = -xfe->max_logical_extent.y;
291 } 313 }
292 314
293 if (geom_mask & XNegative) 315 if (geom_mask & XNegative)
294 win_x = win_x + ScreenWidth - width; 316 win_x = win_x + ScreenWidth - width;
295 if (geom_mask & YNegative) 317 if (geom_mask & YNegative)
296 win_y = win_y + ScreenHeight - height; 318 win_y = win_y + ScreenHeight - height;
297 319
320 if (opt_outline)
321 {
322 /* adding outline increases the total width and height by 2
323 pixels each, and offsets the text one pixel right and one
324 pixel down */
325 effect_x_space = effect_y_space = 2;
326 effect_x_offset = effect_y_offset = 1;
327 }
328 else if (opt_shade)
329 {
330 /* adding a shadow increases the space used */
331 effect_x_space = abs(SHADE_X);
332 effect_y_space = abs(SHADE_Y);
333 /* if the shadow is to the right and below then we don't need
334 * to move the text to make space for it, but shadows to the left
335 * and above need accomodating */
336 effect_x_offset = SHADE_X > 0 ? 0 : -SHADE_X;
337 effect_y_offset = SHADE_Y > 0 ? 0 : -SHADE_Y;
338 }
339 else
340 {
341 effect_x_space = effect_y_space = 0;
342 effect_x_offset = effect_y_offset = 0;
343 }
344
345 /* if we are using -shade or -outline, there will be less usable
346 * space for output */
298 listlen = height / font_height; 347 listlen = (height - effect_y_space) / font_height;
299 348
300 if (!listlen) 349 if (!listlen)
301 { 350 {
302 fprintf (stderr, "height too small for a single line, setting to %d\n", 351 fprintf (stderr, "height too small for a single line, setting to %d\n",
303 font_height); 352 font_height);
304 listlen = 1; 353 listlen = 1;
305 } 354 }
306 355
307 height = listlen * font_height; 356 /* leave the height how the user requested it. it might not all be
308 357 * used, but this will allow the geometry to be tuned more accurately
358 * (with the -frame option)
359 * the old code did this:
360 * height = listlen * font_height + effect_y_space; */
361
309 XSelectInput (disp, root, ExposureMask | FocusChangeMask); 362 XSelectInput (disp, root, ExposureMask | FocusChangeMask);
310} 363}
311 364
312/* 365/*
313 * redraw does a complete redraw, rather than an update (i.e. the area 366 * if redraw() is passwd a non-zero argument, it does a complete
314 * gets cleared first) 367 * redraw, rather than an update. if the argument is zero (and
368 * -noflicker is in effect) then only the lines which have changed
369 * since the last draw are redrawn.
370 *
315 * the rest is handled by regular refresh()'es 371 * the rest is handled by regular refresh()'es
316 */ 372 */
317void 373void
318redraw (void) 374redraw (int redraw_all)
319{ 375{
320 XSetClipMask (disp, WinGC, None); 376 XSetClipMask (disp, WinGC, None);
321 XClearArea (disp, root, win_x - 2, win_y - 2, width + 5, height + 5, False); 377 refresh (0, 32768, 1, redraw_all);
322 refresh (0, 32768);
323} 378}
324 379
325/* Just redraw everything without clearing (i.e. after an EXPOSE event) */ 380/* Just redraw everything without clearing (i.e. after an EXPOSE event) */
326void 381void
327refresh (int miny, int maxy) 382refresh (int miny, int maxy, int clear, int refresh_all)
328{ 383{
329 int lin; 384 int lin;
330 int offset = (listlen + 1) * font_height; 385 int offset = listlen * font_height + font_ascent + effect_y_offset;
331 unsigned long black_color = GetColor ("black"); 386 unsigned long black_color = GetColor ("black");
332 387
333 miny -= win_y + font_height; 388 miny -= win_y + font_height;
334 maxy -= win_y - font_height; 389 maxy -= win_y - font_height;
335 390
391 if (clear && !opt_noflicker)
392 XClearArea (disp, root, win_x, win_y, width, height, False);
393
336 for (lin = listlen; lin--;) 394 for (lin = listlen; lin--;)
337 { 395 {
338 struct linematrix *line = lines + (opt_reverse ? listlen - lin - 1 : lin); 396 struct linematrix *line = lines + (opt_reverse ? listlen - lin - 1 : lin);
397 struct displaymatrix *display_line = display + lin;
339 398
340 offset -= font_height; 399 offset -= font_height;
341 400
342 if (offset < miny || offset > maxy) 401 if (offset < miny || offset > maxy)
343 continue; 402 continue;
344 403
345 if (opt_shade) 404 /* if this line is a different than it was, then it
405 * needs displaying */
406 if (!opt_noflicker
407 || refresh_all
408 || display_line->len != line->len
409 || memcmp (display_line->line, line->line, line->len))
346 { 410 {
411 /* don't bother updating the record of what has been
412 * displayed if -noflicker isn't in effect, since we redraw
413 * the whole display every time anyway */
414 if (opt_noflicker)
415 {
416 /* update the record of what has been displayed;
417 * first make sure the buffer is big enough */
418 if (display_line->buffer_size <= line->len)
419 {
420 display_line->buffer_size = line->len + 1;
421 display_line->line = xrealloc (display_line->line, display_line->buffer_size);
422 }
423
424 display_line->len = line->len;
425 memcpy (display_line->line, line->line, line->len);
426
427 if (clear)
428 XClearArea (disp, root, win_x, win_y + offset - font_ascent,
429 width + effect_x_space, font_height + effect_y_space, False);
430 }
431
432 if (opt_outline)
433 {
434 int x, y;
347 XSetForeground (disp, WinGC, black_color); 435 XSetForeground (disp, WinGC, black_color);
436
437 for (x = -1; x < 2; x += 2)
438 for (y = -1; y < 2; y += 2)
439 XmbDrawString (disp, root, fontset, WinGC,
440 win_x + effect_x_offset + x,
441 win_y + y + offset,
442 line->line, line->len);
443 }
444 else if (opt_shade)
445 {
446 XSetForeground (disp, WinGC, black_color);
348 XmbDrawString (disp, root, fontset, WinGC, win_x + 2, 447 XmbDrawString (disp, root, fontset, WinGC,
448 win_x + effect_x_offset + SHADE_X,
449 win_y + offset + SHADE_Y,
349 win_y + offset + 2, line->line, line->len); 450 line->line, line->len);
350 } 451 }
351 452
352 XSetForeground (disp, WinGC, line->color); 453 XSetForeground (disp, WinGC, line->color);
353 XmbDrawString (disp, root, fontset, WinGC, win_x, win_y + offset, 454 XmbDrawString (disp, root, fontset, WinGC,
455 win_x + effect_x_offset,
456 win_y + offset,
354 line->line, line->len); 457 line->line, line->len);
458 }
355 } 459 }
356 460
357 if (opt_frame) 461 if (opt_frame)
358 { 462 {
359 XSetForeground (disp, WinGC, GetColor (def_color)); 463 XSetForeground (disp, WinGC, GetColor (def_color));
360 XDrawRectangle (disp, root, WinGC, win_x - 2, win_y - 2, width + 4, height + 4); 464 XDrawRectangle (disp, root, WinGC, win_x - 0, win_y - 0, width - 1, height - 1);
361 } 465 }
362} 466}
363 467
364#if HAS_REGEX 468#if HAS_REGEX
365void 469void
… …
378 if (transformre) 482 if (transformre)
379 { 483 {
380 int i; 484 int i;
381 regmatch_t matched[16]; 485 regmatch_t matched[16];
382 486
383 i = regexec (&transformre, string, 16, matched, 0); 487 i = regexec (transformre, s, 16, matched, 0);
384 if (i == 0) 488 if (i == 0)
385 { /* matched */ 489 { /* matched */
490 int match_start = matched[0].rm_so;
491 int match_end = matched[0].rm_eo;
492 int old_len = match_end - match_start;
493 int new_len = strlen(transform_to);
494 int old_whole_len = strlen(s);
495 printf("regexp was matched by '%s' - replace with '%s'\n", s, transform_to);
496 printf("match is from %d to %d\n",
497 match_start, match_end);
498 if (new_len > old_len) {
499 s = xrealloc(s, old_whole_len + new_len - old_len);
500 }
501 if (new_len != old_len) {
502 memcpy(s + match_end + new_len - old_len,
503 s + match_end,
504 old_whole_len - match_end);
505 s[old_whole_len + new_len - old_len] = '\0';
506 }
507 memcpy(s + match_start,
508 transform_to,
509 new_len);
510 printf("transformed to '%s'\n", s);
386 } 511 }
512 else
513 {
514 printf("regexp was not matched by '%s'\n", s);
515 }
387 } 516 }
388} 517}
389#endif 518#endif
390 519
391char * 520char *
… …
401 530
402 return r; 531 return r;
403} 532}
404 533
405/* 534/*
406 * This routine should read a single line, no matter how long. 535 * HACK-1: This routine should read a single line, no matter how long.
407 */ 536 */
408int 537int
409lineinput (struct logfile_entry *logfile) 538lineinput (struct logfile_entry *logfile)
410{ 539{
411 char buff[1024], *p = buff; 540 char buff[1024], *p = buff;
412 int ch; 541 int ch;
542 /* HACK-2: add on the length of any partial line which we will be appending to */
413 int ofs = logfile->buf ? strlen (logfile->buf) : 0; 543 int ofs = logfile->buf ? strlen (logfile->buf) : 0;
414 544
415 do 545 do
416 { 546 {
417 ch = fgetc (logfile->fp); 547 ch = fgetc (logfile->fp);
… …
444 574
445 p = concat_line (logfile->buf, buff); 575 p = concat_line (logfile->buf, buff);
446 free (logfile->buf); logfile->buf = p; 576 free (logfile->buf); logfile->buf = p;
447 577
448 logfile->lastpartial = logfile->partial; 578 logfile->lastpartial = logfile->partial;
579 /* there are 3 ways we could have exited the loop: reading '\n',
580 * reaching EOF, or filling the buffer; the 2nd and 3rd of these
581 * both result in a partial line */
449 logfile->partial = ch == EOF; 582 logfile->partial = ch != '\n';
450 583
451 if (logfile->partial && opt_whole) 584 if (logfile->partial && opt_whole)
452 return 0; 585 return 0;
453 586
454#if HAS_REGEX 587#if HAS_REGEX
… …
526 { /* file missing? */ 659 { /* file missing? */
527 sleep (1); 660 sleep (1);
528 if (e->fp) 661 if (e->fp)
529 fclose (e->fp); 662 fclose (e->fp);
530 if (openlog (e) == NULL) 663 if (openlog (e) == NULL)
531 break; 664 continue;
665 if (fstat (fileno (e->fp), &stats) < 0)
666 continue;
532 } 667 }
533 668
534 if (stats.st_ino != e->inode) 669 if (stats.st_ino != e->inode)
535 { /* file renamed? */ 670 { /* file renamed? */
536 if (e->fp) 671 if (e->fp)
537 fclose (e->fp); 672 fclose (e->fp);
538 if (openlog (e) == NULL) 673 if (openlog (e) == NULL)
539 break; 674 continue;
540 } 675 }
541 676
542 if (stats.st_size < e->last_size) 677 if (stats.st_size < e->last_size)
543 { /* file truncated? */ 678 { /* file truncated? */
544 fseek (e->fp, 0, SEEK_SET); 679 fseek (e->fp, 0, SEEK_SET);
… …
579 struct logfile_entry *current; 714 struct logfile_entry *current;
580 715
581 for (cur_line = idx; cur_line > 0; cur_line--) 716 for (cur_line = idx; cur_line > 0; cur_line--)
582 lines[cur_line] = lines[cur_line - 1]; 717 lines[cur_line] = lines[cur_line - 1];
583 718
584 lines[0].line = strdup ("~"); 719 lines[0].line = xstrdup ("~");
585 720
586 for (current = loglist; current; current = current->next) 721 for (current = loglist; current; current = current->next)
587 if (current->index >= 0 && current->index <= idx) 722 if (current->index >= 0 && current->index <= idx)
588 current->index++; 723 current->index++;
589} 724}
590 725
591/* 726/*
592 * takes a logical log file line and split it into multiple physical 727 * takes a logical log file line and splits it into multiple physical
593 * screen lines by splitting it whenever a part becomes too long. 728 * screen lines by splitting it whenever a part becomes too long.
594 * lal lines will be inserted at position "idx". 729 * lal lines will be inserted at position "idx".
595 */ 730 */
596static void 731static void
597split_line (int idx, const char *str, unsigned long color) 732split_line (int idx, const char *str, unsigned long color)
598{ 733{
599 int l = strlen (str); 734 int l = strlen (str);
735 int last_wrapped = 0;
600 const char *p = str; 736 const char *p = str;
737 static int continuation_width = -1;
738 static int continuation_length;
739
740 /* only calculate the continuation's width once */
741 if (continuation_width == -1)
742 {
743 continuation_length = strlen(continuation);
744 continuation_width = XmbTextEscapement (fontset, continuation, continuation_length);
745 }
601 746
602 do 747 do
603 { 748 {
604 const char *beg = p; 749 const char *beg = p;
750 int w = last_wrapped ? continuation_width : 0;
605 int w = 0; 751 int wrapped = 0;
752 const char *break_p = NULL;
606 753
607 while (*p) 754 while (*p)
608 { 755 {
756 /* find the length in bytes of the next multibyte character */
609 int len = mblen (p, l); 757 int len = mblen (p, l);
610 if (len <= 0) 758 if (len <= 0)
611 len = 1; /* ignore (don't skip) ilegal character sequences */ 759 len = 1; /* ignore (don't skip) illegal character sequences */
612 760
761 /* find the width in pixels of the next character */
613 int cw = XmbTextEscapement (fontset, p, len); 762 int cw = XmbTextEscapement (fontset, p, len);
614 if (cw + w >= width) 763 if (cw + w > width - effect_x_space)
764 {
765 if (p == beg)
766 {
767 fprintf(stderr, "we can't even fit a single character onto the line\n");
768 if (len == 1) fprintf(stderr, "(the character we couldn't fit was '%c')\n", *p);
769 exit(1);
770 }
771
772 wrapped = 1;
615 break; 773 break;
774 }
775
776 if (opt_wordwrap && len == 1 && p[0] == ' ')
777 break_p = p;
616 778
617 w += cw; 779 w += cw;
618 p += len; 780 p += len;
619 l -= len; 781 l -= len;
620 } 782 }
621 783
784 /* if we're wrapping at spaces, and the line is long enough to
785 * wrap, and we've seen a space already, and the space wasn't
786 * the first character on the line, then wrap at the space */
787 if (opt_wordwrap && wrapped && break_p && break_p != beg)
788 {
789 l += p - break_p;
790 p = break_p;
791 }
792
622 { 793 {
794 /* HACK-4 - consider inserting the 'continuation string'
795 * before the rest of the wrapped line */
796 int len = p - beg + (last_wrapped ? continuation_length : 0);
623 char *s = xmalloc (p - beg + 1); 797 char *s = xmalloc (len + 1);
798 if (last_wrapped)
799 {
800 memcpy (s, continuation, continuation_length);
801 memcpy (s + continuation_length, beg, p - beg);
802 }
803 else
624 memcpy (s, beg, p - beg); 804 memcpy (s, beg, len);
805
625 s[p - beg] = 0; 806 s[len] = 0;
626 insert_line (idx); 807 insert_line (idx);
627 lines[idx].line = s; 808 lines[idx].line = s;
628 lines[idx].len = p - beg; 809 lines[idx].len = len;
629 lines[idx].color = color; 810 lines[idx].color = color;
630 } 811 }
812
813 /* if we wrapped at a space, don't display the space */
814 if (opt_wordwrap && wrapped && break_p && break_p != beg)
815 {
816 l--;
817 p++;
818 }
819
820 last_wrapped = wrapped;
631 } 821 }
632 while (l); 822 while (l);
633} 823}
634 824
635/* 825/*
… …
652 842
653static void 843static void
654main_loop (void) 844main_loop (void)
655{ 845{
656 lines = xmalloc (sizeof (struct linematrix) * listlen); 846 lines = xmalloc (sizeof (struct linematrix) * listlen);
847 display = xmalloc (sizeof (struct displaymatrix) * listlen);
657 int lin; 848 int lin;
658 time_t lastreload; 849 time_t lastreload;
659 Region region = XCreateRegion (); 850 Region region = XCreateRegion ();
660 XEvent xev; 851 XEvent xev;
661 struct logfile_entry *lastprinted = NULL; 852 struct logfile_entry *lastprinted = NULL;
… …
665 lastreload = time (NULL); 856 lastreload = time (NULL);
666 857
667 /* Initialize linematrix */ 858 /* Initialize linematrix */
668 for (lin = 0; lin < listlen; lin++) 859 for (lin = 0; lin < listlen; lin++)
669 { 860 {
670 lines[lin].line = strdup ("~"); 861 lines[lin].line = xstrdup ("~");
671 lines[lin].len = 1; 862 lines[lin].len = 1;
863 display[lin].line = xstrdup("");
864 display[lin].len = 0;
865 display[lin].buffer_size = 1;
672 lines[lin].color = GetColor (def_color); 866 lines[lin].color = GetColor (def_color);
673 } 867 }
674 868
675 for (;;) 869 for (;;)
676 { 870 {
… …
701 895
702 /* print filename if any, and if last line was from 896 /* print filename if any, and if last line was from
703 * different file */ 897 * different file */
704 if (!opt_nofilename && lastprinted != current && current->desc[0]) 898 if (!opt_nofilename && lastprinted != current && current->desc[0])
705 { 899 {
706 char buf[1024]; /* HACK */ 900 char buf[1024]; /* HACK-5 */
707 snprintf (buf, sizeof (buf), "[%s]", current->desc); 901 snprintf (buf, sizeof (buf), "[%s]", current->desc);
708 split_line (listlen - 1, buf, current->color); 902 split_line (listlen - 1, buf, current->color);
709 } 903 }
710 904
905 /* if we're dealing with partial lines, and the last
906 * time we showed the line it wasn't finished ... */
907 if (!opt_whole && current->lastpartial)
908 {
711 /* if this is the same file we showed last, and the 909 /* if this is the same file we showed last then
712 * last time we showed it, it wasn't finished, then
713 * append to the last line shown */ 910 append to the last line shown */
714 if (lastprinted == current && current->lastpartial) 911 if (lastprinted == current)
715 { 912 append_line (listlen - 1, current->buf);
913 else
914 {
915 /* but if a different file has been shown in the
916 * mean time, make a new line, starting with the
917 * continuation string */
918 split_line (listlen - 1, continuation, current->color);
716 append_line (listlen - 1, current->buf); 919 append_line (listlen - 1, current->buf);
717 free (current->buf), current->buf = 0; 920 }
718 continue; 921 }
719 }
720 else 922 else
721 { 923 /* otherwise just make a plain and simple new line */
722 split_line (listlen - 1, current->buf, current->color); 924 split_line (listlen - 1, current->buf, current->color);
925
723 free (current->buf), current->buf = 0; 926 free (current->buf), current->buf = 0;
724 }
725
726 current->index = listlen - 1; 927 current->index = listlen - 1;
727 lastprinted = current; 928 lastprinted = current;
728 } 929 }
729 } 930 }
730 931
731 if (need_update) 932 if (need_update)
732 { 933 {
733 redraw (); 934 redraw (0);
734 need_update = 0; 935 need_update = 0;
735 } 936 }
736 else 937 else
737 { 938 {
738 XFlush (disp); 939 XFlush (disp);
… …
795 XRectangle r; 996 XRectangle r;
796 997
797 XSetRegion (disp, WinGC, region); 998 XSetRegion (disp, WinGC, region);
798 XClipBox (region, &r); 999 XClipBox (region, &r);
799 1000
800 refresh (r.y, r.y + r.height); 1001 refresh (r.y, r.y + r.height, 0, 1);
801 1002
802 XDestroyRegion (region); 1003 XDestroyRegion (region);
803 region = XCreateRegion (); 1004 region = XCreateRegion ();
804 } 1005 }
805 } 1006 }
… …
846 continuation = argv[++i]; 1047 continuation = argv[++i];
847 else if (!strcmp (arg, "-font") || !strcmp (arg, "-fn")) 1048 else if (!strcmp (arg, "-font") || !strcmp (arg, "-fn"))
848 fontname = argv[++i]; 1049 fontname = argv[++i];
849#if HAS_REGEX 1050#if HAS_REGEX
850 else if (!strcmp (arg, "-t")) 1051 else if (!strcmp (arg, "-t"))
1052 {
851 transform = argv[++i]; 1053 transform = argv[++i];
1054 transform_to = argv[++i];
1055 printf("transform: '%s' to '%s'\n", transform, transform_to);
1056 }
852#endif 1057#endif
853 else if (!strcmp (arg, "-fork") || !strcmp (arg, "-f")) 1058 else if (!strcmp (arg, "-fork") || !strcmp (arg, "-f"))
854 opt_daemonize = 1; 1059 opt_daemonize = 1;
855 else if (!strcmp (arg, "-reload")) 1060 else if (!strcmp (arg, "-reload"))
856 { 1061 {
857 reload = atoi (argv[++i]); 1062 reload = atoi (argv[++i]);
858 command = argv[++i]; 1063 command = argv[++i];
859 } 1064 }
860 else if (!strcmp (arg, "-shade")) 1065 else if (!strcmp (arg, "-shade"))
861 opt_shade = 1; 1066 opt_shade = 1;
1067 else if (!strcmp (arg, "-outline"))
1068 opt_outline = 1;
1069 else if (!strcmp (arg, "-noflicker"))
1070 opt_noflicker = 1;
862 else if (!strcmp (arg, "-frame")) 1071 else if (!strcmp (arg, "-frame"))
863 opt_frame = 1; 1072 opt_frame = 1;
864 else if (!strcmp (arg, "-no-filename")) 1073 else if (!strcmp (arg, "-no-filename"))
865 opt_nofilename = 1; 1074 opt_nofilename = 1;
866 else if (!strcmp (arg, "-reverse")) 1075 else if (!strcmp (arg, "-reverse"))
… …
869 opt_whole = 1; 1078 opt_whole = 1;
870 else if (!strcmp (arg, "-partial")) 1079 else if (!strcmp (arg, "-partial"))
871 opt_partial = 1; 1080 opt_partial = 1;
872 else if (!strcmp (arg, "-update")) 1081 else if (!strcmp (arg, "-update"))
873 opt_update = opt_partial = 1; 1082 opt_update = opt_partial = 1;
1083 else if (!strcmp (arg, "-wordwrap"))
1084 opt_wordwrap = 1;
874 else if (!strcmp (arg, "-color")) 1085 else if (!strcmp (arg, "-color"))
875 def_color = argv[++i]; 1086 def_color = argv[++i];
876 else if (!strcmp (arg, "-noinitial")) 1087 else if (!strcmp (arg, "-noinitial"))
877 opt_noinitial = 1; 1088 opt_noinitial = 1;
878 else if (!strcmp (arg, "-id")) 1089 else if (!strcmp (arg, "-id"))
… …
934 1145
935 e->fname = xstrdup (fname); 1146 e->fname = xstrdup (fname);
936 if (openlog (e) == NULL) 1147 if (openlog (e) == NULL)
937 perror (fname), exit (1); 1148 perror (fname), exit (1);
938 1149
939 l = strlen (desc); 1150 e->desc = xstrdup (desc);
940 if (l > width - 2) /* must account for [ ] */
941 l = width - 2;
942 e->desc = xmalloc (l + 1);
943 memcpy (e->desc, desc, l);
944 *(e->desc + l) = '\0';
945 } 1151 }
946 1152
947 e->color = GetColor (fcolor); 1153 e->color = GetColor (fcolor);
948 e->partial = 0; 1154 e->partial = 0;
949 e->next = NULL; 1155 e->next = NULL;
… …
967 { 1173 {
968 fprintf (stderr, "Specify at most one of -partial and -whole\n"); 1174 fprintf (stderr, "Specify at most one of -partial and -whole\n");
969 exit (1); 1175 exit (1);
970 } 1176 }
971 1177
1178 /* HACK-7: do we want to allow both -shade and -outline? */
1179 if (opt_shade && opt_outline)
1180 {
1181 fprintf (stderr, "Specify at most one of -shade and -outline\n");
1182 exit (1);
1183 }
1184
972 if (opt_partial) 1185 if (opt_partial)
973 /* if we specifically requested to see partial lines then don't insist on whole lines */ 1186 /* if we specifically requested to see partial lines then don't insist on whole lines */
974 opt_whole = 0; 1187 opt_whole = 0;
975 else if (file_count > 1) 1188 else if (file_count > 1)
976 /* otherwise, if we've viewing multiple files, default to showing whole lines */ 1189 /* otherwise, if we're viewing multiple files, default to showing whole lines */
977 opt_whole = 1; 1190 opt_whole = 1;
978 1191
979#if HAS_REGEX 1192#if HAS_REGEX
980 if (transform) 1193 if (transform)
981 { 1194 {
982 int i; 1195 int i;
983 1196
1197 printf("compiling regexp '%s'\n", transform);
984 transformre = xmalloc (sizeof (transformre)); 1198 transformre = xmalloc (sizeof (regex_t));
985 i = regcomp (&transformre, transform, REG_EXTENDED); 1199 i = regcomp (transformre, transform, REG_EXTENDED);
986 if (i != 0) 1200 if (i != 0)
987 { 1201 {
988 char buf[512]; 1202 char buf[512];
989 1203
990 regerror (i, &transformre, buf, sizeof (buf)); 1204 regerror (i, transformre, buf, sizeof (buf));
991 fprintf (stderr, "Cannot compile regular expression: %s\n", buf); 1205 fprintf (stderr, "Cannot compile regular expression: %s\n", buf);
992 } 1206 }
1207 else
1208 {
1209 printf("compiled '%s' OK to %x\n", transform, (int)transformre);
1210 }
993 } 1211 }
994#endif 1212#endif
995 1213
996 InitWindow (); 1214 InitWindow ();
997 1215
… …
1041xmalloc (size_t size) 1259xmalloc (size_t size)
1042{ 1260{
1043 void *p; 1261 void *p;
1044 1262
1045 while ((p = malloc (size)) == NULL) 1263 while ((p = malloc (size)) == NULL)
1264 {
1265 fprintf (stderr, "Memory exausted.");
1266 sleep (10);
1267 }
1268
1269 return p;
1270}
1271
1272void *
1273xrealloc (void *ptr, size_t size)
1274{
1275 void *p;
1276
1277 while ((p = realloc (ptr, size)) == NULL)
1046 { 1278 {
1047 fprintf (stderr, "Memory exausted."); 1279 fprintf (stderr, "Memory exausted.");
1048 sleep (10); 1280 sleep (10);
1049 } 1281 }
1050 1282
… …
1065 " -reverse print new lines at the top\n" 1297 " -reverse print new lines at the top\n"
1066 " -whole wait for \\n before showing a line\n" 1298 " -whole wait for \\n before showing a line\n"
1067 " -partial show lines even if they don't end with a \\n\n" 1299 " -partial show lines even if they don't end with a \\n\n"
1068 " -update allow updates to old partial lines\n" 1300 " -update allow updates to old partial lines\n"
1069 " -cont string to prefix continued partial lines with\n" 1301 " -cont string to prefix continued partial lines with\n"
1302 " -wordwrap wrap long lines at spaces to avoid breaking words\n"
1070 " defaults to \"[+]\"\n" 1303 " defaults to \"[+]\"\n"
1071 " -shade add shading to font\n" 1304 " -shade add shading to font\n"
1072 " -noinitial don't display the last file lines on\n" 1305 " -noinitial don't display the last file lines on\n"
1073 " startup\n" 1306 " startup\n"
1074 " -i | -interval seconds interval between checks (fractional\n" 1307 " -i | -interval seconds interval between checks (fractional\n"
1075 " values o.k.). Default 3 seconds\n" 1308 " values o.k.). Default 2.4 seconds\n"
1076 " -V display version information and exit\n" 1309 " -V display version information and exit\n"
1077 "\n"); 1310 "\n");
1078 printf ("Example:\n%s -g 80x25+100+50 -font fixed /var/log/messages,green " 1311 printf ("Example:\n%s -g 80x25+100+50 -font fixed /var/log/messages,green "
1079 "/var/log/secure,red,'ALERT'\n", myname); 1312 "/var/log/secure,red,'ALERT'\n", myname);
1080 exit (0); 1313 exit (0);
… …
1088} 1321}
1089 1322
1090int 1323int
1091daemonize (void) 1324daemonize (void)
1092{ 1325{
1326 pid_t pid;
1327
1093 switch (fork ()) 1328 switch (pid = fork ())
1094 { 1329 {
1095 case -1: 1330 case -1:
1096 return -1; 1331 return -1;
1097 case 0: 1332 case 0:
1098 break; 1333 break;
1099 default: 1334 default:
1335 /*printf("%d\n", pid);*/
1100 _exit (0); 1336 exit (0);
1101 } 1337 }
1102 1338
1103 if (setsid () == -1) 1339 if (setsid () == -1)
1104 return -1; 1340 return -1;
1105 1341

Diff Legend

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