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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.189 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.303 by ayin, Sun Jan 27 22:48:33 2008 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: main.C	2	* File: main.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
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.
…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef TTY_GID_SUPPORT
44	# include <grp.h>
45	#endif
46
47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	43	#include <termios.h>
		44
		45	#ifdef HAVE_XSETLOCALE
		46	# define X_LOCALE
		47	# include <X11/Xlocale.h>
		48	#else
		49	# ifdef HAVE_SETLOCALE
		50	# include <clocale>
		51	# endif
49	#endif	52	#endif
50		53
51	vector<rxvt_term *> rxvt_term::termlist;	54	vector<rxvt_term *> rxvt_term::termlist;
52		55
		56	// used to tell global functions which terminal instance is "active"
		57	rxvt_t rxvt_current_term;
		58
53	static char curlocale[128], savelocale[128];	59	static char curlocale[128], savelocale[128];
54		60
55	bool	61	bool
56	rxvt_set_locale (const char *locale)	62	rxvt_set_locale (const char *locale) NOTHROW
57	{	63	{
		64	int size = strlen (locale) + 1;
		65
		66	if (size > sizeof (curlocale))
		67	rxvt_fatal ("locale string too long, aborting.\n");
		68
58	if (!locale \|\| !strncmp (locale, curlocale, 128))	69	if (!locale \|\| !memcmp (locale, curlocale, size))
59	return false;	70	return false;
60		71
61	strncpy (curlocale, locale, 128);	72	memcpy (curlocale, locale, size);
62	setlocale (LC_CTYPE, curlocale);	73	setlocale (LC_CTYPE, curlocale);
63	return true;	74	return true;
64	}	75	}
65		76
66	void	77	void
67	rxvt_push_locale (const char *locale)	78	rxvt_push_locale (const char *locale) NOTHROW
68	{	79	{
69	strcpy (savelocale, curlocale);	80	strcpy (savelocale, curlocale);
70	rxvt_set_locale (locale);	81	rxvt_set_locale (locale);
71	}	82	}
72		83
73	void	84	void
74	rxvt_pop_locale ()	85	rxvt_pop_locale () NOTHROW
75	{	86	{
76	rxvt_set_locale (savelocale);	87	rxvt_set_locale (savelocale);
77	}	88	}
78		89
79	#if ENABLE_COMBINING	90	#if ENABLE_COMBINING
80	class rxvt_composite_vec rxvt_composite;	91	class rxvt_composite_vec rxvt_composite;
81		92
82	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
83	{	94	{
84	compose_char *cc;	95	compose_char *cc;
85		96
86	// break compose chains, as stupid readline really likes to duplicate	97	// break compose chains, as stupid readline really likes to duplicate
87	// composing characters for some reason near the end of a line.	98	// composing characters for some reason near the end of a line.
88	cc = (*this)[c1];	99	cc = (*this)[c1];
89	while (cc)	100	while (cc)
90	{	101	{
…		…
139		150
140	}	151	}
141	#endif	152	#endif
142		153
143	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
144	:	155	{
145	#if TRANSPARENT	156	#if HAVE_BG_PIXMAP
146	rootwin_ev (this, &rxvt_term::rootwin_cb),	157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
147	#endif
148	#ifdef HAVE_SCROLLBARS
149	scrollbar_ev (this, &rxvt_term::x_cb),
150	#endif	158	#endif
151	#ifdef CURSOR_BLINK	159	#ifdef CURSOR_BLINK
152	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
153	#endif	161	#endif
154	#ifdef TEXT_BLINK	162	#ifdef TEXT_BLINK
155	text_blink_ev (this, &rxvt_term::text_blink_cb),	163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
156	#endif	164	#endif
157	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
158	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),	166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
159	#endif	167	#endif
160	#ifdef SELECTION_SCROLLING	168	#ifdef SELECTION_SCROLLING
161	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),	169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
162	#endif	170	#endif
163	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
164	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),	172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
		174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
		175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
		176	#endif
		177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
		178	#ifdef USE_XIM
		179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
165	#endif	180	#endif
166	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
167	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
168	#endif	183	#endif
169	#ifdef USE_XIM	184	#ifndef NO_BELL
170	im_ev (this, &rxvt_term::im_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
171	#endif	186	#endif
172	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
173	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
174	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
175	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
176	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
177	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
178	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
179	incr_ev (this, &rxvt_term::incr_cb)	194
180	{
181	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
182		196
183	termlist.push_back (this);	197	termlist.push_back (this);
184		198
185	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
186	keyboard = new keyboard_manager;	200	keyboard = new keyboard_manager;
187
188	if (!keyboard)
189	rxvt_fatal ("out of memory, aborting.\n");
190	#endif	201	#endif
191	}	202	}
192		203
193	// clean up the most important stuff, do not call x or free mem etc.	204	// clean up the most important stuff, do not call x or free mem etc.
194	// for use before an emergency exit	205	// for use before an emergency exit
		206	void
195	void rxvt_term::emergency_cleanup ()	207	rxvt_term::emergency_cleanup ()
196	{	208	{
197	if (cmd_pid)	209	if (cmd_pid)
198	kill (-cmd_pid, SIGHUP);	210	kill (-cmd_pid, SIGHUP);
199		211
		212	pty_ev.stop ();
200	delete pty; pty = 0;	213	delete pty; pty = 0;
201	}	214	}
202		215
203	rxvt_term::~rxvt_term ()	216	rxvt_term::~rxvt_term ()
204	{	217	{
205	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
206
207	termlist.erase (find (termlist.begin (), termlist.end(), this));	218	termlist.erase (find (termlist.begin (), termlist.end(), this));
208		219
209	emergency_cleanup ();	220	emergency_cleanup ();
210		221
211	#if ENABLE_STYLES	222	#if ENABLE_STYLES
…		…
213	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
214	delete fontset[i];	225	delete fontset[i];
215	#endif	226	#endif
216	delete fontset[0];	227	delete fontset[0];
217		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
		232
218	if (display)	233	if (display)
219	{	234	{
220	dDisp;
221
222	selection_clear ();	235	selection_clear ();
223		236
224	#ifdef USE_XIM	237	#ifdef USE_XIM
225	im_destroy ();	238	im_destroy ();
226	#endif	239	#endif
227	#ifdef XTERM_SCROLLBAR	240	#ifdef XTERM_SCROLLBAR
228	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	241	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
229	if (ShadowGC) XFreeGC (disp, ShadowGC);	242	if (ShadowGC) XFreeGC (dpy, ShadowGC);
230	#endif	243	#endif
231	#ifdef PLAIN_SCROLLBAR	244	#ifdef PLAIN_SCROLLBAR
232	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);	245	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
233	#endif	246	#endif
234	#ifdef NEXT_SCROLLBAR	247	#ifdef NEXT_SCROLLBAR
235	if (blackGC) XFreeGC (disp, blackGC);	248	if (blackGC) XFreeGC (dpy, blackGC);
236	if (whiteGC) XFreeGC (disp, whiteGC);	249	if (whiteGC) XFreeGC (dpy, whiteGC);
237	if (grayGC) XFreeGC (disp, grayGC);	250	if (grayGC) XFreeGC (dpy, grayGC);
238	if (darkGC) XFreeGC (disp, darkGC);	251	if (darkGC) XFreeGC (dpy, darkGC);
239	if (stippleGC) XFreeGC (disp, stippleGC);	252	if (stippleGC) XFreeGC (dpy, stippleGC);
240	if (dimple) XFreePixmap (disp, dimple);	253	if (dimple) XFreePixmap (dpy, dimple);
241	if (upArrow) XFreePixmap (disp, upArrow);	254	if (upArrow) XFreePixmap (dpy, upArrow);
242	if (downArrow) XFreePixmap (disp, downArrow);	255	if (downArrow) XFreePixmap (dpy, downArrow);
243	if (upArrowHi) XFreePixmap (disp, upArrowHi);	256	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
244	if (downArrowHi) XFreePixmap (disp, downArrowHi);	257	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
245	#endif	258	#endif
246	#ifdef RXVT_SCROLLBAR	259	#ifdef RXVT_SCROLLBAR
247	if (topShadowGC) XFreeGC (disp, topShadowGC);	260	if (topShadowGC) XFreeGC (dpy, topShadowGC);
248	if (botShadowGC) XFreeGC (disp, botShadowGC);	261	if (botShadowGC) XFreeGC (dpy, botShadowGC);
249	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	262	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
250	#endif	263	#endif
251	if (gc) XFreeGC (disp, gc);	264	if (gc) XFreeGC (dpy, gc);
252		265
253	delete drawable;	266	delete drawable;
254	// destroy all windows	267	// destroy all windows
255	if (parent[0])	268	if (parent[0])
256	XDestroyWindow (disp, parent[0]);	269	XDestroyWindow (dpy, parent[0]);
257	}
258		270
259	// TODO: free pixcolours, colours should become part of rxvt_display	271	for (int i = 0; i < TOTAL_COLORS; i++)
260	delete pix_colors_focused;	272	if (ISSET_PIXCOLOR (i))
		273	{
		274	pix_colors_focused [i].free (this);
261	#if OFF_FOCUS_FADING	275	#if OFF_FOCUS_FADING
262	delete pix_colors_unfocused;	276	pix_colors_unfocused [i].free (this);
263	#endif	277	#endif
		278	}
264		279
		280	clear ();
		281
		282	display->flush (); /* ideally .put should do this */
265	displays.put (display);	283	displays.put (display);
		284	}
266		285
267	scr_release ();	286	scr_release ();
268		287
269	/* clear all resources */	288	/* clear all resources */
270	for (int i = 0; i < allocated.size (); i++)	289	for (int i = 0; i < allocated.size (); i++)
271	free (allocated [i]);	290	free (allocated [i]);
272		291
273	free (selection.text);	292	free (selection.text);
274	// TODO: manage env vars in child only(!)	293	// TODO: manage env vars in child only(!)
275	free (env_windowid);
276	free (env_display);	294	free (env_display);
277	free (env_term);	295	free (env_term);
278	free (env_colorfgbg);
279	free (locale);	296	free (locale);
280	free (v_buffer);	297	free (v_buffer);
281	free (incr_buf);	298	free (incr_buf);
282		299
283	delete envv;	300	delete envv;
284	delete argv;	301	delete argv;
285		302
286	#ifdef KEYSYM_RESOURCE	303	#ifdef KEYSYM_RESOURCE
287	delete keyboard;	304	delete keyboard;
288	#endif	305	#endif
		306	#ifndef NO_RESOURCES
		307	XrmDestroyDatabase (option_db);
		308	#endif
289	}	309	}
290		310
291	// child has exited, usually destroys	311	// child has exited, usually destroys
292	void	312	void
293	rxvt_term::child_cb (child_watcher &w, int status)	313	rxvt_term::child_cb (ev::child &w, int status)
294	{	314	{
295	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	315	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
296		316
297	cmd_pid = 0;	317	cmd_pid = 0;
298		318
299	if (!OPTION (Opt_hold))	319	if (!option (Opt_hold))
300	destroy ();	320	destroy ();
301	}	321	}
302		322
303	void	323	void
304	rxvt_term::destroy ()	324	rxvt_term::destroy ()
305	{	325	{
306	if (destroy_ev.active)	326	if (destroy_ev.is_active ())
307	return;	327	return;
		328
		329	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308		330
309	#if ENABLE_OVERLAY	331	#if ENABLE_OVERLAY
310	scr_overlay_off ();	332	scr_overlay_off ();
311	#endif	333	#endif
312		334
313	if (display)	335	if (display)
314	{	336	{
315	#if USE_XIM	337	#if USE_XIM
316	im_ev.stop (display);	338	im_ev.stop (display);
317	#endif	339	#endif
318	#if HAVE_SCROLLBARS
319	scrollbar_ev.stop (display);	340	scrollbar_ev.stop (display);
320	#endif	341	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
321	#if TRANSPARENT
322	rootwin_ev.stop (display);	342	rootwin_ev.stop (display);
323	#endif	343	#endif
324	incr_ev.stop ();	344	incr_ev.stop ();
325	termwin_ev.stop (display);	345	termwin_ev.stop (display);
326	vt_ev.stop (display);	346	vt_ev.stop (display);
327	}	347	}
328		348
329	check_ev.stop ();	349	flush_ev.stop ();
330	pty_ev.stop ();	350	pty_ev.stop ();
331	#ifdef CURSOR_BLINK	351	#ifdef CURSOR_BLINK
332	cursor_blink_ev.stop ();	352	cursor_blink_ev.stop ();
333	#endif	353	#endif
334	#ifdef TEXT_BLINK	354	#ifdef TEXT_BLINK
…		…
342	#endif	362	#endif
343	#ifdef POINTER_BLANK	363	#ifdef POINTER_BLANK
344	pointer_ev.stop ();	364	pointer_ev.stop ();
345	#endif	365	#endif
346		366
347	destroy_ev.start (0);	367	destroy_ev.start ();
348	}	368	}
349		369
350	void	370	void
351	rxvt_term::destroy_cb (time_watcher &w)	371	rxvt_term::destroy_cb (ev::idle &w, int revents)
352	{	372	{
353	make_current ();	373	make_current ();
354		374
355	delete this;	375	delete this;
356	}	376	}
…		…
367	{	387	{
368	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	388	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
369	(*t)->emergency_cleanup ();	389	(*t)->emergency_cleanup ();
370	}	390	}
371		391
372	#if ENABLE_FRILLS	392	#if !ENABLE_MINIMAL
373	static void	393	static void
374	print_x_error (Display dpy, XErrorEvent event)	394	print_x_error (Display dpy, XErrorEvent event)
375	{	395	{
376	char buffer[BUFSIZ];	396	char buffer[BUFSIZ];
377	char mesg[BUFSIZ];	397	char mesg[BUFSIZ];
…		…
410	else	430	else
411	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
412	mesg, BUFSIZ);	432	mesg, BUFSIZ);
413	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
414	}	434	}
415	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
416	mesg, BUFSIZ);	436	mesg, BUFSIZ);
417	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
418	}	438	}
419	#endif	439	#endif
420		440
…		…
425	GET_R->allowedxerror = event->error_code;	445	GET_R->allowedxerror = event->error_code;
426	else	446	else
427	{	447	{
428	// GET_R is most likely not the terminal which caused the error,	448	// GET_R is most likely not the terminal which caused the error,
429	// so just output the error and continue	449	// so just output the error and continue
430	#if ENABLE_FRILLS	450	#if ENABLE_MINIMAL
		451	old_xerror_handler (display, event);
		452	#else
431	print_x_error (display, event);	453	print_x_error (display, event);
432	#else
433	old_xerror_handler (display, event);
434	#endif	454	#endif
435	}	455	}
436		456
437	return 0;	457	return 0;
438	}	458	}
…		…
444	DisplayString (display));	464	DisplayString (display));
445	rxvt_emergency_cleanup ();	465	rxvt_emergency_cleanup ();
446	_exit (EXIT_FAILURE);	466	_exit (EXIT_FAILURE);
447	}	467	}
448		468
449	/----------------------------------------------------------------------/
450	bool
451	rxvt_term::init (int argc, const char const argv)
452	{
453	SET_R (this);
454	set_locale ("");
455	set_environ (envv); // few things in X do not call setlocale :(
456
457	if (!init_vars ())
458	return false;
459
460	init_secondary ();
461
462	const char **cmd_argv = init_resources (argc, argv);
463
464	#ifdef KEYSYM_RESOURCE
465	keyboard->register_done ();
466	#endif
467
468	#ifdef HAVE_SCROLLBARS
469	if (OPTION (Opt_scrollBar))
470	scrollBar.setIdle (); /* set existence for size calculations */
471	#endif
472
473	#if ENABLE_PERL
474	if (!rs[Rs_perl_ext_1])
475	rs[Rs_perl_ext_1] = "default";
476
477	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
478	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
479	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
480	{
481	rxvt_perl.init (this);
482	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
483	}
484	#endif
485
486	pty = rxvt_new_ptytty ();
487
488	create_windows (argc, argv);
489
490	dDisp;
491
492	init_xlocale ();
493
494	scr_reset (); // initialize screen
495
496	#if 0
497	XSynchronize (disp, True);
498	#endif
499
500	#ifdef HAVE_SCROLLBARS
501	if (OPTION (Opt_scrollBar))
502	resize_scrollbar (); /* create and map scrollbar */
503	#endif
504	#ifdef TRANSPARENT
505	if (OPTION (Opt_transparent))
506	{
507	XSelectInput (disp, display->root, PropertyChangeMask);
508	check_our_parents ();
509	rootwin_ev.start (display, display->root);
510	}
511	#endif
512
513	XMapWindow (disp, vt);
514	XMapWindow (disp, parent[0]);
515
516	set_colorfgbg ();
517
518	init_command (cmd_argv);
519
520	free (cmd_argv);
521
522	if (pty->pty >= 0)
523	pty_ev.start (pty->pty, EVENT_READ);
524
525	check_ev.start ();
526
527	HOOK_INVOKE ((this, HOOK_START, DT_END));
528
529	return true;
530	}
531
532	static struct sig_handlers	469	static struct sig_handlers
533	{	470	{
534	sig_watcher sw_term, sw_int;	471	ev::sig sw_term, sw_int;
535		472
536	/*	473	/*
537	* Catch a fatal signal and tidy up before quitting	474	* Catch a fatal signal and tidy up before quitting
538	*/	475	*/
539	void	476	void sig_term (ev::sig &w, int revents);
540	sig_term (sig_watcher &w)	477
		478	sig_handlers ()
541	{	479	{
542	#ifdef DEBUG_CMD	480	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
543	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
544	#endif
545	rxvt_emergency_cleanup ();
546	signal (w.signum, SIG_DFL);
547	kill (getpid (), w.signum);
548	}
549
550	sig_handlers ()
551	: sw_term (this, &sig_handlers::sig_term),
552	sw_int (this, &sig_handlers::sig_term)	481	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
553	{
554	}	482	}
555	} sig_handlers;	483	} sig_handlers;
556		484
		485	void
		486	sig_handlers::sig_term (ev::sig &w, int revents)
		487	{
		488	rxvt_emergency_cleanup ();
		489	w.stop ();
		490	kill (getpid (), w.signum);
		491	}
		492
557	char **rxvt_environ; // startup environment	493	char **rxvt_environ; // startup environment
558		494
559	void	495	void
560	rxvt_init ()	496	rxvt_init ()
561	{	497	{
562	uid_t uid = getuid ();	498	ptytty::init ();
563	gid_t gid = getgid ();
564
565	// before doing anything else, check for setuid/setgid operation,
566	// start the helper process and drop privileges
567	if (uid != geteuid ()
568	\|\| gid != getegid ())
569	{
570	#if PTYTTY_HELPER
571	rxvt_ptytty_server ();
572	#else
573	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
574	#endif
575		499
576	// drop privileges	500	if (!ev_default_loop (0))
577	#if HAVE_SETRESUID	501	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
578	setresgid (gid, gid, gid);
579	setresuid (uid, uid, uid);
580	#elif HAVE_SETREUID
581	setregid (gid, gid);
582	setreuid (uid, uid);
583	#elif HAVE_SETUID
584	setgid (gid);
585	setuid (uid);
586	#endif
587
588	if (uid != geteuid ()
589	\|\| gid != getegid ())
590	rxvt_fatal ("unable to drop privileges, aborting.\n");
591	}
592		502
593	rxvt_environ = environ;	503	rxvt_environ = environ;
594		504
595	signal (SIGHUP, SIG_IGN);	505	signal (SIGHUP, SIG_IGN);
596	signal (SIGPIPE, SIG_IGN);	506	signal (SIGPIPE, SIG_IGN);
597		507
598	sig_handlers.sw_term.start (SIGTERM);	508	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
599	sig_handlers.sw_int.start (SIGINT);	509	sig_handlers.sw_int.start (SIGINT); ev_unref ();
600		510
601	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	511	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
602	/* signal (SIGURG, SIG_DFL); */	512	/* signal (SIGURG, SIG_DFL); */
603		513
604	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	514	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
606	XSetIOErrorHandler (rxvt_xioerror_handler);	516	XSetIOErrorHandler (rxvt_xioerror_handler);
607		517
608	XrmInitialize ();	518	XrmInitialize ();
609	}	519	}
610		520
611	/* ------------------------------------------------------------------------- *
612	* MEMORY ALLOCATION WRAPPERS *
613	* ------------------------------------------------------------------------- */
614	void *
615	rxvt_malloc (size_t size)
616	{
617	void *p = malloc (size);
618
619	if (!p)
620	rxvt_fatal ("memory allocation failure. aborting.\n");
621
622	return p;
623	}
624
625	void *
626	rxvt_calloc (size_t number, size_t size)
627	{
628	void *p = calloc (number, size);
629
630	if (!p)
631	rxvt_fatal ("memory allocation failure. aborting.\n");
632
633	return p;
634	}
635
636	void *
637	rxvt_realloc (void *ptr, size_t size)
638	{
639	void *p = realloc (ptr, size);
640
641	if (!p)
642	rxvt_fatal ("memory allocation failure. aborting.\n");
643
644	return p;
645	}
646
647	/----------------------------------------------------------------------/	521	/----------------------------------------------------------------------/
648	/*	522	/*
649	* window size/position calculcations for XSizeHint and other storage.	523	* window size/position calculations for XSizeHint and other storage.
650	* if width/height are non-zero then override calculated width/height	524	* if width/height are non-zero then override calculated width/height
651	*/	525	*/
652	void	526	void
653	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	527	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
654	{	528	{
655	short recalc_x, recalc_y;	529	short recalc_x, recalc_y;
656	int x, y, sb_w, flags;	530	int x, y, sb_w, flags;
657	unsigned int w, h;	531	unsigned int w, h;
658	unsigned int max_width, max_height;	532	unsigned int max_width, max_height;
659	dDisp;
660
661	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
662	ncol, nrow, szHint.width, szHint.height));
663		533
664	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	534	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
665	szHint.win_gravity = NorthWestGravity;	535	szHint.win_gravity = NorthWestGravity;
666	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	536	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
667		537
…		…
729		599
730	if (scrollBar.state)	600	if (scrollBar.state)
731	{	601	{
732	sb_w = scrollbar_TotalWidth ();	602	sb_w = scrollbar_TotalWidth ();
733	szHint.base_width += sb_w;	603	szHint.base_width += sb_w;
		604
734	if (!OPTION (Opt_scrollBar_right))	605	if (!option (Opt_scrollBar_right))
735	window_vt_x += sb_w;	606	window_vt_x += sb_w;
736	}	607	}
737		608
738	szHint.width_inc = fwidth;	609	szHint.width_inc = fwidth;
739	szHint.height_inc = fheight;	610	szHint.height_inc = fheight;
740	szHint.min_width = szHint.base_width + szHint.width_inc;	611	szHint.min_width = szHint.base_width + szHint.width_inc;
741	szHint.min_height = szHint.base_height + szHint.height_inc;	612	szHint.min_height = szHint.base_height + szHint.height_inc;
742		613
743	if (newwidth && newwidth - szHint.base_width < max_width)	614	if (newwidth && newwidth - szHint.base_width < max_width)
744	{	615	{
745	szHint.width = newwidth;	616	szHint.width = newwidth;
…		…
760	{	631	{
761	min_it (height, max_height);	632	min_it (height, max_height);
762	szHint.height = szHint.base_height + height;	633	szHint.height = szHint.base_height + height;
763	}	634	}
764		635
765	if (scrollBar.state && OPTION (Opt_scrollBar_right))	636	if (scrollBar.state && option (Opt_scrollBar_right))
766	window_sb_x = szHint.width - sb_w;	637	window_sb_x = szHint.width - sb_w;
767		638
768	if (recalc_x)	639	if (recalc_x)
769	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	640	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
		641
770	if (recalc_y)	642	if (recalc_y)
771	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	643	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
772		644
773	ncol = width / fwidth;	645	ncol = width / fwidth;
774	nrow = height / fheight;	646	nrow = height / fheight;
775	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
776	ncol, nrow, szHint.width,
777	szHint.height));
778	return;
779	}	647	}
780		648
781	/----------------------------------------------------------------------/	649	/----------------------------------------------------------------------/
782	/*	650	/*
783	* Tell the teletype handler what size the window is.	651	* Tell the teletype handler what size the window is.
…		…
796	ws.ws_xpixel = width;	664	ws.ws_xpixel = width;
797	ws.ws_ypixel = height;	665	ws.ws_ypixel = height;
798	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	666	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
799		667
800	#if 0	668	#if 0
801	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	669	// TIOCSWINSZ is supposed to do this automatically and correctly
802	if (cmd_pid) /* force through to the command */	670	if (cmd_pid) /* force through to the command */
803	kill (-cmd_pid, SIGWINCH);	671	kill (-cmd_pid, SIGWINCH);
804	#endif	672	#endif
805	}	673	}
806		674
…		…
835	delete fontset[0];	703	delete fontset[0];
836	fontset[0] = fs;	704	fontset[0] = fs;
837		705
838	prop = (*fs)[1]->properties ();	706	prop = (*fs)[1]->properties ();
839	prop.height += lineSpace;	707	prop.height += lineSpace;
		708
840	fs->set_prop (prop);	709	fs->set_prop (prop, false);
841		710
842	fwidth = prop.width;	711	fwidth = prop.width;
843	fheight = prop.height;	712	fheight = prop.height;
844	fbase = prop.ascent;	713	fbase = prop.ascent;
845		714
…		…
854	{	723	{
855	fontset[style] = fs = new rxvt_fontset (this);	724	fontset[style] = fs = new rxvt_fontset (this);
856	rxvt_fontprop prop2 = prop;	725	rxvt_fontprop prop2 = prop;
857		726
858	if (res)	727	if (res)
859	prop2.weight = prop2.slant = rxvt_fontprop::unset;	728	{
		729	fs->populate (res);
		730	fs->set_prop (prop2, false);
		731	}
860	else	732	else
861	{	733	{
862	res = fontset[0]->fontdesc;	734	fs->populate (fontset[0]->fontdesc);
863		735
864	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	736	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
865	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	737	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		738
		739	fs->set_prop (prop2, true);
866	}	740	}
867		741
868	fs->populate (res);
869	fs->set_prop (prop2);
870	}	742	}
871	#else	743	#else
872	fontset[style] = fontset[0];	744	fontset[style] = fontset[0];
873	#endif	745	#endif
874	}	746	}
…		…
876	if (parent[0])	748	if (parent[0])
877	{	749	{
878	resize_all_windows (0, 0, 0);	750	resize_all_windows (0, 0, 0);
879	scr_remap_chars ();	751	scr_remap_chars ();
880	scr_touch (true);	752	scr_touch (true);
881	}	753	}
882		754
883	return true;	755	return true;
884	}	756	}
885		757
		758	void
886	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	759	rxvt_term::set_string_property (Atom prop, const char *str, int len)
887	{	760	{
888	XChangeProperty (display->display, parent[0],	761	XChangeProperty (dpy, parent[0],
889	prop, XA_STRING, 8, PropModeReplace,	762	prop, XA_STRING, 8, PropModeReplace,
890	(const unsigned char *)str, len >= 0 ? len : strlen (str));	763	(const unsigned char *)str, len >= 0 ? len : strlen (str));
891	}	764	}
892		765
		766	void
893	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	767	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
894	{	768	{
895	wchar_t *ws = rxvt_mbstowcs (str, len);	769	wchar_t *ws = rxvt_mbstowcs (str, len);
896	char *s = rxvt_wcstoutf8 (ws);	770	char *s = rxvt_wcstoutf8 (ws);
897		771
898	XChangeProperty (display->display, parent[0],	772	XChangeProperty (dpy, parent[0],
899	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	773	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
900	(const unsigned char *)s, strlen (s));	774	(const unsigned char *)s, strlen (s));
901		775
902	free (s);	776	free (s);
903	free (ws);	777	free (ws);
…		…
922	#if ENABLE_EWMH	796	#if ENABLE_EWMH
923	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	797	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
924	#endif	798	#endif
925	}	799	}
926		800
		801	void
		802	rxvt_term::set_window_color (int idx, const char *color)
		803	{
927	#ifdef XTERM_COLOR_CHANGE	804	#ifdef XTERM_COLOR_CHANGE
928	void
929	rxvt_term::set_window_color (int idx, const char *color)
930	{
931	rxvt_color xcol;	805	rxvt_color xcol;
932	int i;	806	int i;
933		807
934	if (color == NULL \|\| *color == '\0')	808	if (color == NULL \|\| *color == '\0')
935	return;	809	return;
936		810
		811	color = strdup (color);
		812	allocated.push_back ((void *)color);
		813	rs[Rs_color + idx] = color;
		814
937	/* handle color aliases */	815	/* handle color aliases */
938	if (isdigit (*color))	816	if (isdigit (*color))
939	{	817	{
940	i = atoi (color);	818	i = atoi (color);
941		819
942	if (i >= 8 && i <= 15)	820	if (i >= 8 && i <= 15)
		821	{
943	{ /* bright colors */	822	/* bright colors */
944	i -= 8;
945	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	823	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
946	SET_PIXCOLOR (idx);
947	goto done;	824	goto done;
948	}	825	}
949		826
950	if (i >= 0 && i <= 7)	827	if (i >= 0 && i <= 7)
		828	{
951	{ /* normal colors */	829	/* normal colors */
952	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	830	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
953	SET_PIXCOLOR (idx);
954	goto done;	831	goto done;
955	}	832	}
956	}	833	}
957		834
958	if (!rXParseAllocColor (&xcol, color))	835	set_color (xcol, color);
959	return;
960
961	/* XStoreColor (display->display, display->cmap, XColor); /
962		836
963	/*	837	/*
964	* FIXME: should free colors here, but no idea how to do it so instead,	838	* FIXME: should free colors here, but no idea how to do it so instead,
965	* so just keep gobbling up the colormap	839	* so just keep gobbling up the colormap
966	*/	840	*/
967	# if 0
968	for (i = Color_Black; i <= Color_White; i++)
969	if (pix_colors[idx] == pix_colors[i])
970	break;
971	if (i > Color_White)
972	{
973	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
974	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
975	DisplayPlanes (display->display, display->screen));
976	}
977	# endif
978		841
979	pix_colors_focused[idx] = xcol;	842	pix_colors_focused[idx] = xcol;
980	SET_PIXCOLOR (idx);
981		843
982	/* XSetWindowAttributes attr; */
983	/* Cursor cursor; */
984	done:	844	done:
985
986	#if OFF_FOCUS_FADING
987	if (rs[Rs_fade])
988	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
989	#endif
990
991	/TODO: handle Color_BD, scrollbar background, etc. /	845	/TODO: handle Color_BD, scrollbar background, etc. /
992		846
		847	update_fade_color (idx);
993	recolour_cursor ();	848	recolour_cursor ();
994	scr_recolour ();	849	scr_recolour ();
		850	#endif /* XTERM_COLOR_CHANGE */
995	}	851	}
996
997	#else
998	# define set_window_color (idx,color) ((void)0)
999	#endif /* XTERM_COLOR_CHANGE */
1000		852
1001	void	853	void
1002	rxvt_term::recolour_cursor ()	854	rxvt_term::recolour_cursor ()
1003	{	855	{
1004	XColor xcol[2];	856	XColor fg, bg;
1005		857
1006	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)	858	(ISSET_PIXCOLOR (Color_pointer_fg)
1007	? pix_colors_focused[Color_pointer_fg]	859	? pix_colors_focused[Color_pointer_fg]
1008	: pix_colors_focused[Color_fg];	860	: pix_colors_focused[Color_fg]).get (fg);
		861
1009	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)	862	(ISSET_PIXCOLOR (Color_pointer_bg)
1010	? pix_colors_focused[Color_pointer_bg]	863	? pix_colors_focused[Color_pointer_bg]
1011	: pix_colors_focused[Color_bg];	864	: pix_colors_focused[Color_bg]).get (bg);
1012		865
1013	XQueryColors (display->display, display->cmap, xcol, 2);	866	XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1014	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1015	}	867	}
1016		868
1017	/----------------------------------------------------------------------/	869	/----------------------------------------------------------------------/
1018	/*	870	/*
1019	* find if fg/bg matches any of the normal (low-intensity) colors	871	* find if fg/bg matches any of the normal (low-intensity) colors
1020	*/	872	*/
1021	void	873	void
1022	rxvt_term::set_colorfgbg ()	874	rxvt_term::set_colorfgbg ()
1023	{	875	{
1024	unsigned int i;	876	unsigned int i;
1025	const char *xpmb = "\0";	877	const char *xpmb = "";
1026	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	878	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1027		879
1028	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1029	strcpy (fstr, "default");	880	strcpy (fstr, "default");
1030	strcpy (bstr, "default");	881	strcpy (bstr, "default");
1031	for (i = Color_Black; i <= Color_White; i++)	882	for (i = Color_Black; i <= Color_White; i++)
1032	if (pix_colors[Color_fg] == pix_colors[i])	883	if (pix_colors[Color_fg] == pix_colors[i])
1033	{	884	{
…		…
1037		888
1038	for (i = Color_Black; i <= Color_White; i++)	889	for (i = Color_Black; i <= Color_White; i++)
1039	if (pix_colors[Color_bg] == pix_colors[i])	890	if (pix_colors[Color_bg] == pix_colors[i])
1040	{	891	{
1041	sprintf (bstr, "%d", (i - Color_Black));	892	sprintf (bstr, "%d", (i - Color_Black));
1042	#ifdef XPM_BACKGROUND	893	#ifdef BG_IMAGE_FROM_FILE
1043	xpmb = "default;";	894	xpmb = "default;";
1044	#endif	895	#endif
1045	break;	896	break;
1046	}	897	}
1047		898
1048	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	899	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1049	}	900	}
1050		901
1051	/----------------------------------------------------------------------/	902	/----------------------------------------------------------------------/
1052		903
1053	int	904	bool
1054	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)	905	rxvt_term::set_color (rxvt_color &color, const char *name)
1055	{	906	{
1056	if (!screen_in_out->set (display, colour))	907	if (color.set (this, name))
1057	{
1058	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1059	return false;
1060	}
1061
1062	return true;	908	return true;
		909
		910	rxvt_warn ("can't get colour '%s', continuing without.\n", name);
		911	return false;
		912	}
		913
		914	void
		915	rxvt_term::alias_color (int dst, int src)
		916	{
		917	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1063	}	918	}
1064		919
1065	/* -------------------------------------------------------------------- *	920	/* -------------------------------------------------------------------- *
1066	* - WINDOW RESIZING - *	921	* - WINDOW RESIZING - *
1067	* -------------------------------------------------------------------- */	922	* -------------------------------------------------------------------- */
1068	void	923	void
1069	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	924	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1070	{	925	{
1071	int fix_screen;	926	int fix_screen;
1072	int old_width = szHint.width, old_height = szHint.height;	927	int old_width = szHint.width;
1073	dDisp;	928	int old_height = szHint.height;
1074		929
1075	window_calc (newwidth, newheight);	930	window_calc (newwidth, newheight);
		931
		932	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1076	XSetWMNormalHints (disp, parent[0], &szHint);	933	XSetWMNormalHints (dpy, parent[0], &szHint);
1077		934
1078	if (!ignoreparent)	935	if (!ignoreparent)
1079	{	936	{
1080	#ifdef SMART_RESIZE	937	#ifdef SMART_RESIZE
1081	/*	938	/*
…		…
1085	int x, y, x1, y1;	942	int x, y, x1, y1;
1086	int dx, dy;	943	int dx, dy;
1087	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	944	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1088	Window unused_cr;	945	Window unused_cr;
1089		946
1090	XTranslateCoordinates (disp, parent[0], display->root,	947	XTranslateCoordinates (dpy, parent[0], display->root,
1091	0, 0, &x, &y, &unused_cr);	948	0, 0, &x, &y, &unused_cr);
1092	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,	949	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1093	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	950	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1094	/*	951	/*
1095	* if display->root isn't the parent window, a WM will probably have offset	952	* if display->root isn't the parent window, a WM will probably have offset
1096	* our position for handles and decorations. Counter it	953	* our position for handles and decorations. Counter it
1097	*/	954	*/
…		…
1099	{	956	{
1100	x -= x1;	957	x -= x1;
1101	y -= y1;	958	y -= y1;
1102	}	959	}
1103		960
1104	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	961	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1105	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	962	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1106	dx = old_width - szHint.width;	963	dx = old_width - szHint.width;
1107	dy = old_height - szHint.height;	964	dy = old_height - szHint.height;
1108		965
1109	/* Check position of the center of the window */	966	/* Check position of the center of the window */
1110	if (x < x1) /* left half */	967	if (x < x1) /* left half */
1111	dx = 0;	968	dx = 0;
…		…
1114	if (y < y1) /* top half */	971	if (y < y1) /* top half */
1115	dy = 0;	972	dy = 0;
1116	else if (y == y1) /* exact center */	973	else if (y == y1) /* exact center */
1117	dy /= 2;	974	dy /= 2;
1118		975
1119	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,	976	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1120	szHint.width, szHint.height);	977	szHint.width, szHint.height);
1121	#else	978	#else
1122	XResizeWindow (disp, parent[0], szHint.width, szHint.height);	979	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1123	#endif	980	#endif
1124	}	981	}
1125		982
1126	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	983	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1127		984
1128	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	985	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1129	{	986	{
1130	if (scrollBar.state)	987	if (scrollBar.state)
1131	{	988	{
1132	XMoveResizeWindow (disp, scrollBar.win,	989	XMoveResizeWindow (dpy, scrollBar.win,
1133	window_sb_x, 0,	990	window_sb_x, 0,
1134	scrollbar_TotalWidth (), szHint.height);	991	scrollbar_TotalWidth (), szHint.height);
1135	resize_scrollbar ();	992	resize_scrollbar ();
1136	}	993	}
1137		994
1138	XMoveResizeWindow (disp, vt,	995	XMoveResizeWindow (dpy, vt,
1139	window_vt_x, window_vt_y,	996	window_vt_x, window_vt_y,
1140	width, height);	997	width, height);
1141		998
		999	#ifdef HAVE_BG_PIXMAP
		1000	if (bgPixmap.window_size_sensitive ())
		1001	update_background ();
		1002	#endif
		1003
1142	scr_clear ();	1004	scr_clear ();
1143	#ifdef XPM_BACKGROUND
1144	resize_pixmap ();
1145	#endif
1146	}	1005	}
1147		1006
1148	if (fix_screen \|\| old_height == 0)	1007	if (fix_screen \|\| old_height == 0)
1149	{
1150	int curr_screen = -1;
1151	int old_ncol = prev_ncol;
1152
1153	/* scr_reset only works on the primary screen */
1154	if (old_height) /* this is not the first time through */
1155	{
1156	unsigned int ocol = ncol;
1157	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1158	curr_screen = scr_change_screen (PRIMARY);
1159	ncol = ocol;
1160	}
1161
1162	scr_reset ();	1008	scr_reset ();
1163		1009
1164	if (curr_screen >= 0) /* this is not the first time through */	1010	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1165	{	1011	//scr_touch (false);
1166	scr_change_screen (curr_screen);
1167	selection_check (old_ncol != ncol ? 4 : 0);
1168	}
1169	}
1170		1012
1171	old_width = szHint.width;	1013	#ifdef HAVE_BG_PIXMAP
1172	old_height = szHint.height;	1014	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1173		1015	// if (bgPixmap.pixmap)
1174	#ifdef XPM_BACKGROUND
1175	if (pixmap)
1176	scr_touch (false);	1016	// scr_touch (false);
1177	#endif	1017	#endif
1178		1018
1179	#ifdef USE_XIM	1019	#ifdef USE_XIM
1180	IMSetStatusPosition ();	1020	IMSetPosition ();
1181	#endif	1021	#endif
1182	}	1022	}
1183		1023
1184	/*	1024	/*
1185	* Set the width/height of the vt window in characters. Units are pixels.	1025	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1190	{	1030	{
1191	XWindowAttributes wattr;	1031	XWindowAttributes wattr;
1192		1032
1193	if (newwidth == 0 \|\| newheight == 0)	1033	if (newwidth == 0 \|\| newheight == 0)
1194	{	1034	{
1195	XGetWindowAttributes (display->display, display->root, &wattr);	1035	XGetWindowAttributes (dpy, display->root, &wattr);
1196		1036
1197	if (newwidth == 0)	1037	if (newwidth == 0)
1198	newwidth = wattr.width - szHint.base_width;	1038	newwidth = wattr.width - szHint.base_width;
1199	if (newheight == 0)	1039	if (newheight == 0)
1200	newheight = wattr.height - szHint.base_height;	1040	newheight = wattr.height - szHint.base_height;
…		…
1214	#ifdef USE_XIM	1054	#ifdef USE_XIM
1215		1055
1216	void	1056	void
1217	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1057	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1218	{	1058	{
1219	fg = pix_colors[Color_fg];	1059	fg = pix_colors [Color_fg];
1220	bg = pix_colors[Color_bg];	1060	bg = pix_colors [Color_bg];
1221	}	1061	}
1222		1062
1223	void	1063	void
1224	rxvt_term::im_set_size (XRectangle &size)	1064	rxvt_term::im_set_size (XRectangle &size)
1225	{	1065	{
…		…
1262	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1102	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1263		1103
1264	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1104	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1265	*p = '\0';	1105	*p = '\0';
1266		1106
1267	atom = XInternAtom (display->display, server, False);	1107	atom = XInternAtom (dpy, server, False);
1268	win = XGetSelectionOwner (display->display, atom);	1108	win = XGetSelectionOwner (dpy, atom);
1269		1109
1270	if (win != None)	1110	if (win != None)
1271	return True;	1111	return True;
1272	}	1112	}
1273		1113
…		…
1280	XPoint nspot;	1120	XPoint nspot;
1281	XVaNestedList preedit_attr;	1121	XVaNestedList preedit_attr;
1282		1122
1283	if (!Input_Context	1123	if (!Input_Context
1284	\|\| !focus	1124	\|\| !focus
1285	\|\| !(input_style & XIMPreeditPosition))	1125	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1286	return;	1126	return;
1287		1127
1288	im_set_position (nspot);	1128	im_set_position (nspot);
1289		1129
1290	if (nspot.x == spot.x && nspot.y == spot.y)	1130	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1309	input_method = 0;	1149	input_method = 0;
1310	}	1150	}
1311		1151
1312	Input_Context = 0;	1152	Input_Context = 0;
1313	}	1153	}
		1154
		1155	#ifdef ENABLE_XIM_ONTHESPOT
		1156
		1157	static void
		1158	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1159	{
		1160	((rxvt_term *)client_data)->make_current ();
		1161	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1162	}
		1163
		1164	static void
		1165	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1166	{
		1167	((rxvt_term *)client_data)->make_current ();
		1168	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1169	}
		1170
		1171	static void
		1172	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1173	{
		1174	rxvt_term term = (rxvt_term )client_data;
		1175	XIMText *text = call_data->text;
		1176
		1177	term->make_current ();
		1178
		1179	if (text)
		1180	{
		1181	void *str;
		1182
		1183	if (!text->encoding_is_wchar && text->string.multi_byte)
		1184	{
		1185	// of course, X makes it ugly again
		1186	if (term->rs[Rs_imLocale])
		1187	SET_LOCALE (term->rs[Rs_imLocale]);
		1188
		1189	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1190	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1191
		1192	if (term->rs[Rs_imLocale])
		1193	SET_LOCALE (term->locale);
		1194	}
		1195	else
		1196	str = (void *)text->string.wide_char;
		1197
		1198	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1199	DT_INT, call_data->caret,
		1200	DT_INT, call_data->chg_first,
		1201	DT_INT, call_data->chg_length,
		1202	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1203	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1204	DT_END));
		1205	}
		1206	else
		1207	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1208	DT_INT, call_data->caret,
		1209	DT_INT, call_data->chg_first,
		1210	DT_INT, call_data->chg_length,
		1211	DT_END));
		1212	}
		1213
		1214	#if 0
		1215	static void
		1216	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1217	{
		1218	((rxvt_term *)client_data)->make_current ();
		1219	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1220	DT_INT, call_data->position,
		1221	DT_INT, call_data->direction,
		1222	DT_INT, call_data->style,
		1223	DT_END));
		1224	}
		1225	#endif
		1226
		1227	#endif
1314		1228
1315	/*	1229	/*
1316	* Try to open a XIM with the current modifiers, then see if we can	1230	* Try to open a XIM with the current modifiers, then see if we can
1317	* open a suitable preedit type	1231	* open a suitable preedit type
1318	*/	1232	*/
…		…
1325	XRectangle rect, status_rect, needed_rect;	1239	XRectangle rect, status_rect, needed_rect;
1326	unsigned long fg, bg;	1240	unsigned long fg, bg;
1327	const char *p;	1241	const char *p;
1328	char **s;	1242	char **s;
1329	XIMStyles *xim_styles;	1243	XIMStyles *xim_styles;
		1244	#ifdef ENABLE_XIM_ONTHESPOT
		1245	XIMCallback xcb[4];
		1246	#endif
1330		1247
1331	set_environ (envv);	1248	set_environ (envv);
1332		1249
1333	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1250	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1334	return false;	1251	return false;
1335		1252
1336	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1337	input_method = display->get_xim (locale, modifiers);	1253	input_method = display->get_xim (locale, modifiers);
1338	if (input_method == NULL)	1254	if (input_method == NULL)
1339	return false;	1255	return false;
1340		1256
1341	xim = input_method->xim;	1257	xim = input_method->xim;
…		…
1361	s = rxvt_splitcommastring (p);	1277	s = rxvt_splitcommastring (p);
1362		1278
1363	for (i = found = 0; !found && s[i]; i++)	1279	for (i = found = 0; !found && s[i]; i++)
1364	{	1280	{
1365	if (!strcmp (s[i], "OverTheSpot"))	1281	if (!strcmp (s[i], "OverTheSpot"))
1366	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1282	input_style = XIMPreeditPosition \| XIMStatusNothing;
1367	else if (!strcmp (s[i], "OffTheSpot"))	1283	else if (!strcmp (s[i], "OffTheSpot"))
1368	input_style = (XIMPreeditArea \| XIMStatusArea);	1284	input_style = XIMPreeditArea \| XIMStatusArea;
1369	else if (!strcmp (s[i], "Root"))	1285	else if (!strcmp (s[i], "Root"))
1370	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1286	input_style = XIMPreeditNothing \| XIMStatusNothing;
1371	else if (!strcmp (s[i], "None"))	1287	else if (!strcmp (s[i], "None"))
1372	input_style = (XIMPreeditNone \| XIMStatusNone);	1288	input_style = XIMPreeditNone \| XIMStatusNone;
		1289	#ifdef ENABLE_XIM_ONTHESPOT
		1290	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1291	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1292	#endif
		1293	else
		1294	input_style = XIMPreeditNothing \| XIMStatusNothing;
1373		1295
1374	for (j = 0; j < xim_styles->count_styles; j++)	1296	for (j = 0; j < xim_styles->count_styles; j++)
1375	if (input_style == xim_styles->supported_styles[j])	1297	if (input_style == xim_styles->supported_styles[j])
1376	{	1298	{
1377	rxvt_freecommastring (s);	1299	rxvt_freecommastring (s);
…		…
1415	"*",	1337	"*",
1416	fheight,	1338	fheight,
1417	fheight + 1, fheight - 1,	1339	fheight + 1, fheight - 1,
1418	fheight - 2, fheight + 2);	1340	fheight - 2, fheight + 2);
1419		1341
1420	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1342	fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1421	&missing_charset_list, &missing_charset_count, &def_string);	1343	&missing_charset_list, &missing_charset_count, &def_string);
1422		1344
1423	if (missing_charset_list)	1345	if (missing_charset_list)
1424	XFreeStringList (missing_charset_list);	1346	XFreeStringList (missing_charset_list);
1425		1347
…		…
1466	XNBackground, bg,	1388	XNBackground, bg,
1467	XNArea, &status_rect,	1389	XNArea, &status_rect,
1468	XNFontSet, fs,	1390	XNFontSet, fs,
1469	NULL);	1391	NULL);
1470	}	1392	}
		1393	#if ENABLE_XIM_ONTHESPOT
		1394	else if (input_style & XIMPreeditCallbacks)
		1395	{
		1396	im_set_position (spot);
		1397
		1398	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1399	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1400	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1401	# if 0
		1402	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1403	# endif
		1404
		1405	preedit_attr = XVaCreateNestedList (0,
		1406	XNSpotLocation, &spot,
		1407	XNPreeditStartCallback, &xcb[0],
		1408	XNPreeditDoneCallback , &xcb[1],
		1409	XNPreeditDrawCallback , &xcb[2],
		1410	# if 0
		1411	XNPreeditCaretCallback, &xcb[3],
		1412	# endif
		1413	NULL);
		1414	}
		1415	#endif
1471		1416
1472	Input_Context = XCreateIC (xim,	1417	Input_Context = XCreateIC (xim,
1473	XNInputStyle, input_style,	1418	XNInputStyle, input_style,
1474	XNClientWindow, vt,	1419	XNClientWindow, vt,
1475	XNFocusWindow, parent[0],	1420	XNFocusWindow, parent[0],
…		…
1477	preedit_attr,	1422	preedit_attr,
1478	status_attr ? XNStatusAttributes : NULL,	1423	status_attr ? XNStatusAttributes : NULL,
1479	status_attr, NULL);	1424	status_attr, NULL);
1480		1425
1481	if (preedit_attr) XFree (preedit_attr);	1426	if (preedit_attr) XFree (preedit_attr);
1482	if (status_attr) XFree (status_attr);	1427	if (status_attr) XFree (status_attr);
1483	if (fs) XFreeFontSet (display->display, fs);	1428	if (fs) XFreeFontSet (dpy, fs);
1484		1429
1485	if (Input_Context == NULL)	1430	if (Input_Context == NULL)
1486	{	1431	{
1487	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1432	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1488	im_destroy ();	1433	im_destroy ();
1489	return false;	1434	return false;
1490	}	1435	}
1491		1436
1492	if (input_style & XIMPreeditArea)	1437	#if 0
		1438	// unfortunately, only the focus window is used by XIM, hard to fix
		1439	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1440	vt_select_input ();
		1441	#endif
		1442
1493	IMSetStatusPosition ();	1443	IMSetPosition ();
1494		1444
1495	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1496	return true;	1445	return true;
1497	}	1446	}
1498		1447
1499	void	1448	void
1500	rxvt_term::im_cb ()	1449	rxvt_term::im_cb ()
…		…
1506		1455
1507	make_current ();	1456	make_current ();
1508		1457
1509	im_destroy ();	1458	im_destroy ();
1510		1459
1511	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1512	if (Input_Context)	1460	if (Input_Context)
1513	return;	1461	return;
1514		1462
1515	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1463	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1516	if (rs[Rs_imLocale])	1464	if (rs[Rs_imLocale])
…		…
1558	SET_LOCALE (locale);	1506	SET_LOCALE (locale);
1559	#endif	1507	#endif
1560	}	1508	}
1561		1509
1562	void	1510	void
1563	rxvt_term::IMSetStatusPosition ()	1511	rxvt_term::IMSetPosition ()
1564	{	1512	{
1565	XRectangle preedit_rect, status_rect, *needed_rect;	1513	XRectangle preedit_rect, status_rect, *needed_rect;
1566	XVaNestedList preedit_attr, status_attr;	1514	XVaNestedList preedit_attr, status_attr;
1567		1515
1568	if (!Input_Context	1516	if (!Input_Context
1569	\|\| !focus	1517	\|\| !focus
1570	\|\| !(input_style & XIMPreeditArea)	1518	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1571	\|\| !IMisRunning ())	1519	\|\| !IMisRunning ())
1572	return;	1520	return;
1573		1521
		1522	if (input_style & XIMPreeditPosition)
		1523	{
		1524	im_set_size (preedit_rect);
		1525	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
		1526
		1527	XSetICValues (Input_Context,
		1528	XNPreeditAttributes, preedit_attr, NULL);
		1529	}
		1530	else
		1531	{
1574	/* Getting the necessary width of preedit area */	1532	/* Getting the necessary width of preedit area */
1575	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1533	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1576	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1534	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1577	XFree (status_attr);	1535	XFree (status_attr);
1578		1536
1579	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);	1537	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1580	XFree (needed_rect);	1538	XFree (needed_rect);
1581		1539
1582	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1540	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1583	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1541	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1584		1542
1585	XSetICValues (Input_Context,	1543	XSetICValues (Input_Context,
1586	XNPreeditAttributes, preedit_attr,	1544	XNPreeditAttributes, preedit_attr,
1587	XNStatusAttributes, status_attr, NULL);	1545	XNStatusAttributes, status_attr,
		1546	NULL);
1588		1547
		1548	XFree (status_attr);
		1549	}
		1550
1589	XFree (preedit_attr);	1551	XFree (preedit_attr);
1590	XFree (status_attr);
1591	}	1552	}
1592	#endif /* USE_XIM */	1553	#endif /* USE_XIM */
1593		1554
1594	/----------------------------------------------------------------------/	1555	void
1595	rxvt_t rxvt_current_term;	1556	rxvt_term::get_window_origin (int &x, int &y)
		1557	{
		1558	Window cr;
		1559	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1560	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1561	}
		1562
		1563	Pixmap
		1564	rxvt_term::get_pixmap_property (int prop_id)
		1565	{
		1566	if (prop_id > 0 && prop_id < NUM_XA)
		1567	if (xa[prop_id])
		1568	{
		1569	int aformat;
		1570	unsigned long nitems, bytes_after;
		1571	Atom atype;
		1572	unsigned char *prop = NULL;
		1573	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1574	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1575	&nitems, &bytes_after, &prop);
		1576	if (result == Success && prop && atype == XA_PIXMAP)
		1577	return (Pixmap )prop;
		1578	}
		1579
		1580	return None;
		1581	}
		1582
		1583	#ifdef HAVE_BG_PIXMAP
		1584	# if TRACE_PIXMAPS
		1585	# undef update_background
		1586	void
		1587	rxvt_term::trace_update_background (const char *file, int line)
		1588	{
		1589	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1590	update_background ();
		1591	}
		1592	# endif
		1593
		1594	void
		1595	rxvt_term::update_background ()
		1596	{
		1597	if (update_background_ev.is_active ())
		1598	return;
		1599
		1600	bgPixmap.invalidate ();
		1601
		1602	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1603
		1604	if (to_wait <= 0.)
		1605	bgPixmap.render ();
		1606	else
		1607	update_background_ev.start (to_wait);
		1608	}
		1609
		1610	void
		1611	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1612	{
		1613	make_current ();
		1614
		1615	update_background_ev.stop ();
		1616	bgPixmap.render ();
		1617	refresh_check ();
		1618	}
		1619
		1620	#endif /* HAVE_BG_PIXMAP */
1596		1621
1597	/----------------------- end-of-file (C source) -----------------------/	1622	/----------------------- 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.189 by root, Thu Jan 19 09:47:15 2006 UTC vs. Revision 1.303 by ayin, Sun Jan 27 22:48:33 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.189 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.303 by ayin, Sun Jan 27 22:48:33 2008 UTC