ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/root-tail/root-tail.c

Comparing root-tail/root-tail.c (file contents):
Revision 1.21 by pcg, Sat Mar 27 20:54:33 2004 UTC vs.
Revision 1.63 by chris_moore, Thu Apr 15 00:38:13 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	* Copyright 2000,2001,2002,2003,2004
		4	* Marc Lehmann <pcg@goof.com>,
		5	* Chris Moore <chris.moore@mail.com>,
		6	* and many others, see README
3	*	7	*
4	* Original version by Mike Baker, then maintained by pcg@goof.com.	8	* Original version by Mike Baker.
5	*	9	*
6	* This program is free software; you can redistribute it and/or modify	10	* 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	11	* 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	12	* the Free Software Foundation; either version 2 of the License, or
9	* (at your option) any later version.	13	* (at your option) any later version.
…		…
17	* along with this program; if not, write to the Free Software	21	* along with this program; if not, write to the Free Software
18	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.	22	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
19	*/	23	*/
20		24
21	#include "config.h"	25	#include "config.h"
		26	#include <assert.h>
22	#include <stdlib.h>	27	#include <stdlib.h>
23	#include <stdio.h>	28	#include <stdio.h>
24	#include <unistd.h>	29	#include <unistd.h>
25	#include <string.h>	30	#include <string.h>
26	#include <signal.h>	31	#include <signal.h>
…		…
31	#include <sys/stat.h>	36	#include <sys/stat.h>
32	#include <sys/types.h>	37	#include <sys/types.h>
33	#include <locale.h>	38	#include <locale.h>
34	#include <ctype.h>	39	#include <ctype.h>
35	#include <stdarg.h>	40	#include <stdarg.h>
		41	#include <X11/Xlib.h>
		42	#include <X11/Xatom.h>
		43	#include <X11/Xutil.h>
		44
36	#if HAS_REGEX	45	#if HAS_REGEX
37	#include <regex.h>	46	#include <regex.h>
38	#endif	47	#endif
39	#include <X11/Xlib.h>	48
40	#include <X11/Xatom.h>	49	#define SHADE_X 2
41	#include <X11/Xutil.h>	50	#define SHADE_Y 2
		51
		52	/* some italic fonts still go over the margin - this margin of error cleans up the mess */
		53	#define MARGIN_OF_ERROR 2
42		54
43	/* data structures */	55	/* data structures */
44	struct logfile_entry	56	struct logfile_entry
45	{	57	{
46	struct logfile_entry *next;	58	struct logfile_entry *next;
47		59
48	char *fname; /* name of file */	60	char *fname; /* name of file */
49	char *desc; /* alternative description */	61	char *desc; /* alternative description */
50	char *buf; /* text read but not yet displayed */	62	char *buf; /* text read but not yet displayed */
		63	const char *fontname;
		64	XFontSet fontset;
		65	int font_height;
		66	int font_ascent;
51	FILE *fp; /* FILE struct associated with file */	67	FILE *fp; /* FILE struct associated with file */
52	ino_t inode; /* inode of the file opened */	68	ino_t inode; /* inode of the file opened */
53	off_t last_size; /* file size at the last check */	69	off_t last_size; /* file size at the last check */
54	unsigned long color; /* color to be used for printing */	70	unsigned long color; /* color to be used for printing */
		71	const char *colorname; /* color name/string */
55	int partial; /* true if the last line isn't complete */	72	int partial; /* true if the last line isn't complete */
56	int lastpartial; /* true if the previous output wasn't complete */	73	int lastpartial; /* true if the previous output wasn't complete */
57	int index; /* index into linematrix of a partial line */	74	struct line_node *last; /* last line we output */
		75	int modified; /* true if line is modified & needs displaying */
58	};	76	};
59		77
		78	struct line_node
		79	{
		80	struct line_node *next;
		81	struct line_node *prev;
		82	struct logfile_entry *logfile;
		83
		84	char *line; /* the text of the line (so far) */
		85	int len; /* the length of the line (in bytes) so far */
		86	int wrapped_left; /* true if wrapped from the previous line */
		87	int wrapped_right; /* true if wrapped to the next line */
		88	struct breakinfo *breaks; /* array of indicies to spaces if wrapped_right */
		89	int num_words; /* the number of words in the line */
		90	int free_pixels; /* the number of free pixels to spread out */
		91	};
		92
		93	struct breakinfo
		94	{
		95	int index; /* index into string of start of substring */
		96	int width; /* width in pixels of start of substring */
		97	int len; /* length of substring */
		98	};
		99
60	struct linematrix	100	struct displaymatrix
61	{	101	{
62	char *line;	102	char *line;
63	int len;	103	int len;
		104	int offset;
		105	int buffer_size;
64	unsigned long color;	106	unsigned long color;
65	};	107	};
66		108
67	/* global variables */	109	/* global variables */
68	struct linematrix *lines;	110	struct line_node *linelist = NULL, *linelist_tail = NULL;
		111	struct displaymatrix *display;
		112	int continuation_width = -1;
		113	int continuation_color;
		114	int continuation_length;
		115
		116	/* HACK - ideally listlen will start at however many '~'s will fit on
		117	* the screen */
69	int width = STD_WIDTH, height = STD_HEIGHT, listlen;	118	int width = STD_WIDTH, height = STD_HEIGHT, listlen = 50;
70	int win_x = LOC_X, win_y = LOC_Y;	119	int win_x = LOC_X, win_y = LOC_Y;
71	int font_descent, font_height;	120	int effect_x_space, effect_y_space; /* how much space does shading / outlining take up */
		121	int effect_x_offset, effect_y_offset; /* and how does it offset the usable space */
72	int do_reopen;	122	int do_reopen;
73	struct timeval interval = { 2, 400000 };	123	struct timeval interval = { 2, 400000 };
74	XFontSet fontset;
75		124
76	/* command line options */	125	/* command line options */
77	int opt_noinitial, opt_shade, opt_frame, opt_reverse, opt_nofilename,	126	int opt_noinitial, opt_shade, opt_frame, opt_reverse, opt_nofilename,
78	opt_outline, opt_whole, opt_update, geom_mask, reload = 0;	127	opt_outline, opt_noflicker, opt_whole, opt_update, opt_wordwrap,
		128	opt_justify, geom_mask, opt_minspace, reload;
79	const char *command = NULL,	129	const char *command = NULL,
80	*fontname = USE_FONT, *dispname = NULL, *def_color = DEF_COLOR,	130	*fontname = USE_FONT, *dispname = NULL, *def_color = DEF_COLOR,
81	*continuation = "[+]";	131	*continuation = "|| ", *cont_color = DEF_CONT_COLOR;
82		132
83	struct logfile_entry *loglist = NULL, *loglist_tail = NULL;	133	struct logfile_entry *loglist = NULL, *loglist_tail = NULL;
84		134
85	Display *disp;	135	Display *disp;
86	Window root;	136	Window root;
…		…
92	regex_t from;	142	regex_t from;
93	const char *to;	143	const char *to;
94	struct re_list *next;	144	struct re_list *next;
95	};	145	};
96	struct re_list *re_head, *re_tail;	146	struct re_list *re_head, *re_tail;
		147	char *transform_to = NULL;
		148	regex_t *transformre;
97	#endif	149	#endif
98		150
99		151
100	/* prototypes */	152	/* prototypes */
101	void list_files (int);	153	void list_files (int);
102	void force_reopen (int);	154	void force_reopen (int);
103	void force_refresh (int);	155	void force_refresh (int);
104	void blank_window (int);	156	void blank_window (int);
		157	#ifdef USE_TOON_GET_ROOT_WINDOW
		158	Window ToonGetRootWindow(Display *, int, Window *);
		159	#endif /* USE_TOON_GET_ROOT_WINDOW */
105		160
106	void InitWindow (void);	161	void InitWindow (void);
107	unsigned long GetColor (const char *);	162	unsigned long GetColor (const char *);
108	void redraw (void);	163	void redraw (int);
109	void refresh (int, int);	164	void refresh (int, int, int, int);
110		165
111	void transform_line (char *s);	166	void transform_line (char *s);
112	int lineinput (struct logfile_entry *);	167	int lineinput (struct logfile_entry *);
113	void reopen (void);	168	void reopen (void);
114	void check_open_files (void);	169	void check_open_files (void);
…		…
118	void display_version (void);	173	void display_version (void);
119	void display_help (char *);	174	void display_help (char *);
120	void install_signal (int, void (*)(int));	175	void install_signal (int, void (*)(int));
121	void *xstrdup (const char *);	176	void *xstrdup (const char *);
122	void *xmalloc (size_t);	177	void *xmalloc (size_t);
		178	void *xrealloc (void *, size_t);
123	int daemonize (void);	179	int daemonize (void);
124		180
125	/* signal handlers */	181	/* signal handlers */
126	void	182	void
127	list_files (int dummy)	183	list_files (int dummy)
…		…
140	}	196	}
141		197
142	void	198	void
143	force_refresh (int dummy)	199	force_refresh (int dummy)
144	{	200	{
145	redraw ();	201	redraw (1);
146	}	202	}
147		203
148	void	204	void
149	blank_window (int dummy)	205	blank_window (int dummy)
150	{	206	{
151	XClearArea (disp, root, win_x - 2, win_y - 2, width + 5, height + 5, False);	207	XClearArea (disp, root, win_x, win_y, width + MARGIN_OF_ERROR, height, False);
152	XFlush (disp);	208	XFlush (disp);
153	exit (0);	209	exit (0);
154	}	210	}
155		211
156	/* X related functions */	212	/* X related functions */
…		…
169	fprintf (stderr, "can't allocate %s\n", ColorName);	225	fprintf (stderr, "can't allocate %s\n", ColorName);
170		226
171	return Color.pixel;	227	return Color.pixel;
172	}	228	}
173		229
		230	#ifndef USE_TOON_GET_ROOT_WINDOW
174	static Window	231	static void
175	root_window (Display * display, int screen_number)	232	find_root_window (Display *display, int screen_number)
176	{	233	{
		234	if (!root)
		235	{
177	Atom SWM_VROOT = XInternAtom (display, "__SWM_VROOT", False);	236	Atom SWM_VROOT = XInternAtom (display, "__SWM_VROOT", False);
		237	Atom NAUTILUS_DESKTOP_WINDOW_ID = XInternAtom (display, "NAUTILUS_DESKTOP_WINDOW_ID", False);
178	Window real_root_window = RootWindow (display, screen_number);	238	root = RootWindow (display, screen_number);
179		239
180	if (root) /* root window set via option */
181	return root;
182
183	if (SWM_VROOT != None)
184	{
185	Window unused, *windows;	240	Window unused, *windows = 0;
186	unsigned int count;	241	unsigned int count;
187		242
		243	Atom type;
		244	int format;
		245	unsigned long nitems, bytes_after_return;
		246	unsigned char *virtual_root_window;
		247
		248	if (XGetWindowProperty (display, root, NAUTILUS_DESKTOP_WINDOW_ID,
		249	0, 1, False, XA_WINDOW, &type, &format,
		250	&nitems, &bytes_after_return,
		251	&virtual_root_window) == Success
		252	&& type == XA_WINDOW)
		253	{
188	if (XQueryTree (display, real_root_window, &unused, &unused, &windows,	254	if (XQueryTree (display, *(Window *)virtual_root_window, &unused, &unused, &windows, &count))
189	&count))	255	root = windows[count - 1];
		256
		257	XFree (virtual_root_window);
		258	}
		259	else if (XQueryTree (display, root, &unused, &unused, &windows, &count))
190	{	260	{
191	int i;	261	int i;
192		262
193	for (i = 0; i < count; i++)	263	for (i = 0; i < count; i++)
194	{	264	{
195	Atom type;
196	int format;
197	unsigned long nitems, bytes_after_return;
198	unsigned char *virtual_root_window;
199
200	if (XGetWindowProperty (display, windows[i], SWM_VROOT,	265	if (XGetWindowProperty (display, windows[i], SWM_VROOT,
201	0, 1, False, XA_WINDOW, &type, &format,	266	0, 1, False, XA_WINDOW, &type, &format,
202	&nitems, &bytes_after_return,	267	&nitems, &bytes_after_return,
203	&virtual_root_window) == Success)	268	&virtual_root_window) == Success
		269	&& type == XA_WINDOW)
204	{	270	{
205	if (type != None)
206	{
207	if (type == XA_WINDOW)
208	{
209	XFree (windows);
210	return (Window) virtual_root_window;	271	root = *(Window *)virtual_root_window;
211	}	272	XFree (virtual_root_window);
212	else
213	fprintf (stderr,
214	"__SWM_VROOT property type mismatch");
215	}	273	break;
216	}	274	}
217	else	275	}
218	fprintf (stderr,
219	"failed to get __SWM_VROOT property on window 0x%lx",
220	windows[i]);
221	}
222		276
223	if (count)
224	XFree (windows);	277	XFree (windows);
225	}	278	}
226	else	279	else
227	fprintf (stderr, "Can't query tree on root window 0x%lx",	280	fprintf (stderr, "Can't query tree on root window 0x%lx", root);
228	real_root_window);
229	}	281	}
230	else
231	/* This shouldn't happen. The Xlib documentation is wrong BTW. */
232	fprintf (stderr, "Can't intern atom __SWM_VROOT");
233
234	return real_root_window;
235	}	282	}
		283	#endif /* USE_TOON_GET_ROOT_WINDOW */
236		284
237	void	285	void
238	InitWindow (void)	286	InitWindow (void)
239	{	287	{
240	XGCValues gcv;	288	XGCValues gcv;
241	unsigned long gcm;	289	unsigned long gcm;
242	int screen, ScreenWidth, ScreenHeight;	290	int screen, ScreenWidth, ScreenHeight;
		291	struct logfile_entry *e;
243		292
244	if (!(disp = XOpenDisplay (dispname)))	293	if (!(disp = XOpenDisplay (dispname)))
245	{	294	{
246	fprintf (stderr, "Can't open display %s.\n", dispname);	295	fprintf (stderr, "Can't open display %s.\n", dispname);
247	exit (1);	296	exit (1);
…		…
249		298
250	screen = DefaultScreen (disp);	299	screen = DefaultScreen (disp);
251	ScreenHeight = DisplayHeight (disp, screen);	300	ScreenHeight = DisplayHeight (disp, screen);
252	ScreenWidth = DisplayWidth (disp, screen);	301	ScreenWidth = DisplayWidth (disp, screen);
253		302
254	root = root_window (disp, screen);	303	find_root_window (disp, screen);
255		304
256	gcm = GCBackground;	305	gcm = GCBackground;
257	gcv.graphics_exposures = True;	306	gcv.graphics_exposures = True;
258	WinGC = XCreateGC (disp, root, gcm, &gcv);	307	WinGC = XCreateGC (disp, root, gcm, &gcv);
259	XMapWindow (disp, root);	308	XMapWindow (disp, root);
		309
260	XSetForeground (disp, WinGC, GetColor (DEF_COLOR));	310	XSetForeground (disp, WinGC, GetColor (DEF_COLOR));
261		311
		312	for (e = loglist; e; e = e->next)
262	{	313	{
263	char **missing_charset_list;	314	char **missing_charset_list;
264	int missing_charset_count;	315	int missing_charset_count;
265	char *def_string;	316	char *def_string;
266		317
267	fontset = XCreateFontSet (disp, fontname,	318	e->fontset = XCreateFontSet (disp, e->fontname,
268	&missing_charset_list, &missing_charset_count,	319	&missing_charset_list, &missing_charset_count,
269	&def_string);	320	&def_string);
270		321
271	if (missing_charset_count)	322	if (missing_charset_count)
		323	{
		324	fprintf (stderr,
		325	"Missing charsets in String to FontSet conversion (%s)\n",
		326	missing_charset_list[0]);
		327	XFreeStringList (missing_charset_list);
		328	}
		329
		330	if (!e->fontset)
		331	{
		332	fprintf (stderr, "unable to create fontset for font '%s', exiting.\n", e->fontname);
		333	exit (1);
		334	}
		335
272	{	336	{
273	fprintf (stderr,	337	XFontSetExtents *xfe = XExtentsOfFontSet (e->fontset);
274	"Missing charsets in String to FontSet conversion (%s)\n",	338
275	missing_charset_list[0]);	339	e->font_height = xfe->max_logical_extent.height;
276	XFreeStringList (missing_charset_list);	340	e->font_ascent = -xfe->max_logical_extent.y;
277	}	341	}
278	}
279		342
280	if (!fontset)	343	if (e->font_height > height - effect_y_space)
		344	{
		345	fprintf(stderr, "\n the display isn't tall enough to display a single line in font '%s'\n",
		346	e->fontname);
		347	fprintf(stderr, "\n the geometry in use is %d pixels tall\n", height);
		348	fprintf(stderr, "\n font '%s' is %d pixels tall\n", e->fontname, e->font_height);
		349	if (effect_y_space)
		350	fprintf(stderr, "\n the shade or outline options need an extra %d pixel%s of vertical space\n",
		351	effect_y_space, effect_y_space == 1 ? "" : "s");
		352	fprintf(stderr, "\n");
		353	exit(1);
		354	}
281	{	355	}
282	fprintf (stderr, "unable to create fontset, exiting.\n");
283	exit (1);
284	}
285
286	{
287	XFontSetExtents *xfe = XExtentsOfFontSet (fontset);
288
289	font_height = xfe->max_logical_extent.height;
290	font_descent = xfe->max_logical_extent.y;
291	}
292		356
293	if (geom_mask & XNegative)	357	if (geom_mask & XNegative)
294	win_x = win_x + ScreenWidth - width;	358	win_x = win_x + ScreenWidth - width;
295	if (geom_mask & YNegative)	359	if (geom_mask & YNegative)
296	win_y = win_y + ScreenHeight - height;	360	win_y = win_y + ScreenHeight - height;
297		361
298	listlen = height / font_height;
299
300	if (!listlen)
301	{	362	{
302	fprintf (stderr, "height too small for a single line, setting to %d\n",	363	struct logfile_entry *e;
303	font_height);	364
304	listlen = 1;	365	for (e = loglist; e; e = e->next)
		366	e->color = GetColor (e->colorname);
305	}	367	}
306
307	height = listlen * font_height;
308		368
309	XSelectInput (disp, root, ExposureMask | FocusChangeMask);	369	XSelectInput (disp, root, ExposureMask | FocusChangeMask);
310	}	370	}
311		371
312	/*	372	/*
313	* redraw does a complete redraw, rather than an update (i.e. the area	373	* if redraw () is passwd a non-zero argument, it does a complete
314	* gets cleared first)	374	* redraw, rather than an update. if the argument is zero (and
		375	* -noflicker is in effect) then only the lines which have changed
		376	* since the last draw are redrawn.
		377	*
315	* the rest is handled by regular refresh()'es	378	* the rest is handled by regular refresh ()'es
316	*/	379	*/
317	void	380	void
318	redraw (void)	381	redraw (int redraw_all)
319	{	382	{
320	XSetClipMask (disp, WinGC, None);	383	XSetClipMask (disp, WinGC, None);
321	XClearArea (disp, root, win_x - 2, win_y - 2, width + 5, height + 5, False);	384	refresh (0, 32768, 1, redraw_all);
322	refresh (0, 32768);	385	}
		386
		387	void draw_text (Display *disp, Window root, GC WinGC, int x, int y, struct line_node *line, int foreground)
		388	{
		389	if (line->wrapped_right && opt_justify && line->breaks)
		390	{
		391	int i;
		392	for (i = 0; i < line->num_words; i++)
		393	XmbDrawString (disp, root, line->logfile->fontset, WinGC,
		394	x + line->breaks[i].width + ((i * line->free_pixels) / (line->num_words - 1))
		395	+ continuation_width * line->wrapped_left, y,
		396	line->line + line->breaks[i].index,
		397	line->breaks[i].len);
		398
		399	if (line->wrapped_left)
		400	{
		401	if (foreground) XSetForeground (disp, WinGC, continuation_color);
		402	XmbDrawString (disp, root, line->logfile->fontset, WinGC, x, y, continuation, continuation_length);
		403	}
		404	}
		405	else
		406	{
		407	XmbDrawString (disp, root, line->logfile->fontset, WinGC, x + continuation_width * line->wrapped_left,
		408	y, line->line, line->len);
		409
		410	if (line->wrapped_left)
		411	{
		412	if (foreground) XSetForeground (disp, WinGC, continuation_color);
		413	XmbDrawString (disp, root, line->logfile->fontset, WinGC, x, y, continuation, continuation_length);
		414	}
		415	}
323	}	416	}
324		417
325	/* Just redraw everything without clearing (i.e. after an EXPOSE event) */	418	/* Just redraw everything without clearing (i.e. after an EXPOSE event) */
326	void	419	void
327	refresh (int miny, int maxy)	420	refresh (int miny, int maxy, int clear, int refresh_all)
328	{	421	{
329	int lin;	422	int lin = 0;
330	int offset = (listlen + 1) * font_height;	423	int space = height;
		424	int offset;
331	unsigned long black_color = GetColor ("black");	425	unsigned long black_color = GetColor ("black");
		426	struct line_node *line;
		427	int step_per_line;
		428	int foreground = 0;
332		429
333	miny -= win_y + font_height;	430	if (opt_reverse)
334	maxy -= win_y - font_height;	431	offset = effect_y_offset;
		432	else
		433	offset = height + effect_y_offset;
335		434
336	for (lin = listlen; lin--;)	435	miny -= win_y;
337	{	436	maxy -= win_y;
338	struct linematrix *line = lines + (opt_reverse ? listlen - lin - 1 : lin);
339		437
340	offset -= font_height;	438	if (clear && !opt_noflicker)
		439	XClearArea (disp, root, win_x, win_y, width + MARGIN_OF_ERROR, height, False);
341		440
342	if (offset < miny || offset > maxy)	441	for (line = linelist; line; line = line->next, lin++)
343	continue;	442	{
		443	struct displaymatrix *display_line;
344		444
345	if (opt_outline)	445	if (opt_noflicker && lin >= listlen)
		446	{
		447	int i = listlen;
		448	listlen *= 1.5;
		449	display = xrealloc(display, listlen * sizeof(struct displaymatrix));
		450	for (; i < listlen; i++)
		451	{
		452	display[i].line = xstrdup ("");
		453	display[i].len = 0;
		454	display[i].offset = 0;
		455	display[i].buffer_size = 0;
		456	}
346	{	457	}
		458
		459	display_line = display + lin;
		460
		461	step_per_line = line->logfile->font_height + effect_y_space;
		462	if (step_per_line > space)
		463	break;
		464
		465	if (!opt_reverse)
		466	offset -= step_per_line;
		467
		468	offset += line->logfile->font_ascent;
		469
		470	miny -= line->logfile->font_height;
		471	maxy += line->logfile->font_height;
		472
		473	if (offset >= miny && offset <= maxy)
		474	{
		475	/* if this line is a different than it was, then it
		476	* needs displaying */
		477	if (!opt_noflicker
		478	|| refresh_all
		479	|| display_line->len != line->len
		480	|| display_line->color != line->logfile->color
		481	|| display_line->offset != offset
		482	|| memcmp (display_line->line, line->line, line->len))
		483	{
		484	/* don't bother updating the record of what has been
		485	* displayed if -noflicker isn't in effect, since we redraw
		486	* the whole display every time anyway */
		487	if (opt_noflicker)
		488	{
		489	/* update the record of what has been displayed;
		490	* first make sure the buffer is big enough */
		491	if (display_line->buffer_size < line->len)
		492	{
		493	display_line->buffer_size = line->len;
		494	display_line->line = xrealloc (display_line->line, display_line->buffer_size);
		495	}
		496
		497	display_line->len = line->len;
		498	display_line->color = line->logfile->color;
		499	display_line->offset = offset;
		500	memcpy (display_line->line, line->line, line->len);
		501
		502	if (clear)
		503	{
		504	#ifdef DEBUG
		505	static int toggle;
		506	toggle = 1 - toggle;
		507	XSetForeground (disp, WinGC, toggle ? GetColor ("cyan") : GetColor ("yellow"));
		508	XFillRectangle (disp, root, WinGC, win_x, win_y + offset - line->logfile->font_ascent,
		509	width, step_per_line);
		510	#else /* DEBUG */
		511	XClearArea (disp, root, win_x, win_y + offset - line->logfile->font_ascent,
		512	width + MARGIN_OF_ERROR, step_per_line, False);
		513	#endif /* DEBUG */
		514	}
		515	}
		516
		517	if (opt_outline)
		518	{
		519	int x, y;
347	XSetForeground (disp, WinGC, black_color);	520	XSetForeground (disp, WinGC, black_color);
348	XmbDrawString (disp, root, fontset, WinGC, win_x - 1,	521
349	win_y + offset + 1, line->line, line->len);	522	for (x = -1; x <= 1; x += 2)
350	XmbDrawString (disp, root, fontset, WinGC, win_x + 1,	523	for (y = -1; y <= 1; y += 2)
351	win_y + offset + 1, line->line, line->len);	524	draw_text (disp, root, WinGC,
352	XmbDrawString (disp, root, fontset, WinGC, win_x - 1,	525	win_x + effect_x_offset + x,
353	win_y + offset - 1, line->line, line->len);	526	win_y + y + offset, line, foreground = 0);
354	XmbDrawString (disp, root, fontset, WinGC, win_x + 1,	527	}
355	win_y + offset - 1, line->line, line->len);
356	}
357	else if (opt_shade)	528	else if (opt_shade)
358	{	529	{
359	XSetForeground (disp, WinGC, black_color);	530	XSetForeground (disp, WinGC, black_color);
360	XmbDrawString (disp, root, fontset, WinGC, win_x + 2,	531	draw_text (disp, root, WinGC,
361	win_y + offset + 2, line->line, line->len);	532	win_x + effect_x_offset + SHADE_X,
362	}	533	win_y + offset + SHADE_Y, line, foreground = 0);
		534	}
363		535
364	XSetForeground (disp, WinGC, line->color);	536	XSetForeground (disp, WinGC, line->logfile->color);
365	XmbDrawString (disp, root, fontset, WinGC, win_x, win_y + offset,	537	draw_text (disp, root, WinGC,
366	line->line, line->len);	538	win_x + effect_x_offset,
		539	win_y + offset, line, foreground = 1);
		540	}
		541	}
		542
		543	if (opt_reverse)
		544	offset += step_per_line;
		545	offset -= line->logfile->font_ascent;
		546
		547	miny += line->logfile->font_height;
		548	maxy -= line->logfile->font_height;
		549
		550	space -= step_per_line;
		551	}
		552
		553	if (space > 0 && clear)
		554	{
		555	#ifdef DEBUG
		556	XSetForeground (disp, WinGC, GetColor ("orange"));
		557	XFillRectangle (disp, root, WinGC, win_x, win_y + offset - (opt_reverse ? 0 : space),
		558	width, space);
		559	#else /* DEBUG */
		560	XClearArea (disp, root, win_x, win_y + offset - (opt_reverse ? 0 : space),
		561	width + MARGIN_OF_ERROR, space, False);
		562	#endif
		563	}
		564
		565	/* at least one of the lines must fit in the allocated area. we've
		566	* already checked at initialisation time that all the fonts are small
		567	* enough to fit at least one line in the display area, but assert it
		568	* again here to be sure */
		569	assert(line != linelist);
		570
		571	/* any lines that didn't just get looked at are never going to be, so break the chain */
		572	if (line) line->prev->next = 0;
		573
		574	/* and throw them all away */
		575	while (line)
		576	{
		577	struct line_node *this = line;
		578	line = line->next;
		579	if (this->logfile && this->logfile->last == this)
		580	this->logfile->last = NULL;
		581	free (this->line);
		582	free (this->breaks);
		583	free (this);
367	}	584	}
368		585
369	if (opt_frame)	586	if (opt_frame)
370	{	587	{
371	XSetForeground (disp, WinGC, GetColor (def_color));	588	XSetForeground (disp, WinGC, GetColor (def_color));
		589	/* note that XDrawRectangle() draws a rectangle one pixel bigger
		590	* in both dimensions than you ask for, hence the subtractions.
		591	* XFillRectangle() doesn't suffer from this problem */
372	XDrawRectangle (disp, root, WinGC, win_x - 2, win_y - 2, width + 4, height + 4);	592	XDrawRectangle (disp, root, WinGC, win_x - 0, win_y - 0, width - 1, height - 1);
373	}	593	}
374	}	594	}
375		595
376	#if HAS_REGEX	596	#if HAS_REGEX
377	void	597	void
…		…
390	if (transformre)	610	if (transformre)
391	{	611	{
392	int i;	612	int i;
393	regmatch_t matched[16];	613	regmatch_t matched[16];
394		614
395	i = regexec (&transformre, string, 16, matched, 0);	615	i = regexec (transformre, s, 16, matched, 0);
396	if (i == 0)	616	if (i == 0)
397	{ /* matched */	617	{ /* matched */
		618	int match_start = matched[0].rm_so;
		619	int match_end = matched[0].rm_eo;
		620	int old_len = match_end - match_start;
		621	int new_len = strlen (transform_to);
		622	int old_whole_len = strlen (s);
		623
		624	printf ("regexp was matched by '%s' - replace with '%s'\n", s, transform_to);
		625	printf ("match is from %d to %d\n", match_start, match_end);
		626	if (new_len > old_len)
		627	s = xrealloc (s, old_whole_len + new_len - old_len);
		628
		629	if (new_len != old_len)
		630	{
		631	memcpy (s + match_end + new_len - old_len,
		632	s + match_end,
		633	old_whole_len - match_end);
		634	s[old_whole_len + new_len - old_len] = '\0';
398	}	635	}
		636
		637	memcpy (s + match_start,
		638	transform_to,
		639	new_len);
		640	printf ("transformed to '%s'\n", s);
		641	}
		642	else
		643	printf ("regexp was not matched by '%s'\n", s);
399	}	644	}
400	}	645	}
401	#endif	646	#endif
402		647
		648	/*
		649	* appends p2 to the end of p1, if p1 is not null
		650	* otherwise allocates a new string and copies p2 to it
		651	*/
403	char *	652	char *
404	concat_line (const char *p1, const char *p2)	653	concat_line (char *p1, const char *p2)
405	{	654	{
406	int l1 = p1 ? strlen (p1) : 0;	655	int l1 = p1 ? strlen (p1) : 0;
407	int l2 = strlen (p2);	656	int l2 = strlen (p2);
408	char *r = xmalloc (l1 + l2 + 1);	657	char *r;
409		658
410	memcpy (r, p1, l1);	659	assert (p2);
		660
		661	if (p1)
		662	r = xrealloc(p1, l1 + l2 + 1);
		663	else
		664	r = xmalloc (l2 + 1);
		665
411	memcpy (r + l1, p2, l2);	666	memcpy (r + l1, p2, l2);
412	r[l1 + l2] = 0;	667	r[l1 + l2] = 0;
413		668
414	return r;	669	return r;
415	}	670	}
416		671
417	/*	672	/*
418	* This routine should read a single line, no matter how long.	673	* This routine can read a line of any length if it is called enough times.
419	*/	674	*/
420	int	675	int
421	lineinput (struct logfile_entry *logfile)	676	lineinput (struct logfile_entry *logfile)
422	{	677	{
423	char buff[1024], *p = buff;	678	char buff[1024], *p;
424	int ch;	679	int ch;
		680	/* HACK-2: add on the length of any partial line which we will be appending to */
425	int ofs = logfile->buf ? strlen (logfile->buf) : 0;	681	int ofs = logfile->buf ? strlen (logfile->buf) : 0;
426		682
		683	/* this loop ensures that the whole line is read, even if it's
		684	* longer than the buffer. we need to do this because when --whole
		685	* is in effect we don't know whether to display the line or not
		686	* until we've seen how (ie. whether) it ends */
427	do	687	do
428	{	688	{
		689	p = buff;
		690	do
		691	{
429	ch = fgetc (logfile->fp);	692	ch = fgetc (logfile->fp);
430		693
431	if (ch == '\n' || ch == EOF)	694	if (ch == '\n' || ch == EOF)
432	break;	695	break;
433	else if (ch == '\r')	696	else if (ch == '\r')
434	continue; /* skip */	697	continue; /* skip */
435	else if (ch == '\t')	698	else if (ch == '\t')
436	{	699	{
437	do	700	do
438	{	701	{
439	*p++ = ' ';	702	*p++ = ' ';
		703	ofs++;
		704	}
		705	while (ofs & 7);
		706	}
		707	else
		708	{
		709	*p++ = ch;
440	ofs++;	710	ofs++;
441	}	711	}
442	while (ofs & 7);
443	}
444	else
445	{	712	}
446	*p++ = ch;
447	ofs++;
448	}
449	}
450	while (p < buff + (sizeof buff) - 8 - 1);	713	while (p < buff + (sizeof buff) - 8 - 1);
451		714
452	if (p == buff && ch == EOF)	715	if (p == buff && ch == EOF)
453	return 0;	716	return 0;
454		717
455	*p = 0;	718	*p = 0;
456		719
457	p = concat_line (logfile->buf, buff);	720	p = logfile->buf = concat_line (logfile->buf, buff);
458	free (logfile->buf); logfile->buf = p;	721	}
		722	while (ch != '\n' && ch != EOF);
459		723
460	logfile->lastpartial = logfile->partial;	724	logfile->lastpartial = logfile->partial;
		725	/* there are 3 ways we could have exited the loop: reading '\n',
		726	* reaching EOF, or filling the buffer; the 2nd and 3rd of these
		727	* both result in a partial line */
461	logfile->partial = ch == EOF;	728	logfile->partial = ch != '\n';
462		729
463	if (logfile->partial && opt_whole)	730	if (logfile->partial && opt_whole)
464	return 0;	731	return 0;
465		732
466	#if HAS_REGEX	733	#if HAS_REGEX
467	transform_line (logfile->buf);	734	transform_line (logfile->buf);
…		…
495	else	762	else
496	file->inode = stats.st_ino;	763	file->inode = stats.st_ino;
497		764
498	if (opt_noinitial)	765	if (opt_noinitial)
499	fseek (file->fp, 0, SEEK_END);	766	fseek (file->fp, 0, SEEK_END);
500	else if (stats.st_size > (listlen + 1) * width)	767	else /* if (stats.st_size > (listlen + 1) * width)
		768	* HACK - 'width' is in pixels - how are we to know how much text will fit?
501	fseek (file->fp, -((listlen + 2) * width), SEEK_END);	769	* fseek (file->fp, -((listlen + 2) * width/10), SEEK_END); */
		770	fseek (file->fp, -5000, SEEK_END);
502		771
503	file->last_size = stats.st_size;	772	file->last_size = stats.st_size;
504	return file->fp;	773	return file->fp;
505	}	774	}
506		775
…		…
538	{ /* file missing? */	807	{ /* file missing? */
539	sleep (1);	808	sleep (1);
540	if (e->fp)	809	if (e->fp)
541	fclose (e->fp);	810	fclose (e->fp);
542	if (openlog (e) == NULL)	811	if (openlog (e) == NULL)
543	break;	812	continue;
		813	if (fstat (fileno (e->fp), &stats) < 0)
		814	continue;
544	}	815	}
545		816
546	if (stats.st_ino != e->inode)	817	if (stats.st_ino != e->inode)
547	{ /* file renamed? */	818	{ /* file renamed? */
548	if (e->fp)	819	if (e->fp)
549	fclose (e->fp);	820	fclose (e->fp);
550	if (openlog (e) == NULL)	821	if (openlog (e) == NULL)
551	break;	822	continue;
		823	if (fstat (fileno (e->fp), &stats) < 0)
		824	continue;
552	}	825	}
553		826
554	if (stats.st_size < e->last_size)	827	if (stats.st_size < e->last_size)
555	{ /* file truncated? */	828	{ /* file truncated? */
556	fseek (e->fp, 0, SEEK_SET);	829	fseek (e->fp, 0, SEEK_SET);
…		…
558	}	831	}
559	}	832	}
560	}	833	}
561		834
562	/*	835	/*
563	* insert a single physical line (that must be short enough to fit)	836	* insert a single node in the list of screen lines and return a
564	* at position "idx" by pushing up lines above it. the caller	837	* pointer to the new node.
565	* MUST then fill in lines[idx] with valid data.	838	* the caller MUST then fill in ret->line and ret->len with valid
		839	* data.
		840	*/
		841	static struct line_node *
		842	new_line_node (struct logfile_entry *log)
		843	{
		844	struct line_node *new = xmalloc (sizeof (struct line_node));
		845
		846	new->logfile = log;
		847	new->wrapped_left = 0;
		848	new->wrapped_right = 0;
		849	new->breaks = 0;
		850
		851	assert(log);
		852
		853	if (!log || !log->last)
		854	{
		855	new->next = linelist;
		856	new->next->prev = new;
		857
		858	new->prev = NULL;
		859	linelist = new;
		860	}
		861	else
		862	{
		863	/* 2 pointers from the new node */
		864	new->next = log->last;
		865	new->prev = log->last->prev;
		866
		867	/* 2 pointers back to the new node */
		868	if (new->next) new->next->prev = new;
		869	if (new->prev) new->prev->next = new;
		870
		871	/* if this is a new first entry in the list then update
		872	* 'linelist' */
		873	if (log->last == linelist)
		874	linelist = new;
		875	}
		876
		877	/* update the logfile record */
		878	if (log)
		879	log->last = new;
		880
		881	return new;
		882	}
		883
		884	/*
		885	* this is called after either adding a new line or appending to an
		886	* old one. in both cases it's possible that the line no longer fits,
		887	* and needs wrapping. this function checks the last line associated
		888	* with the supplied logfile.
566	*/	889	*/
567	static void	890	static void
568	insert_line (int idx)	891	possibly_split_long_line (struct logfile_entry *log)
569	{	892	{
570	int cur_line;	893	char *str = log->last->line;
571	struct logfile_entry *current;
572
573	free (lines[0].line);
574
575	for (cur_line = 0; cur_line < idx; cur_line++)
576	lines[cur_line] = lines[cur_line + 1];
577
578	for (current = loglist; current; current = current->next)
579	if (current->index <= idx)
580	current->index--;
581	}
582
583	/*
584	* remove a single physical line at position "idx" by moving the lines above it
585	* down and inserting a "~" line at the top.
586	*/
587	static void
588	delete_line (int idx)
589	{
590	int cur_line;
591	struct logfile_entry *current;
592
593	for (cur_line = idx; cur_line > 0; cur_line--)
594	lines[cur_line] = lines[cur_line - 1];
595
596	lines[0].line = strdup ("~");
597
598	for (current = loglist; current; current = current->next)
599	if (current->index >= 0 && current->index <= idx)
600	current->index++;
601	}
602
603	/*
604	* takes a logical log file line and split it into multiple physical
605	* screen lines by splitting it whenever a part becomes too long.
606	* lal lines will be inserted at position "idx".
607	*/
608	static void
609	split_line (int idx, const char *str, unsigned long color)
610	{
611	int l = strlen (str);	894	int l = strlen (str);
612	const char *p = str;	895	char *p = str;
		896	struct line_node *line;
		897	int spaces;
		898	static struct breakinfo *breaks;
		899	static int break_buffer_size;
		900
		901	/* only calculate the continuation's width once */
		902	if (continuation_width == -1)
		903	{
		904	continuation_length = strlen (continuation);
		905	continuation_width = XmbTextEscapement (log->fontset, continuation, continuation_length);
		906	continuation_color = GetColor (cont_color);
		907
		908	/* make an array to store information about the location of
		909	* spaces in the line */
		910	if (opt_justify)
		911	{
		912	break_buffer_size = 32;
		913	breaks = xmalloc (break_buffer_size * sizeof (struct breakinfo));
		914	}
		915	}
613		916
614	do	917	do
615	{	918	{
616	const char *beg = p;	919	const char *beg = p;
		920	int start_w = log->last->wrapped_left ? continuation_width : 0;
		921	int w = start_w;
617	int w = 0;	922	int wrapped = 0;
		923	char *break_p = NULL;
		924	int width_at_break_p = 0;
		925	int prefix_len;
		926
		927	spaces = 0;
		928
		929	if (opt_justify)
		930	breaks[spaces].index = breaks[spaces].width = 0;
618		931
619	while (*p)	932	while (*p)
620	{	933	{
		934	int cw, len;
		935
		936	/* find the length in bytes of the next multibyte character */
621	int len = mblen (p, l);	937	len = mblen (p, l);
622	if (len <= 0)	938	if (len <= 0)
623	len = 1; /* ignore (don't skip) ilegal character sequences */	939	len = 1; /* ignore (don't skip) illegal character sequences */
624		940
		941	/* find the width in pixels of the next character */
625	int cw = XmbTextEscapement (fontset, p, len);	942	cw = XmbTextEscapement (log->fontset, p, len);
		943	if (opt_wordwrap && len == 1 && p[0] == ' ' && p != break_p + 1)
		944	{
		945	break_p = p;
		946	width_at_break_p = w;
		947	spaces++;
		948
		949	if (opt_justify)
		950	{
		951	/* increase the size of the 'breaks' array when
		952	* necessary */
		953	if (spaces >= break_buffer_size)
		954	{
		955	break_buffer_size *= 1.5;
		956	breaks = xrealloc (breaks, break_buffer_size * sizeof (struct breakinfo));
		957	}
		958
		959	/* store information about (a) the location of each
		960	* space */
		961	breaks[spaces].index = p + 1 - beg;
		962	/* (b) the width (in pixels) of the string up to
		963	* this space */
		964	breaks[spaces].width = cw + w - start_w;
		965	/* (c) the length of each 'word' */
		966	breaks[spaces-1].len = breaks[spaces].index - breaks[spaces-1].index;
		967	}
		968	}
		969
626	if (cw + w >= width)	970	if (cw + w > width - effect_x_space)
		971	{
		972	if (p == beg)
		973	{
		974	fprintf (stderr, "we can't even fit a single character onto the line\n");
		975	if (len == 1) fprintf (stderr, "(the character we couldn't fit was '%c')\n", *p);
		976	exit (1);
		977	}
		978
		979	wrapped = 1;
627	break;	980	break;
		981	}
628		982
629	w += cw;	983	w += cw;
630	p += len;	984	p += len;
631	l -= len;	985	l -= len;
632	}	986	}
633		987
		988	/* if we're wrapping at spaces, and the line is long enough to
		989	* wrap, and we've seen a space already, and the space wasn't
		990	* the first character on the line, then wrap at the space */
		991	if (!wrapped)
		992	break;
		993
		994	/* choose where to break the line */
		995	if (opt_wordwrap && break_p && break_p != beg)
634	{	996	{
635	char *s = xmalloc (p - beg + 1);	997	prefix_len = break_p - beg;
636	memcpy (s, beg, p - beg);	998	p = break_p;
637	s[p - beg] = 0;	999	w = width_at_break_p;
638	insert_line (idx);	1000
639	lines[idx].line = s;	1001	/* if breaking at a space, skip all adjacent spaces */
640	lines[idx].len = p - beg;	1002	while (*p == ' ')
641	lines[idx].color = color;	1003	{
		1004	int len = mblen (p, l);
		1005	if (len != 1) break;
		1006	p++;
		1007	}
		1008
		1009	if (opt_justify)
		1010	{
		1011	spaces--;
		1012	breaks[spaces].len--;
		1013	}
642	}	1014	}
		1015	else
		1016	prefix_len = p - beg;
		1017
		1018	/* make a copy of the tail end of the string */
		1019	p = xstrdup (p);
		1020
		1021	/* and reduce the size of the head of the string */
		1022	log->last->line = xrealloc (log->last->line, prefix_len + 1);
		1023	log->last->len = prefix_len;
		1024	log->last->line[prefix_len] = '\0';
		1025
		1026	/* note that the head was wrapped on it's right */
		1027	log->last->wrapped_right = 1;
		1028
		1029	/* 'spaces' includes any space we broke on; we can only justify
		1030	* if there's at least one other space */
		1031	if (opt_justify && spaces &&
		1032	width - effect_x_space - width_at_break_p < spaces * log->font_height)
		1033	{
		1034	int i;
		1035	log->last->free_pixels = width - effect_x_space - w;
		1036	log->last->num_words = spaces + 1;
		1037	log->last->breaks = malloc (log->last->num_words * sizeof (struct breakinfo));
		1038	for (i = 0; i < log->last->num_words; i++)
		1039	log->last->breaks[i] = breaks[i];
		1040	}
		1041
		1042	line = new_line_node (log);
		1043	line->line = p;
		1044	l = line->len = strlen (p);
		1045
		1046	/* note that the tail end of the string is wrapped at its left */
		1047	line->wrapped_left = 1;
643	}	1048	}
644	while (l);	1049	while (l);
		1050	}
		1051
		1052	static void
		1053	insert_new_line (char *str, struct logfile_entry *log)
		1054	{
		1055	struct line_node *new;
		1056	new = new_line_node (log);
		1057	new->line = str;
		1058	new->len = strlen (str);
		1059
		1060	possibly_split_long_line (log);
645	}	1061	}
646		1062
647	/*	1063	/*
648	* append something to an existing physical line. this is done	1064	* append something to an existing physical line. this is done
649	* by deleting the file on-screen, concatenating the new data to it	1065	* by deleting the file on-screen, concatenating the new data to it
650	* and splitting it again.	1066	* and splitting it again.
651	*/	1067	*/
652	static void	1068	static void
653	append_line (int idx, const char *str)	1069	append_to_existing_line (char *str, struct logfile_entry *log)
654	{	1070	{
655	unsigned long color = lines[idx].color;	1071	char *old, *new;
656	char *old = lines[idx].line;	1072
		1073	assert(log);
		1074	assert(log->last);
		1075
		1076	old = log->last->line;
		1077	assert(old);
		1078
657	char *new = concat_line (old, str);	1079	new = concat_line (old, str);
658
659	free (old);	1080	free (str);
660		1081	log->last->line = new;
661	delete_line (idx);	1082	log->last->len = strlen (new);
662	split_line (idx, new, color);	1083	possibly_split_long_line (log);
663	}	1084	}
664		1085
665	static void	1086	static void
666	main_loop (void)	1087	main_loop (void)
667	{	1088	{
668	lines = xmalloc (sizeof (struct linematrix) * listlen);
669	int lin;	1089	int lin;
670	time_t lastreload;	1090	time_t lastreload;
671	Region region = XCreateRegion ();	1091	Region region = XCreateRegion ();
672	XEvent xev;	1092	XEvent xev;
673	struct logfile_entry *lastprinted = NULL;	1093	struct logfile_entry *lastprinted = NULL;
674	struct logfile_entry *current;	1094	struct logfile_entry *current;
675	int need_update = 1;	1095	int need_update = 1;
676		1096
		1097	display = xmalloc (sizeof (struct displaymatrix) * listlen);
		1098
677	lastreload = time (NULL);	1099	lastreload = time (NULL);
678		1100
679	/* Initialize linematrix */	1101	/* Initialize line_node */
680	for (lin = 0; lin < listlen; lin++)	1102	for (lin = 0; lin < listlen; lin++)
681	{	1103	{
		1104	struct line_node *e = xmalloc (sizeof (struct line_node));
		1105	e->line = xstrdup ("~");
		1106	e->len = 1;
		1107	e->logfile = loglist; /* this is only needed to get a color for the '~' */
		1108	e->wrapped_left = 0;
		1109	e->wrapped_right = 0;
		1110	e->breaks = 0;
		1111	e->next = NULL;
		1112	e->prev = linelist_tail;
		1113
		1114	if (!linelist)
		1115	linelist = e;
		1116	if (linelist_tail)
		1117	linelist_tail->next = e;
		1118	linelist_tail = e;
		1119
682	lines[lin].line = strdup ("~");	1120	display[lin].line = xstrdup ("");
683	lines[lin].len = 1;	1121	display[lin].len = 0;
684	lines[lin].color = GetColor (def_color);	1122	display[lin].offset = 0;
		1123	display[lin].buffer_size = 0;
685	}	1124	}
686		1125
687	for (;;)	1126	for (;;)
688	{	1127	{
689	/* read logs */	1128	/* read logs */
…		…
700	/* if we're trying to update old partial lines in	1139	/* if we're trying to update old partial lines in
701	* place, and the last time this file was updated the	1140	* place, and the last time this file was updated the
702	* output was partial, and that partial line is not	1141	* output was partial, and that partial line is not
703	* too close to the top of the screen, then update	1142	* too close to the top of the screen, then update
704	* that partial line */	1143	* that partial line */
705	if (opt_update && current->lastpartial && current->index >= 0)	1144	if (opt_update && current->lastpartial && current->last)
706	{	1145	{
707	int idx = current->index;
708	append_line (idx, current->buf);	1146	append_to_existing_line (current->buf, current);
709	current->index = idx;	1147	current->buf = 0;
710	free (current->buf), current->buf = 0;
711	continue;	1148	continue;
712	}	1149	}
713		1150
		1151	/* if all we just read was a newline ending a line that we've already displayed, skip it */
		1152	if (current->buf[0] == '\0' && current->lastpartial)
		1153	{
		1154	free(current->buf);
		1155	current->buf = 0;
		1156	continue;
		1157	}
		1158
714	/* print filename if any, and if last line was from	1159	/* print filename if any, and if last line was from
715	* different file */	1160	* different file */
716	if (!opt_nofilename && lastprinted != current && current->desc[0])	1161	if (lastprinted != current)
		1162	{
		1163	current->last = 0;
		1164	if (!opt_nofilename && current->desc[0])
		1165	{
		1166	insert_new_line (xstrdup ("["), current);
		1167	append_to_existing_line (xstrdup (current->desc), current);
		1168	append_to_existing_line (xstrdup ("]"), current);
		1169	}
		1170	}
		1171
		1172	/* if we're dealing with partial lines, and the last
		1173	* time we showed the line it wasn't finished ... */
		1174	if (!opt_whole && current->lastpartial)
717	{	1175	{
718	char buf[1024]; /* HACK */
719	snprintf (buf, sizeof (buf), "[%s]", current->desc);
720	split_line (listlen - 1, buf, current->color);
721	}
722
723	/* if this is the same file we showed last, and the	1176	/* if this is the same file we showed last then
724	* last time we showed it, it wasn't finished, then
725	* append to the last line shown */	1177	append to the last line shown */
726	if (lastprinted == current && current->lastpartial)	1178	if (lastprinted == current)
		1179	append_to_existing_line (current->buf, current);
		1180	else
727	{	1181	{
728	append_line (listlen - 1, current->buf);	1182	/* but if a different file has been shown in the
		1183	* mean time, make a new line, starting with the
		1184	* continuation string */
729	free (current->buf), current->buf = 0;	1185	insert_new_line (current->buf, current);
		1186	current->last->wrapped_left = 1;
730	continue;	1187	}
731	}	1188	}
732	else	1189	else
733	{	1190	/* otherwise just make a plain and simple new line */
734	split_line (listlen - 1, current->buf, current->color);
735	free (current->buf), current->buf = 0;	1191	insert_new_line (current->buf, current);
736	}
737		1192
738	current->index = listlen - 1;	1193	current->buf = 0;
739	lastprinted = current;	1194	lastprinted = current;
740	}	1195	}
741	}	1196	}
742		1197
743	if (need_update)	1198	if (need_update)
744	{	1199	{
745	redraw ();	1200	redraw (0);
746	need_update = 0;	1201	need_update = 0;
747	}	1202	}
748	else	1203	else
749	{	1204	{
750	XFlush (disp);	1205	XFlush (disp);
…		…
807	XRectangle r;	1262	XRectangle r;
808		1263
809	XSetRegion (disp, WinGC, region);	1264	XSetRegion (disp, WinGC, region);
810	XClipBox (region, &r);	1265	XClipBox (region, &r);
811		1266
812	refresh (r.y, r.y + r.height);	1267	refresh (r.y, r.y + r.height, 0, 1);
813		1268
814	XDestroyRegion (region);	1269	XDestroyRegion (region);
815	region = XCreateRegion ();	1270	region = XCreateRegion ();
816	}	1271	}
817	}	1272	}
…		…
827	#if HAS_REGEX	1282	#if HAS_REGEX
828	char *transform = NULL;	1283	char *transform = NULL;
829	#endif	1284	#endif
830		1285
831	setlocale (LC_CTYPE, ""); /* try to initialize the locale. */	1286	setlocale (LC_CTYPE, ""); /* try to initialize the locale. */
832
833	/* window needs to be initialized before colorlookups can be done */
834	/* just a dummy to get the color lookups right */
835	geom_mask = NoValue;
836	InitWindow ();
837		1287
838	for (i = 1; i < argc; i++)	1288	for (i = 1; i < argc; i++)
839	{	1289	{
840	const char *arg = argv[i];	1290	const char *arg = argv[i];
841		1291
…		…
854	XParseGeometry (argv[++i], &win_x, &win_y, &width, &height);	1304	XParseGeometry (argv[++i], &win_x, &win_y, &width, &height);
855	else if (!strcmp (arg, "-display"))	1305	else if (!strcmp (arg, "-display"))
856	dispname = argv[++i];	1306	dispname = argv[++i];
857	else if (!strcmp (arg, "-cont"))	1307	else if (!strcmp (arg, "-cont"))
858	continuation = argv[++i];	1308	continuation = argv[++i];
		1309	else if (!strcmp (arg, "-cont-color"))
		1310	cont_color = argv[++i];
859	else if (!strcmp (arg, "-font") || !strcmp (arg, "-fn"))	1311	else if (!strcmp (arg, "-font") || !strcmp (arg, "-fn"))
860	fontname = argv[++i];	1312	fontname = argv[++i];
861	#if HAS_REGEX	1313	#if HAS_REGEX
862	else if (!strcmp (arg, "-t"))	1314	else if (!strcmp (arg, "-t"))
		1315	{
863	transform = argv[++i];	1316	transform = argv[++i];
		1317	transform_to = argv[++i];
		1318	printf ("transform: '%s' to '%s'\n", transform, transform_to);
		1319	}
864	#endif	1320	#endif
865	else if (!strcmp (arg, "-fork") || !strcmp (arg, "-f"))	1321	else if (!strcmp (arg, "-fork") || !strcmp (arg, "-f"))
866	opt_daemonize = 1;	1322	opt_daemonize = 1;
867	else if (!strcmp (arg, "-reload"))	1323	else if (!strcmp (arg, "-reload"))
868	{	1324	{
…		…
871	}	1327	}
872	else if (!strcmp (arg, "-shade"))	1328	else if (!strcmp (arg, "-shade"))
873	opt_shade = 1;	1329	opt_shade = 1;
874	else if (!strcmp (arg, "-outline"))	1330	else if (!strcmp (arg, "-outline"))
875	opt_outline = 1;	1331	opt_outline = 1;
		1332	else if (!strcmp (arg, "-minspace"))
		1333	opt_minspace = 1;
		1334	else if (!strcmp (arg, "-noflicker"))
		1335	opt_noflicker = 1;
876	else if (!strcmp (arg, "-frame"))	1336	else if (!strcmp (arg, "-frame"))
877	opt_frame = 1;	1337	opt_frame = 1;
878	else if (!strcmp (arg, "-no-filename"))	1338	else if (!strcmp (arg, "-no-filename"))
879	opt_nofilename = 1;	1339	opt_nofilename = 1;
880	else if (!strcmp (arg, "-reverse"))	1340	else if (!strcmp (arg, "-reverse"))
…		…
883	opt_whole = 1;	1343	opt_whole = 1;
884	else if (!strcmp (arg, "-partial"))	1344	else if (!strcmp (arg, "-partial"))
885	opt_partial = 1;	1345	opt_partial = 1;
886	else if (!strcmp (arg, "-update"))	1346	else if (!strcmp (arg, "-update"))
887	opt_update = opt_partial = 1;	1347	opt_update = opt_partial = 1;
		1348	else if (!strcmp (arg, "-wordwrap"))
		1349	opt_wordwrap = 1;
		1350	else if (!strcmp (arg, "-justify"))
		1351	opt_justify = 1;
888	else if (!strcmp (arg, "-color"))	1352	else if (!strcmp (arg, "-color"))
889	def_color = argv[++i];	1353	def_color = argv[++i];
890	else if (!strcmp (arg, "-noinitial"))	1354	else if (!strcmp (arg, "-noinitial"))
891	opt_noinitial = 1;	1355	opt_noinitial = 1;
892	else if (!strcmp (arg, "-id"))	1356	else if (!strcmp (arg, "-id"))
893	root = atoi (argv[++i]);	1357	{
		1358	unsigned long id;
		1359
		1360	if (sscanf (argv[++i], "%li", &id) == 1 && id)
		1361	root = id;
		1362	}
894	else if (!strcmp (arg, "-interval") || !strcmp (arg, "-i"))	1363	else if (!strcmp (arg, "-interval") || !strcmp (arg, "-i"))
895	{	1364	{
896	double iv = atof (argv[++i]);	1365	double iv = atof (argv[++i]);
897		1366
898	interval.tv_sec = (int) iv;	1367	interval.tv_sec = (int) iv;
…		…
928	}	1397	}
929		1398
930	e = xmalloc (sizeof (struct logfile_entry));	1399	e = xmalloc (sizeof (struct logfile_entry));
931	e->partial = 0;	1400	e->partial = 0;
932	e->buf = 0;	1401	e->buf = 0;
933	e->index = -1;
934		1402
935	if (arg[0] == '-' && arg[1] == '\0')	1403	if (arg[0] == '-' && arg[1] == '\0')
936	{	1404	{
937	if ((e->fp = fdopen (0, "r")) == NULL)	1405	if ((e->fp = fdopen (0, "r")) == NULL)
938	perror ("fdopen"), exit (1);	1406	perror ("fdopen"), exit (1);
939	if (fcntl (0, F_SETFL, O_NONBLOCK) < 0)	1407	if (fcntl (0, F_SETFL, O_NONBLOCK) < 0)
940	perror ("fcntl"), exit (1);	1408	perror ("fcntl"), exit (1);
		1409
941	e->fname = NULL;	1410	e->fname = NULL;
942	e->inode = 0;	1411	e->inode = 0;
		1412	if (desc == arg)
943	e->desc = xstrdup ("stdin");	1413	e->desc = xstrdup ("stdin");
		1414	else
		1415	e->desc = xstrdup (desc);
944	}	1416	}
945	else	1417	else
946	{	1418	{
947	int l;
948
949	e->fname = xstrdup (fname);	1419	e->fname = xstrdup (fname);
		1420
950	if (openlog (e) == NULL)	1421	if (openlog (e) == NULL)
951	perror (fname), exit (1);	1422	perror (fname), exit (1);
952		1423
953	l = strlen (desc);	1424	e->desc = xstrdup (desc);
954	if (l > width - 2) /* must account for [ ] */
955	l = width - 2;
956	e->desc = xmalloc (l + 1);
957	memcpy (e->desc, desc, l);
958	*(e->desc + l) = '\0';
959	}	1425	}
960		1426
961	e->color = GetColor (fcolor);	1427	e->colorname = fcolor;
962	e->partial = 0;	1428	e->partial = 0;
		1429	e->fontname = fontname;
		1430	e->last = NULL;
963	e->next = NULL;	1431	e->next = NULL;
964		1432
965	if (!loglist)	1433	if (!loglist)
966	loglist = e;	1434	loglist = e;
967	if (loglist_tail)	1435	if (loglist_tail)
968	loglist_tail->next = e;	1436	loglist_tail->next = e;
		1437
969	loglist_tail = e;	1438	loglist_tail = e;
970	}	1439	}
971	}	1440	}
972		1441
973	if (!loglist)	1442	if (!loglist)
…		…
975	fprintf (stderr, "You did not specify any files to tail\n"	1444	fprintf (stderr, "You did not specify any files to tail\n"
976	"use %s --help for help\n", argv[0]);	1445	"use %s --help for help\n", argv[0]);
977	exit (1);	1446	exit (1);
978	}	1447	}
979		1448
		1449	if (opt_update && opt_whole)
		1450	{
		1451	fprintf (stderr, "Specify at most one of -update and -whole\n");
		1452	exit (1);
		1453	}
980	if (opt_partial && opt_whole)	1454	else if (opt_partial && opt_whole)
981	{	1455	{
982	fprintf (stderr, "Specify at most one of -partial and -whole\n");	1456	fprintf (stderr, "Specify at most one of -partial and -whole\n");
		1457	exit (1);
		1458	}
		1459
		1460	/* it doesn't make sense to justify if word wrap isn't on */
		1461	if (opt_justify)
		1462	opt_wordwrap = 1;
		1463
		1464	/* HACK-7: do we want to allow both -shade and -outline? */
		1465	if (opt_shade && opt_outline)
		1466	{
		1467	fprintf (stderr, "Specify at most one of -shade and -outline\n");
983	exit (1);	1468	exit (1);
984	}	1469	}
985		1470
986	if (opt_partial)	1471	if (opt_partial)
987	/* if we specifically requested to see partial lines then don't insist on whole lines */	1472	/* if we specifically requested to see partial lines then don't insist on whole lines */
988	opt_whole = 0;	1473	opt_whole = 0;
989	else if (file_count > 1)	1474	else if (file_count > 1)
990	/* otherwise, if we've viewing multiple files, default to showing whole lines */	1475	/* otherwise, if we're viewing multiple files, default to showing whole lines */
991	opt_whole = 1;	1476	opt_whole = 1;
992		1477
993	#if HAS_REGEX	1478	#if HAS_REGEX
994	if (transform)	1479	if (transform)
995	{	1480	{
996	int i;	1481	int i;
997		1482
		1483	printf ("compiling regexp '%s'\n", transform);
998	transformre = xmalloc (sizeof (transformre));	1484	transformre = xmalloc (sizeof (regex_t));
999	i = regcomp (&transformre, transform, REG_EXTENDED);	1485	i = regcomp (transformre, transform, REG_EXTENDED);
1000	if (i != 0)	1486	if (i != 0)
1001	{	1487	{
1002	char buf[512];	1488	char buf[512];
1003		1489
1004	regerror (i, &transformre, buf, sizeof (buf));	1490	regerror (i, transformre, buf, sizeof (buf));
1005	fprintf (stderr, "Cannot compile regular expression: %s\n", buf);	1491	fprintf (stderr, "Cannot compile regular expression: %s\n", buf);
1006	}	1492	}
		1493	else
		1494	printf ("compiled '%s' OK to %x\n", transform, (int)transformre);
1007	}	1495	}
1008	#endif	1496	#endif
		1497
		1498	if (opt_outline && !opt_minspace)
		1499	{
		1500	/* adding outline increases the total width and height by 2
		1501	pixels each, and offsets the text one pixel right and one
		1502	pixel down */
		1503	effect_x_space = effect_y_space = 2;
		1504	effect_x_offset = effect_y_offset = 1;
		1505	}
		1506	else if (opt_shade && !opt_minspace)
		1507	{
		1508	/* adding a shadow increases the space used */
		1509	effect_x_space = abs (SHADE_X);
		1510	effect_y_space = abs (SHADE_Y);
		1511
		1512	/* if the shadow is to the right and below then we don't need
		1513	* to move the text to make space for it, but shadows to the left
		1514	* and above need accomodating */
		1515	effect_x_offset = SHADE_X > 0 ? 0 : -SHADE_X;
		1516	effect_y_offset = SHADE_Y > 0 ? 0 : -SHADE_Y;
		1517	}
		1518	else
		1519	{
		1520	effect_x_space = effect_y_space = 0;
		1521	effect_x_offset = effect_y_offset = 0;
		1522	}
1009		1523
1010	InitWindow ();	1524	InitWindow ();
1011		1525
1012	install_signal (SIGINT, blank_window);	1526	install_signal (SIGINT, blank_window);
1013	install_signal (SIGQUIT, blank_window);	1527	install_signal (SIGQUIT, blank_window);
…		…
1032	action.sa_handler = handler;	1546	action.sa_handler = handler;
1033	sigemptyset (&action.sa_mask);	1547	sigemptyset (&action.sa_mask);
1034	action.sa_flags = SA_RESTART;	1548	action.sa_flags = SA_RESTART;
1035		1549
1036	if (sigaction (sig, &action, NULL) < 0)	1550	if (sigaction (sig, &action, NULL) < 0)
1037	fprintf (stderr, "sigaction(%d): %s\n", sig, strerror (errno)), exit (1);	1551	fprintf (stderr, "sigaction (%d): %s\n", sig, strerror (errno)), exit (1);
1038	}	1552	}
1039		1553
1040	void *	1554	void *
1041	xstrdup (const char *string)	1555	xstrdup (const char *string)
1042	{	1556	{
1043	void *p;	1557	void *p;
1044		1558
1045	while ((p = strdup (string)) == NULL)	1559	while ((p = strdup (string)) == NULL)
1046	{	1560	{
1047	fprintf (stderr, "Memory exausted.");	1561	fprintf (stderr, "Memory exhausted in xstrdup ().\n");
1048	sleep (10);	1562	sleep (10);
1049	}	1563	}
1050		1564
1051	return p;	1565	return p;
1052	}	1566	}
…		…
1056	{	1570	{
1057	void *p;	1571	void *p;
1058		1572
1059	while ((p = malloc (size)) == NULL)	1573	while ((p = malloc (size)) == NULL)
1060	{	1574	{
1061	fprintf (stderr, "Memory exausted.");	1575	fprintf (stderr, "Memory exhausted in xmalloc ().\n");
		1576	sleep (10);
		1577	}
		1578
		1579	return p;
		1580	}
		1581
		1582	void *
		1583	xrealloc (void *ptr, size_t size)
		1584	{
		1585	void *p;
		1586
		1587	while ((p = realloc (ptr, size)) == NULL)
		1588	{
		1589	fprintf (stderr, "Memory exhausted in xrealloc ().\n");
1062	sleep (10);	1590	sleep (10);
1063	}	1591	}
1064		1592
1065	return p;	1593	return p;
1066	}	1594	}
1067		1595
1068	void	1596	void
1069	display_help (char *myname)	1597	display_help (char *myname)
1070	{	1598	{
1071	printf ("Usage: %s [options] file1[,color[,desc]] "	1599	printf ("Usage: %s [options] file1[,color[,desc]]"
1072	"[file2[,color[,desc]] ...]\n", myname);	1600	"[options] [file2[,color[,desc]] ...]\n", myname);
1073	printf (" -g | -geometry geometry -g WIDTHxHEIGHT+X+Y\n"	1601	printf (" -g | -geometry geometry -g WIDTHxHEIGHT+X+Y\n"
1074	" -color color use color $color as default\n"	1602	" -color color use color $color as default\n"
1075	" -reload sec command reload after $sec and run command\n"	1603	" -reload sec command reload after $sec and run command\n"
1076	" -id id window id to use instead of the root window\n"	1604	" -id id window id to use instead of the root window\n"
1077	" -font FONTSPEC (-fn) font to use\n"	1605	" -font FONTSPEC (-fn) font to use\n"
…		…
1079	" -reverse print new lines at the top\n"	1607	" -reverse print new lines at the top\n"
1080	" -whole wait for \\n before showing a line\n"	1608	" -whole wait for \\n before showing a line\n"
1081	" -partial show lines even if they don't end with a \\n\n"	1609	" -partial show lines even if they don't end with a \\n\n"
1082	" -update allow updates to old partial lines\n"	1610	" -update allow updates to old partial lines\n"
1083	" -cont string to prefix continued partial lines with\n"	1611	" -cont string to prefix continued partial lines with\n"
1084	" defaults to \"[+]\"\n"	1612	" defaults to \"|| \"\n"
		1613	" -wordwrap wrap long lines at spaces to avoid breaking words\n"
1085	" -shade add shading to font\n"	1614	" -shade add shading to font\n"
		1615	" -outline add black outline to font\n"
		1616	" -minspace force minimum line spacing\n"
1086	" -noinitial don't display the last file lines on\n"	1617	" -noinitial don't display the last file lines on\n"
1087	" startup\n"	1618	" startup\n"
1088	" -i | -interval seconds interval between checks (fractional\n"	1619	" -i | -interval seconds interval between checks (fractional\n"
1089	" values o.k.). Default 2.4 seconds\n"	1620	" values o.k.). Default 2.4 seconds\n"
1090	" -V display version information and exit\n"	1621	" -V display version information and exit\n"
1091	"\n");	1622	"\n");
1092	printf ("Example:\n%s -g 80x25+100+50 -font fixed /var/log/messages,green "	1623	printf ("Example:\n%s -g 800x250+100+50 -font fixed /var/log/messages,green "
1093	"/var/log/secure,red,'ALERT'\n", myname);	1624	"/var/log/secure,red,'ALERT'\n", myname);
1094	exit (0);	1625	exit (0);
1095	}	1626	}
1096		1627
1097	void	1628	void
…		…
1102	}	1633	}
1103		1634
1104	int	1635	int
1105	daemonize (void)	1636	daemonize (void)
1106	{	1637	{
		1638	pid_t pid;
		1639
1107	switch (fork ())	1640	switch (pid = fork ())
1108	{	1641	{
1109	case -1:	1642	case -1:
1110	return -1;	1643	return -1;
1111	case 0:	1644	case 0:
1112	break;	1645	break;
1113	default:	1646	default:
		1647	/*printf ("%d\n", pid);*/
1114	_exit (0);	1648	exit (0);
1115	}	1649	}
1116		1650
1117	if (setsid () == -1)	1651	if (setsid () == -1)
1118	return -1;	1652	return -1;
1119		1653

Diff Legend

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