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.40 by chris_moore, Wed Mar 31 16:27:04 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	3	* Copyright 2000,2001,2002,2003,2004
4	* Marc Lehmann <pcg@goof.com>,	4	* Marc Lehmann <pcg@goof.com>,
		5	* Chris Moore <chris.moore@mail.com>,
5	* and many others, see README	6	* and many others, see README
6	*	7	*
7	* Original version by Mike Baker.	8	* Original version by Mike Baker.
8	*	9	*
9	* 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
10	* 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
11	* the Free Software Foundation; either version 2 of the License, or	12	* the Free Software Foundation; either version 2 of the License, or
…		…
20	* along with this program; if not, write to the Free Software	21	* along with this program; if not, write to the Free Software
21	* 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.
22	*/	23	*/
23		24
24	#include "config.h"	25	#include "config.h"
		26	#include <assert.h>
25	#include <stdlib.h>	27	#include <stdlib.h>
26	#include <stdio.h>	28	#include <stdio.h>
27	#include <unistd.h>	29	#include <unistd.h>
28	#include <string.h>	30	#include <string.h>
29	#include <signal.h>	31	#include <signal.h>
…		…
45	#endif	47	#endif
46		48
47	#define SHADE_X 2	49	#define SHADE_X 2
48	#define SHADE_Y 2	50	#define SHADE_Y 2
49		51
		52	/* some italic fonts still go over the margin - this margin of error cleans up the mess */
		53	#define MARGIN_OF_ERROR 2
		54
50	/* data structures */	55	/* data structures */
51	struct logfile_entry	56	struct logfile_entry
52	{	57	{
53	struct logfile_entry *next;	58	struct logfile_entry *next;
54		59
55	char *fname; /* name of file */	60	char *fname; /* name of file */
56	char *desc; /* alternative description */	61	char *desc; /* alternative description */
57	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;
58	FILE *fp; /* FILE struct associated with file */	67	FILE *fp; /* FILE struct associated with file */
59	ino_t inode; /* inode of the file opened */	68	ino_t inode; /* inode of the file opened */
60	off_t last_size; /* file size at the last check */	69	off_t last_size; /* file size at the last check */
61	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 */
62	int partial; /* true if the last line isn't complete */	72	int partial; /* true if the last line isn't complete */
63	int lastpartial; /* true if the previous output wasn't complete */	73	int lastpartial; /* true if the previous output wasn't complete */
64	int index; /* index into linematrix of a partial line */	74	struct line_node *last; /* last line we output */
65	int modified; /* true if line is modified & needs displaying */	75	int modified; /* true if line is modified & needs displaying */
66	};	76	};
67		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
68	struct linematrix	100	struct displaymatrix
69	{	101	{
70	char *line;	102	char *line;
71	int len;	103	int len;
72	unsigned long color;	104	int offset;
73	};
74
75	struct displaymatrix
76	{
77	char *line;
78	int len;
79	int buffer_size;	105	int buffer_size;
80	unsigned long color;	106	unsigned long color;
81	};	107	};
82		108
83	/* global variables */	109	/* global variables */
84	struct linematrix *lines;	110	struct line_node *linelist = NULL, *linelist_tail = NULL;
85	struct displaymatrix *display;	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 */
86	int width = STD_WIDTH, height = STD_HEIGHT, listlen;	118	int width = STD_WIDTH, height = STD_HEIGHT, listlen = 50;
87	int win_x = LOC_X, win_y = LOC_Y;	119	int win_x = LOC_X, win_y = LOC_Y;
88	int font_ascent, font_height;
89	int effect_x_space, effect_y_space; /* how much space does shading / outlining take up */	120	int effect_x_space, effect_y_space; /* how much space does shading / outlining take up */
90	int effect_x_offset, effect_y_offset; /* and how does it offset the usable space */	121	int effect_x_offset, effect_y_offset; /* and how does it offset the usable space */
91	int do_reopen;	122	int do_reopen;
92	struct timeval interval = { 2, 400000 };	123	struct timeval interval = { 2, 400000 };
93	XFontSet fontset;
94		124
95	/* command line options */	125	/* command line options */
96	int opt_noinitial, opt_shade, opt_frame, opt_reverse, opt_nofilename,	126	int opt_noinitial, opt_shade, opt_frame, opt_reverse, opt_nofilename,
97	opt_outline, opt_noflicker, opt_whole, opt_update, opt_wordwrap,	127	opt_outline, opt_noflicker, opt_whole, opt_update, opt_wordwrap,
98	geom_mask, reload = 0;	128	opt_justify, geom_mask, opt_minspace, reload;
99	const char *command = NULL,	129	const char *command = NULL,
100	*fontname = USE_FONT, *dispname = NULL, *def_color = DEF_COLOR,	130	*fontname = USE_FONT, *dispname = NULL, *def_color = DEF_COLOR,
101	*continuation = "[+]";	131	*continuation = "|| ", *cont_color = DEF_CONT_COLOR;
102		132
103	struct logfile_entry *loglist = NULL, *loglist_tail = NULL;	133	struct logfile_entry *loglist = NULL, *loglist_tail = NULL;
104		134
105	Display *disp;	135	Display *disp;
106	Window root;	136	Window root;
…		…
122	/* prototypes */	152	/* prototypes */
123	void list_files (int);	153	void list_files (int);
124	void force_reopen (int);	154	void force_reopen (int);
125	void force_refresh (int);	155	void force_refresh (int);
126	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 */
127		160
128	void InitWindow (void);	161	void InitWindow (void);
129	unsigned long GetColor (const char *);	162	unsigned long GetColor (const char *);
130	void redraw (int);	163	void redraw (int);
131	void refresh (int, int, int, int);	164	void refresh (int, int, int, int);
…		…
169	}	202	}
170		203
171	void	204	void
172	blank_window (int dummy)	205	blank_window (int dummy)
173	{	206	{
174	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);
175	XFlush (disp);	208	XFlush (disp);
176	exit (0);	209	exit (0);
177	}	210	}
178		211
179	/* X related functions */	212	/* X related functions */
…		…
192	fprintf (stderr, "can't allocate %s\n", ColorName);	225	fprintf (stderr, "can't allocate %s\n", ColorName);
193		226
194	return Color.pixel;	227	return Color.pixel;
195	}	228	}
196		229
		230	#ifndef USE_TOON_GET_ROOT_WINDOW
197	static Window	231	static void
198	root_window (Display * display, int screen_number)	232	find_root_window (Display *display, int screen_number)
199	{	233	{
		234	if (!root)
		235	{
200	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);
201	Window real_root_window = RootWindow (display, screen_number);	238	root = RootWindow (display, screen_number);
202		239
203	if (root) /* root window set via option */
204	return root;
205
206	if (SWM_VROOT != None)
207	{
208	Window unused, *windows;	240	Window unused, *windows = 0;
209	unsigned int count;	241	unsigned int count;
210		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	{
211	if (XQueryTree (display, real_root_window, &unused, &unused, &windows,	254	if (XQueryTree (display, *(Window *)virtual_root_window, &unused, &unused, &windows, &count))
212	&count))	255	root = windows[count - 1];
		256
		257	XFree (virtual_root_window);
		258	}
		259	else if (XQueryTree (display, root, &unused, &unused, &windows, &count))
213	{	260	{
214	int i;	261	int i;
215		262
216	for (i = 0; i < count; i++)	263	for (i = 0; i < count; i++)
217	{	264	{
218	Atom type;
219	int format;
220	unsigned long nitems, bytes_after_return;
221	unsigned char *virtual_root_window;
222
223	if (XGetWindowProperty (display, windows[i], SWM_VROOT,	265	if (XGetWindowProperty (display, windows[i], SWM_VROOT,
224	0, 1, False, XA_WINDOW, &type, &format,	266	0, 1, False, XA_WINDOW, &type, &format,
225	&nitems, &bytes_after_return,	267	&nitems, &bytes_after_return,
226	&virtual_root_window) == Success)	268	&virtual_root_window) == Success
		269	&& type == XA_WINDOW)
227	{	270	{
228	if (type != None)
229	{
230	if (type == XA_WINDOW)
231	{
232	XFree (windows);
233	return (Window) virtual_root_window;	271	root = *(Window *)virtual_root_window;
234	}	272	XFree (virtual_root_window);
235	else
236	fprintf (stderr,
237	"__SWM_VROOT property type mismatch");
238	}	273	break;
239	}	274	}
240	else	275	}
241	fprintf (stderr,
242	"failed to get __SWM_VROOT property on window 0x%lx",
243	windows[i]);
244	}
245		276
246	if (count)
247	XFree (windows);	277	XFree (windows);
248	}	278	}
249	else	279	else
250	fprintf (stderr, "Can't query tree on root window 0x%lx",	280	fprintf (stderr, "Can't query tree on root window 0x%lx", root);
251	real_root_window);
252	}	281	}
253	else
254	/* This shouldn't happen. The Xlib documentation is wrong BTW. */
255	fprintf (stderr, "Can't intern atom __SWM_VROOT");
256
257	return real_root_window;
258	}	282	}
		283	#endif /* USE_TOON_GET_ROOT_WINDOW */
259		284
260	void	285	void
261	InitWindow (void)	286	InitWindow (void)
262	{	287	{
263	XGCValues gcv;	288	XGCValues gcv;
264	unsigned long gcm;	289	unsigned long gcm;
265	int screen, ScreenWidth, ScreenHeight;	290	int screen, ScreenWidth, ScreenHeight;
		291	struct logfile_entry *e;
266		292
267	if (!(disp = XOpenDisplay (dispname)))	293	if (!(disp = XOpenDisplay (dispname)))
268	{	294	{
269	fprintf (stderr, "Can't open display %s.\n", dispname);	295	fprintf (stderr, "Can't open display %s.\n", dispname);
270	exit (1);	296	exit (1);
…		…
272		298
273	screen = DefaultScreen (disp);	299	screen = DefaultScreen (disp);
274	ScreenHeight = DisplayHeight (disp, screen);	300	ScreenHeight = DisplayHeight (disp, screen);
275	ScreenWidth = DisplayWidth (disp, screen);	301	ScreenWidth = DisplayWidth (disp, screen);
276		302
277	root = root_window (disp, screen);	303	find_root_window (disp, screen);
278		304
279	gcm = GCBackground;	305	gcm = GCBackground;
280	gcv.graphics_exposures = True;	306	gcv.graphics_exposures = True;
281	WinGC = XCreateGC (disp, root, gcm, &gcv);	307	WinGC = XCreateGC (disp, root, gcm, &gcv);
282	XMapWindow (disp, root);	308	XMapWindow (disp, root);
		309
283	XSetForeground (disp, WinGC, GetColor (DEF_COLOR));	310	XSetForeground (disp, WinGC, GetColor (DEF_COLOR));
284		311
		312	for (e = loglist; e; e = e->next)
285	{	313	{
286	char **missing_charset_list;	314	char **missing_charset_list;
287	int missing_charset_count;	315	int missing_charset_count;
288	char *def_string;	316	char *def_string;
289		317
290	fontset = XCreateFontSet (disp, fontname,	318	e->fontset = XCreateFontSet (disp, e->fontname,
291	&missing_charset_list, &missing_charset_count,	319	&missing_charset_list, &missing_charset_count,
292	&def_string);	320	&def_string);
293		321
294	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
295	{	336	{
296	fprintf (stderr,	337	XFontSetExtents *xfe = XExtentsOfFontSet (e->fontset);
297	"Missing charsets in String to FontSet conversion (%s)\n",	338
298	missing_charset_list[0]);	339	e->font_height = xfe->max_logical_extent.height;
299	XFreeStringList (missing_charset_list);	340	e->font_ascent = -xfe->max_logical_extent.y;
300	}	341	}
301	}
302		342
303	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	}
304	{	355	}
305	fprintf (stderr, "unable to create fontset, exiting.\n");
306	exit (1);
307	}
308
309	{
310	XFontSetExtents *xfe = XExtentsOfFontSet (fontset);
311
312	font_height = xfe->max_logical_extent.height;
313	font_ascent = -xfe->max_logical_extent.y;
314	}
315		356
316	if (geom_mask & XNegative)	357	if (geom_mask & XNegative)
317	win_x = win_x + ScreenWidth - width;	358	win_x = win_x + ScreenWidth - width;
318	if (geom_mask & YNegative)	359	if (geom_mask & YNegative)
319	win_y = win_y + ScreenHeight - height;	360	win_y = win_y + ScreenHeight - height;
320		361
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 */
348	listlen = (height - effect_y_space) / font_height;
349
350	if (!listlen)
351	{
352	fprintf (stderr, "height too small for a single line, setting to %d\n",
353	font_height);
354	listlen = 1;
355	}
356
357	/* leave the height how the user requested it. it might not all be
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		362	{
		363	struct logfile_entry *e;
		364
		365	for (e = loglist; e; e = e->next)
		366	e->color = GetColor (e->colorname);
		367	}
		368
363	XSelectInput (disp, root, ExposureMask | FocusChangeMask);	369	XSelectInput (disp, root, ExposureMask | FocusChangeMask);
364	}	370	}
365		371
366	/*	372	/*
367	* if redraw() is passwd a non-zero argument, it does a complete	373	* if redraw () is passwd a non-zero argument, it does a complete
368	* redraw, rather than an update. if the argument is zero (and	374	* redraw, rather than an update. if the argument is zero (and
369	* -noflicker is in effect) then only the lines which have changed	375	* -noflicker is in effect) then only the lines which have changed
370	* since the last draw are redrawn.	376	* since the last draw are redrawn.
371	*	377	*
372	* the rest is handled by regular refresh()'es	378	* the rest is handled by regular refresh ()'es
373	*/	379	*/
374	void	380	void
375	redraw (int redraw_all)	381	redraw (int redraw_all)
376	{	382	{
377	XSetClipMask (disp, WinGC, None);	383	XSetClipMask (disp, WinGC, None);
378	refresh (0, 32768, 1, redraw_all);	384	refresh (0, 32768, 1, redraw_all);
379	}	385	}
380		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	}
		416	}
		417
381	/* Just redraw everything without clearing (i.e. after an EXPOSE event) */	418	/* Just redraw everything without clearing (i.e. after an EXPOSE event) */
382	void	419	void
383	refresh (int miny, int maxy, int clear, int refresh_all)	420	refresh (int miny, int maxy, int clear, int refresh_all)
384	{	421	{
385	int lin;	422	int lin = 0;
386	int offset = listlen * font_height + font_ascent + effect_y_offset;	423	int space = height;
		424	int offset;
387	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;
388		429
389	miny -= win_y + font_height;	430	if (opt_reverse)
390	maxy -= win_y - font_height;	431	offset = effect_y_offset;
		432	else
		433	offset = height + effect_y_offset;
		434
		435	miny -= win_y;
		436	maxy -= win_y;
391		437
392	if (clear && !opt_noflicker)	438	if (clear && !opt_noflicker)
393	XClearArea (disp, root, win_x, win_y, width, height, False);	439	XClearArea (disp, root, win_x, win_y, width + MARGIN_OF_ERROR, height, False);
394		440
395	for (lin = listlen; lin--;)	441	for (line = linelist; line; line = line->next, lin++)
396	{	442	{
397	struct linematrix *line = lines + (opt_reverse ? listlen - lin - 1 : lin);
398	struct displaymatrix *display_line = display + lin;	443	struct displaymatrix *display_line;
399		444
400	offset -= font_height;	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	}
		457	}
401		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
402	if (offset < miny || offset > maxy)	473	if (offset >= miny && offset <= maxy)
403	continue;	474	{
404
405	/* if this line is a different than it was, then it	475	/* if this line is a different than it was, then it
406	* needs displaying */	476	* needs displaying */
407	if (!opt_noflicker	477	if (!opt_noflicker
408	|| refresh_all	478	|| refresh_all
409	|| display_line->len != line->len	479	|| display_line->len != line->len
410	|| display_line->color != line->color	480	|| display_line->color != line->logfile->color
		481	|| display_line->offset != offset
411	|| memcmp (display_line->line, line->line, line->len))	482	|| memcmp (display_line->line, line->line, line->len))
412	{	483	{
413	/* don't bother updating the record of what has been	484	/* don't bother updating the record of what has been
414	* displayed if -noflicker isn't in effect, since we redraw	485	* displayed if -noflicker isn't in effect, since we redraw
415	* the whole display every time anyway */	486	* the whole display every time anyway */
416	if (opt_noflicker)	487	if (opt_noflicker)
417	{	488	{
418	/* update the record of what has been displayed;	489	/* update the record of what has been displayed;
419	* first make sure the buffer is big enough */	490	* first make sure the buffer is big enough */
420	if (display_line->buffer_size <= line->len)	491	if (display_line->buffer_size < line->len)
421	{	492	{
422	display_line->buffer_size = line->len;	493	display_line->buffer_size = line->len;
423	display_line->line = xrealloc (display_line->line, display_line->buffer_size);	494	display_line->line = xrealloc (display_line->line, display_line->buffer_size);
424	}	495	}
425		496
426	display_line->len = line->len;	497	display_line->len = line->len;
427	display_line->color = line->color;	498	display_line->color = line->logfile->color;
		499	display_line->offset = offset;
428	memcpy (display_line->line, line->line, line->len);	500	memcpy (display_line->line, line->line, line->len);
429		501
430	if (clear)	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 */
431	XClearArea (disp, root, win_x, win_y + offset - font_ascent,	511	XClearArea (disp, root, win_x, win_y + offset - line->logfile->font_ascent,
432	width + effect_x_space, font_height + effect_y_space, False);	512	width + MARGIN_OF_ERROR, step_per_line, False);
433	}	513	#endif /* DEBUG */
		514	}
		515	}
434		516
435	if (opt_outline)	517	if (opt_outline)
436	{	518	{
437	int x, y;	519	int x, y;
438	XSetForeground (disp, WinGC, black_color);	520	XSetForeground (disp, WinGC, black_color);
439		521
440	for (x = -1; x <= 1; x += 2)	522	for (x = -1; x <= 1; x += 2)
441	for (y = -1; y <= 1; y += 2)	523	for (y = -1; y <= 1; y += 2)
442	XmbDrawString (disp, root, fontset, WinGC,	524	draw_text (disp, root, WinGC,
443	win_x + effect_x_offset + x,	525	win_x + effect_x_offset + x,
444	win_y + y + offset,	526	win_y + y + offset, line, foreground = 0);
445	line->line, line->len);
446	}	527	}
447	else if (opt_shade)	528	else if (opt_shade)
448	{	529	{
449	XSetForeground (disp, WinGC, black_color);	530	XSetForeground (disp, WinGC, black_color);
450	XmbDrawString (disp, root, fontset, WinGC,	531	draw_text (disp, root, WinGC,
451	win_x + effect_x_offset + SHADE_X,	532	win_x + effect_x_offset + SHADE_X,
452	win_y + offset + SHADE_Y,	533	win_y + offset + SHADE_Y, line, foreground = 0);
453	line->line, line->len);
454	}	534	}
455		535
456	XSetForeground (disp, WinGC, line->color);	536	XSetForeground (disp, WinGC, line->logfile->color);
457	XmbDrawString (disp, root, fontset, WinGC,	537	draw_text (disp, root, WinGC,
458	win_x + effect_x_offset,	538	win_x + effect_x_offset,
459	win_y + offset,	539	win_y + offset, line, foreground = 1);
460	line->line, line->len);	540	}
461	}	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);
462	}	584	}
463		585
464	if (opt_frame)	586	if (opt_frame)
465	{	587	{
466	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 */
467	XDrawRectangle (disp, root, WinGC, win_x - 0, win_y - 0, width - 1, height - 1);	592	XDrawRectangle (disp, root, WinGC, win_x - 0, win_y - 0, width - 1, height - 1);
468	}	593	}
469	}	594	}
470		595
471	#if HAS_REGEX	596	#if HAS_REGEX
…		…
488	regmatch_t matched[16];	613	regmatch_t matched[16];
489		614
490	i = regexec (transformre, s, 16, matched, 0);	615	i = regexec (transformre, s, 16, matched, 0);
491	if (i == 0)	616	if (i == 0)
492	{ /* matched */	617	{ /* matched */
493	int match_start = matched[0].rm_so;	618	int match_start = matched[0].rm_so;
494	int match_end = matched[0].rm_eo;	619	int match_end = matched[0].rm_eo;
495	int old_len = match_end - match_start;	620	int old_len = match_end - match_start;
496	int new_len = strlen (transform_to);	621	int new_len = strlen (transform_to);
497	int old_whole_len = strlen (s);	622	int old_whole_len = strlen (s);
498		623
499	printf ("regexp was matched by '%s' - replace with '%s'\n", s, transform_to);	624	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);	625	printf ("match is from %d to %d\n", match_start, match_end);
501	if (new_len > old_len)	626	if (new_len > old_len)
502	s = xrealloc(s, old_whole_len + new_len - old_len);	627	s = xrealloc (s, old_whole_len + new_len - old_len);
503		628
504	if (new_len != old_len)	629	if (new_len != old_len)
505	{	630	{
506	memcpy(s + match_end + new_len - old_len,	631	memcpy (s + match_end + new_len - old_len,
507	s + match_end,	632	s + match_end,
508	old_whole_len - match_end);	633	old_whole_len - match_end);
509	s[old_whole_len + new_len - old_len] = '\0';	634	s[old_whole_len + new_len - old_len] = '\0';
510	}	635	}
511		636
512	memcpy (s + match_start,	637	memcpy (s + match_start,
513	transform_to,	638	transform_to,
514	new_len);	639	new_len);
515	printf ("transformed to '%s'\n", s);	640	printf ("transformed to '%s'\n", s);
516	}	641	}
517	else	642	else
518	{
519	printf ("regexp was not matched by '%s'\n", s);	643	printf ("regexp was not matched by '%s'\n", s);
520	}
521	}	644	}
522	}	645	}
523	#endif	646	#endif
524		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	*/
525	char *	652	char *
526	concat_line (const char *p1, const char *p2)	653	concat_line (char *p1, const char *p2)
527	{	654	{
528	int l1 = p1 ? strlen (p1) : 0;	655	int l1 = p1 ? strlen (p1) : 0;
529	int l2 = strlen (p2);	656	int l2 = strlen (p2);
530	char *r = xmalloc (l1 + l2 + 1);	657	char *r;
531		658
532	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
533	memcpy (r + l1, p2, l2);	666	memcpy (r + l1, p2, l2);
534	r[l1 + l2] = 0;	667	r[l1 + l2] = 0;
535		668
536	return r;	669	return r;
537	}	670	}
538		671
539	/*	672	/*
540	* HACK-1: 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.
541	*/	674	*/
542	int	675	int
543	lineinput (struct logfile_entry *logfile)	676	lineinput (struct logfile_entry *logfile)
544	{	677	{
545	char buff[1024], *p = buff;	678	char buff[1024], *p;
546	int ch;	679	int ch;
547	/* HACK-2: add on the length of any partial line which we will be appending to */	680	/* HACK-2: add on the length of any partial line which we will be appending to */
548	int ofs = logfile->buf ? strlen (logfile->buf) : 0;	681	int ofs = logfile->buf ? strlen (logfile->buf) : 0;
549		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 */
550	do	687	do
551	{	688	{
		689	p = buff;
		690	do
		691	{
552	ch = fgetc (logfile->fp);	692	ch = fgetc (logfile->fp);
553		693
554	if (ch == '\n' || ch == EOF)	694	if (ch == '\n' || ch == EOF)
555	break;	695	break;
556	else if (ch == '\r')	696	else if (ch == '\r')
557	continue; /* skip */	697	continue; /* skip */
558	else if (ch == '\t')	698	else if (ch == '\t')
559	{	699	{
560	do	700	do
561	{	701	{
562	*p++ = ' ';	702	*p++ = ' ';
		703	ofs++;
		704	}
		705	while (ofs & 7);
		706	}
		707	else
		708	{
		709	*p++ = ch;
563	ofs++;	710	ofs++;
564	}	711	}
565	while (ofs & 7);
566	}
567	else
568	{	712	}
569	*p++ = ch;
570	ofs++;
571	}
572	}
573	while (p < buff + (sizeof buff) - 8 - 1);	713	while (p < buff + (sizeof buff) - 8 - 1);
574		714
575	if (p == buff && ch == EOF)	715	if (p == buff && ch == EOF)
576	return 0;	716	return 0;
577		717
578	*p = 0;	718	*p = 0;
579		719
580	p = concat_line (logfile->buf, buff);	720	p = logfile->buf = concat_line (logfile->buf, buff);
581	free (logfile->buf); logfile->buf = p;	721	}
		722	while (ch != '\n' && ch != EOF);
582		723
583	logfile->lastpartial = logfile->partial;	724	logfile->lastpartial = logfile->partial;
584	/* there are 3 ways we could have exited the loop: reading '\n',	725	/* there are 3 ways we could have exited the loop: reading '\n',
585	* reaching EOF, or filling the buffer; the 2nd and 3rd of these	726	* reaching EOF, or filling the buffer; the 2nd and 3rd of these
586	* both result in a partial line */	727	* both result in a partial line */
587	logfile->partial = ch != '\n';	728	logfile->partial = ch != '\n';
588		729
589	if (logfile->partial && opt_whole)	730	if (logfile->partial && opt_whole)
590	return 0;	731	return 0;
591		732
592	#if HAS_REGEX	733	#if HAS_REGEX
593	transform_line (logfile->buf);	734	transform_line (logfile->buf);
…		…
621	else	762	else
622	file->inode = stats.st_ino;	763	file->inode = stats.st_ino;
623		764
624	if (opt_noinitial)	765	if (opt_noinitial)
625	fseek (file->fp, 0, SEEK_END);	766	fseek (file->fp, 0, SEEK_END);
626	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?
627	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);
628		771
629	file->last_size = stats.st_size;	772	file->last_size = stats.st_size;
630	return file->fp;	773	return file->fp;
631	}	774	}
632		775
…		…
688	}	831	}
689	}	832	}
690	}	833	}
691		834
692	/*	835	/*
693	* 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
694	* at position "idx" by pushing up lines above it. the caller	837	* pointer to the new node.
695	* 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.
696	*/	889	*/
697	static void	890	static void
698	insert_line (int idx)	891	possibly_split_long_line (struct logfile_entry *log)
699	{	892	{
700	int cur_line;	893	char *str = log->last->line;
701	struct logfile_entry *current;
702
703	free (lines[0].line);
704
705	for (cur_line = 0; cur_line < idx; cur_line++)
706	lines[cur_line] = lines[cur_line + 1];
707
708	for (current = loglist; current; current = current->next)
709	if (current->index <= idx)
710	current->index--;
711	}
712
713	/*
714	* remove a single physical line at position "idx" by moving the lines above it
715	* down and inserting a "~" line at the top.
716	*/
717	static void
718	delete_line (int idx)
719	{
720	int cur_line;
721	struct logfile_entry *current;
722
723	for (cur_line = idx; cur_line > 0; cur_line--)
724	lines[cur_line] = lines[cur_line - 1];
725
726	lines[0].line = xstrdup ("~");
727
728	for (current = loglist; current; current = current->next)
729	if (current->index >= 0 && current->index <= idx)
730	current->index++;
731	}
732
733	/*
734	* takes a logical log file line and splits it into multiple physical
735	* screen lines by splitting it whenever a part becomes too long.
736	* lal lines will be inserted at position "idx".
737	*/
738	static void
739	split_line (int idx, const char *str, unsigned long color)
740	{
741	int l = strlen (str);	894	int l = strlen (str);
742	int last_wrapped = 0;
743	const char *p = str;	895	char *p = str;
744	static int continuation_width = -1;	896	struct line_node *line;
745	static int continuation_length;	897	int spaces;
		898	static struct breakinfo *breaks;
		899	static int break_buffer_size;
746		900
747	/* only calculate the continuation's width once */	901	/* only calculate the continuation's width once */
748	if (continuation_width == -1)	902	if (continuation_width == -1)
749	{	903	{
750	continuation_length = strlen (continuation);	904	continuation_length = strlen (continuation);
751	continuation_width = XmbTextEscapement (fontset, continuation, continuation_length);	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	}
752	}	915	}
753		916
754	do	917	do
755	{	918	{
756	const char *beg = p;	919	const char *beg = p;
757	int w = last_wrapped ? continuation_width : 0;	920	int start_w = log->last->wrapped_left ? continuation_width : 0;
		921	int w = start_w;
758	int wrapped = 0;	922	int wrapped = 0;
759	const char *break_p = NULL;	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;
760		931
761	while (*p)	932	while (*p)
762	{	933	{
		934	int cw, len;
		935
763	/* find the length in bytes of the next multibyte character */	936	/* find the length in bytes of the next multibyte character */
764	int len = mblen (p, l);	937	len = mblen (p, l);
765	if (len <= 0)	938	if (len <= 0)
766	len = 1; /* ignore (don't skip) illegal character sequences */	939	len = 1; /* ignore (don't skip) illegal character sequences */
767		940
768	/* find the width in pixels of the next character */	941	/* find the width in pixels of the next character */
769	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
770	if (cw + w > width - effect_x_space)	970	if (cw + w > width - effect_x_space)
771	{	971	{
772	if (p == beg)	972	if (p == beg)
773	{	973	{
774	fprintf (stderr, "we can't even fit a single character onto the line\n");	974	fprintf (stderr, "we can't even fit a single character onto the line\n");
775	if (len == 1) fprintf (stderr, "(the character we couldn't fit was '%c')\n", *p);	975	if (len == 1) fprintf (stderr, "(the character we couldn't fit was '%c')\n", *p);
776	exit (1);	976	exit (1);
777	}	977	}
778		978
779	wrapped = 1;	979	wrapped = 1;
780	break;	980	break;
781	}	981	}
782
783	if (opt_wordwrap && len == 1 && p[0] == ' ')
784	break_p = p;
785		982
786	w += cw;	983	w += cw;
787	p += len;	984	p += len;
788	l -= len;	985	l -= len;
789	}	986	}
790		987
791	/* if we're wrapping at spaces, and the line is long enough to	988	/* if we're wrapping at spaces, and the line is long enough to
792	* wrap, and we've seen a space already, and the space wasn't	989	* wrap, and we've seen a space already, and the space wasn't
793	* the first character on the line, then wrap at the space */	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 */
794	if (opt_wordwrap && wrapped && break_p && break_p != beg)	995	if (opt_wordwrap && break_p && break_p != beg)
795	{
796	l += p - break_p;
797	p = break_p;
798	}
799
800	{	996	{
801	/* HACK-4 - consider inserting the 'continuation string'	997	prefix_len = break_p - beg;
802	* before the rest of the wrapped line */	998	p = break_p;
803	int len = p - beg + (last_wrapped ? continuation_length : 0);	999	w = width_at_break_p;
804	char *s = xmalloc (len + 1);
805	if (last_wrapped)
806	{
807	memcpy (s, continuation, continuation_length);
808	memcpy (s + continuation_length, beg, p - beg);
809	}
810	else
811	memcpy (s, beg, len);
812		1000
813	s[len] = 0;	1001	/* if breaking at a space, skip all adjacent spaces */
814	insert_line (idx);	1002	while (*p == ' ')
815	lines[idx].line = s;	1003	{
816	lines[idx].len = len;	1004	int len = mblen (p, l);
817	lines[idx].color = color;	1005	if (len != 1) break;
		1006	p++;
		1007	}
		1008
		1009	if (opt_justify)
		1010	{
		1011	spaces--;
		1012	breaks[spaces].len--;
		1013	}
818	}	1014	}
		1015	else
		1016	prefix_len = p - beg;
819		1017
820	/* if we wrapped at a space, don't display the space */	1018	/* make a copy of the tail end of the string */
821	if (opt_wordwrap && wrapped && break_p && break_p != beg)	1019	p = xstrdup (p);
822	{
823	l--;
824	p++;
825	}
826		1020
827	last_wrapped = wrapped;	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;
828	}	1048	}
829	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);
830	}	1061	}
831		1062
832	/*	1063	/*
833	* append something to an existing physical line. this is done	1064	* append something to an existing physical line. this is done
834	* 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
835	* and splitting it again.	1066	* and splitting it again.
836	*/	1067	*/
837	static void	1068	static void
838	append_line (int idx, const char *str)	1069	append_to_existing_line (char *str, struct logfile_entry *log)
839	{	1070	{
840	unsigned long color = lines[idx].color;	1071	char *old, *new;
841	char *old = lines[idx].line;	1072
		1073	assert(log);
		1074	assert(log->last);
		1075
		1076	old = log->last->line;
		1077	assert(old);
		1078
842	char *new = concat_line (old, str);	1079	new = concat_line (old, str);
843
844	free (old);	1080	free (str);
845		1081	log->last->line = new;
846	delete_line (idx);	1082	log->last->len = strlen (new);
847	split_line (idx, new, color);	1083	possibly_split_long_line (log);
848	}	1084	}
849		1085
850	static void	1086	static void
851	main_loop (void)	1087	main_loop (void)
852	{	1088	{
853	lines = xmalloc (sizeof (struct linematrix) * listlen);
854	display = xmalloc (sizeof (struct displaymatrix) * listlen);
855	int lin;	1089	int lin;
856	time_t lastreload;	1090	time_t lastreload;
857	Region region = XCreateRegion ();	1091	Region region = XCreateRegion ();
858	XEvent xev;	1092	XEvent xev;
859	struct logfile_entry *lastprinted = NULL;	1093	struct logfile_entry *lastprinted = NULL;
860	struct logfile_entry *current;	1094	struct logfile_entry *current;
861	int need_update = 1;	1095	int need_update = 1;
862		1096
		1097	display = xmalloc (sizeof (struct displaymatrix) * listlen);
		1098
863	lastreload = time (NULL);	1099	lastreload = time (NULL);
864		1100
865	/* Initialize linematrix */	1101	/* Initialize line_node */
866	for (lin = 0; lin < listlen; lin++)	1102	for (lin = 0; lin < listlen; lin++)
867	{	1103	{
		1104	struct line_node *e = xmalloc (sizeof (struct line_node));
868	lines[lin].line = xstrdup ("~");	1105	e->line = xstrdup ("~");
869	lines[lin].len = 1;	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
870	display[lin].line = xstrdup("");	1120	display[lin].line = xstrdup ("");
871	display[lin].len = 0;	1121	display[lin].len = 0;
		1122	display[lin].offset = 0;
872	display[lin].buffer_size = 0;	1123	display[lin].buffer_size = 0;
873	lines[lin].color = GetColor (def_color);
874	}	1124	}
875		1125
876	for (;;)	1126	for (;;)
877	{	1127	{
878	/* read logs */	1128	/* read logs */
…		…
889	/* if we're trying to update old partial lines in	1139	/* if we're trying to update old partial lines in
890	* place, and the last time this file was updated the	1140	* place, and the last time this file was updated the
891	* output was partial, and that partial line is not	1141	* output was partial, and that partial line is not
892	* too close to the top of the screen, then update	1142	* too close to the top of the screen, then update
893	* that partial line */	1143	* that partial line */
894	if (opt_update && current->lastpartial && current->index >= 0)	1144	if (opt_update && current->lastpartial && current->last)
895	{	1145	{
896	int idx = current->index;
897	append_line (idx, current->buf);	1146	append_to_existing_line (current->buf, current);
898	current->index = idx;	1147	current->buf = 0;
899	free (current->buf), current->buf = 0;
900	continue;	1148	continue;
901	}	1149	}
902		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
903	/* print filename if any, and if last line was from	1159	/* print filename if any, and if last line was from
904	* different file */	1160	* different file */
905	if (!opt_nofilename && lastprinted != current && current->desc[0])	1161	if (lastprinted != current)
906	{	1162	{
907	char buf[1024]; /* HACK-5 */	1163	current->last = 0;
908	snprintf (buf, sizeof (buf), "[%s]", current->desc);	1164	if (!opt_nofilename && current->desc[0])
909	split_line (listlen - 1, buf, current->color);	1165	{
910	}	1166	insert_new_line (xstrdup ("["), current);
		1167	append_to_existing_line (xstrdup (current->desc), current);
		1168	append_to_existing_line (xstrdup ("]"), current);
		1169	}
		1170	}
911		1171
912	/* if we're dealing with partial lines, and the last	1172	/* if we're dealing with partial lines, and the last
913	* time we showed the line it wasn't finished ... */	1173	* time we showed the line it wasn't finished ... */
914	if (!opt_whole && current->lastpartial)	1174	if (!opt_whole && current->lastpartial)
915	{	1175	{
916	/* if this is the same file we showed last then	1176	/* if this is the same file we showed last then
917	append to the last line shown */	1177	append to the last line shown */
918	if (lastprinted == current)	1178	if (lastprinted == current)
919	append_line (listlen - 1, current->buf);	1179	append_to_existing_line (current->buf, current);
920	else	1180	else
921	{	1181	{
922	/* but if a different file has been shown in the	1182	/* but if a different file has been shown in the
923	* mean time, make a new line, starting with the	1183	* mean time, make a new line, starting with the
924	* continuation string */	1184	* continuation string */
925	split_line (listlen - 1, continuation, current->color);	1185	insert_new_line (current->buf, current);
926	append_line (listlen - 1, current->buf);	1186	current->last->wrapped_left = 1;
927	}	1187	}
928	}	1188	}
929	else	1189	else
930	/* otherwise just make a plain and simple new line */	1190	/* otherwise just make a plain and simple new line */
931	split_line (listlen - 1, current->buf, current->color);	1191	insert_new_line (current->buf, current);
932		1192
933	free (current->buf), current->buf = 0;	1193	current->buf = 0;
934	current->index = listlen - 1;
935	lastprinted = current;	1194	lastprinted = current;
936	}	1195	}
937	}	1196	}
938		1197
939	if (need_update)	1198	if (need_update)
…		…
1023	#if HAS_REGEX	1282	#if HAS_REGEX
1024	char *transform = NULL;	1283	char *transform = NULL;
1025	#endif	1284	#endif
1026		1285
1027	setlocale (LC_CTYPE, ""); /* try to initialize the locale. */	1286	setlocale (LC_CTYPE, ""); /* try to initialize the locale. */
1028
1029	/* window needs to be initialized before colorlookups can be done */
1030	/* just a dummy to get the color lookups right */
1031	geom_mask = NoValue;
1032	InitWindow ();
1033		1287
1034	for (i = 1; i < argc; i++)	1288	for (i = 1; i < argc; i++)
1035	{	1289	{
1036	const char *arg = argv[i];	1290	const char *arg = argv[i];
1037		1291
…		…
1050	XParseGeometry (argv[++i], &win_x, &win_y, &width, &height);	1304	XParseGeometry (argv[++i], &win_x, &win_y, &width, &height);
1051	else if (!strcmp (arg, "-display"))	1305	else if (!strcmp (arg, "-display"))
1052	dispname = argv[++i];	1306	dispname = argv[++i];
1053	else if (!strcmp (arg, "-cont"))	1307	else if (!strcmp (arg, "-cont"))
1054	continuation = argv[++i];	1308	continuation = argv[++i];
		1309	else if (!strcmp (arg, "-cont-color"))
		1310	cont_color = argv[++i];
1055	else if (!strcmp (arg, "-font") || !strcmp (arg, "-fn"))	1311	else if (!strcmp (arg, "-font") || !strcmp (arg, "-fn"))
1056	fontname = argv[++i];	1312	fontname = argv[++i];
1057	#if HAS_REGEX	1313	#if HAS_REGEX
1058	else if (!strcmp (arg, "-t"))	1314	else if (!strcmp (arg, "-t"))
1059	{	1315	{
1060	transform = argv[++i];	1316	transform = argv[++i];
1061	transform_to = argv[++i];	1317	transform_to = argv[++i];
1062	printf("transform: '%s' to '%s'\n", transform, transform_to);	1318	printf ("transform: '%s' to '%s'\n", transform, transform_to);
1063	}	1319	}
1064	#endif	1320	#endif
1065	else if (!strcmp (arg, "-fork") || !strcmp (arg, "-f"))	1321	else if (!strcmp (arg, "-fork") || !strcmp (arg, "-f"))
1066	opt_daemonize = 1;	1322	opt_daemonize = 1;
1067	else if (!strcmp (arg, "-reload"))	1323	else if (!strcmp (arg, "-reload"))
1068	{	1324	{
…		…
1071	}	1327	}
1072	else if (!strcmp (arg, "-shade"))	1328	else if (!strcmp (arg, "-shade"))
1073	opt_shade = 1;	1329	opt_shade = 1;
1074	else if (!strcmp (arg, "-outline"))	1330	else if (!strcmp (arg, "-outline"))
1075	opt_outline = 1;	1331	opt_outline = 1;
		1332	else if (!strcmp (arg, "-minspace"))
		1333	opt_minspace = 1;
1076	else if (!strcmp (arg, "-noflicker"))	1334	else if (!strcmp (arg, "-noflicker"))
1077	opt_noflicker = 1;	1335	opt_noflicker = 1;
1078	else if (!strcmp (arg, "-frame"))	1336	else if (!strcmp (arg, "-frame"))
1079	opt_frame = 1;	1337	opt_frame = 1;
1080	else if (!strcmp (arg, "-no-filename"))	1338	else if (!strcmp (arg, "-no-filename"))
…		…
1087	opt_partial = 1;	1345	opt_partial = 1;
1088	else if (!strcmp (arg, "-update"))	1346	else if (!strcmp (arg, "-update"))
1089	opt_update = opt_partial = 1;	1347	opt_update = opt_partial = 1;
1090	else if (!strcmp (arg, "-wordwrap"))	1348	else if (!strcmp (arg, "-wordwrap"))
1091	opt_wordwrap = 1;	1349	opt_wordwrap = 1;
		1350	else if (!strcmp (arg, "-justify"))
		1351	opt_justify = 1;
1092	else if (!strcmp (arg, "-color"))	1352	else if (!strcmp (arg, "-color"))
1093	def_color = argv[++i];	1353	def_color = argv[++i];
1094	else if (!strcmp (arg, "-noinitial"))	1354	else if (!strcmp (arg, "-noinitial"))
1095	opt_noinitial = 1;	1355	opt_noinitial = 1;
1096	else if (!strcmp (arg, "-id"))	1356	else if (!strcmp (arg, "-id"))
1097	root = atoi (argv[++i]);	1357	{
		1358	unsigned long id;
		1359
		1360	if (sscanf (argv[++i], "%li", &id) == 1 && id)
		1361	root = id;
		1362	}
1098	else if (!strcmp (arg, "-interval") || !strcmp (arg, "-i"))	1363	else if (!strcmp (arg, "-interval") || !strcmp (arg, "-i"))
1099	{	1364	{
1100	double iv = atof (argv[++i]);	1365	double iv = atof (argv[++i]);
1101		1366
1102	interval.tv_sec = (int) iv;	1367	interval.tv_sec = (int) iv;
…		…
1132	}	1397	}
1133		1398
1134	e = xmalloc (sizeof (struct logfile_entry));	1399	e = xmalloc (sizeof (struct logfile_entry));
1135	e->partial = 0;	1400	e->partial = 0;
1136	e->buf = 0;	1401	e->buf = 0;
1137	e->index = -1;
1138		1402
1139	if (arg[0] == '-' && arg[1] == '\0')	1403	if (arg[0] == '-' && arg[1] == '\0')
1140	{	1404	{
1141	if ((e->fp = fdopen (0, "r")) == NULL)	1405	if ((e->fp = fdopen (0, "r")) == NULL)
1142	perror ("fdopen"), exit (1);	1406	perror ("fdopen"), exit (1);
1143	if (fcntl (0, F_SETFL, O_NONBLOCK) < 0)	1407	if (fcntl (0, F_SETFL, O_NONBLOCK) < 0)
1144	perror ("fcntl"), exit (1);	1408	perror ("fcntl"), exit (1);
1145		1409
1146	e->fname = NULL;	1410	e->fname = NULL;
1147	e->inode = 0;	1411	e->inode = 0;
		1412	if (desc == arg)
1148	e->desc = xstrdup ("stdin");	1413	e->desc = xstrdup ("stdin");
		1414	else
		1415	e->desc = xstrdup (desc);
1149	}	1416	}
1150	else	1417	else
1151	{	1418	{
1152	e->fname = xstrdup (fname);	1419	e->fname = xstrdup (fname);
1153		1420
…		…
1155	perror (fname), exit (1);	1422	perror (fname), exit (1);
1156		1423
1157	e->desc = xstrdup (desc);	1424	e->desc = xstrdup (desc);
1158	}	1425	}
1159		1426
1160	e->color = GetColor (fcolor);	1427	e->colorname = fcolor;
1161	e->partial = 0;	1428	e->partial = 0;
		1429	e->fontname = fontname;
		1430	e->last = NULL;
1162	e->next = NULL;	1431	e->next = NULL;
1163		1432
1164	if (!loglist)	1433	if (!loglist)
1165	loglist = e;	1434	loglist = e;
1166	if (loglist_tail)	1435	if (loglist_tail)
…		…
1175	fprintf (stderr, "You did not specify any files to tail\n"	1444	fprintf (stderr, "You did not specify any files to tail\n"
1176	"use %s --help for help\n", argv[0]);	1445	"use %s --help for help\n", argv[0]);
1177	exit (1);	1446	exit (1);
1178	}	1447	}
1179		1448
		1449	if (opt_update && opt_whole)
		1450	{
		1451	fprintf (stderr, "Specify at most one of -update and -whole\n");
		1452	exit (1);
		1453	}
1180	if (opt_partial && opt_whole)	1454	else if (opt_partial && opt_whole)
1181	{	1455	{
1182	fprintf (stderr, "Specify at most one of -partial and -whole\n");	1456	fprintf (stderr, "Specify at most one of -partial and -whole\n");
1183	exit (1);	1457	exit (1);
1184	}	1458	}
		1459
		1460	/* it doesn't make sense to justify if word wrap isn't on */
		1461	if (opt_justify)
		1462	opt_wordwrap = 1;
1185		1463
1186	/* HACK-7: do we want to allow both -shade and -outline? */	1464	/* HACK-7: do we want to allow both -shade and -outline? */
1187	if (opt_shade && opt_outline)	1465	if (opt_shade && opt_outline)
1188	{	1466	{
1189	fprintf (stderr, "Specify at most one of -shade and -outline\n");	1467	fprintf (stderr, "Specify at most one of -shade and -outline\n");
…		…
1200	#if HAS_REGEX	1478	#if HAS_REGEX
1201	if (transform)	1479	if (transform)
1202	{	1480	{
1203	int i;	1481	int i;
1204		1482
1205	printf("compiling regexp '%s'\n", transform);	1483	printf ("compiling regexp '%s'\n", transform);
1206	transformre = xmalloc (sizeof (regex_t));	1484	transformre = xmalloc (sizeof (regex_t));
1207	i = regcomp (transformre, transform, REG_EXTENDED);	1485	i = regcomp (transformre, transform, REG_EXTENDED);
1208	if (i != 0)	1486	if (i != 0)
1209	{	1487	{
1210	char buf[512];	1488	char buf[512];
1211		1489
1212	regerror (i, transformre, buf, sizeof (buf));	1490	regerror (i, transformre, buf, sizeof (buf));
1213	fprintf (stderr, "Cannot compile regular expression: %s\n", buf);	1491	fprintf (stderr, "Cannot compile regular expression: %s\n", buf);
1214	}	1492	}
1215	else	1493	else
1216	{
1217	printf("compiled '%s' OK to %x\n", transform, (int)transformre);	1494	printf ("compiled '%s' OK to %x\n", transform, (int)transformre);
1218	}
1219	}	1495	}
1220	#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	}
1221		1523
1222	InitWindow ();	1524	InitWindow ();
1223		1525
1224	install_signal (SIGINT, blank_window);	1526	install_signal (SIGINT, blank_window);
1225	install_signal (SIGQUIT, blank_window);	1527	install_signal (SIGQUIT, blank_window);
…		…
1244	action.sa_handler = handler;	1546	action.sa_handler = handler;
1245	sigemptyset (&action.sa_mask);	1547	sigemptyset (&action.sa_mask);
1246	action.sa_flags = SA_RESTART;	1548	action.sa_flags = SA_RESTART;
1247		1549
1248	if (sigaction (sig, &action, NULL) < 0)	1550	if (sigaction (sig, &action, NULL) < 0)
1249	fprintf (stderr, "sigaction(%d): %s\n", sig, strerror (errno)), exit (1);	1551	fprintf (stderr, "sigaction (%d): %s\n", sig, strerror (errno)), exit (1);
1250	}	1552	}
1251		1553
1252	void *	1554	void *
1253	xstrdup (const char *string)	1555	xstrdup (const char *string)
1254	{	1556	{
1255	void *p;	1557	void *p;
1256		1558
1257	while ((p = strdup (string)) == NULL)	1559	while ((p = strdup (string)) == NULL)
1258	{	1560	{
1259	fprintf (stderr, "Memory exausted.");	1561	fprintf (stderr, "Memory exhausted in xstrdup ().\n");
1260	sleep (10);	1562	sleep (10);
1261	}	1563	}
1262		1564
1263	return p;	1565	return p;
1264	}	1566	}
…		…
1268	{	1570	{
1269	void *p;	1571	void *p;
1270		1572
1271	while ((p = malloc (size)) == NULL)	1573	while ((p = malloc (size)) == NULL)
1272	{	1574	{
1273	fprintf (stderr, "Memory exausted.");	1575	fprintf (stderr, "Memory exhausted in xmalloc ().\n");
1274	sleep (10);	1576	sleep (10);
1275	}	1577	}
1276		1578
1277	return p;	1579	return p;
1278	}	1580	}
…		…
1282	{	1584	{
1283	void *p;	1585	void *p;
1284		1586
1285	while ((p = realloc (ptr, size)) == NULL)	1587	while ((p = realloc (ptr, size)) == NULL)
1286	{	1588	{
1287	fprintf (stderr, "Memory exausted.");	1589	fprintf (stderr, "Memory exhausted in xrealloc ().\n");
1288	sleep (10);	1590	sleep (10);
1289	}	1591	}
1290		1592
1291	return p;	1593	return p;
1292	}	1594	}
1293		1595
1294	void	1596	void
1295	display_help (char *myname)	1597	display_help (char *myname)
1296	{	1598	{
1297	printf ("Usage: %s [options] file1[,color[,desc]] "	1599	printf ("Usage: %s [options] file1[,color[,desc]]"
1298	"[file2[,color[,desc]] ...]\n", myname);	1600	"[options] [file2[,color[,desc]] ...]\n", myname);
1299	printf (" -g | -geometry geometry -g WIDTHxHEIGHT+X+Y\n"	1601	printf (" -g | -geometry geometry -g WIDTHxHEIGHT+X+Y\n"
1300	" -color color use color $color as default\n"	1602	" -color color use color $color as default\n"
1301	" -reload sec command reload after $sec and run command\n"	1603	" -reload sec command reload after $sec and run command\n"
1302	" -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"
1303	" -font FONTSPEC (-fn) font to use\n"	1605	" -font FONTSPEC (-fn) font to use\n"
…		…
1305	" -reverse print new lines at the top\n"	1607	" -reverse print new lines at the top\n"
1306	" -whole wait for \\n before showing a line\n"	1608	" -whole wait for \\n before showing a line\n"
1307	" -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"
1308	" -update allow updates to old partial lines\n"	1610	" -update allow updates to old partial lines\n"
1309	" -cont string to prefix continued partial lines with\n"	1611	" -cont string to prefix continued partial lines with\n"
		1612	" defaults to \"|| \"\n"
1310	" -wordwrap wrap long lines at spaces to avoid breaking words\n"	1613	" -wordwrap wrap long lines at spaces to avoid breaking words\n"
1311	" defaults to \"[+]\"\n"
1312	" -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"
1313	" -noinitial don't display the last file lines on\n"	1617	" -noinitial don't display the last file lines on\n"
1314	" startup\n"	1618	" startup\n"
1315	" -i | -interval seconds interval between checks (fractional\n"	1619	" -i | -interval seconds interval between checks (fractional\n"
1316	" values o.k.). Default 2.4 seconds\n"	1620	" values o.k.). Default 2.4 seconds\n"
1317	" -V display version information and exit\n"	1621	" -V display version information and exit\n"
1318	"\n");	1622	"\n");
1319	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 "
1320	"/var/log/secure,red,'ALERT'\n", myname);	1624	"/var/log/secure,red,'ALERT'\n", myname);
1321	exit (0);	1625	exit (0);
1322	}	1626	}
1323		1627
1324	void	1628	void
…		…
1338	case -1:	1642	case -1:
1339	return -1;	1643	return -1;
1340	case 0:	1644	case 0:
1341	break;	1645	break;
1342	default:	1646	default:
1343	/*printf("%d\n", pid);*/	1647	/*printf ("%d\n", pid);*/
1344	exit (0);	1648	exit (0);
1345	}	1649	}
1346		1650
1347	if (setsid () == -1)	1651	if (setsid () == -1)
1348	return -1;	1652	return -1;

Diff Legend

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