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