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.19 by pcg, Sat Mar 27 16:25:11 2004 UTC vs.
Revision 1.47 by pcg, Thu Apr 1 13:37:30 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 unsigned long color;
81};
82
67/* global variables */ 83/* global variables */
68struct linematrix *lines; 84struct linematrix *lines;
85struct displaymatrix *display;
69int width = STD_WIDTH, height = STD_HEIGHT, listlen; 86int width = STD_WIDTH, height = STD_HEIGHT, listlen;
70int win_x = LOC_X, win_y = LOC_Y; 87int win_x = LOC_X, win_y = LOC_Y;
71int font_descent, font_height; 88int font_ascent, font_height;
89int effect_x_space, effect_y_space; /* how much space does shading / outlining take up */
90int effect_x_offset, effect_y_offset; /* and how does it offset the usable space */
72int do_reopen; 91int do_reopen;
73struct timeval interval = { 3, 0 }; 92struct timeval interval = { 2, 400000 };
74XFontSet fontset; 93XFontSet fontset;
75 94
76/* command line options */ 95/* command line options */
77int opt_noinitial, opt_shade, opt_frame, opt_reverse, opt_nofilename, 96int opt_noinitial, opt_shade, opt_frame, opt_reverse, opt_nofilename,
78 opt_whole, opt_update, geom_mask, reload = 0; 97 opt_outline, opt_noflicker, opt_whole, opt_update, opt_wordwrap,
98 geom_mask, reload = 0;
79const char *command = NULL, 99const char *command = NULL,
80 *fontname = USE_FONT, *dispname = NULL, *def_color = DEF_COLOR, 100 *fontname = USE_FONT, *dispname = NULL, *def_color = DEF_COLOR,
81 *continuation = "[+]"; 101 *continuation = "[+]";
82 102
83struct logfile_entry *loglist = NULL, *loglist_tail = NULL; 103struct logfile_entry *loglist = NULL, *loglist_tail = NULL;
… …
92 regex_t from; 112 regex_t from;
93 const char *to; 113 const char *to;
94 struct re_list *next; 114 struct re_list *next;
95}; 115};
96struct re_list *re_head, *re_tail; 116struct re_list *re_head, *re_tail;
117char *transform_to = NULL;
118regex_t *transformre;
97#endif 119#endif
98 120
99 121
100/* prototypes */ 122/* prototypes */
101void list_files (int); 123void list_files (int);
… …
103void force_refresh (int); 125void force_refresh (int);
104void blank_window (int); 126void blank_window (int);
105 127
106void InitWindow (void); 128void InitWindow (void);
107unsigned long GetColor (const char *); 129unsigned long GetColor (const char *);
108void redraw (void); 130void redraw (int);
109void refresh (int, int); 131void refresh (int, int, int, int);
110 132
111void transform_line (char *s); 133void transform_line (char *s);
112int lineinput (struct logfile_entry *); 134int lineinput (struct logfile_entry *);
113void reopen (void); 135void reopen (void);
114void check_open_files (void); 136void check_open_files (void);
… …
118void display_version (void); 140void display_version (void);
119void display_help (char *); 141void display_help (char *);
120void install_signal (int, void (*)(int)); 142void install_signal (int, void (*)(int));
121void *xstrdup (const char *); 143void *xstrdup (const char *);
122void *xmalloc (size_t); 144void *xmalloc (size_t);
145void *xrealloc (void *, size_t);
123int daemonize (void); 146int daemonize (void);
124 147
125/* signal handlers */ 148/* signal handlers */
126void 149void
127list_files (int dummy) 150list_files (int dummy)
… …
140} 163}
141 164
142void 165void
143force_refresh (int dummy) 166force_refresh (int dummy)
144{ 167{
145 redraw (); 168 redraw (1);
146} 169}
147 170
148void 171void
149blank_window (int dummy) 172blank_window (int dummy)
150{ 173{
… …
285 308
286 { 309 {
287 XFontSetExtents *xfe = XExtentsOfFontSet (fontset); 310 XFontSetExtents *xfe = XExtentsOfFontSet (fontset);
288 311
289 font_height = xfe->max_logical_extent.height; 312 font_height = xfe->max_logical_extent.height;
290 font_descent = xfe->max_logical_extent.y; 313 font_ascent = -xfe->max_logical_extent.y;
291 } 314 }
292 315
293 if (geom_mask & XNegative) 316 if (geom_mask & XNegative)
294 win_x = win_x + ScreenWidth - width; 317 win_x = win_x + ScreenWidth - width;
295 if (geom_mask & YNegative) 318 if (geom_mask & YNegative)
296 win_y = win_y + ScreenHeight - height; 319 win_y = win_y + ScreenHeight - height;
297 320
321 if (opt_outline)
322 {
323 /* adding outline increases the total width and height by 2
324 pixels each, and offsets the text one pixel right and one
325 pixel down */
326 effect_x_space = effect_y_space = 2;
327 effect_x_offset = effect_y_offset = 1;
328 }
329 else if (opt_shade)
330 {
331 /* adding a shadow increases the space used */
332 effect_x_space = abs(SHADE_X);
333 effect_y_space = abs(SHADE_Y);
334 /* if the shadow is to the right and below then we don't need
335 * to move the text to make space for it, but shadows to the left
336 * and above need accomodating */
337 effect_x_offset = SHADE_X > 0 ? 0 : -SHADE_X;
338 effect_y_offset = SHADE_Y > 0 ? 0 : -SHADE_Y;
339 }
340 else
341 {
342 effect_x_space = effect_y_space = 0;
343 effect_x_offset = effect_y_offset = 0;
344 }
345
346 /* if we are using -shade or -outline, there will be less usable
347 * space for output */
298 listlen = height / font_height; 348 listlen = (height - effect_y_space) / font_height;
299 349
300 if (!listlen) 350 if (!listlen)
301 { 351 {
302 fprintf (stderr, "height too small for a single line, setting to %d\n", 352 fprintf (stderr, "height too small for a single line, setting to %d\n",
303 font_height); 353 font_height);
304 listlen = 1; 354 listlen = 1;
305 } 355 }
306 356
307 height = listlen * font_height; 357 /* leave the height how the user requested it. it might not all be
308 358 * used, but this will allow the geometry to be tuned more accurately
359 * (with the -frame option)
360 * the old code did this:
361 * height = listlen * font_height + effect_y_space; */
362
309 XSelectInput (disp, root, ExposureMask | FocusChangeMask); 363 XSelectInput (disp, root, ExposureMask | FocusChangeMask);
310} 364}
311 365
312/* 366/*
313 * redraw does a complete redraw, rather than an update (i.e. the area 367 * if redraw() is passwd a non-zero argument, it does a complete
314 * gets cleared first) 368 * redraw, rather than an update. if the argument is zero (and
369 * -noflicker is in effect) then only the lines which have changed
370 * since the last draw are redrawn.
371 *
315 * the rest is handled by regular refresh()'es 372 * the rest is handled by regular refresh()'es
316 */ 373 */
317void 374void
318redraw (void) 375redraw (int redraw_all)
319{ 376{
320 XClearArea (disp, root, win_x - 2, win_y - 2, width + 5, height + 5, False); 377 XSetClipMask (disp, WinGC, None);
321 refresh (0, 32768); 378 refresh (0, 32768, 1, redraw_all);
322} 379}
323 380
324/* Just redraw everything without clearing (i.e. after an EXPOSE event) */ 381/* Just redraw everything without clearing (i.e. after an EXPOSE event) */
325void 382void
326refresh (int miny, int maxy) 383refresh (int miny, int maxy, int clear, int refresh_all)
327{ 384{
328 int lin; 385 int lin;
329 int offset = (listlen + 1) * font_height; 386 int offset = listlen * font_height + font_ascent + effect_y_offset;
330 unsigned long black_color = GetColor ("black"); 387 unsigned long black_color = GetColor ("black");
331 388
332 miny -= win_y + font_height; 389 miny -= win_y + font_height;
333 maxy -= win_y - font_height; 390 maxy -= win_y - font_height;
334 391
392 if (clear && !opt_noflicker)
393 XClearArea (disp, root, win_x, win_y, width, height, False);
335 394
336 for (lin = listlen; lin--;) 395 for (lin = listlen; lin--;)
337 { 396 {
338 struct linematrix *line = lines + (opt_reverse ? listlen - lin - 1 : lin); 397 struct linematrix *line = lines + (opt_reverse ? listlen - lin - 1 : lin);
398 struct displaymatrix *display_line = display + lin;
339 399
340 offset -= font_height; 400 offset -= font_height;
341 401
342 if (offset < miny || offset > maxy) 402 if (offset < miny || offset > maxy)
343 continue; 403 continue;
344 404
345 if (opt_shade) 405 /* if this line is a different than it was, then it
406 * needs displaying */
407 if (!opt_noflicker
408 || refresh_all
409 || display_line->len != line->len
410 || display_line->color != line->color
411 || memcmp (display_line->line, line->line, line->len))
346 { 412 {
413 /* don't bother updating the record of what has been
414 * displayed if -noflicker isn't in effect, since we redraw
415 * the whole display every time anyway */
416 if (opt_noflicker)
417 {
418 /* update the record of what has been displayed;
419 * first make sure the buffer is big enough */
420 if (display_line->buffer_size < line->len)
421 {
422 display_line->buffer_size = line->len;
423 display_line->line = xrealloc (display_line->line, display_line->buffer_size);
424 }
425
426 display_line->len = line->len;
427 display_line->color = line->color;
428 memcpy (display_line->line, line->line, line->len);
429
430 if (clear)
431 XClearArea (disp, root, win_x, win_y + offset - font_ascent,
432 width + effect_x_space, font_height + effect_y_space, False);
433 }
434
435 if (opt_outline)
436 {
437 int x, y;
347 XSetForeground (disp, WinGC, black_color); 438 XSetForeground (disp, WinGC, black_color);
439
440 for (x = -1; x <= 1; x += 2)
441 for (y = -1; y <= 1; y += 2)
442 XmbDrawString (disp, root, fontset, WinGC,
443 win_x + effect_x_offset + x,
444 win_y + y + offset,
445 line->line, line->len);
446 }
447 else if (opt_shade)
448 {
449 XSetForeground (disp, WinGC, black_color);
348 XmbDrawString (disp, root, fontset, WinGC, win_x + 2, 450 XmbDrawString (disp, root, fontset, WinGC,
451 win_x + effect_x_offset + SHADE_X,
452 win_y + offset + SHADE_Y,
349 win_y + offset + 2, line->line, line->len); 453 line->line, line->len);
350 } 454 }
351 455
352 XSetForeground (disp, WinGC, line->color); 456 XSetForeground (disp, WinGC, line->color);
353 XmbDrawString (disp, root, fontset, WinGC, win_x, win_y + offset, 457 XmbDrawString (disp, root, fontset, WinGC,
458 win_x + effect_x_offset,
459 win_y + offset,
354 line->line, line->len); 460 line->line, line->len);
461 }
355 } 462 }
356 463
357 if (opt_frame) 464 if (opt_frame)
358 { 465 {
359 XSetForeground (disp, WinGC, GetColor (def_color)); 466 XSetForeground (disp, WinGC, GetColor (def_color));
360 XDrawRectangle (disp, root, WinGC, win_x - 2, win_y - 2, width + 4, height + 4); 467 XDrawRectangle (disp, root, WinGC, win_x - 0, win_y - 0, width - 1, height - 1);
361 } 468 }
362} 469}
363 470
364#if HAS_REGEX 471#if HAS_REGEX
365void 472void
… …
378 if (transformre) 485 if (transformre)
379 { 486 {
380 int i; 487 int i;
381 regmatch_t matched[16]; 488 regmatch_t matched[16];
382 489
383 i = regexec (&transformre, string, 16, matched, 0); 490 i = regexec (transformre, s, 16, matched, 0);
384 if (i == 0) 491 if (i == 0)
385 { /* matched */ 492 { /* matched */
493 int match_start = matched[0].rm_so;
494 int match_end = matched[0].rm_eo;
495 int old_len = match_end - match_start;
496 int new_len = strlen (transform_to);
497 int old_whole_len = strlen (s);
498
499 printf ("regexp was matched by '%s' - replace with '%s'\n", s, transform_to);
500 printf ("match is from %d to %d\n", match_start, match_end);
501 if (new_len > old_len)
502 s = xrealloc(s, old_whole_len + new_len - old_len);
503
504 if (new_len != old_len)
505 {
506 memcpy(s + match_end + new_len - old_len,
507 s + match_end,
508 old_whole_len - match_end);
509 s[old_whole_len + new_len - old_len] = '\0';
386 } 510 }
511
512 memcpy (s + match_start,
513 transform_to,
514 new_len);
515 printf ("transformed to '%s'\n", s);
516 }
517 else
518 {
519 printf ("regexp was not matched by '%s'\n", s);
520 }
387 } 521 }
388} 522}
389#endif 523#endif
390 524
391char * 525char *
… …
401 535
402 return r; 536 return r;
403} 537}
404 538
405/* 539/*
406 * This routine should read a single line, no matter how long. 540 * This routine can read a line of any length if it is called enough times.
407 */ 541 */
408int 542int
409lineinput (struct logfile_entry *logfile) 543lineinput (struct logfile_entry *logfile)
410{ 544{
411 char buff[1024], *p = buff; 545 char buff[1024], *p;
412 int ch; 546 int ch;
547 /* 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; 548 int ofs = logfile->buf ? strlen (logfile->buf) : 0;
414 549
550 /* this loop ensures that the whole line is read, even if it's
551 * longer than the buffer. we need to do this because when --whole
552 * is in effect we don't know whether to display the line or not
553 * until we've seen how (ie. whether) it ends */
415 do 554 do
416 { 555 {
556 p = buff;
557 do
558 {
417 ch = fgetc (logfile->fp); 559 ch = fgetc (logfile->fp);
418 560
419 if (ch == '\n' || ch == EOF) 561 if (ch == '\n' || ch == EOF)
420 break; 562 break;
421 else if (ch == '\r') 563 else if (ch == '\r')
422 continue; /* skip */ 564 continue; /* skip */
423 else if (ch == '\t') 565 else if (ch == '\t')
424 { 566 {
425 do 567 do
426 { 568 {
427 *p++ = ' '; 569 *p++ = ' ';
428 ofs++; 570 ofs++;
429 } 571 }
430 while (ofs & 7); 572 while (ofs & 7);
431 }
432 else
433 {
434 *p++ = ch;
435 ofs++;
436 }
437 } 573 }
574 else
575 {
576 *p++ = ch;
577 ofs++;
578 }
579 }
438 while (p < buff + (sizeof buff) - 8 - 1); 580 while (p < buff + (sizeof buff) - 8 - 1);
439 581
440 if (p == buff && ch == EOF) 582 if (p == buff && ch == EOF)
441 return 0; 583 return 0;
442 584
443 *p = 0; 585 *p = 0;
444 586
445 p = concat_line (logfile->buf, buff); 587 p = concat_line (logfile->buf, buff);
446 free (logfile->buf); logfile->buf = p; 588 free (logfile->buf); logfile->buf = p;
589 }
590 while (ch != '\n' && ch != EOF);
447 591
448 logfile->lastpartial = logfile->partial; 592 logfile->lastpartial = logfile->partial;
593 /* there are 3 ways we could have exited the loop: reading '\n',
594 * reaching EOF, or filling the buffer; the 2nd and 3rd of these
595 * both result in a partial line */
449 logfile->partial = ch == EOF; 596 logfile->partial = ch != '\n';
450 597
451 if (logfile->partial && opt_whole) 598 if (logfile->partial && opt_whole)
452 return 0; 599 return 0;
453 600
454#if HAS_REGEX 601#if HAS_REGEX
… …
526 { /* file missing? */ 673 { /* file missing? */
527 sleep (1); 674 sleep (1);
528 if (e->fp) 675 if (e->fp)
529 fclose (e->fp); 676 fclose (e->fp);
530 if (openlog (e) == NULL) 677 if (openlog (e) == NULL)
531 break; 678 continue;
679 if (fstat (fileno (e->fp), &stats) < 0)
680 continue;
532 } 681 }
533 682
534 if (stats.st_ino != e->inode) 683 if (stats.st_ino != e->inode)
535 { /* file renamed? */ 684 { /* file renamed? */
536 if (e->fp) 685 if (e->fp)
537 fclose (e->fp); 686 fclose (e->fp);
538 if (openlog (e) == NULL) 687 if (openlog (e) == NULL)
539 break; 688 continue;
689 if (fstat (fileno (e->fp), &stats) < 0)
690 continue;
540 } 691 }
541 692
542 if (stats.st_size < e->last_size) 693 if (stats.st_size < e->last_size)
543 { /* file truncated? */ 694 { /* file truncated? */
544 fseek (e->fp, 0, SEEK_SET); 695 fseek (e->fp, 0, SEEK_SET);
… …
579 struct logfile_entry *current; 730 struct logfile_entry *current;
580 731
581 for (cur_line = idx; cur_line > 0; cur_line--) 732 for (cur_line = idx; cur_line > 0; cur_line--)
582 lines[cur_line] = lines[cur_line - 1]; 733 lines[cur_line] = lines[cur_line - 1];
583 734
584 lines[0].line = strdup ("~"); 735 lines[0].line = xstrdup ("~");
585 736
586 for (current = loglist; current; current = current->next) 737 for (current = loglist; current; current = current->next)
587 if (current->index >= 0 && current->index <= idx) 738 if (current->index >= 0 && current->index <= idx)
588 current->index++; 739 current->index++;
589} 740}
590 741
591/* 742/*
592 * takes a logical log file line and split it into multiple physical 743 * takes a logical log file line and splits it into multiple physical
593 * screen lines by splitting it whenever a part becomes too long. 744 * screen lines by splitting it whenever a part becomes too long.
594 * lal lines will be inserted at position "idx". 745 * lal lines will be inserted at position "idx".
595 */ 746 */
596static void 747static void
597split_line (int idx, const char *str, unsigned long color) 748split_line (int idx, const char *str, unsigned long color)
598{ 749{
599 int l = strlen (str); 750 int l = strlen (str);
751 int last_wrapped = 0;
600 const char *p = str; 752 const char *p = str;
753 static int continuation_width = -1;
754 static int continuation_length;
755
756 /* only calculate the continuation's width once */
757 if (continuation_width == -1)
758 {
759 continuation_length = strlen (continuation);
760 continuation_width = XmbTextEscapement (fontset, continuation, continuation_length);
761 }
601 762
602 do 763 do
603 { 764 {
604 const char *beg = p; 765 const char *beg = p;
766 int w = last_wrapped ? continuation_width : 0;
605 int w = 0; 767 int wrapped = 0;
768 const char *break_p = NULL;
606 769
607 while (*p) 770 while (*p)
608 { 771 {
772 int cw, len;
773
774 /* find the length in bytes of the next multibyte character */
609 int len = mblen (p, l); 775 len = mblen (p, l);
610 if (len <= 0) 776 if (len <= 0)
611 len = 1; /* ignore (don't skip) ilegal character sequences */ 777 len = 1; /* ignore (don't skip) illegal character sequences */
612 778
779 /* find the width in pixels of the next character */
613 int cw = XmbTextEscapement (fontset, p, len); 780 cw = XmbTextEscapement (fontset, p, len);
614 if (cw + w >= width) 781 if (cw + w > width - effect_x_space)
782 {
783 if (p == beg)
784 {
785 fprintf (stderr, "we can't even fit a single character onto the line\n");
786 if (len == 1) fprintf (stderr, "(the character we couldn't fit was '%c')\n", *p);
787 exit (1);
788 }
789
790 wrapped = 1;
615 break; 791 break;
792 }
793
794 if (opt_wordwrap && len == 1 && p[0] == ' ')
795 break_p = p;
616 796
617 w += cw; 797 w += cw;
618 p += len; 798 p += len;
619 l -= len; 799 l -= len;
620 } 800 }
621 801
802 /* if we're wrapping at spaces, and the line is long enough to
803 * wrap, and we've seen a space already, and the space wasn't
804 * the first character on the line, then wrap at the space */
805 if (opt_wordwrap && wrapped && break_p && break_p != beg)
806 {
807 l += p - break_p;
808 p = break_p;
809 }
810
622 { 811 {
812 int len = p - beg + (last_wrapped ? continuation_length : 0);
623 char *s = xmalloc (p - beg + 1); 813 char *s = xmalloc (len + 1);
624 memcpy (s, beg, p - beg); 814 if (last_wrapped)
815 {
816 memcpy (s, continuation, continuation_length);
817 memcpy (s + continuation_length, beg, p - beg);
818 }
819 else
820 memcpy (s, beg, len);
821
625 s[p - beg] = 0; 822 s[len] = 0;
626 insert_line (idx); 823 insert_line (idx);
627 lines[idx].line = s; 824 lines[idx].line = s;
628 lines[idx].len = p - beg; 825 lines[idx].len = len;
629 lines[idx].color = color; 826 lines[idx].color = color;
630 } 827 }
828
829 /* if we wrapped at a space, don't display the space */
830 if (opt_wordwrap && wrapped && break_p && break_p != beg)
831 {
832 l--;
833 p++;
834 }
835
836 last_wrapped = wrapped;
631 } 837 }
632 while (l); 838 while (l);
633} 839}
634 840
635/* 841/*
… …
651} 857}
652 858
653static void 859static void
654main_loop (void) 860main_loop (void)
655{ 861{
656 lines = xmalloc (sizeof (struct linematrix) * listlen); 862 int lin;
657 int lin, miny, maxy;
658 time_t lastreload; 863 time_t lastreload;
659 Region region = XCreateRegion (); 864 Region region = XCreateRegion ();
660 XEvent xev; 865 XEvent xev;
661 struct logfile_entry *lastprinted = NULL; 866 struct logfile_entry *lastprinted = NULL;
662 struct logfile_entry *current; 867 struct logfile_entry *current;
663 int need_update = 1; 868 int need_update = 1;
664 869
665 maxy = 0; 870 lines = xmalloc (sizeof (struct linematrix) * listlen);
666 miny = win_y + height; 871 display = xmalloc (sizeof (struct displaymatrix) * listlen);
872
667 lastreload = time (NULL); 873 lastreload = time (NULL);
668 874
669 /* Initialize linematrix */ 875 /* Initialize linematrix */
670 for (lin = 0; lin < listlen; lin++) 876 for (lin = 0; lin < listlen; lin++)
671 { 877 {
672 lines[lin].line = strdup ("~"); 878 lines[lin].line = xstrdup ("~");
673 lines[lin].len = 1; 879 lines[lin].len = 1;
880 display[lin].line = xstrdup("");
881 display[lin].len = 0;
882 display[lin].buffer_size = 0;
674 lines[lin].color = GetColor (def_color); 883 lines[lin].color = GetColor (def_color);
675 } 884 }
676 885
677 for (;;) 886 for (;;)
678 { 887 {
… …
703 912
704 /* print filename if any, and if last line was from 913 /* print filename if any, and if last line was from
705 * different file */ 914 * different file */
706 if (!opt_nofilename && lastprinted != current && current->desc[0]) 915 if (!opt_nofilename && lastprinted != current && current->desc[0])
707 { 916 {
708 char buf[1024]; /* HACK */
709 snprintf (buf, sizeof (buf), "[%s]", current->desc);
710 split_line (listlen - 1, buf, current->color); 917 split_line (listlen - 1, "[", current->color);
918 append_line (listlen - 1, current->desc);
919 append_line (listlen - 1, "]");
711 } 920 }
712 921
922 /* if we're dealing with partial lines, and the last
923 * time we showed the line it wasn't finished ... */
924 if (!opt_whole && current->lastpartial)
925 {
713 /* if this is the same file we showed last, and the 926 /* if this is the same file we showed last then
714 * last time we showed it, it wasn't finished, then
715 * append to the last line shown */ 927 append to the last line shown */
716 if (lastprinted == current && current->lastpartial) 928 if (lastprinted == current)
717 { 929 append_line (listlen - 1, current->buf);
930 else
931 {
932 /* but if a different file has been shown in the
933 * mean time, make a new line, starting with the
934 * continuation string */
935 split_line (listlen - 1, continuation, current->color);
718 append_line (listlen - 1, current->buf); 936 append_line (listlen - 1, current->buf);
719 free (current->buf), current->buf = 0; 937 }
720 continue; 938 }
721 }
722 else 939 else
723 { 940 /* otherwise just make a plain and simple new line */
724 split_line (listlen - 1, current->buf, current->color); 941 split_line (listlen - 1, current->buf, current->color);
942
725 free (current->buf), current->buf = 0; 943 free (current->buf), current->buf = 0;
726 }
727
728 current->index = listlen - 1; 944 current->index = listlen - 1;
729 lastprinted = current; 945 lastprinted = current;
730 } 946 }
731 } 947 }
732 948
733 if (need_update) 949 if (need_update)
734 { 950 {
735 redraw (); 951 redraw (0);
736 need_update = 0; 952 need_update = 0;
737 } 953 }
738 else 954 else
739 { 955 {
740 XFlush (disp); 956 XFlush (disp);
… …
768 984
769 r.x = xev.xexpose.x; 985 r.x = xev.xexpose.x;
770 r.y = xev.xexpose.y; 986 r.y = xev.xexpose.y;
771 r.width = xev.xexpose.width; 987 r.width = xev.xexpose.width;
772 r.height = xev.xexpose.height; 988 r.height = xev.xexpose.height;
989
773 XUnionRectWithRegion (&r, region, region); 990 XUnionRectWithRegion (&r, region, region);
774 if (miny > r.y)
775 miny = r.y;
776 if (maxy < r.y + r.height)
777 maxy = r.y + r.height;
778 } 991 }
779 break; 992 break;
780 default: 993 default:
781#ifdef DEBUGMODE 994#ifdef DEBUGMODE
782 fprintf (stderr, "PANIC! Unknown event %d\n", xev.type); 995 fprintf (stderr, "PANIC! Unknown event %d\n", xev.type);
… …
795 lastreload = time (NULL); 1008 lastreload = time (NULL);
796 } 1009 }
797 1010
798 if (!XEmptyRegion (region)) 1011 if (!XEmptyRegion (region))
799 { 1012 {
1013 XRectangle r;
1014
800 XSetRegion (disp, WinGC, region); 1015 XSetRegion (disp, WinGC, region);
1016 XClipBox (region, &r);
801 1017
802 refresh (miny, maxy); 1018 refresh (r.y, r.y + r.height, 0, 1);
1019
803 XDestroyRegion (region); 1020 XDestroyRegion (region);
804 region = XCreateRegion (); 1021 region = XCreateRegion ();
805 maxy = 0;
806 miny = 32768;
807 } 1022 }
808 } 1023 }
809} 1024}
810 1025
811 1026
… …
849 continuation = argv[++i]; 1064 continuation = argv[++i];
850 else if (!strcmp (arg, "-font") || !strcmp (arg, "-fn")) 1065 else if (!strcmp (arg, "-font") || !strcmp (arg, "-fn"))
851 fontname = argv[++i]; 1066 fontname = argv[++i];
852#if HAS_REGEX 1067#if HAS_REGEX
853 else if (!strcmp (arg, "-t")) 1068 else if (!strcmp (arg, "-t"))
1069 {
854 transform = argv[++i]; 1070 transform = argv[++i];
1071 transform_to = argv[++i];
1072 printf("transform: '%s' to '%s'\n", transform, transform_to);
1073 }
855#endif 1074#endif
856 else if (!strcmp (arg, "-fork") || !strcmp (arg, "-f")) 1075 else if (!strcmp (arg, "-fork") || !strcmp (arg, "-f"))
857 opt_daemonize = 1; 1076 opt_daemonize = 1;
858 else if (!strcmp (arg, "-reload")) 1077 else if (!strcmp (arg, "-reload"))
859 { 1078 {
860 reload = atoi (argv[++i]); 1079 reload = atoi (argv[++i]);
861 command = argv[++i]; 1080 command = argv[++i];
862 } 1081 }
863 else if (!strcmp (arg, "-shade")) 1082 else if (!strcmp (arg, "-shade"))
864 opt_shade = 1; 1083 opt_shade = 1;
1084 else if (!strcmp (arg, "-outline"))
1085 opt_outline = 1;
1086 else if (!strcmp (arg, "-noflicker"))
1087 opt_noflicker = 1;
865 else if (!strcmp (arg, "-frame")) 1088 else if (!strcmp (arg, "-frame"))
866 opt_frame = 1; 1089 opt_frame = 1;
867 else if (!strcmp (arg, "-no-filename")) 1090 else if (!strcmp (arg, "-no-filename"))
868 opt_nofilename = 1; 1091 opt_nofilename = 1;
869 else if (!strcmp (arg, "-reverse")) 1092 else if (!strcmp (arg, "-reverse"))
… …
872 opt_whole = 1; 1095 opt_whole = 1;
873 else if (!strcmp (arg, "-partial")) 1096 else if (!strcmp (arg, "-partial"))
874 opt_partial = 1; 1097 opt_partial = 1;
875 else if (!strcmp (arg, "-update")) 1098 else if (!strcmp (arg, "-update"))
876 opt_update = opt_partial = 1; 1099 opt_update = opt_partial = 1;
1100 else if (!strcmp (arg, "-wordwrap"))
1101 opt_wordwrap = 1;
877 else if (!strcmp (arg, "-color")) 1102 else if (!strcmp (arg, "-color"))
878 def_color = argv[++i]; 1103 def_color = argv[++i];
879 else if (!strcmp (arg, "-noinitial")) 1104 else if (!strcmp (arg, "-noinitial"))
880 opt_noinitial = 1; 1105 opt_noinitial = 1;
881 else if (!strcmp (arg, "-id")) 1106 else if (!strcmp (arg, "-id"))
… …
925 { 1150 {
926 if ((e->fp = fdopen (0, "r")) == NULL) 1151 if ((e->fp = fdopen (0, "r")) == NULL)
927 perror ("fdopen"), exit (1); 1152 perror ("fdopen"), exit (1);
928 if (fcntl (0, F_SETFL, O_NONBLOCK) < 0) 1153 if (fcntl (0, F_SETFL, O_NONBLOCK) < 0)
929 perror ("fcntl"), exit (1); 1154 perror ("fcntl"), exit (1);
1155
930 e->fname = NULL; 1156 e->fname = NULL;
931 e->inode = 0; 1157 e->inode = 0;
932 e->desc = xstrdup ("stdin"); 1158 e->desc = xstrdup ("stdin");
933 } 1159 }
934 else 1160 else
935 { 1161 {
936 int l;
937
938 e->fname = xstrdup (fname); 1162 e->fname = xstrdup (fname);
1163
939 if (openlog (e) == NULL) 1164 if (openlog (e) == NULL)
940 perror (fname), exit (1); 1165 perror (fname), exit (1);
941 1166
942 l = strlen (desc); 1167 e->desc = xstrdup (desc);
943 if (l > width - 2) /* must account for [ ] */
944 l = width - 2;
945 e->desc = xmalloc (l + 1);
946 memcpy (e->desc, desc, l);
947 *(e->desc + l) = '\0';
948 } 1168 }
949 1169
950 e->color = GetColor (fcolor); 1170 e->color = GetColor (fcolor);
951 e->partial = 0; 1171 e->partial = 0;
952 e->next = NULL; 1172 e->next = NULL;
953 1173
954 if (!loglist) 1174 if (!loglist)
955 loglist = e; 1175 loglist = e;
956 if (loglist_tail) 1176 if (loglist_tail)
957 loglist_tail->next = e; 1177 loglist_tail->next = e;
1178
958 loglist_tail = e; 1179 loglist_tail = e;
959 } 1180 }
960 } 1181 }
961 1182
962 if (!loglist) 1183 if (!loglist)
… …
964 fprintf (stderr, "You did not specify any files to tail\n" 1185 fprintf (stderr, "You did not specify any files to tail\n"
965 "use %s --help for help\n", argv[0]); 1186 "use %s --help for help\n", argv[0]);
966 exit (1); 1187 exit (1);
967 } 1188 }
968 1189
1190 if (opt_update && opt_whole)
1191 {
1192 fprintf (stderr, "Specify at most one of -update and -whole\n");
1193 exit (1);
1194 }
969 if (opt_partial && opt_whole) 1195 else if (opt_partial && opt_whole)
970 { 1196 {
971 fprintf (stderr, "Specify at most one of -partial and -whole\n"); 1197 fprintf (stderr, "Specify at most one of -partial and -whole\n");
1198 exit (1);
1199 }
1200
1201 /* HACK-7: do we want to allow both -shade and -outline? */
1202 if (opt_shade && opt_outline)
1203 {
1204 fprintf (stderr, "Specify at most one of -shade and -outline\n");
972 exit (1); 1205 exit (1);
973 } 1206 }
974 1207
975 if (opt_partial) 1208 if (opt_partial)
976 /* if we specifically requested to see partial lines then don't insist on whole lines */ 1209 /* if we specifically requested to see partial lines then don't insist on whole lines */
977 opt_whole = 0; 1210 opt_whole = 0;
978 else if (file_count > 1) 1211 else if (file_count > 1)
979 /* otherwise, if we've viewing multiple files, default to showing whole lines */ 1212 /* otherwise, if we're viewing multiple files, default to showing whole lines */
980 opt_whole = 1; 1213 opt_whole = 1;
981 1214
982#if HAS_REGEX 1215#if HAS_REGEX
983 if (transform) 1216 if (transform)
984 { 1217 {
985 int i; 1218 int i;
986 1219
1220 printf("compiling regexp '%s'\n", transform);
987 transformre = xmalloc (sizeof (transformre)); 1221 transformre = xmalloc (sizeof (regex_t));
988 i = regcomp (&transformre, transform, REG_EXTENDED); 1222 i = regcomp (transformre, transform, REG_EXTENDED);
989 if (i != 0) 1223 if (i != 0)
990 { 1224 {
991 char buf[512]; 1225 char buf[512];
992 1226
993 regerror (i, &transformre, buf, sizeof (buf)); 1227 regerror (i, transformre, buf, sizeof (buf));
994 fprintf (stderr, "Cannot compile regular expression: %s\n", buf); 1228 fprintf (stderr, "Cannot compile regular expression: %s\n", buf);
995 } 1229 }
1230 else
1231 {
1232 printf("compiled '%s' OK to %x\n", transform, (int)transformre);
1233 }
996 } 1234 }
997#endif 1235#endif
998 1236
999 InitWindow (); 1237 InitWindow ();
1000 1238
… …
1031{ 1269{
1032 void *p; 1270 void *p;
1033 1271
1034 while ((p = strdup (string)) == NULL) 1272 while ((p = strdup (string)) == NULL)
1035 { 1273 {
1036 fprintf (stderr, "Memory exausted."); 1274 fprintf (stderr, "Memory exhausted in xstrdup().\n");
1037 sleep (10); 1275 sleep (10);
1038 } 1276 }
1039 1277
1040 return p; 1278 return p;
1041} 1279}
… …
1045{ 1283{
1046 void *p; 1284 void *p;
1047 1285
1048 while ((p = malloc (size)) == NULL) 1286 while ((p = malloc (size)) == NULL)
1049 { 1287 {
1050 fprintf (stderr, "Memory exausted."); 1288 fprintf (stderr, "Memory exhausted in xmalloc().\n");
1289 sleep (10);
1290 }
1291
1292 return p;
1293}
1294
1295void *
1296xrealloc (void *ptr, size_t size)
1297{
1298 void *p;
1299
1300 while ((p = realloc (ptr, size)) == NULL)
1301 {
1302 fprintf (stderr, "Memory exhausted in xrealloc().\n");
1051 sleep (10); 1303 sleep (10);
1052 } 1304 }
1053 1305
1054 return p; 1306 return p;
1055} 1307}
… …
1068 " -reverse print new lines at the top\n" 1320 " -reverse print new lines at the top\n"
1069 " -whole wait for \\n before showing a line\n" 1321 " -whole wait for \\n before showing a line\n"
1070 " -partial show lines even if they don't end with a \\n\n" 1322 " -partial show lines even if they don't end with a \\n\n"
1071 " -update allow updates to old partial lines\n" 1323 " -update allow updates to old partial lines\n"
1072 " -cont string to prefix continued partial lines with\n" 1324 " -cont string to prefix continued partial lines with\n"
1325 " -wordwrap wrap long lines at spaces to avoid breaking words\n"
1073 " defaults to \"[+]\"\n" 1326 " defaults to \"[+]\"\n"
1074 " -shade add shading to font\n" 1327 " -shade add shading to font\n"
1075 " -noinitial don't display the last file lines on\n" 1328 " -noinitial don't display the last file lines on\n"
1076 " startup\n" 1329 " startup\n"
1077 " -i | -interval seconds interval between checks (fractional\n" 1330 " -i | -interval seconds interval between checks (fractional\n"
1078 " values o.k.). Default 3 seconds\n" 1331 " values o.k.). Default 2.4 seconds\n"
1079 " -V display version information and exit\n" 1332 " -V display version information and exit\n"
1080 "\n"); 1333 "\n");
1081 printf ("Example:\n%s -g 80x25+100+50 -font fixed /var/log/messages,green " 1334 printf ("Example:\n%s -g 800x250+100+50 -font fixed /var/log/messages,green "
1082 "/var/log/secure,red,'ALERT'\n", myname); 1335 "/var/log/secure,red,'ALERT'\n", myname);
1083 exit (0); 1336 exit (0);
1084} 1337}
1085 1338
1086void 1339void
… …
1091} 1344}
1092 1345
1093int 1346int
1094daemonize (void) 1347daemonize (void)
1095{ 1348{
1349 pid_t pid;
1350
1096 switch (fork ()) 1351 switch (pid = fork ())
1097 { 1352 {
1098 case -1: 1353 case -1:
1099 return -1; 1354 return -1;
1100 case 0: 1355 case 0:
1101 break; 1356 break;
1102 default: 1357 default:
1358 /*printf("%d\n", pid);*/
1103 _exit (0); 1359 exit (0);
1104 } 1360 }
1105 1361
1106 if (setsid () == -1) 1362 if (setsid () == -1)
1107 return -1; 1363 return -1;
1108 1364

Diff Legend

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