[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.275 by root, Tue Dec 11 15:42:51 2007 UTC vs.
Revision 1.335 by root, Sun Oct 24 17:52:50 2010 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "init.h"
35	#include "keyboard.h"	36	#include "keyboard.h"
36	#include "rxvtperl.h"	37	#include "rxvtperl.h"
37		38
38	#include <limits>	39	#include <limits>
39		40
		41	#include <cassert>
40	#include <csignal>	42	#include <csignal>
41	#include <cstring>	43	#include <cstring>
42		44
43	# include <termios.h>	45	#include <termios.h>
44		46
45	#ifdef HAVE_XSETLOCALE	47	#ifdef HAVE_XSETLOCALE
46	# define X_LOCALE	48	# define X_LOCALE
47	# include <X11/Xlocale.h>	49	# include <X11/Xlocale.h>
48	#else	50	#else
49	# ifdef HAVE_SETLOCALE	51	# ifdef HAVE_SETLOCALE
50	# include <clocale>	52	# include <clocale>
51	# endif	53	# endif
52	#endif	54	#endif
53		55
		56	struct termios rxvt_term::def_tio;
54	vector<rxvt_term *> rxvt_term::termlist;	57	vector<rxvt_term *> rxvt_term::termlist;
55		58
56	// used to tell global functions which terminal instance is "active"	59	// used to tell global functions which terminal instance is "active"
57	rxvt_t rxvt_current_term;	60	rxvt_t rxvt_current_term;
58		61
…		…
101	{	104	{
102	if (cc->c2 == c2) return c1;	105	if (cc->c2 == c2) return c1;
103	cc = (*this)[cc->c1];	106	cc = (*this)[cc->c1];
104	}	107	}
105		108
106	// check to see wether this combination already exists otherwise	109	// check to see whether this combination already exists otherwise
107	for (cc = v.end (); cc-- > v.begin (); )	110	for (cc = v.end (); cc-- > v.begin (); )
108	{	111	{
109	if (cc->c1 == c1 && cc->c2 == c2)	112	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	113	return COMPOSE_LO + (cc - v.begin ());
111	}	114	}
…		…
155	{	158	{
156	#if HAVE_BG_PIXMAP	159	#if HAVE_BG_PIXMAP
157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);	160	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158	#endif	161	#endif
159	#ifdef CURSOR_BLINK	162	#ifdef CURSOR_BLINK
160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this);	163	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161	#endif	164	#endif
162	#ifdef TEXT_BLINK	165	#ifdef TEXT_BLINK
163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);	166	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164	#endif	167	#endif
165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	168	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
…		…
170	#endif	173	#endif
171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	174	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	175	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173	#endif	176	#endif
174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	177	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
175	rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	178	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176	#endif	179	#endif
177	#ifdef HAVE_SCROLLBARS
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	180	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#endif
180	#ifdef USE_XIM	181	#ifdef USE_XIM
181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	182	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182	#endif	183	#endif
183	#ifdef POINTER_BLANK	184	#ifdef POINTER_BLANK
184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	185	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
185	#endif	186	#endif
186	#ifndef NO_BELL	187	#ifndef NO_BELL
187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);	188	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
188	#endif	189	#endif
189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	190	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190	prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);	191	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); flush_ev.set (0., 1. / 60.); // refresh at max. 60 Hz normally
192	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	192	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	193	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);	194	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	195	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	196	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
…		…
227	if (fontset[i] != fontset[0])	227	if (fontset[i] != fontset[0])
228	delete fontset[i];	228	delete fontset[i];
229	#endif	229	#endif
230	delete fontset[0];	230	delete fontset[0];
231		231
		232	#ifdef HAVE_BG_PIXMAP
		233	bgPixmap.destroy ();
		234	#endif
		235	#ifdef HAVE_AFTERIMAGE
		236	if (asv)
		237	destroy_asvisual (asv, 0);
		238	if (asimman)
		239	destroy_image_manager (asimman, 0);
		240	#endif
		241
232	if (display)	242	if (display)
233	{	243	{
234	selection_clear ();	244	selection_clear ();
		245	selection_clear (true);
235		246
236	#ifdef USE_XIM	247	#ifdef USE_XIM
237	im_destroy ();	248	im_destroy ();
238	#endif	249	#endif
239	#ifdef XTERM_SCROLLBAR	250	scrollBar.destroy ();
240	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
241	if (ShadowGC) XFreeGC (dpy, ShadowGC);
242	#endif
243	#ifdef PLAIN_SCROLLBAR
244	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
245	#endif
246	#ifdef NEXT_SCROLLBAR
247	if (blackGC) XFreeGC (dpy, blackGC);
248	if (whiteGC) XFreeGC (dpy, whiteGC);
249	if (grayGC) XFreeGC (dpy, grayGC);
250	if (darkGC) XFreeGC (dpy, darkGC);
251	if (stippleGC) XFreeGC (dpy, stippleGC);
252	if (dimple) XFreePixmap (dpy, dimple);
253	if (upArrow) XFreePixmap (dpy, upArrow);
254	if (downArrow) XFreePixmap (dpy, downArrow);
255	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
256	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
257	#endif
258	#ifdef RXVT_SCROLLBAR
259	if (topShadowGC) XFreeGC (dpy, topShadowGC);
260	if (botShadowGC) XFreeGC (dpy, botShadowGC);
261	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
262	#endif
263	if (gc) XFreeGC (dpy, gc);	251	if (gc) XFreeGC (dpy, gc);
264		252
265	delete drawable;	253	delete drawable;
266	// destroy all windows	254	// destroy all windows
267	if (parent[0])	255	if (parent[0])
…		…
275	pix_colors_unfocused [i].free (this);	263	pix_colors_unfocused [i].free (this);
276	#endif	264	#endif
277	}	265	}
278		266
279	clear ();	267	clear ();
280	}
281		268
282	delete [] pix_colors_focused;	269	display->flush (); /* ideally .put should do this */
283	#if OFF_FOCUS_FADING
284	delete [] pix_colors_unfocused;
285	#endif
286
287	#ifdef HAVE_BG_PIXMAP
288	bgPixmap.destroy ();
289	#endif
290	displays.put (display);	270	displays.put (display);
		271	}
291		272
292	scr_release ();	273	scr_release ();
293		274
294	/* clear all resources */	275	/* clear all resources */
295	for (int i = 0; i < allocated.size (); i++)	276	for (int i = 0; i < allocated.size (); i++)
296	free (allocated [i]);	277	free (allocated [i]);
297		278
298	free (selection.text);	279	free (selection.text);
		280	free (selection.clip_text);
299	// TODO: manage env vars in child only(!)	281	// TODO: manage env vars in child only(!)
300	free (env_display);	282	free (env_display);
301	free (env_term);	283	free (env_term);
302	free (locale);	284	free (locale);
303	free (v_buffer);	285	free (v_buffer);
…		…
327	}	309	}
328		310
329	void	311	void
330	rxvt_term::destroy ()	312	rxvt_term::destroy ()
331	{	313	{
332	if (ev_is_active (&destroy_ev))	314	if (destroy_ev.is_active ())
333	return;	315	return;
334		316
335	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	317	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
336		318
337	#if ENABLE_OVERLAY	319	#if ENABLE_OVERLAY
…		…
341	if (display)	323	if (display)
342	{	324	{
343	#if USE_XIM	325	#if USE_XIM
344	im_ev.stop (display);	326	im_ev.stop (display);
345	#endif	327	#endif
346	#if HAVE_SCROLLBARS
347	scrollbar_ev.stop (display);	328	scrollbar_ev.stop (display);
348	#endif
349	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	329	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
350	rootwin_ev.stop (display);	330	rootwin_ev.stop (display);
351	#endif	331	#endif
352	incr_ev.stop ();	332	incr_ev.stop ();
353	termwin_ev.stop (display);	333	termwin_ev.stop (display);
354	vt_ev.stop (display);	334	vt_ev.stop (display);
355	}	335	}
356		336
357	prepare_ev.stop ();	337	flush_ev.stop ();
358	pty_ev.stop ();	338	pty_ev.stop ();
359	#ifdef CURSOR_BLINK	339	#ifdef CURSOR_BLINK
360	cursor_blink_ev.stop ();	340	cursor_blink_ev.stop ();
361	#endif	341	#endif
362	#ifdef TEXT_BLINK	342	#ifdef TEXT_BLINK
…		…
405	char mesg[BUFSIZ];	385	char mesg[BUFSIZ];
406	char number[32];	386	char number[32];
407	char *mtype = "XlibMessage";	387	char *mtype = "XlibMessage";
408	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	388	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
409	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	389	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
410	rxvt_warn ("An X Error occured, trying to continue after report.\n");	390	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
411	rxvt_warn ("%s: %s\n", mesg, buffer);	391	rxvt_warn ("%s: %s\n", mesg, buffer);
412	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	392	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
413	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	393	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
414	sprintf(number, "%d", event->request_code);	394	sprintf(number, "%d", event->request_code);
415	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	395	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
416	rxvt_warn ("(which is %s)\n", buffer);	396	rxvt_warn ("(which is %s)\n", buffer);
417	if (event->request_code >= 128) {	397	if (event->request_code >= 128) {
418	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	398	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
419	mesg, BUFSIZ);	399	mesg, BUFSIZ);
420	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	400	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
421	}	401	}
422	if ((event->error_code == BadWindow) \|\|	402	if ((event->error_code == BadWindow) \|\|
423	(event->error_code == BadPixmap) \|\|	403	(event->error_code == BadPixmap) \|\|
424	(event->error_code == BadCursor) \|\|	404	(event->error_code == BadCursor) \|\|
425	(event->error_code == BadFont) \|\|	405	(event->error_code == BadFont) \|\|
426	(event->error_code == BadDrawable) \|\|	406	(event->error_code == BadDrawable) \|\|
427	(event->error_code == BadColor) \|\|	407	(event->error_code == BadColor) \|\|
428	(event->error_code == BadGC) \|\|	408	(event->error_code == BadGC) \|\|
429	(event->error_code == BadIDChoice) \|\|	409	(event->error_code == BadIDChoice) \|\|
430	(event->error_code == BadValue) \|\|	410	(event->error_code == BadValue) \|\|
431	(event->error_code == BadAtom)) {	411	(event->error_code == BadAtom)) {
432	if (event->error_code == BadValue)	412	if (event->error_code == BadValue)
433	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	413	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
434	mesg, BUFSIZ);	414	mesg, BUFSIZ);
435	else if (event->error_code == BadAtom)	415	else if (event->error_code == BadAtom)
436	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	416	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
437	mesg, BUFSIZ);	417	mesg, BUFSIZ);
438	else	418	else
439	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	419	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
440	mesg, BUFSIZ);	420	mesg, BUFSIZ);
441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	421	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
442	}	422	}
443	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	423	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
444	mesg, BUFSIZ);	424	mesg, BUFSIZ);
445	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	425	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
446	}	426	}
447	#endif	427	#endif
448		428
449	int	429	int
…		…
472	DisplayString (display));	452	DisplayString (display));
473	rxvt_emergency_cleanup ();	453	rxvt_emergency_cleanup ();
474	_exit (EXIT_FAILURE);	454	_exit (EXIT_FAILURE);
475	}	455	}
476		456
477	/----------------------------------------------------------------------/
478	bool
479	rxvt_term::init (int argc, const char const argv, stringvec *envv)
480	{
481	this->envv = envv;
482
483	SET_R (this);
484	set_locale ("");
485	set_environ (envv); // few things in X do not call setlocale :(
486
487	if (!init_vars ())
488	return false;
489
490	init_secondary ();
491
492	const char **cmd_argv = init_resources (argc, argv);
493
494	#ifdef KEYSYM_RESOURCE
495	keyboard->register_done ();
496	#endif
497
498	#ifdef HAVE_SCROLLBARS
499	if (option (Opt_scrollBar))
500	scrollBar.setIdle (); /* set existence for size calculations */
501	#endif
502
503	pty = ptytty::create ();
504
505	create_windows (argc, argv);
506
507	init_xlocale ();
508
509	scr_reset (); // initialize screen
510
511	#if 0
512	XSynchronize (dpy, True);
513	#endif
514
515	#ifdef HAVE_SCROLLBARS
516	if (option (Opt_scrollBar))
517	resize_scrollbar (); /* create and map scrollbar */
518	#endif
519	#ifdef HAVE_BG_PIXMAP
520	{
521	bgPixmap.set_target (this);
522
523	#ifdef ENABLE_TRANSPARENCY
524	if (option (Opt_transparent))
525	{
526	bgPixmap.set_transparent ();
527	#ifdef HAVE_AFTERIMAGE
528	if (rs [Rs_blurradius])
529	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530	#endif
531	if (ISSET_PIXCOLOR (Color_tint))
532	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533	if (rs [Rs_shade])
534	bgPixmap.set_shade (rs [Rs_shade]);
535
536	bgPixmap.set_root_pixmap ();
537	XSelectInput (dpy, display->root, PropertyChangeMask);
538	rootwin_ev.start (display, display->root);
539	}
540	#endif
541
542	#ifdef BG_IMAGE_FROM_FILE
543	if (rs[Rs_backgroundPixmap] != NULL)
544	{
545	const char *p = rs[Rs_backgroundPixmap];
546
547	if ((p = strchr (p, ';')) != NULL)
548	{
549	p++;
550	bgPixmap.set_geometry (p);
551	}
552	else
553	bgPixmap.set_defaultGeometry ();
554
555	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
556	if (!bgPixmap.window_position_sensitive ())
557	update_background ();
558	}
559	#endif
560	}
561	#endif
562
563	#if ENABLE_PERL
564	rootwin_ev.start (display, display->root);
565	#endif
566
567	set_colorfgbg ();
568
569	init_command (cmd_argv);
570
571	free (cmd_argv);
572
573	if (pty->pty >= 0)
574	pty_ev.start (pty->pty, ev::READ);
575
576	prepare_ev.start ();
577
578	HOOK_INVOKE ((this, HOOK_START, DT_END));
579
580	#if ENABLE_XEMBED
581	if (rs[Rs_embed])
582	{
583	long info[2] = { 0, XEMBED_MAPPED };
584
585	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
586	32, PropModeReplace, (unsigned char *)&info, 2);
587	}
588	#endif
589
590	XMapWindow (dpy, vt);
591	XMapWindow (dpy, parent[0]);
592
593	return true;
594	}
595
596	static struct sig_handlers	457	static struct sig_handlers
597	{	458	{
598	ev::sig sw_term, sw_int;	459	ev::sig sw_term, sw_int;
599		460
600	/*	461	/*
…		…
615	rxvt_emergency_cleanup ();	476	rxvt_emergency_cleanup ();
616	w.stop ();	477	w.stop ();
617	kill (getpid (), w.signum);	478	kill (getpid (), w.signum);
618	}	479	}
619		480
		481	static void
		482	rxvt_get_ttymode (struct termios *tio)
		483	{
		484	if (tcgetattr (STDIN_FILENO, tio) < 0)
		485	memset (tio, 0, sizeof (struct termios));
		486
		487	for (int i = 0; i < NCCS; i++)
		488	tio->c_cc[i] = VDISABLE;
		489
		490	tio->c_cc[VINTR] = CINTR;
		491	tio->c_cc[VQUIT] = CQUIT;
		492	tio->c_cc[VERASE] = CERASE;
		493	#ifdef VERASE2
		494	tio->c_cc[VERASE2] = CERASE2;
		495	#endif
		496	tio->c_cc[VKILL] = CKILL;
		497	tio->c_cc[VEOF] = CEOF;
		498	tio->c_cc[VSTART] = CSTART;
		499	tio->c_cc[VSTOP] = CSTOP;
		500	tio->c_cc[VSUSP] = CSUSP;
		501	# ifdef VDSUSP
		502	tio->c_cc[VDSUSP] = CDSUSP;
		503	# endif
		504	# ifdef VREPRINT
		505	tio->c_cc[VREPRINT] = CRPRNT;
		506	# endif
		507	# ifdef VDISCRD
		508	tio->c_cc[VDISCRD] = CFLUSH;
		509	# endif
		510	# ifdef VWERSE
		511	tio->c_cc[VWERSE] = CWERASE;
		512	# endif
		513	# ifdef VLNEXT
		514	tio->c_cc[VLNEXT] = CLNEXT;
		515	# endif
		516
		517	# if VMIN != VEOF
		518	tio->c_cc[VMIN] = 1;
		519	# endif
		520	# if VTIME != VEOL
		521	tio->c_cc[VTIME] = 0;
		522	# endif
		523
		524	/* input modes */
		525	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		526	# ifdef IMAXBEL
		527	\| IMAXBEL
		528	# endif
		529	\| IXON);
		530
		531	/* output modes */
		532	tio->c_oflag = (OPOST \| ONLCR);
		533
		534	/* control modes */
		535	tio->c_cflag = (CS8 \| CREAD);
		536
		537	/* local modes */
		538	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		539	# if defined (ECHOCTL) && defined (ECHOKE)
		540	\| ECHOCTL \| ECHOKE
		541	# endif
		542	\| ECHOE \| ECHOK);
		543	}
		544
620	char **rxvt_environ; // startup environment	545	char **rxvt_environ; // startup environment
621		546
622	void	547	void
623	rxvt_init ()	548	rxvt_init ()
624	{	549	{
625	ptytty::init ();	550	assert (("fontMask must not overlap other RS masks",
		551	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
626		552
		553	rxvt_get_ttymode (&rxvt_term::def_tio);
		554
		555	// get rid of stdin/stdout as we don't need them, to free resources
		556	dup2 (STDERR_FILENO, STDIN_FILENO);
		557	dup2 (STDERR_FILENO, STDOUT_FILENO);
		558
627	if (!ev_default_loop (0))	559	if (!ev_default_loop ())
628	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	560	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629		561
630	rxvt_environ = environ;	562	rxvt_environ = environ;
631		563
632	signal (SIGHUP, SIG_IGN);	564	signal (SIGHUP, SIG_IGN);
633	signal (SIGPIPE, SIG_IGN);	565	signal (SIGPIPE, SIG_IGN);
634		566
635	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	567	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
636	sig_handlers.sw_int.start (SIGINT); ev_unref ();	568	sig_handlers.sw_int.start (SIGINT); ev_unref ();
637
638	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
639	/* signal (SIGURG, SIG_DFL); */
640		569
641	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	570	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
642	// TODO: handle this with exceptions and tolerate the memory loss	571	// TODO: handle this with exceptions and tolerate the memory loss
643	XSetIOErrorHandler (rxvt_xioerror_handler);	572	XSetIOErrorHandler (rxvt_xioerror_handler);
644		573
645	XrmInitialize ();	574	XrmInitialize ();
646	}
647
648	/* ------------------------------------------------------------------------- *
649	* MEMORY ALLOCATION WRAPPERS *
650	* ------------------------------------------------------------------------- */
651	void *
652	rxvt_malloc (size_t size)
653	{
654	void *p = malloc (size);
655
656	if (!p)
657	rxvt_fatal ("memory allocation failure. aborting.\n");
658
659	return p;
660	}
661
662	void *
663	rxvt_calloc (size_t number, size_t size)
664	{
665	void *p = calloc (number, size);
666
667	if (!p)
668	rxvt_fatal ("memory allocation failure. aborting.\n");
669
670	return p;
671	}
672
673	void *
674	rxvt_realloc (void *ptr, size_t size)
675	{
676	void *p = realloc (ptr, size);
677
678	if (!p)
679	rxvt_fatal ("memory allocation failure. aborting.\n");
680
681	return p;
682	}	575	}
683		576
684	/----------------------------------------------------------------------/	577	/----------------------------------------------------------------------/
685	/*	578	/*
686	* window size/position calculations for XSizeHint and other storage.	579	* window size/position calculations for XSizeHint and other storage.
…		…
688	*/	581	*/
689	void	582	void
690	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	583	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
691	{	584	{
692	short recalc_x, recalc_y;	585	short recalc_x, recalc_y;
693	int x, y, sb_w, flags;	586	int x, y, flags;
694	unsigned int w, h;	587	unsigned int w, h;
695	unsigned int max_width, max_height;	588	unsigned int max_width, max_height;
696		589
697	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	590	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
698	szHint.win_gravity = NorthWestGravity;	591	szHint.win_gravity = NorthWestGravity;
…		…
708	if (rs[Rs_geometry])	601	if (rs[Rs_geometry])
709	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	602	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
710		603
711	if (flags & WidthValue)	604	if (flags & WidthValue)
712	{	605	{
		606	if (!w)
		607	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		608
713	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	609	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
714	szHint.flags \|= USSize;	610	szHint.flags \|= USSize;
715	}	611	}
716		612
717	if (flags & HeightValue)	613	if (flags & HeightValue)
718	{	614	{
		615	if (!h)
		616	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		617
719	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	618	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
720	szHint.flags \|= USSize;	619	szHint.flags \|= USSize;
721	}	620	}
722		621
723	if (flags & XValue)	622	if (flags & XValue)
724	{	623	{
…		…
755	max_width = MAX_COLS * fwidth;	654	max_width = MAX_COLS * fwidth;
756	max_height = MAX_ROWS * fheight;	655	max_height = MAX_ROWS * fheight;
757		656
758	szHint.base_width = szHint.base_height = 2 * int_bwidth;	657	szHint.base_width = szHint.base_height = 2 * int_bwidth;
759		658
760	sb_w = 0;
761	window_vt_x = window_vt_y = int_bwidth;	659	window_vt_x = window_vt_y = int_bwidth;
762		660
763	if (scrollBar.state)	661	if (scrollBar.state)
764	{	662	{
765	sb_w = scrollbar_TotalWidth ();	663	int sb_w = scrollBar.total_width ();
766	szHint.base_width += sb_w;	664	szHint.base_width += sb_w;
767		665
768	if (!option (Opt_scrollBar_right))	666	if (!option (Opt_scrollBar_right))
769	window_vt_x += sb_w;	667	window_vt_x += sb_w;
770	}	668	}
…		…
794	{	692	{
795	min_it (height, max_height);	693	min_it (height, max_height);
796	szHint.height = szHint.base_height + height;	694	szHint.height = szHint.base_height + height;
797	}	695	}
798		696
799	if (scrollBar.state && option (Opt_scrollBar_right))
800	window_sb_x = szHint.width - sb_w;
801
802	if (recalc_x)	697	if (recalc_x)
803	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	698	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804		699
805	if (recalc_y)	700	if (recalc_y)
806	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	701	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
807		702
808	ncol = width / fwidth;	703	ncol = width / fwidth;
809	nrow = height / fheight;	704	nrow = height / fheight;
810	}	705	}
811		706
812	/----------------------------------------------------------------------/	707	/----------------------------------------------------------------------/
813	/*	708	/*
…		…
824		719
825	ws.ws_col = ncol;	720	ws.ws_col = ncol;
826	ws.ws_row = nrow;	721	ws.ws_row = nrow;
827	ws.ws_xpixel = width;	722	ws.ws_xpixel = width;
828	ws.ws_ypixel = height;	723	ws.ws_ypixel = height;
829	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	724	ioctl (pty->pty, TIOCSWINSZ, &ws);
830		725
831	#if 0	726	#if 0
832	// TIOCSWINSZ is supposed to do this automatically and correctly	727	// TIOCSWINSZ is supposed to do this automatically and correctly
833	if (cmd_pid) /* force through to the command */	728	if (cmd_pid) /* force through to the command */
834	kill (-cmd_pid, SIGWINCH);	729	kill (-cmd_pid, SIGWINCH);
…		…
864	#endif	759	#endif
865		760
866	delete fontset[0];	761	delete fontset[0];
867	fontset[0] = fs;	762	fontset[0] = fs;
868		763
869	prop = (*fs)[1]->properties ();	764	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
870	prop.height += lineSpace;	765	prop.height += lineSpace;
		766	prop.width += letterSpace;
871		767
872	fs->set_prop (prop, false);	768	fs->set_prop (prop, false);
873		769
874	fwidth = prop.width;	770	fwidth = prop.width;
875	fheight = prop.height;	771	fheight = prop.height;
…		…
925	prop, XA_STRING, 8, PropModeReplace,	821	prop, XA_STRING, 8, PropModeReplace,
926	(const unsigned char *)str, len >= 0 ? len : strlen (str));	822	(const unsigned char *)str, len >= 0 ? len : strlen (str));
927	}	823	}
928		824
929	void	825	void
		826	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		827	{
		828	XTextProperty ct;
		829
		830	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		831	{
		832	XSetTextProperty (dpy, parent[0], &ct, prop);
		833	XFree (ct.value);
		834	}
		835	}
		836
		837	void
930	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	838	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
931	{	839	{
932	wchar_t *ws = rxvt_mbstowcs (str, len);	840	wchar_t *ws = rxvt_mbstowcs (str, len);
933	char *s = rxvt_wcstoutf8 (ws);	841	char *s = rxvt_wcstoutf8 (ws);
934		842
…		…
944	/----------------------------------------------------------------------/	852	/----------------------------------------------------------------------/
945	/* xterm sequences - title, iconName, color (exptl) */	853	/* xterm sequences - title, iconName, color (exptl) */
946	void	854	void
947	rxvt_term::set_title (const char *str)	855	rxvt_term::set_title (const char *str)
948	{	856	{
949	set_string_property (XA_WM_NAME, str);	857	set_mbstring_property (XA_WM_NAME, str);
950	#if ENABLE_EWMH	858	#if ENABLE_EWMH
951	set_utf8_property (xa[XA_NET_WM_NAME], str);	859	set_utf8_property (xa[XA_NET_WM_NAME], str);
952	#endif	860	#endif
953	}	861	}
954		862
955	void	863	void
956	rxvt_term::set_icon_name (const char *str)	864	rxvt_term::set_icon_name (const char *str)
957	{	865	{
958	set_string_property (XA_WM_ICON_NAME, str);	866	set_mbstring_property (XA_WM_ICON_NAME, str);
959	#if ENABLE_EWMH	867	#if ENABLE_EWMH
960	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	868	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
961	#endif	869	#endif
962	}	870	}
963		871
964	void	872	void
965	rxvt_term::set_window_color (int idx, const char *color)	873	rxvt_term::set_window_color (int idx, const char *color)
966	{	874	{
967	#ifdef XTERM_COLOR_CHANGE	875	#ifdef XTERM_COLOR_CHANGE
968	rxvt_color xcol;	876	rxvt_color xcol;
969	int i;
970		877
971	if (color == NULL \|\| *color == '\0')	878	if (color == NULL \|\| *color == '\0')
972	return;	879	return;
973		880
974	color = strdup (color);	881	color = strdup (color);
…		…
976	rs[Rs_color + idx] = color;	883	rs[Rs_color + idx] = color;
977		884
978	/* handle color aliases */	885	/* handle color aliases */
979	if (isdigit (*color))	886	if (isdigit (*color))
980	{	887	{
981	i = atoi (color);	888	int i = atoi (color);
982		889
983	if (i >= 8 && i <= 15)	890	if (i >= 8 && i <= 15)
984	{	891	{
985	/* bright colors */	892	/* bright colors */
986	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	893	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
1090	int old_width = szHint.width;	997	int old_width = szHint.width;
1091	int old_height = szHint.height;	998	int old_height = szHint.height;
1092		999
1093	window_calc (newwidth, newheight);	1000	window_calc (newwidth, newheight);
1094		1001
1095	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1002	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1003
		1004	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1005	if (set_hint)
		1006	{
		1007	szHint.flags &= ~(PBaseSize \| PResizeInc);
1096	XSetWMNormalHints (dpy, parent[0], &szHint);	1008	XSetWMNormalHints (dpy, parent[0], &szHint);
		1009	szHint.flags \|= PBaseSize \| PResizeInc;
		1010	}
1097		1011
1098	if (!ignoreparent)	1012	if (!ignoreparent)
1099	{	1013	{
1100	#ifdef SMART_RESIZE	1014	#ifdef SMART_RESIZE
1101	/*	1015	/*
…		…
1141	#else	1055	#else
1142	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1056	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1143	#endif	1057	#endif
1144	}	1058	}
1145		1059
		1060	if (set_hint)
		1061	XSetWMNormalHints (dpy, parent[0], &szHint);
		1062
1146	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1063	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1147		1064
1148	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1065	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1149	{	1066	{
1150	if (scrollBar.state)	1067	if (scrollBar.state)
1151	{	1068	scrollBar.resize ();
1152	XMoveResizeWindow (dpy, scrollBar.win,
1153	window_sb_x, 0,
1154	scrollbar_TotalWidth (), szHint.height);
1155	resize_scrollbar ();
1156	}
1157		1069
1158	XMoveResizeWindow (dpy, vt,	1070	XMoveResizeWindow (dpy, vt,
1159	window_vt_x, window_vt_y,	1071	window_vt_x, window_vt_y,
1160	width, height);	1072	width, height);
1161		1073
1162	#ifdef HAVE_BG_PIXMAP	1074	#ifdef HAVE_BG_PIXMAP
1163	if (bgPixmap.window_size_sensitive ())	1075	if (bgPixmap.window_size_sensitive ())
1164	update_background ();	1076	update_background ();
1165	#endif	1077	#endif
1166
1167	scr_clear ();
1168	}	1078	}
1169		1079
1170	if (fix_screen \|\| old_height == 0)	1080	if (fix_screen \|\| old_height == 0)
1171	scr_reset ();	1081	scr_reset ();
1172
1173	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1174	//scr_touch (false);
1175		1082
1176	#ifdef HAVE_BG_PIXMAP	1083	#ifdef HAVE_BG_PIXMAP
1177	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?	1084	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1178	// if (bgPixmap.pixmap)	1085	// if (bgPixmap.pixmap)
1179	// scr_touch (false);	1086	// scr_touch (false);
…		…
1251		1158
1252	/* Checking whether input method is running. */	1159	/* Checking whether input method is running. */
1253	bool	1160	bool
1254	rxvt_term::IMisRunning ()	1161	rxvt_term::IMisRunning ()
1255	{	1162	{
1256	char *p;
1257	Atom atom;	1163	Atom atom;
1258	Window win;	1164	Window win;
1259	char server[IMBUFSIZ];	1165	char server[IMBUFSIZ];
1260		1166
1261	/* get current locale modifier */	1167	/* get current locale modifier */
1262	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1168	if (char *p = XSetLocaleModifiers (0))
1263	{	1169	{
1264	strcpy (server, "@server=");	1170	strcpy (server, "@server=");
1265	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1171	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1266		1172
1267	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1173	if (p = strchr (server + 1, '@')) /* first one only */
1268	*p = '\0';	1174	*p = '\0';
1269		1175
1270	atom = XInternAtom (dpy, server, False);	1176	atom = XInternAtom (dpy, server, False);
1271	win = XGetSelectionOwner (dpy, atom);	1177	win = XGetSelectionOwner (dpy, atom);
1272		1178
…		…
1339		1245
1340	term->make_current ();	1246	term->make_current ();
1341		1247
1342	if (text)	1248	if (text)
1343	{	1249	{
1344	void *str;	1250	wchar_t *str;
1345		1251
1346	if (!text->encoding_is_wchar && text->string.multi_byte)	1252	if (!text->encoding_is_wchar && text->string.multi_byte)
1347	{	1253	{
1348	// of course, X makes it ugly again	1254	// of course, X makes it ugly again
1349	if (term->rs[Rs_imLocale])	1255	if (term->rs[Rs_imLocale])
1350	SET_LOCALE (term->rs[Rs_imLocale]);	1256	SET_LOCALE (term->rs[Rs_imLocale]);
1351		1257
1352	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1258	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1353	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1259	mbstowcs (str, text->string.multi_byte, text->length + 1);
1354		1260
1355	if (term->rs[Rs_imLocale])	1261	if (term->rs[Rs_imLocale])
1356	SET_LOCALE (term->locale);	1262	SET_LOCALE (term->locale);
1357	}	1263	}
1358	else	1264	else
1359	str = (void *)text->string.wide_char;	1265	str = text->string.wide_char;
1360		1266
1361	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1267	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1362	DT_INT, call_data->caret,	1268	DT_INT, call_data->caret,
1363	DT_INT, call_data->chg_first,	1269	DT_INT, call_data->chg_first,
1364	DT_INT, call_data->chg_length,	1270	DT_INT, call_data->chg_length,
…		…
1718	void	1624	void
1719	rxvt_term::get_window_origin (int &x, int &y)	1625	rxvt_term::get_window_origin (int &x, int &y)
1720	{	1626	{
1721	Window cr;	1627	Window cr;
1722	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1628	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1723	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1724	}	1629	}
1725		1630
1726	Pixmap	1631	Pixmap
1727	rxvt_term::get_pixmap_property (int prop_id)	1632	rxvt_term::get_pixmap_property (int prop_id)
1728	{	1633	{
…		…
1735	unsigned char *prop = NULL;	1640	unsigned char *prop = NULL;
1736	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1641	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1737	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1642	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1738	&nitems, &bytes_after, &prop);	1643	&nitems, &bytes_after, &prop);
1739	if (result == Success && prop && atype == XA_PIXMAP)	1644	if (result == Success && prop && atype == XA_PIXMAP)
1740	{
1741	return (Pixmap )prop;	1645	return (Pixmap )prop;
1742	}
1743	}	1646	}
		1647
1744	return None;	1648	return None;
1745	}	1649	}
1746		1650
1747	#ifdef HAVE_BG_PIXMAP	1651	#ifdef HAVE_BG_PIXMAP
1748	# if TRACE_PIXMAPS
1749	# undef update_background
1750	int rxvt_term::trace_update_background (const char *file, int line)
1751	{
1752	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753	update_background ();
1754	}
1755	# endif
1756		1652
1757	int	1653	void
1758	rxvt_term::update_background ()	1654	rxvt_term::update_background ()
1759	{	1655	{
		1656	if (update_background_ev.is_active ())
		1657	return;
		1658
1760	bgPixmap.invalidate ();	1659	bgPixmap.invalidate ();
1761		1660
1762	/* no chance of real time refresh if we are blurring! */	1661	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1763	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1662
		1663	if (to_wait <= 0.)
1764	bgPixmap.render ();	1664	bgPixmap.render ();
1765	else	1665	else
1766	{
1767	update_background_ev.stop ();
1768
1769	if (!bgPixmap.need_client_side_rendering())
1770	update_background_ev.start (.05);	1666	update_background_ev.start (to_wait);
1771	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772	update_background_ev.start (.20); /* very slow !!! */
1773	else
1774	update_background_ev.start (.07);
1775	}
1776
1777	return 0;
1778	}	1667	}
1779		1668
1780	void	1669	void
1781	rxvt_term::update_background_cb (ev::timer &w, int revents)	1670	rxvt_term::update_background_cb (ev::timer &w, int revents)
1782	{	1671	{
		1672	make_current ();
		1673
		1674	update_background_ev.stop ();
1783	bgPixmap.render ();	1675	bgPixmap.render ();
		1676	refresh_check ();
1784	}	1677	}
1785		1678
1786	#endif /* HAVE_BG_PIXMAP */	1679	#endif /* HAVE_BG_PIXMAP */
1787		1680
1788	/----------------------- end-of-file (C source) -----------------------/	1681	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.275 by root, Tue Dec 11 15:42:51 2007 UTC vs. Revision 1.335 by root, Sun Oct 24 17:52:50 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.275 by root, Tue Dec 11 15:42:51 2007 UTC vs.
Revision 1.335 by root, Sun Oct 24 17:52:50 2010 UTC