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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC vs.
Revision 1.360 by sf-exg, Fri Aug 19 16:01:37 2011 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-2008 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "init.h"
35	#include "keyboard.h"	36	#include "keyboard.h"
36	#include "rxvtperl.h"	37	#include "rxvtperl.h"
37		38
38	#include <limits>	39	#include <limits>
39		40
		41	#include <cassert>
40	#include <csignal>	42	#include <csignal>
41	#include <cstring>	43	#include <cstring>
42		44
43	#include <termios.h>	45	#include <termios.h>
44		46
…		…
49	# ifdef HAVE_SETLOCALE	51	# ifdef HAVE_SETLOCALE
50	# include <clocale>	52	# include <clocale>
51	# endif	53	# endif
52	#endif	54	#endif
53		55
		56	struct termios rxvt_term::def_tio;
54	vector<rxvt_term *> rxvt_term::termlist;	57	vector<rxvt_term *> rxvt_term::termlist;
55		58
56	// used to tell global functions which terminal instance is "active"	59	// used to tell global functions which terminal instance is "active"
57	rxvt_t rxvt_current_term;	60	rxvt_t rxvt_current_term;
58		61
…		…
93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	96	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94	{	97	{
95	compose_char *cc;	98	compose_char *cc;
96		99
97	// break compose chains, as stupid readline really likes to duplicate	100	// break compose chains, as stupid readline really likes to duplicate
98	// composing characters for some reason near the end of a line.	101	// composing characters for some reason, near the end of a line.
99	cc = (*this)[c1];	102	cc = (*this)[c1];
100	while (cc)	103	while (cc)
101	{	104	{
102	if (cc->c2 == c2) return c1;	105	if (cc->c2 == c2) return c1;
103	cc = (*this)[cc->c1];	106	cc = (*this)[cc->c1];
104	}	107	}
105		108
106	// check to see wether this combination already exists otherwise	109	// check to see whether this combination already exists otherwise
107	for (cc = v.end (); cc-- > v.begin (); )	110	for (cc = v.begin (); cc < v.end (); cc++)
108	{
109	if (cc->c1 == c1 && cc->c2 == c2)	111	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	112	return COMPOSE_LO + (cc - v.begin ());
111	}
112		113
113	// allocate a new combination	114	// allocate a new combination
114	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	115	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115	{	116	{
116	static int seen;	117	static int seen;
117		118
118	if (!seen++)	119	if (!seen++)
119	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");	120	rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120		121
121	return REPLACEMENT_CHAR;	122	return REPLACEMENT_CHAR;
122	}	123	}
123		124
124	v.push_back (compose_char (c1, c2));	125	v.push_back (compose_char (c1, c2));
…		…
186	#endif	187	#endif
187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	188	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);	189	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	190	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	191	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194		194
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		196
…		…
225	delete fontset[i];	225	delete fontset[i];
226	#endif	226	#endif
227	delete fontset[0];	227	delete fontset[0];
228		228
229	#ifdef HAVE_BG_PIXMAP	229	#ifdef HAVE_BG_PIXMAP
230	bgPixmap.destroy ();	230	bg_destroy ();
231	#endif	231	#endif
232		232
233	if (display)	233	if (display)
234	{	234	{
235	selection_clear ();	235	selection_clear ();
		236	selection_clear (true);
236		237
237	#ifdef USE_XIM	238	#ifdef USE_XIM
238	im_destroy ();	239	im_destroy ();
239	#endif	240	#endif
240	scrollBar.destroy ();	241	scrollBar.destroy ();
241	if (gc) XFreeGC (dpy, gc);	242	if (gc) XFreeGC (dpy, gc);
242		243
243	delete drawable;	244	delete drawable;
244	// destroy all windows	245	// destroy all windows
245	if (parent[0])	246	if (parent)
246	XDestroyWindow (dpy, parent[0]);	247	XDestroyWindow (dpy, parent);
247		248
248	for (int i = 0; i < TOTAL_COLORS; i++)	249	for (int i = 0; i < TOTAL_COLORS; i++)
249	if (ISSET_PIXCOLOR (i))	250	if (ISSET_PIXCOLOR (i))
250	{	251	{
251	pix_colors_focused [i].free (this);	252	pix_colors_focused [i].free (this);
…		…
265	/* clear all resources */	266	/* clear all resources */
266	for (int i = 0; i < allocated.size (); i++)	267	for (int i = 0; i < allocated.size (); i++)
267	free (allocated [i]);	268	free (allocated [i]);
268		269
269	free (selection.text);	270	free (selection.text);
		271	free (selection.clip_text);
270	// TODO: manage env vars in child only(!)	272	// TODO: manage env vars in child only(!)
271	free (env_display);	273	free (env_display);
272	free (env_term);	274	free (env_term);
273	free (locale);	275	free (locale);
274	free (v_buffer);	276	free (v_buffer);
275	free (incr_buf);	277
		278	delete selection_req;
276		279
277	delete envv;	280	delete envv;
278	delete argv;	281	delete argv;
279		282
280	#ifdef KEYSYM_RESOURCE	283	#ifdef KEYSYM_RESOURCE
…		…
316	#endif	319	#endif
317	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
319	rootwin_ev.stop (display);	322	rootwin_ev.stop (display);
320	#endif	323	#endif
321	incr_ev.stop ();
322	termwin_ev.stop (display);	324	termwin_ev.stop (display);
323	vt_ev.stop (display);	325	vt_ev.stop (display);
324	}	326	}
325		327
326	flush_ev.stop ();	328	flush_ev.stop ();
…		…
348	rxvt_term::destroy_cb (ev::idle &w, int revents)	350	rxvt_term::destroy_cb (ev::idle &w, int revents)
349	{	351	{
350	make_current ();	352	make_current ();
351		353
352	delete this;	354	delete this;
		355	}
		356
		357	void
		358	rxvt_term::set_option (uint8_t opt, bool set)
		359	{
		360	if (!opt)
		361	return;
		362
		363	uint8_t mask = 1 << (opt & 7);
		364	uint8_t &val = options [opt >> 3];
		365
		366	val = val & ~mask \| (set ? mask : 0);
353	}	367	}
354		368
355	/----------------------------------------------------------------------/	369	/----------------------------------------------------------------------/
356	/*	370	/*
357	* Exit gracefully, clearing the utmp entry and restoring tty attributes	371	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
371	print_x_error (Display dpy, XErrorEvent event)	385	print_x_error (Display dpy, XErrorEvent event)
372	{	386	{
373	char buffer[BUFSIZ];	387	char buffer[BUFSIZ];
374	char mesg[BUFSIZ];	388	char mesg[BUFSIZ];
375	char number[32];	389	char number[32];
376	char *mtype = "XlibMessage";	390	const char mtype[] = "XlibMessage";
377	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	391	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
378	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	392	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
379	rxvt_warn ("An X Error occured, trying to continue after report.\n");	393	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
380	rxvt_warn ("%s: %s\n", mesg, buffer);	394	rxvt_warn ("%s: %s\n", mesg, buffer);
381	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	395	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
382	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	396	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
383	sprintf(number, "%d", event->request_code);	397	sprintf(number, "%d", event->request_code);
384	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	398	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
385	rxvt_warn ("(which is %s)\n", buffer);	399	rxvt_warn ("(which is %s)\n", buffer);
386	if (event->request_code >= 128) {	400	if (event->request_code >= 128) {
387	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	401	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
388	mesg, BUFSIZ);	402	mesg, BUFSIZ);
389	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
390	}	404	}
391	if ((event->error_code == BadWindow) \|\|	405	if ((event->error_code == BadWindow) \|\|
392	(event->error_code == BadPixmap) \|\|	406	(event->error_code == BadPixmap) \|\|
393	(event->error_code == BadCursor) \|\|	407	(event->error_code == BadCursor) \|\|
394	(event->error_code == BadFont) \|\|	408	(event->error_code == BadFont) \|\|
395	(event->error_code == BadDrawable) \|\|	409	(event->error_code == BadDrawable) \|\|
396	(event->error_code == BadColor) \|\|	410	(event->error_code == BadColor) \|\|
397	(event->error_code == BadGC) \|\|	411	(event->error_code == BadGC) \|\|
398	(event->error_code == BadIDChoice) \|\|	412	(event->error_code == BadIDChoice) \|\|
399	(event->error_code == BadValue) \|\|	413	(event->error_code == BadValue) \|\|
400	(event->error_code == BadAtom)) {	414	(event->error_code == BadAtom)) {
401	if (event->error_code == BadValue)	415	if (event->error_code == BadValue)
402	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	416	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
403	mesg, BUFSIZ);	417	mesg, BUFSIZ);
404	else if (event->error_code == BadAtom)	418	else if (event->error_code == BadAtom)
405	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	419	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
406	mesg, BUFSIZ);	420	mesg, BUFSIZ);
407	else	421	else
408	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	422	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
409	mesg, BUFSIZ);	423	mesg, BUFSIZ);
410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	424	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
411	}	425	}
412	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	426	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
413	mesg, BUFSIZ);	427	mesg, BUFSIZ);
414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
415	}	429	}
416	#endif	430	#endif
417		431
418	int	432	int
…		…
465	rxvt_emergency_cleanup ();	479	rxvt_emergency_cleanup ();
466	w.stop ();	480	w.stop ();
467	kill (getpid (), w.signum);	481	kill (getpid (), w.signum);
468	}	482	}
469		483
		484	static void
		485	rxvt_get_ttymode (struct termios *tio)
		486	{
		487	if (tcgetattr (STDIN_FILENO, tio) < 0)
		488	memset (tio, 0, sizeof (struct termios));
		489
		490	for (int i = 0; i < NCCS; i++)
		491	tio->c_cc[i] = VDISABLE;
		492
		493	tio->c_cc[VINTR] = CINTR;
		494	tio->c_cc[VQUIT] = CQUIT;
		495	tio->c_cc[VERASE] = CERASE;
		496	#ifdef VERASE2
		497	tio->c_cc[VERASE2] = CERASE2;
		498	#endif
		499	tio->c_cc[VKILL] = CKILL;
		500	tio->c_cc[VEOF] = CEOF;
		501	tio->c_cc[VSTART] = CSTART;
		502	tio->c_cc[VSTOP] = CSTOP;
		503	tio->c_cc[VSUSP] = CSUSP;
		504	# ifdef VDSUSP
		505	tio->c_cc[VDSUSP] = CDSUSP;
		506	# endif
		507	# ifdef VREPRINT
		508	tio->c_cc[VREPRINT] = CRPRNT;
		509	# endif
		510	# ifdef VDISCRD
		511	tio->c_cc[VDISCRD] = CFLUSH;
		512	# endif
		513	# ifdef VWERSE
		514	tio->c_cc[VWERSE] = CWERASE;
		515	# endif
		516	# ifdef VLNEXT
		517	tio->c_cc[VLNEXT] = CLNEXT;
		518	# endif
		519	# ifdef VSTATUS
		520	tio->c_cc[VSTATUS] = CSTATUS;
		521	# endif
		522
		523	# if VMIN != VEOF
		524	tio->c_cc[VMIN] = 1;
		525	# endif
		526	# if VTIME != VEOL
		527	tio->c_cc[VTIME] = 0;
		528	# endif
		529
		530	/* input modes */
		531	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		532	# ifdef IMAXBEL
		533	\| IMAXBEL
		534	# endif
		535	\| IXON);
		536
		537	/* output modes */
		538	tio->c_oflag = (OPOST \| ONLCR);
		539
		540	/* control modes */
		541	tio->c_cflag = (CS8 \| CREAD);
		542
		543	/* local modes */
		544	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		545	# if defined (ECHOCTL) && defined (ECHOKE)
		546	\| ECHOCTL \| ECHOKE
		547	# endif
		548	\| ECHOE \| ECHOK);
		549	}
		550
470	char **rxvt_environ; // startup environment	551	char **rxvt_environ; // startup environment
471		552
472	void	553	void
473	rxvt_init ()	554	rxvt_init ()
474	{	555	{
475	ptytty::init ();	556	assert (("fontMask must not overlap other RS masks",
		557	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
476		558
		559	rxvt_get_ttymode (&rxvt_term::def_tio);
		560
		561	// get rid of stdin/stdout as we don't need them, to free resources
		562	dup2 (STDERR_FILENO, STDIN_FILENO);
		563	dup2 (STDERR_FILENO, STDOUT_FILENO);
		564
477	if (!ev_default_loop (0))	565	if (!ev_default_loop ())
478	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	566	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
479		567
480	rxvt_environ = environ;	568	rxvt_environ = environ;
481		569
482	signal (SIGHUP, SIG_IGN);	570	signal (SIGHUP, SIG_IGN);
483	signal (SIGPIPE, SIG_IGN);	571	signal (SIGPIPE, SIG_IGN);
484		572
485	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	573	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
486	sig_handlers.sw_int.start (SIGINT); ev_unref ();	574	sig_handlers.sw_int.start (SIGINT); ev_unref ();
487
488	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
489	/* signal (SIGURG, SIG_DFL); */
490		575
491	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	576	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
492	// TODO: handle this with exceptions and tolerate the memory loss	577	// TODO: handle this with exceptions and tolerate the memory loss
493	XSetIOErrorHandler (rxvt_xioerror_handler);	578	XSetIOErrorHandler (rxvt_xioerror_handler);
494		579
…		…
619	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	704	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
620		705
621	if (recalc_y)	706	if (recalc_y)
622	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	707	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
623		708
624	ncol = width / fwidth;	709	ncol = width / fwidth;
625	nrow = height / fheight;	710	nrow = height / fheight;
		711
		712	// When the size of the vt window is not a multiple of the cell
		713	// size, i.e., when the wm does not honour our size hints, there are
		714	// extra areas not covered by the terminal screen. Such gaps, when a
		715	// bg pixmap is set, would have to be cleared manually to properly
		716	// refresh the background. We take the simpler route and shrink the
		717	// vt window so as to avoid creating gaps.
		718	width = ncol * fwidth;
		719	height = nrow * fheight;
626	}	720	}
627		721
628	/----------------------------------------------------------------------/	722	/----------------------------------------------------------------------/
629	/*	723	/*
630	* Tell the teletype handler what size the window is.	724	* Tell the teletype handler what size the window is.
…		…
640		734
641	ws.ws_col = ncol;	735	ws.ws_col = ncol;
642	ws.ws_row = nrow;	736	ws.ws_row = nrow;
643	ws.ws_xpixel = width;	737	ws.ws_xpixel = width;
644	ws.ws_ypixel = height;	738	ws.ws_ypixel = height;
645	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	739	ioctl (pty->pty, TIOCSWINSZ, &ws);
646		740
647	#if 0	741	#if 0
648	// TIOCSWINSZ is supposed to do this automatically and correctly	742	// TIOCSWINSZ is supposed to do this automatically and correctly
649	if (cmd_pid) /* force through to the command */	743	if (cmd_pid) /* force through to the command */
650	kill (-cmd_pid, SIGWINCH);	744	kill (-cmd_pid, SIGWINCH);
651	#endif	745	#endif
652	}	746	}
653		747
654	/----------------------------------------------------------------------/	748	/----------------------------------------------------------------------/
655	/* set_fonts () - load and set the various fonts	749	/* load and set the various fonts */
656	*
657	* init = 1 - initialize
658	*
659	* fontname == FONT_UP - switch to bigger font
660	* fontname == FONT_DN - switch to smaller font
661	*/
662	bool	750	bool
663	rxvt_term::set_fonts ()	751	rxvt_term::set_fonts ()
664	{	752	{
665	rxvt_fontset *fs = new rxvt_fontset (this);	753	rxvt_fontset *fs = new rxvt_fontset (this);
666	rxvt_fontprop prop;	754	rxvt_fontprop prop;
…		…
680	#endif	768	#endif
681		769
682	delete fontset[0];	770	delete fontset[0];
683	fontset[0] = fs;	771	fontset[0] = fs;
684		772
685	prop = (*fs)[1]->properties ();	773	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
686	prop.height += lineSpace;	774	prop.height += lineSpace;
		775	prop.width += letterSpace;
687		776
688	fs->set_prop (prop, false);	777	fs->set_prop (prop, false);
689		778
690	fwidth = prop.width;	779	fwidth = prop.width;
691	fheight = prop.height;	780	fheight = prop.height;
…		…
722	#else	811	#else
723	fontset[style] = fontset[0];	812	fontset[style] = fontset[0];
724	#endif	813	#endif
725	}	814	}
726		815
727	if (parent[0])	816	if (parent)
728	{	817	{
729	resize_all_windows (0, 0, 0);	818	resize_all_windows (0, 0, 0);
730	scr_remap_chars ();	819	scr_remap_chars ();
731	scr_touch (true);	820	scr_touch (true);
732	}	821	}
…		…
735	}	824	}
736		825
737	void	826	void
738	rxvt_term::set_string_property (Atom prop, const char *str, int len)	827	rxvt_term::set_string_property (Atom prop, const char *str, int len)
739	{	828	{
740	XChangeProperty (dpy, parent[0],	829	XChangeProperty (dpy, parent,
741	prop, XA_STRING, 8, PropModeReplace,	830	prop, XA_STRING, 8, PropModeReplace,
742	(const unsigned char *)str, len >= 0 ? len : strlen (str));	831	(const unsigned char *)str, len >= 0 ? len : strlen (str));
743	}	832	}
744		833
745	void	834	void
		835	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		836	{
		837	XTextProperty ct;
		838
		839	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		840	{
		841	XSetTextProperty (dpy, parent, &ct, prop);
		842	XFree (ct.value);
		843	}
		844	}
		845
		846	void
746	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	847	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
747	{	848	{
748	wchar_t *ws = rxvt_mbstowcs (str, len);	849	wchar_t *ws = rxvt_mbstowcs (str, len);
749	char *s = rxvt_wcstoutf8 (ws);	850	char *s = rxvt_wcstoutf8 (ws);
750		851
751	XChangeProperty (dpy, parent[0],	852	XChangeProperty (dpy, parent,
752	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	853	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
753	(const unsigned char *)s, strlen (s));	854	(const unsigned char *)s, strlen (s));
754		855
755	free (s);	856	free (s);
756	free (ws);	857	free (ws);
…		…
760	/----------------------------------------------------------------------/	861	/----------------------------------------------------------------------/
761	/* xterm sequences - title, iconName, color (exptl) */	862	/* xterm sequences - title, iconName, color (exptl) */
762	void	863	void
763	rxvt_term::set_title (const char *str)	864	rxvt_term::set_title (const char *str)
764	{	865	{
765	set_string_property (XA_WM_NAME, str);	866	set_mbstring_property (XA_WM_NAME, str);
766	#if ENABLE_EWMH	867	#if ENABLE_EWMH
767	set_utf8_property (xa[XA_NET_WM_NAME], str);	868	set_utf8_property (xa[XA_NET_WM_NAME], str);
768	#endif	869	#endif
769	}	870	}
770		871
771	void	872	void
772	rxvt_term::set_icon_name (const char *str)	873	rxvt_term::set_icon_name (const char *str)
773	{	874	{
774	set_string_property (XA_WM_ICON_NAME, str);	875	set_mbstring_property (XA_WM_ICON_NAME, str);
775	#if ENABLE_EWMH	876	#if ENABLE_EWMH
776	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	877	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
777	#endif	878	#endif
778	}	879	}
779		880
…		…
851	void	952	void
852	rxvt_term::set_colorfgbg ()	953	rxvt_term::set_colorfgbg ()
853	{	954	{
854	unsigned int i;	955	unsigned int i;
855	const char *xpmb = "";	956	const char *xpmb = "";
856	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	957	char fstr[] = "default";
		958	char bstr[] = "default";
857		959
858	strcpy (fstr, "default");
859	strcpy (bstr, "default");
860	for (i = Color_Black; i <= Color_White; i++)	960	for (i = Color_Black; i <= Color_White; i++)
861	if (pix_colors[Color_fg] == pix_colors[i])	961	if (pix_colors[Color_fg] == pix_colors[i])
862	{	962	{
863	sprintf (fstr, "%d", (i - Color_Black));	963	sprintf (fstr, "%d", i - Color_Black);
864	break;	964	break;
865	}	965	}
866		966
867	for (i = Color_Black; i <= Color_White; i++)	967	for (i = Color_Black; i <= Color_White; i++)
868	if (pix_colors[Color_bg] == pix_colors[i])	968	if (pix_colors[Color_bg] == pix_colors[i])
869	{	969	{
870	sprintf (bstr, "%d", (i - Color_Black));	970	sprintf (bstr, "%d", i - Color_Black);
871	#ifdef BG_IMAGE_FROM_FILE	971	#ifdef BG_IMAGE_FROM_FILE
872	xpmb = "default;";	972	xpmb = "default;";
873	#endif	973	#endif
874	break;	974	break;
875	}	975	}
…		…
905	int old_width = szHint.width;	1005	int old_width = szHint.width;
906	int old_height = szHint.height;	1006	int old_height = szHint.height;
907		1007
908	window_calc (newwidth, newheight);	1008	window_calc (newwidth, newheight);
909		1009
910	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1010	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1011
		1012	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1013	if (set_hint)
		1014	{
		1015	szHint.flags &= ~(PBaseSize \| PResizeInc);
911	XSetWMNormalHints (dpy, parent[0], &szHint);	1016	XSetWMNormalHints (dpy, parent, &szHint);
		1017	szHint.flags \|= PBaseSize \| PResizeInc;
		1018	}
912		1019
913	if (!ignoreparent)	1020	if (!ignoreparent)
914	{	1021	{
915	#ifdef SMART_RESIZE	1022	#ifdef SMART_RESIZE
916	/*	1023	/*
…		…
920	int x, y, x1, y1;	1027	int x, y, x1, y1;
921	int dx, dy;	1028	int dx, dy;
922	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1029	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
923	Window unused_cr;	1030	Window unused_cr;
924		1031
925	XTranslateCoordinates (dpy, parent[0], display->root,	1032	XTranslateCoordinates (dpy, parent, display->root,
926	0, 0, &x, &y, &unused_cr);	1033	0, 0, &x, &y, &unused_cr);
927	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1034	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
928	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1035	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
929	/*	1036	/*
930	* if display->root isn't the parent window, a WM will probably have offset	1037	* if display->root isn't the parent window, a WM will probably have offset
931	* our position for handles and decorations. Counter it	1038	* our position for handles and decorations. Counter it
932	*/	1039	*/
…		…
949	if (y < y1) /* top half */	1056	if (y < y1) /* top half */
950	dy = 0;	1057	dy = 0;
951	else if (y == y1) /* exact center */	1058	else if (y == y1) /* exact center */
952	dy /= 2;	1059	dy /= 2;
953		1060
954	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1061	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
955	szHint.width, szHint.height);	1062	szHint.width, szHint.height);
956	#else	1063	#else
957	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1064	XResizeWindow (dpy, parent, szHint.width, szHint.height);
958	#endif	1065	#endif
959	}	1066	}
		1067
		1068	if (set_hint)
		1069	XSetWMNormalHints (dpy, parent, &szHint);
960		1070
961	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1071	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
962		1072
963	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1073	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
964	{	1074	{
…		…
968	XMoveResizeWindow (dpy, vt,	1078	XMoveResizeWindow (dpy, vt,
969	window_vt_x, window_vt_y,	1079	window_vt_x, window_vt_y,
970	width, height);	1080	width, height);
971		1081
972	#ifdef HAVE_BG_PIXMAP	1082	#ifdef HAVE_BG_PIXMAP
973	if (bgPixmap.window_size_sensitive ())	1083	if (bg_window_size_sensitive ())
974	update_background ();	1084	update_background ();
975	#endif	1085	#endif
976
977	scr_clear ();
978	}	1086	}
979		1087
980	if (fix_screen \|\| old_height == 0)	1088	if (fix_screen \|\| old_height == 0)
981	scr_reset ();	1089	scr_reset ();
982		1090
983	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
984	//scr_touch (false);
985
986	#ifdef HAVE_BG_PIXMAP
987	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
988	// if (bgPixmap.pixmap)
989	// scr_touch (false);
990	#endif
991
992	#ifdef USE_XIM	1091	#ifdef USE_XIM
993	IMSetPosition ();	1092	im_set_position ();
994	#endif	1093	#endif
995	}	1094	}
996		1095
997	/*	1096	/*
998	* Set the width/height of the vt window in characters. Units are pixels.	1097	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1059	status_rect.height = fheight;	1158	status_rect.height = fheight;
1060	}	1159	}
1061		1160
1062	/* Checking whether input method is running. */	1161	/* Checking whether input method is running. */
1063	bool	1162	bool
1064	rxvt_term::IMisRunning ()	1163	rxvt_term::im_is_running ()
1065	{	1164	{
1066	char *p;
1067	Atom atom;	1165	Atom atom;
1068	Window win;	1166	Window win;
1069	char server[IMBUFSIZ];	1167	char server[IMBUFSIZ];
1070		1168
1071	/* get current locale modifier */	1169	/* get current locale modifier */
1072	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1170	if (char *p = XSetLocaleModifiers (0))
1073	{	1171	{
1074	strcpy (server, "@server=");	1172	strcpy (server, "@server=");
1075	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1173	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1076		1174
1077	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1175	if (p = strchr (server + 1, '@')) /* first one only */
1078	*p = '\0';	1176	*p = '\0';
1079		1177
1080	atom = XInternAtom (dpy, server, False);	1178	atom = XInternAtom (dpy, server, False);
1081	win = XGetSelectionOwner (dpy, atom);	1179	win = XGetSelectionOwner (dpy, atom);
1082		1180
1083	if (win != None)	1181	if (win != None)
1084	return True;	1182	return true;
1085	}	1183	}
1086		1184
1087	return False;	1185	return false;
1088	}	1186	}
1089		1187
1090	void	1188	void
1091	rxvt_term::IMSendSpot ()	1189	rxvt_term::im_send_spot ()
1092	{	1190	{
1093	XPoint nspot;	1191	XPoint nspot;
1094	XVaNestedList preedit_attr;	1192	XVaNestedList preedit_attr;
1095		1193
1096	if (!Input_Context	1194	if (!Input_Context
…		…
1149		1247
1150	term->make_current ();	1248	term->make_current ();
1151		1249
1152	if (text)	1250	if (text)
1153	{	1251	{
1154	void *str;	1252	wchar_t *str;
1155		1253
1156	if (!text->encoding_is_wchar && text->string.multi_byte)	1254	if (!text->encoding_is_wchar && text->string.multi_byte)
1157	{	1255	{
1158	// of course, X makes it ugly again	1256	// of course, X makes it ugly again
1159	if (term->rs[Rs_imLocale])	1257	if (term->rs[Rs_imLocale])
1160	SET_LOCALE (term->rs[Rs_imLocale]);	1258	SET_LOCALE (term->rs[Rs_imLocale]);
1161		1259
1162	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1260	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1163	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1261	mbstowcs (str, text->string.multi_byte, text->length + 1);
1164		1262
1165	if (term->rs[Rs_imLocale])	1263	if (term->rs[Rs_imLocale])
1166	SET_LOCALE (term->locale);	1264	SET_LOCALE (term->locale);
1167	}	1265	}
1168	else	1266	else
1169	str = (void *)text->string.wide_char;	1267	str = text->string.wide_char;
1170		1268
1171	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1269	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1172	DT_INT, call_data->caret,	1270	DT_INT, call_data->caret,
1173	DT_INT, call_data->chg_first,	1271	DT_INT, call_data->chg_first,
1174	DT_INT, call_data->chg_length,	1272	DT_INT, call_data->chg_length,
…		…
1202	/*	1300	/*
1203	* Try to open a XIM with the current modifiers, then see if we can	1301	* Try to open a XIM with the current modifiers, then see if we can
1204	* open a suitable preedit type	1302	* open a suitable preedit type
1205	*/	1303	*/
1206	bool	1304	bool
1207	rxvt_term::IM_get_IC (const char *modifiers)	1305	rxvt_term::im_get_ic (const char *modifiers)
1208	{	1306	{
1209	int i, j, found;	1307	int i, j, found;
1210	XIM xim;	1308	XIM xim;
1211	XPoint spot;	1309	XPoint spot;
1212	XRectangle rect, status_rect, needed_rect;	1310	XRectangle rect, status_rect, needed_rect;
1213	unsigned long fg, bg;	1311	unsigned long fg, bg;
1214	const char *p;	1312	const char *p;
1215	char **s;	1313	char **s;
1216	XIMStyles *xim_styles;	1314	XIMStyles *xim_styles;
1217	#ifdef ENABLE_XIM_ONTHESPOT
1218	XIMCallback xcb[4];
1219	#endif
1220		1315
1221	set_environ (envv);	1316	set_environ (envv);
1222		1317
1223	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1318	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1224	return false;	1319	return false;
…		…
1245	p = pet[pi];	1340	p = pet[pi];
1246		1341
1247	if (!p)	1342	if (!p)
1248	continue;	1343	continue;
1249		1344
1250	s = rxvt_splitcommastring (p);	1345	s = rxvt_strsplit (',', p);
1251		1346
1252	for (i = found = 0; !found && s[i]; i++)	1347	for (i = found = 0; !found && s[i]; i++)
1253	{	1348	{
1254	if (!strcmp (s[i], "OverTheSpot"))	1349	if (!strcmp (s[i], "OverTheSpot"))
1255	input_style = XIMPreeditPosition \| XIMStatusNothing;	1350	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1267	input_style = XIMPreeditNothing \| XIMStatusNothing;	1362	input_style = XIMPreeditNothing \| XIMStatusNothing;
1268		1363
1269	for (j = 0; j < xim_styles->count_styles; j++)	1364	for (j = 0; j < xim_styles->count_styles; j++)
1270	if (input_style == xim_styles->supported_styles[j])	1365	if (input_style == xim_styles->supported_styles[j])
1271	{	1366	{
1272	rxvt_freecommastring (s);	1367	rxvt_free_strsplit (s);
1273		1368
1274	found = 1;	1369	found = 1;
1275	goto foundpet;	1370	goto foundpet;
1276	}	1371	}
1277		1372
1278	}	1373	}
1279		1374
1280	rxvt_freecommastring (s);	1375	rxvt_free_strsplit (s);
1281	}	1376	}
1282		1377
1283	foundpet:	1378	foundpet:
1284		1379
1285	XFree (xim_styles);	1380	XFree (xim_styles);
…		…
1364	NULL);	1459	NULL);
1365	}	1460	}
1366	#if ENABLE_XIM_ONTHESPOT	1461	#if ENABLE_XIM_ONTHESPOT
1367	else if (input_style & XIMPreeditCallbacks)	1462	else if (input_style & XIMPreeditCallbacks)
1368	{	1463	{
		1464	XIMCallback xcb[4];
		1465
1369	im_set_position (spot);	1466	im_set_position (spot);
1370		1467
1371	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;	1468	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1372	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;	1469	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1373	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;	1470	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
…		…
1388	#endif	1485	#endif
1389		1486
1390	Input_Context = XCreateIC (xim,	1487	Input_Context = XCreateIC (xim,
1391	XNInputStyle, input_style,	1488	XNInputStyle, input_style,
1392	XNClientWindow, vt,	1489	XNClientWindow, vt,
1393	XNFocusWindow, parent[0],	1490	XNFocusWindow, parent,
1394	preedit_attr ? XNPreeditAttributes : NULL,	1491	preedit_attr ? XNPreeditAttributes : NULL,
1395	preedit_attr,	1492	preedit_attr,
1396	status_attr ? XNStatusAttributes : NULL,	1493	status_attr ? XNStatusAttributes : NULL,
1397	status_attr, NULL);	1494	status_attr, NULL);
1398		1495
…		…
1411	// unfortunately, only the focus window is used by XIM, hard to fix	1508	// unfortunately, only the focus window is used by XIM, hard to fix
1412	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1509	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1413	vt_select_input ();	1510	vt_select_input ();
1414	#endif	1511	#endif
1415		1512
1416	IMSetPosition ();	1513	im_set_position ();
1417		1514
1418	return true;	1515	return true;
1419	}	1516	}
1420		1517
1421	void	1518	void
…		…
1441	p = rs[Rs_inputMethod];	1538	p = rs[Rs_inputMethod];
1442	if (p && *p)	1539	if (p && *p)
1443	{	1540	{
1444	bool found = false;	1541	bool found = false;
1445		1542
1446	s = rxvt_splitcommastring (p);	1543	s = rxvt_strsplit (',', p);
1447		1544
1448	for (i = 0; s[i]; i++)	1545	for (i = 0; s[i]; i++)
1449	{	1546	{
1450	if (*s[i])	1547	if (*s[i])
1451	{	1548	{
1452	strcpy (buf, "@im=");	1549	strcpy (buf, "@im=");
1453	strncat (buf, s[i], IMBUFSIZ - 5);	1550	strncat (buf, s[i], IMBUFSIZ - 5);
1454	if (IM_get_IC (buf))	1551	if (im_get_ic (buf))
1455	{	1552	{
1456	found = true;	1553	found = true;
1457	break;	1554	break;
1458	}	1555	}
1459	}	1556	}
1460	}	1557	}
1461		1558
1462	rxvt_freecommastring (s);	1559	rxvt_free_strsplit (s);
1463		1560
1464	if (found)	1561	if (found)
1465	goto done;	1562	goto done;
1466	}	1563	}
1467		1564
1468	/* try with XMODIFIERS env. var. */	1565	/* try with XMODIFIERS env. var. */
1469	if (IM_get_IC (""))	1566	if (im_get_ic (""))
1470	goto done;	1567	goto done;
1471		1568
1472	/* try with no modifiers base IF the user didn't specify an IM */	1569	/* try with no modifiers base IF the user didn't specify an IM */
1473	if (IM_get_IC ("@im=none"))	1570	if (im_get_ic ("@im=none"))
1474	goto done;	1571	goto done;
1475		1572
1476	done:	1573	done:
1477	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1574	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1478	if (rs[Rs_imLocale])	1575	if (rs[Rs_imLocale])
1479	SET_LOCALE (locale);	1576	SET_LOCALE (locale);
1480	#endif	1577	#endif
1481	}	1578	}
1482		1579
1483	void	1580	void
1484	rxvt_term::IMSetPosition ()	1581	rxvt_term::im_set_position ()
1485	{	1582	{
1486	XRectangle preedit_rect, status_rect, *needed_rect;	1583	XRectangle preedit_rect, status_rect, *needed_rect;
1487	XVaNestedList preedit_attr, status_attr;	1584	XVaNestedList preedit_attr, status_attr;
1488		1585
1489	if (!Input_Context	1586	if (!Input_Context
1490	\|\| !focus	1587	\|\| !focus
1491	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))	1588	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1492	\|\| !IMisRunning ())	1589	\|\| !im_is_running ())
1493	return;	1590	return;
1494		1591
1495	if (input_style & XIMPreeditPosition)	1592	if (input_style & XIMPreeditPosition)
1496	{	1593	{
1497	im_set_size (preedit_rect);	1594	im_set_size (preedit_rect);
…		…
1527		1624
1528	void	1625	void
1529	rxvt_term::get_window_origin (int &x, int &y)	1626	rxvt_term::get_window_origin (int &x, int &y)
1530	{	1627	{
1531	Window cr;	1628	Window cr;
1532	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1629	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1533	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1534	}	1630	}
1535		1631
1536	Pixmap	1632	Pixmap
1537	rxvt_term::get_pixmap_property (int prop_id)	1633	rxvt_term::get_pixmap_property (Atom property)
1538	{	1634	{
1539	if (prop_id > 0 && prop_id < NUM_XA)	1635	Pixmap pixmap = None;
1540	if (xa[prop_id])	1636
1541	{
1542	int aformat;	1637	int aformat;
1543	unsigned long nitems, bytes_after;	1638	unsigned long nitems, bytes_after;
1544	Atom atype;	1639	Atom atype;
1545	unsigned char *prop = NULL;	1640	unsigned char *prop;
1546	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1641	int result = XGetWindowProperty (dpy, display->root, property,
1547	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1642	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1548	&nitems, &bytes_after, &prop);	1643	&nitems, &bytes_after, &prop);
1549	if (result == Success && prop && atype == XA_PIXMAP)	1644	if (result == Success)
		1645	{
		1646	if (atype == XA_PIXMAP)
1550	return (Pixmap )prop;	1647	pixmap = (Pixmap )prop;
		1648	XFree (prop);
1551	}	1649	}
1552		1650
1553	return None;	1651	return pixmap;
1554	}	1652	}
1555		1653
1556	#ifdef HAVE_BG_PIXMAP	1654	#ifdef HAVE_BG_PIXMAP
1557	# if TRACE_PIXMAPS
1558	# undef update_background
1559	void
1560	rxvt_term::trace_update_background (const char *file, int line)
1561	{
1562	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1563	update_background ();
1564	}
1565	# endif
1566		1655
1567	void	1656	void
1568	rxvt_term::update_background ()	1657	rxvt_term::update_background ()
1569	{	1658	{
1570	if (update_background_ev.is_active ())	1659	if (update_background_ev.is_active ())
1571	return;	1660	return;
1572		1661
1573	bgPixmap.invalidate ();	1662	bg_invalidate ();
1574		1663
1575	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1664	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1576		1665
1577	if (to_wait <= 0.)	1666	if (to_wait <= 0.)
1578	bgPixmap.render ();	1667	bg_render ();
1579	else	1668	else
1580	update_background_ev.start (to_wait);	1669	update_background_ev.start (to_wait);
1581	}	1670	}
1582		1671
1583	void	1672	void
1584	rxvt_term::update_background_cb (ev::timer &w, int revents)	1673	rxvt_term::update_background_cb (ev::timer &w, int revents)
1585	{	1674	{
1586	make_current ();	1675	make_current ();
1587		1676
1588	update_background_ev.stop ();	1677	update_background_ev.stop ();
1589	bgPixmap.render ();	1678	bg_render ();
1590	refresh_check ();	1679	refresh_check ();
1591	}	1680	}
1592		1681
1593	#endif /* HAVE_BG_PIXMAP */	1682	#endif /* HAVE_BG_PIXMAP */
1594		1683

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC vs. Revision 1.360 by sf-exg, Fri Aug 19 16:01:37 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC vs.
Revision 1.360 by sf-exg, Fri Aug 19 16:01:37 2011 UTC