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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.258 by ayin, Thu Nov 15 11:36:15 2007 UTC vs.
Revision 1.331 by sf-exg, Mon Jul 26 22:07:38 2010 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
35	#include "keyboard.h"	35	#include "keyboard.h"
36	#include "rxvtperl.h"	36	#include "rxvtperl.h"
37		37
38	#include <limits>	38	#include <limits>
39		39
		40	#include <cassert>
40	#include <csignal>	41	#include <csignal>
41	#include <cstring>	42	#include <cstring>
42		43
43	#ifdef HAVE_TERMIOS_H
44	# include <termios.h>	44	#include <termios.h>
45	#endif
46		45
47	#ifdef HAVE_XSETLOCALE	46	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	47	# define X_LOCALE
49	# include <X11/Xlocale.h>	48	# include <X11/Xlocale.h>
50	#else	49	#else
…		…
103	{	102	{
104	if (cc->c2 == c2) return c1;	103	if (cc->c2 == c2) return c1;
105	cc = (*this)[cc->c1];	104	cc = (*this)[cc->c1];
106	}	105	}
107		106
108	// check to see wether this combination already exists otherwise	107	// check to see whether this combination already exists otherwise
109	for (cc = v.end (); cc-- > v.begin (); )	108	for (cc = v.end (); cc-- > v.begin (); )
110	{	109	{
111	if (cc->c1 == c1 && cc->c2 == c2)	110	if (cc->c1 == c1 && cc->c2 == c2)
112	return COMPOSE_LO + (cc - v.begin ());	111	return COMPOSE_LO + (cc - v.begin ());
113	}	112	}
…		…
152		151
153	}	152	}
154	#endif	153	#endif
155		154
156	rxvt_term::rxvt_term ()	155	rxvt_term::rxvt_term ()
157	:	156	{
		157	#if HAVE_BG_PIXMAP
		158	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
		159	#endif
		160	#ifdef CURSOR_BLINK
		161	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
		162	#endif
		163	#ifdef TEXT_BLINK
		164	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
		165	#endif
		166	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		167	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
		168	#endif
		169	#ifdef SELECTION_SCROLLING
		170	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
		171	#endif
		172	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		173	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		174	#endif
158	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	175	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
159	rootwin_ev (this, &rxvt_term::rootwin_cb),	176	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
160	#endif	177	#endif
161	#if HAVE_BG_PIXMAP	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
162	update_background_ev(this, &rxvt_term::update_background_cb),	179	#ifdef USE_XIM
163	#endif	180	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164	#ifdef HAVE_SCROLLBARS
165	scrollbar_ev (this, &rxvt_term::x_cb),
166	#endif
167	#ifdef CURSOR_BLINK
168	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
169	#endif
170	#ifdef TEXT_BLINK
171	text_blink_ev (this, &rxvt_term::text_blink_cb),
172	#endif
173	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175	#endif
176	#ifdef SELECTION_SCROLLING
177	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178	#endif
179	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181	#endif	181	#endif
182	#ifdef POINTER_BLANK	182	#ifdef POINTER_BLANK
183	pointer_ev (this, &rxvt_term::pointer_cb),	183	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184	#endif
185	#ifdef USE_XIM
186	im_ev (this, &rxvt_term::im_cb),
187	#endif	184	#endif
188	#ifndef NO_BELL	185	#ifndef NO_BELL
189	bell_ev (this, &rxvt_term::bell_cb),	186	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190	#endif	187	#endif
191	termwin_ev (this, &rxvt_term::x_cb),	188	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192	vt_ev (this, &rxvt_term::x_cb),	189	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193	child_ev (this, &rxvt_term::child_cb),	190	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194	prepare_ev (this, &rxvt_term::prepare_cb),	191	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195	flush_ev (this, &rxvt_term::flush_cb),	192	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196	destroy_ev (this, &rxvt_term::destroy_cb),	193	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197	pty_ev (this, &rxvt_term::pty_cb),	194	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198	incr_ev (this, &rxvt_term::incr_cb)	195
199	{
200	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	196	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201		197
202	termlist.push_back (this);	198	termlist.push_back (this);
203		199
204	#ifdef KEYSYM_RESOURCE	200	#ifdef KEYSYM_RESOURCE
…		…
229	if (fontset[i] != fontset[0])	225	if (fontset[i] != fontset[0])
230	delete fontset[i];	226	delete fontset[i];
231	#endif	227	#endif
232	delete fontset[0];	228	delete fontset[0];
233		229
		230	#ifdef HAVE_BG_PIXMAP
		231	bgPixmap.destroy ();
		232	#endif
		233	#ifdef HAVE_AFTERIMAGE
		234	if (asv)
		235	destroy_asvisual (asv, 0);
		236	if (asimman)
		237	destroy_image_manager (asimman, 0);
		238	#endif
		239
234	if (display)	240	if (display)
235	{	241	{
236	selection_clear ();	242	selection_clear ();
		243	selection_clear (true);
237		244
238	#ifdef USE_XIM	245	#ifdef USE_XIM
239	im_destroy ();	246	im_destroy ();
240	#endif	247	#endif
241	#ifdef XTERM_SCROLLBAR	248	scrollBar.destroy ();
242	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243	if (ShadowGC) XFreeGC (dpy, ShadowGC);
244	#endif
245	#ifdef PLAIN_SCROLLBAR
246	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247	#endif
248	#ifdef NEXT_SCROLLBAR
249	if (blackGC) XFreeGC (dpy, blackGC);
250	if (whiteGC) XFreeGC (dpy, whiteGC);
251	if (grayGC) XFreeGC (dpy, grayGC);
252	if (darkGC) XFreeGC (dpy, darkGC);
253	if (stippleGC) XFreeGC (dpy, stippleGC);
254	if (dimple) XFreePixmap (dpy, dimple);
255	if (upArrow) XFreePixmap (dpy, upArrow);
256	if (downArrow) XFreePixmap (dpy, downArrow);
257	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259	#endif
260	#ifdef RXVT_SCROLLBAR
261	if (topShadowGC) XFreeGC (dpy, topShadowGC);
262	if (botShadowGC) XFreeGC (dpy, botShadowGC);
263	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264	#endif
265	if (gc) XFreeGC (dpy, gc);	249	if (gc) XFreeGC (dpy, gc);
266		250
267	delete drawable;	251	delete drawable;
268	// destroy all windows	252	// destroy all windows
269	if (parent[0])	253	if (parent[0])
…		…
277	pix_colors_unfocused [i].free (this);	261	pix_colors_unfocused [i].free (this);
278	#endif	262	#endif
279	}	263	}
280		264
281	clear ();	265	clear ();
282	}
283		266
284	delete [] pix_colors_focused;	267	display->flush (); /* ideally .put should do this */
285	#if OFF_FOCUS_FADING
286	delete [] pix_colors_unfocused;
287	#endif
288
289	displays.put (display);	268	displays.put (display);
		269	}
290		270
291	scr_release ();	271	scr_release ();
292		272
293	/* clear all resources */	273	/* clear all resources */
294	for (int i = 0; i < allocated.size (); i++)	274	for (int i = 0; i < allocated.size (); i++)
295	free (allocated [i]);	275	free (allocated [i]);
296		276
297	free (selection.text);	277	free (selection.text);
		278	free (selection.clip_text);
298	// TODO: manage env vars in child only(!)	279	// TODO: manage env vars in child only(!)
299	free (env_display);	280	free (env_display);
300	free (env_term);	281	free (env_term);
301	free (locale);	282	free (locale);
302	free (v_buffer);	283	free (v_buffer);
…		…
306	delete argv;	287	delete argv;
307		288
308	#ifdef KEYSYM_RESOURCE	289	#ifdef KEYSYM_RESOURCE
309	delete keyboard;	290	delete keyboard;
310	#endif	291	#endif
		292	#ifndef NO_RESOURCES
		293	XrmDestroyDatabase (option_db);
		294	#endif
311	}	295	}
312		296
313	// child has exited, usually destroys	297	// child has exited, usually destroys
314	void	298	void
315	rxvt_term::child_cb (ev::child &w, int status)	299	rxvt_term::child_cb (ev::child &w, int status)
…		…
323	}	307	}
324		308
325	void	309	void
326	rxvt_term::destroy ()	310	rxvt_term::destroy ()
327	{	311	{
328	if (destroy_ev.active)	312	if (destroy_ev.is_active ())
329	return;	313	return;
330		314
331	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	315	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332		316
333	#if ENABLE_OVERLAY	317	#if ENABLE_OVERLAY
…		…
337	if (display)	321	if (display)
338	{	322	{
339	#if USE_XIM	323	#if USE_XIM
340	im_ev.stop (display);	324	im_ev.stop (display);
341	#endif	325	#endif
342	#if HAVE_SCROLLBARS
343	scrollbar_ev.stop (display);	326	scrollbar_ev.stop (display);
344	#endif
345	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	327	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
346	rootwin_ev.stop (display);	328	rootwin_ev.stop (display);
347	#endif	329	#endif
348	incr_ev.stop ();	330	incr_ev.stop ();
349	termwin_ev.stop (display);	331	termwin_ev.stop (display);
350	vt_ev.stop (display);	332	vt_ev.stop (display);
351	}	333	}
352		334
353	prepare_ev.stop ();	335	flush_ev.stop ();
354	pty_ev.stop ();	336	pty_ev.stop ();
355	#ifdef CURSOR_BLINK	337	#ifdef CURSOR_BLINK
356	cursor_blink_ev.stop ();	338	cursor_blink_ev.stop ();
357	#endif	339	#endif
358	#ifdef TEXT_BLINK	340	#ifdef TEXT_BLINK
…		…
370		352
371	destroy_ev.start ();	353	destroy_ev.start ();
372	}	354	}
373		355
374	void	356	void
375	rxvt_term::destroy_cb (ev::check &w, int revents)	357	rxvt_term::destroy_cb (ev::idle &w, int revents)
376	{	358	{
377	make_current ();	359	make_current ();
378		360
379	delete this;	361	delete this;
380	}	362	}
…		…
401	char mesg[BUFSIZ];	383	char mesg[BUFSIZ];
402	char number[32];	384	char number[32];
403	char *mtype = "XlibMessage";	385	char *mtype = "XlibMessage";
404	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	386	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	387	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406	rxvt_warn ("An X Error occured, trying to continue after report.\n");	388	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407	rxvt_warn ("%s: %s\n", mesg, buffer);	389	rxvt_warn ("%s: %s\n", mesg, buffer);
408	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	390	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	391	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410	sprintf(number, "%d", event->request_code);	392	sprintf(number, "%d", event->request_code);
411	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	393	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412	rxvt_warn ("(which is %s)\n", buffer);	394	rxvt_warn ("(which is %s)\n", buffer);
413	if (event->request_code >= 128) {	395	if (event->request_code >= 128) {
414	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	396	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415	mesg, BUFSIZ);	397	mesg, BUFSIZ);
416	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	398	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417	}	399	}
418	if ((event->error_code == BadWindow) \|\|	400	if ((event->error_code == BadWindow) \|\|
419	(event->error_code == BadPixmap) \|\|	401	(event->error_code == BadPixmap) \|\|
420	(event->error_code == BadCursor) \|\|	402	(event->error_code == BadCursor) \|\|
421	(event->error_code == BadFont) \|\|	403	(event->error_code == BadFont) \|\|
422	(event->error_code == BadDrawable) \|\|	404	(event->error_code == BadDrawable) \|\|
423	(event->error_code == BadColor) \|\|	405	(event->error_code == BadColor) \|\|
424	(event->error_code == BadGC) \|\|	406	(event->error_code == BadGC) \|\|
425	(event->error_code == BadIDChoice) \|\|	407	(event->error_code == BadIDChoice) \|\|
426	(event->error_code == BadValue) \|\|	408	(event->error_code == BadValue) \|\|
427	(event->error_code == BadAtom)) {	409	(event->error_code == BadAtom)) {
428	if (event->error_code == BadValue)	410	if (event->error_code == BadValue)
429	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	411	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430	mesg, BUFSIZ);	412	mesg, BUFSIZ);
431	else if (event->error_code == BadAtom)	413	else if (event->error_code == BadAtom)
432	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	414	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433	mesg, BUFSIZ);	415	mesg, BUFSIZ);
434	else	416	else
435	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	417	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436	mesg, BUFSIZ);	418	mesg, BUFSIZ);
437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	419	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438	}	420	}
439	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	421	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440	mesg, BUFSIZ);	422	mesg, BUFSIZ);
441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	423	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442	}	424	}
443	#endif	425	#endif
444		426
445	int	427	int
…		…
468	DisplayString (display));	450	DisplayString (display));
469	rxvt_emergency_cleanup ();	451	rxvt_emergency_cleanup ();
470	_exit (EXIT_FAILURE);	452	_exit (EXIT_FAILURE);
471	}	453	}
472		454
473	/----------------------------------------------------------------------/
474	bool
475	rxvt_term::init (int argc, const char const argv, stringvec *envv)
476	{
477	this->envv = envv;
478
479	SET_R (this);
480	set_locale ("");
481	set_environ (envv); // few things in X do not call setlocale :(
482
483	if (!init_vars ())
484	return false;
485
486	init_secondary ();
487
488	const char **cmd_argv = init_resources (argc, argv);
489
490	#ifdef KEYSYM_RESOURCE
491	keyboard->register_done ();
492	#endif
493
494	#ifdef HAVE_SCROLLBARS
495	if (option (Opt_scrollBar))
496	scrollBar.setIdle (); /* set existence for size calculations */
497	#endif
498
499	pty = ptytty::create ();
500
501	create_windows (argc, argv);
502
503	init_xlocale ();
504
505	scr_reset (); // initialize screen
506
507	#if 0
508	XSynchronize (dpy, True);
509	#endif
510
511	#ifdef HAVE_SCROLLBARS
512	if (option (Opt_scrollBar))
513	resize_scrollbar (); /* create and map scrollbar */
514	#endif
515	#ifdef HAVE_BG_PIXMAP
516	{
517	bgPixmap.set_target (this);
518
519	#ifdef ENABLE_TRANSPARENCY
520	if (option (Opt_transparent))
521	{
522	bgPixmap.set_transparent ();
523	#ifdef HAVE_AFTERIMAGE
524	if (rs [Rs_blurradius])
525	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526	#endif
527	if (ISSET_PIXCOLOR (Color_tint))
528	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529	if (rs [Rs_shade])
530	bgPixmap.set_shade (rs [Rs_shade]);
531
532	bgPixmap.set_root_pixmap ();
533	XSelectInput (dpy, display->root, PropertyChangeMask);
534	rootwin_ev.start (display, display->root);
535	}
536	#endif
537
538	#ifdef BG_IMAGE_FROM_FILE
539	if (rs[Rs_backgroundPixmap] != NULL)
540	{
541	const char *p = rs[Rs_backgroundPixmap];
542
543	if ((p = strchr (p, ';')) != NULL)
544	{
545	p++;
546	bgPixmap.set_geometry (p);
547	}
548	else
549	bgPixmap.set_defaultGeometry ();
550
551	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552	if (!bgPixmap.window_position_sensitive ())
553	update_background ();
554	}
555	#endif
556	}
557	#endif
558
559	#if ENABLE_PERL
560	rootwin_ev.start (display, display->root);
561	#endif
562
563	set_colorfgbg ();
564
565	init_command (cmd_argv);
566
567	free (cmd_argv);
568
569	if (pty->pty >= 0)
570	pty_ev.start (pty->pty, ev::READ);
571
572	prepare_ev.start ();
573
574	HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576	#if ENABLE_XEMBED
577	if (rs[Rs_embed])
578	{
579	long info[2] = { 0, XEMBED_MAPPED };
580
581	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582	32, PropModeReplace, (unsigned char *)&info, 2);
583	}
584	#endif
585
586	XMapWindow (dpy, vt);
587	XMapWindow (dpy, parent[0]);
588
589	return true;
590	}
591
592	static struct sig_handlers	455	static struct sig_handlers
593	{	456	{
594	ev::sig sw_term, sw_int;	457	ev::sig sw_term, sw_int;
595		458
596	/*	459	/*
597	* Catch a fatal signal and tidy up before quitting	460	* Catch a fatal signal and tidy up before quitting
598	*/	461	*/
599	void
600	sig_term (ev::sig &w, int revents)	462	void sig_term (ev::sig &w, int revents);
		463
		464	sig_handlers ()
601	{	465	{
602	rxvt_emergency_cleanup ();	466	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603	w.stop ();
604	kill (getpid (), w.signum);
605	}
606
607	sig_handlers ()
608	: sw_term (this, &sig_handlers::sig_term),
609	sw_int (this, &sig_handlers::sig_term)	467	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610	{
611	}	468	}
612	} sig_handlers;	469	} sig_handlers;
613		470
		471	void
		472	sig_handlers::sig_term (ev::sig &w, int revents)
		473	{
		474	rxvt_emergency_cleanup ();
		475	w.stop ();
		476	kill (getpid (), w.signum);
		477	}
		478
614	char **rxvt_environ; // startup environment	479	char **rxvt_environ; // startup environment
615		480
616	void	481	void
617	rxvt_init ()	482	rxvt_init ()
618	{	483	{
		484	assert (("fontMask must not overlap other RS masks",
		485	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
		486
		487	// get rid of stdin/stdout as we don't need them, to free resources
		488	dup2 (STDERR_FILENO, STDIN_FILENO);
		489	dup2 (STDERR_FILENO, STDOUT_FILENO);
		490
619	ptytty::init ();	491	ptytty::init ();
620		492
621	if (!ev::ev_default_loop (0))	493	if (!ev_default_loop (0))
622	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	494	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623		495
624	rxvt_environ = environ;	496	rxvt_environ = environ;
625		497
626	signal (SIGHUP, SIG_IGN);	498	signal (SIGHUP, SIG_IGN);
627	signal (SIGPIPE, SIG_IGN);	499	signal (SIGPIPE, SIG_IGN);
628		500
629	sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();	501	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
630	sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();	502	sig_handlers.sw_int.start (SIGINT); ev_unref ();
631
632	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
633	/* signal (SIGURG, SIG_DFL); */
634		503
635	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	504	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
636	// TODO: handle this with exceptions and tolerate the memory loss	505	// TODO: handle this with exceptions and tolerate the memory loss
637	XSetIOErrorHandler (rxvt_xioerror_handler);	506	XSetIOErrorHandler (rxvt_xioerror_handler);
638		507
639	XrmInitialize ();	508	XrmInitialize ();
640	}
641
642	/* ------------------------------------------------------------------------- *
643	* MEMORY ALLOCATION WRAPPERS *
644	* ------------------------------------------------------------------------- */
645	void *
646	rxvt_malloc (size_t size)
647	{
648	void *p = malloc (size);
649
650	if (!p)
651	rxvt_fatal ("memory allocation failure. aborting.\n");
652
653	return p;
654	}
655
656	void *
657	rxvt_calloc (size_t number, size_t size)
658	{
659	void *p = calloc (number, size);
660
661	if (!p)
662	rxvt_fatal ("memory allocation failure. aborting.\n");
663
664	return p;
665	}
666
667	void *
668	rxvt_realloc (void *ptr, size_t size)
669	{
670	void *p = realloc (ptr, size);
671
672	if (!p)
673	rxvt_fatal ("memory allocation failure. aborting.\n");
674
675	return p;
676	}	509	}
677		510
678	/----------------------------------------------------------------------/	511	/----------------------------------------------------------------------/
679	/*	512	/*
680	* window size/position calculations for XSizeHint and other storage.	513	* window size/position calculations for XSizeHint and other storage.
…		…
682	*/	515	*/
683	void	516	void
684	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	517	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
685	{	518	{
686	short recalc_x, recalc_y;	519	short recalc_x, recalc_y;
687	int x, y, sb_w, flags;	520	int x, y, flags;
688	unsigned int w, h;	521	unsigned int w, h;
689	unsigned int max_width, max_height;	522	unsigned int max_width, max_height;
690		523
691	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	524	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
692	szHint.win_gravity = NorthWestGravity;	525	szHint.win_gravity = NorthWestGravity;
…		…
702	if (rs[Rs_geometry])	535	if (rs[Rs_geometry])
703	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	536	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
704		537
705	if (flags & WidthValue)	538	if (flags & WidthValue)
706	{	539	{
		540	if (!w)
		541	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		542
707	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	543	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
708	szHint.flags \|= USSize;	544	szHint.flags \|= USSize;
709	}	545	}
710		546
711	if (flags & HeightValue)	547	if (flags & HeightValue)
712	{	548	{
		549	if (!h)
		550	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		551
713	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	552	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
714	szHint.flags \|= USSize;	553	szHint.flags \|= USSize;
715	}	554	}
716		555
717	if (flags & XValue)	556	if (flags & XValue)
718	{	557	{
…		…
749	max_width = MAX_COLS * fwidth;	588	max_width = MAX_COLS * fwidth;
750	max_height = MAX_ROWS * fheight;	589	max_height = MAX_ROWS * fheight;
751		590
752	szHint.base_width = szHint.base_height = 2 * int_bwidth;	591	szHint.base_width = szHint.base_height = 2 * int_bwidth;
753		592
754	sb_w = 0;
755	window_vt_x = window_vt_y = int_bwidth;	593	window_vt_x = window_vt_y = int_bwidth;
756		594
757	if (scrollBar.state)	595	if (scrollBar.state)
758	{	596	{
759	sb_w = scrollbar_TotalWidth ();	597	int sb_w = scrollBar.total_width ();
760	szHint.base_width += sb_w;	598	szHint.base_width += sb_w;
761		599
762	if (!option (Opt_scrollBar_right))	600	if (!option (Opt_scrollBar_right))
763	window_vt_x += sb_w;	601	window_vt_x += sb_w;
764	}	602	}
…		…
788	{	626	{
789	min_it (height, max_height);	627	min_it (height, max_height);
790	szHint.height = szHint.base_height + height;	628	szHint.height = szHint.base_height + height;
791	}	629	}
792		630
793	if (scrollBar.state && option (Opt_scrollBar_right))
794	window_sb_x = szHint.width - sb_w;
795
796	if (recalc_x)	631	if (recalc_x)
797	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	632	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
798		633
799	if (recalc_y)	634	if (recalc_y)
800	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	635	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
801		636
802	ncol = width / fwidth;	637	ncol = width / fwidth;
803	nrow = height / fheight;	638	nrow = height / fheight;
804	}	639	}
805		640
806	/----------------------------------------------------------------------/	641	/----------------------------------------------------------------------/
807	/*	642	/*
…		…
818		653
819	ws.ws_col = ncol;	654	ws.ws_col = ncol;
820	ws.ws_row = nrow;	655	ws.ws_row = nrow;
821	ws.ws_xpixel = width;	656	ws.ws_xpixel = width;
822	ws.ws_ypixel = height;	657	ws.ws_ypixel = height;
823	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	658	ioctl (pty->pty, TIOCSWINSZ, &ws);
824		659
825	#if 0	660	#if 0
826	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	661	// TIOCSWINSZ is supposed to do this automatically and correctly
827	if (cmd_pid) /* force through to the command */	662	if (cmd_pid) /* force through to the command */
828	kill (-cmd_pid, SIGWINCH);	663	kill (-cmd_pid, SIGWINCH);
829	#endif	664	#endif
830	}	665	}
831		666
…		…
858	#endif	693	#endif
859		694
860	delete fontset[0];	695	delete fontset[0];
861	fontset[0] = fs;	696	fontset[0] = fs;
862		697
863	prop = (*fs)[1]->properties ();	698	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
864	prop.height += lineSpace;	699	prop.height += lineSpace;
		700	prop.width += letterSpace;
865		701
866	fs->set_prop (prop, false);	702	fs->set_prop (prop, false);
867		703
868	fwidth = prop.width;	704	fwidth = prop.width;
869	fheight = prop.height;	705	fheight = prop.height;
…		…
919	prop, XA_STRING, 8, PropModeReplace,	755	prop, XA_STRING, 8, PropModeReplace,
920	(const unsigned char *)str, len >= 0 ? len : strlen (str));	756	(const unsigned char *)str, len >= 0 ? len : strlen (str));
921	}	757	}
922		758
923	void	759	void
		760	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		761	{
		762	XTextProperty ct;
		763
		764	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		765	{
		766	XSetTextProperty (dpy, parent[0], &ct, prop);
		767	XFree (ct.value);
		768	}
		769	}
		770
		771	void
924	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	772	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
925	{	773	{
926	wchar_t *ws = rxvt_mbstowcs (str, len);	774	wchar_t *ws = rxvt_mbstowcs (str, len);
927	char *s = rxvt_wcstoutf8 (ws);	775	char *s = rxvt_wcstoutf8 (ws);
928		776
…		…
938	/----------------------------------------------------------------------/	786	/----------------------------------------------------------------------/
939	/* xterm sequences - title, iconName, color (exptl) */	787	/* xterm sequences - title, iconName, color (exptl) */
940	void	788	void
941	rxvt_term::set_title (const char *str)	789	rxvt_term::set_title (const char *str)
942	{	790	{
943	set_string_property (XA_WM_NAME, str);	791	set_mbstring_property (XA_WM_NAME, str);
944	#if ENABLE_EWMH	792	#if ENABLE_EWMH
945	set_utf8_property (xa[XA_NET_WM_NAME], str);	793	set_utf8_property (xa[XA_NET_WM_NAME], str);
946	#endif	794	#endif
947	}	795	}
948		796
949	void	797	void
950	rxvt_term::set_icon_name (const char *str)	798	rxvt_term::set_icon_name (const char *str)
951	{	799	{
952	set_string_property (XA_WM_ICON_NAME, str);	800	set_mbstring_property (XA_WM_ICON_NAME, str);
953	#if ENABLE_EWMH	801	#if ENABLE_EWMH
954	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	802	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
955	#endif	803	#endif
956	}	804	}
957		805
958	void	806	void
959	rxvt_term::set_window_color (int idx, const char *color)	807	rxvt_term::set_window_color (int idx, const char *color)
960	{	808	{
961	#ifdef XTERM_COLOR_CHANGE	809	#ifdef XTERM_COLOR_CHANGE
962	rxvt_color xcol;	810	rxvt_color xcol;
963	int i;
964		811
965	if (color == NULL \|\| *color == '\0')	812	if (color == NULL \|\| *color == '\0')
966	return;	813	return;
967		814
968	color = strdup (color);	815	color = strdup (color);
…		…
970	rs[Rs_color + idx] = color;	817	rs[Rs_color + idx] = color;
971		818
972	/* handle color aliases */	819	/* handle color aliases */
973	if (isdigit (*color))	820	if (isdigit (*color))
974	{	821	{
975	i = atoi (color);	822	int i = atoi (color);
976		823
977	if (i >= 8 && i <= 15)	824	if (i >= 8 && i <= 15)
		825	{
978	{ /* bright colors */	826	/* bright colors */
979	i -= 8;
980	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	827	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
981	goto done;	828	goto done;
982	}	829	}
983		830
984	if (i >= 0 && i <= 7)	831	if (i >= 0 && i <= 7)
		832	{
985	{ /* normal colors */	833	/* normal colors */
986	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	834	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
987	goto done;	835	goto done;
988	}	836	}
989	}	837	}
990		838
…		…
995	* so just keep gobbling up the colormap	843	* so just keep gobbling up the colormap
996	*/	844	*/
997		845
998	pix_colors_focused[idx] = xcol;	846	pix_colors_focused[idx] = xcol;
999		847
1000	/* XSetWindowAttributes attr; */
1001	/* Cursor cursor; */
1002	done:	848	done:
1003	/TODO: handle Color_BD, scrollbar background, etc. /	849	/TODO: handle Color_BD, scrollbar background, etc. /
1004		850
1005	update_fade_color (idx);	851	update_fade_color (idx);
1006	recolour_cursor ();	852	recolour_cursor ();
…		…
1030	*/	876	*/
1031	void	877	void
1032	rxvt_term::set_colorfgbg ()	878	rxvt_term::set_colorfgbg ()
1033	{	879	{
1034	unsigned int i;	880	unsigned int i;
1035	const char *xpmb = "\0";	881	const char *xpmb = "";
1036	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	882	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1037		883
1038	strcpy (fstr, "default");	884	strcpy (fstr, "default");
1039	strcpy (bstr, "default");	885	strcpy (bstr, "default");
1040	for (i = Color_Black; i <= Color_White; i++)	886	for (i = Color_Black; i <= Color_White; i++)
…		…
1085	int old_width = szHint.width;	931	int old_width = szHint.width;
1086	int old_height = szHint.height;	932	int old_height = szHint.height;
1087		933
1088	window_calc (newwidth, newheight);	934	window_calc (newwidth, newheight);
1089		935
1090	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	936	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		937
		938	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		939	if (set_hint)
		940	{
		941	szHint.flags &= ~(PBaseSize \| PResizeInc);
1091	XSetWMNormalHints (dpy, parent[0], &szHint);	942	XSetWMNormalHints (dpy, parent[0], &szHint);
		943	szHint.flags \|= PBaseSize \| PResizeInc;
		944	}
1092		945
1093	if (!ignoreparent)	946	if (!ignoreparent)
1094	{	947	{
1095	#ifdef SMART_RESIZE	948	#ifdef SMART_RESIZE
1096	/*	949	/*
…		…
1136	#else	989	#else
1137	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	990	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1138	#endif	991	#endif
1139	}	992	}
1140		993
		994	if (set_hint)
		995	XSetWMNormalHints (dpy, parent[0], &szHint);
		996
1141	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	997	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1142		998
1143	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	999	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1144	{	1000	{
1145	if (scrollBar.state)	1001	if (scrollBar.state)
1146	{	1002	scrollBar.resize ();
1147	XMoveResizeWindow (dpy, scrollBar.win,
1148	window_sb_x, 0,
1149	scrollbar_TotalWidth (), szHint.height);
1150	resize_scrollbar ();
1151	}
1152		1003
1153	XMoveResizeWindow (dpy, vt,	1004	XMoveResizeWindow (dpy, vt,
1154	window_vt_x, window_vt_y,	1005	window_vt_x, window_vt_y,
1155	width, height);	1006	width, height);
1156		1007
1157	#ifdef HAVE_BG_PIXMAP	1008	#ifdef HAVE_BG_PIXMAP
1158	if (bgPixmap.window_size_sensitive ())	1009	if (bgPixmap.window_size_sensitive ())
1159	update_background ();	1010	update_background ();
1160	#endif	1011	#endif
1161
1162	scr_clear ();
1163	}	1012	}
1164		1013
1165	if (fix_screen \|\| old_height == 0)	1014	if (fix_screen \|\| old_height == 0)
1166	scr_reset ();	1015	scr_reset ();
1167
1168	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1169	//scr_touch (false);
1170		1016
1171	#ifdef HAVE_BG_PIXMAP	1017	#ifdef HAVE_BG_PIXMAP
1172	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?	1018	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1173	// if (bgPixmap.pixmap)	1019	// if (bgPixmap.pixmap)
1174	// scr_touch (false);	1020	// scr_touch (false);
…		…
1246		1092
1247	/* Checking whether input method is running. */	1093	/* Checking whether input method is running. */
1248	bool	1094	bool
1249	rxvt_term::IMisRunning ()	1095	rxvt_term::IMisRunning ()
1250	{	1096	{
1251	char *p;
1252	Atom atom;	1097	Atom atom;
1253	Window win;	1098	Window win;
1254	char server[IMBUFSIZ];	1099	char server[IMBUFSIZ];
1255		1100
1256	/* get current locale modifier */	1101	/* get current locale modifier */
1257	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1102	if (char *p = XSetLocaleModifiers (0))
1258	{	1103	{
1259	strcpy (server, "@server=");	1104	strcpy (server, "@server=");
1260	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1105	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1261		1106
1262	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1107	if (p = strchr (server + 1, '@')) /* first one only */
1263	*p = '\0';	1108	*p = '\0';
1264		1109
1265	atom = XInternAtom (dpy, server, False);	1110	atom = XInternAtom (dpy, server, False);
1266	win = XGetSelectionOwner (dpy, atom);	1111	win = XGetSelectionOwner (dpy, atom);
1267		1112
…		…
1334		1179
1335	term->make_current ();	1180	term->make_current ();
1336		1181
1337	if (text)	1182	if (text)
1338	{	1183	{
1339	void *str;	1184	wchar_t *str;
1340		1185
1341	if (!text->encoding_is_wchar && text->string.multi_byte)	1186	if (!text->encoding_is_wchar && text->string.multi_byte)
1342	{	1187	{
1343	// of course, X makes it ugly again	1188	// of course, X makes it ugly again
1344	if (term->rs[Rs_imLocale])	1189	if (term->rs[Rs_imLocale])
1345	SET_LOCALE (term->rs[Rs_imLocale]);	1190	SET_LOCALE (term->rs[Rs_imLocale]);
1346		1191
1347	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1192	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1348	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1193	mbstowcs (str, text->string.multi_byte, text->length + 1);
1349		1194
1350	if (term->rs[Rs_imLocale])	1195	if (term->rs[Rs_imLocale])
1351	SET_LOCALE (term->locale);	1196	SET_LOCALE (term->locale);
1352	}	1197	}
1353	else	1198	else
1354	str = (void *)text->string.wide_char;	1199	str = text->string.wide_char;
1355		1200
1356	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1201	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1357	DT_INT, call_data->caret,	1202	DT_INT, call_data->caret,
1358	DT_INT, call_data->chg_first,	1203	DT_INT, call_data->chg_first,
1359	DT_INT, call_data->chg_length,	1204	DT_INT, call_data->chg_length,
…		…
1713	void	1558	void
1714	rxvt_term::get_window_origin (int &x, int &y)	1559	rxvt_term::get_window_origin (int &x, int &y)
1715	{	1560	{
1716	Window cr;	1561	Window cr;
1717	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1562	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1718	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1563	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1719	}	1564	}
1720		1565
1721	Pixmap	1566	Pixmap
1722	rxvt_term::get_pixmap_property (int prop_id)	1567	rxvt_term::get_pixmap_property (int prop_id)
1723	{	1568	{
…		…
1730	unsigned char *prop = NULL;	1575	unsigned char *prop = NULL;
1731	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1576	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1732	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1577	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1733	&nitems, &bytes_after, &prop);	1578	&nitems, &bytes_after, &prop);
1734	if (result == Success && prop && atype == XA_PIXMAP)	1579	if (result == Success && prop && atype == XA_PIXMAP)
1735	{
1736	return (Pixmap )prop;	1580	return (Pixmap )prop;
1737	}
1738	}	1581	}
		1582
1739	return None;	1583	return None;
1740	}	1584	}
1741		1585
1742	#ifdef HAVE_BG_PIXMAP	1586	#ifdef HAVE_BG_PIXMAP
1743	int	1587	# if TRACE_PIXMAPS
		1588	# undef update_background
		1589	void
		1590	rxvt_term::trace_update_background (const char *file, int line)
		1591	{
		1592	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1593	update_background ();
		1594	}
		1595	# endif
		1596
		1597	void
1744	rxvt_term::update_background ()	1598	rxvt_term::update_background ()
1745	{	1599	{
		1600	if (update_background_ev.is_active ())
		1601	return;
		1602
1746	bgPixmap.invalidate ();	1603	bgPixmap.invalidate ();
1747		1604
1748	/* no chance of real time refresh if we are blurring! */	1605	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1749	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1606
		1607	if (to_wait <= 0.)
1750	bgPixmap.render ();	1608	bgPixmap.render ();
1751	else	1609	else
1752	{
1753	update_background_ev.stop ();
1754
1755	if (!bgPixmap.need_client_side_rendering())
1756	update_background_ev.start (.05);	1610	update_background_ev.start (to_wait);
1757	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1758	update_background_ev.start (.20); /* very slow !!! */
1759	else
1760	update_background_ev.start (.07);
1761	}
1762
1763	return 0;
1764	}	1611	}
1765		1612
1766	void	1613	void
1767	rxvt_term::update_background_cb (ev::timer &w, int revents)	1614	rxvt_term::update_background_cb (ev::timer &w, int revents)
1768	{	1615	{
		1616	make_current ();
		1617
		1618	update_background_ev.stop ();
1769	bgPixmap.render ();	1619	bgPixmap.render ();
		1620	refresh_check ();
1770	}	1621	}
1771		1622
1772	#endif /* HAVE_BG_PIXMAP */	1623	#endif /* HAVE_BG_PIXMAP */
1773		1624
1774	/----------------------- end-of-file (C source) -----------------------/	1625	/----------------------- 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.258 by ayin, Thu Nov 15 11:36:15 2007 UTC vs. Revision 1.331 by sf-exg, Mon Jul 26 22:07:38 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.258 by ayin, Thu Nov 15 11:36:15 2007 UTC vs.
Revision 1.331 by sf-exg, Mon Jul 26 22:07:38 2010 UTC