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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.348 by sf-exg, Thu Jan 20 16:41:23 2011 UTC vs.
Revision 1.362 by sf-exg, Tue Dec 6 11:29:52 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-2010 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.
…		…
105	if (cc->c2 == c2) return c1;	105	if (cc->c2 == c2) return c1;
106	cc = (*this)[cc->c1];	106	cc = (*this)[cc->c1];
107	}	107	}
108		108
109	// check to see whether this combination already exists otherwise	109	// check to see whether this combination already exists otherwise
110	for (cc = v.end (); cc-- > v.begin (); )	110	for (cc = v.begin (); cc < v.end (); cc++)
111	if (cc->c1 == c1 && cc->c2 == c2)	111	if (cc->c1 == c1 && cc->c2 == c2)
112	return COMPOSE_LO + (cc - v.begin ());	112	return COMPOSE_LO + (cc - v.begin ());
113		113
114	// allocate a new combination	114	// allocate a new combination
115	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	115	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
…		…
187	#endif	187	#endif
188	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	188	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);	189	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	190	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	191	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195		194
196	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197		196
198	termlist.push_back (this);	197	termlist.push_back (this);
199		198
200	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
201	keyboard = new keyboard_manager;	200	keyboard = new keyboard_manager;
202	#endif	201	#endif
		202
		203	// this->envv = 0;
203	}	204	}
204		205
205	// 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.
206	// for use before an emergency exit	207	// for use before an emergency exit
207	void	208	void
…		…
226	delete fontset[i];	227	delete fontset[i];
227	#endif	228	#endif
228	delete fontset[0];	229	delete fontset[0];
229		230
230	#ifdef HAVE_BG_PIXMAP	231	#ifdef HAVE_BG_PIXMAP
231	bgPixmap.destroy ();	232	bg_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	233	#endif
239		234
240	if (display)	235	if (display)
241	{	236	{
242	selection_clear ();	237	selection_clear ();
…		…
248	scrollBar.destroy ();	243	scrollBar.destroy ();
249	if (gc) XFreeGC (dpy, gc);	244	if (gc) XFreeGC (dpy, gc);
250		245
251	delete drawable;	246	delete drawable;
252	// destroy all windows	247	// destroy all windows
253	if (parent[0])	248	if (parent)
254	XDestroyWindow (dpy, parent[0]);	249	XDestroyWindow (dpy, parent);
255		250
256	for (int i = 0; i < TOTAL_COLORS; i++)	251	for (int i = 0; i < TOTAL_COLORS; i++)
257	if (ISSET_PIXCOLOR (i))	252	if (ISSET_PIXCOLOR (i))
258	{	253	{
259	pix_colors_focused [i].free (this);	254	pix_colors_focused [i].free (this);
…		…
279	// TODO: manage env vars in child only(!)	274	// TODO: manage env vars in child only(!)
280	free (env_display);	275	free (env_display);
281	free (env_term);	276	free (env_term);
282	free (locale);	277	free (locale);
283	free (v_buffer);	278	free (v_buffer);
284	free (incr_buf);	279
		280	delete selection_req;
285		281
286	delete envv;	282	delete envv;
287	delete argv;	283	delete argv;
288		284
289	#ifdef KEYSYM_RESOURCE	285	#ifdef KEYSYM_RESOURCE
…		…
325	#endif	321	#endif
326	scrollbar_ev.stop (display);	322	scrollbar_ev.stop (display);
327	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	323	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
328	rootwin_ev.stop (display);	324	rootwin_ev.stop (display);
329	#endif	325	#endif
330	incr_ev.stop ();
331	termwin_ev.stop (display);	326	termwin_ev.stop (display);
332	vt_ev.stop (display);	327	vt_ev.stop (display);
333	}	328	}
334		329
335	flush_ev.stop ();	330	flush_ev.stop ();
…		…
713	if (recalc_y)	708	if (recalc_y)
714	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	709	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
715		710
716	ncol = width / fwidth;	711	ncol = width / fwidth;
717	nrow = height / fheight;	712	nrow = height / fheight;
		713
		714	// When the size of the vt window is not a multiple of the cell
		715	// size, i.e., when the wm does not honour our size hints, there are
		716	// extra areas not covered by the terminal screen. Such gaps, when a
		717	// bg pixmap is set, would have to be cleared manually to properly
		718	// refresh the background. We take the simpler route and shrink the
		719	// vt window so as to avoid creating gaps.
		720	width = ncol * fwidth;
		721	height = nrow * fheight;
718	}	722	}
719		723
720	/----------------------------------------------------------------------/	724	/----------------------------------------------------------------------/
721	/*	725	/*
722	* Tell the teletype handler what size the window is.	726	* Tell the teletype handler what size the window is.
…		…
742	kill (-cmd_pid, SIGWINCH);	746	kill (-cmd_pid, SIGWINCH);
743	#endif	747	#endif
744	}	748	}
745		749
746	/----------------------------------------------------------------------/	750	/----------------------------------------------------------------------/
747	/* set_fonts () - load and set the various fonts	751	/* load and set the various fonts */
748	*
749	* init = 1 - initialize
750	*
751	* fontname == FONT_UP - switch to bigger font
752	* fontname == FONT_DN - switch to smaller font
753	*/
754	bool	752	bool
755	rxvt_term::set_fonts ()	753	rxvt_term::set_fonts ()
756	{	754	{
757	rxvt_fontset *fs = new rxvt_fontset (this);	755	rxvt_fontset *fs = new rxvt_fontset (this);
758	rxvt_fontprop prop;	756	rxvt_fontprop prop;
…		…
815	#else	813	#else
816	fontset[style] = fontset[0];	814	fontset[style] = fontset[0];
817	#endif	815	#endif
818	}	816	}
819		817
820	if (parent[0])	818	if (parent)
821	{	819	{
822	resize_all_windows (0, 0, 0);	820	resize_all_windows (0, 0, 0);
823	scr_remap_chars ();	821	scr_remap_chars ();
824	scr_touch (true);	822	scr_touch (true);
825	}	823	}
…		…
828	}	826	}
829		827
830	void	828	void
831	rxvt_term::set_string_property (Atom prop, const char *str, int len)	829	rxvt_term::set_string_property (Atom prop, const char *str, int len)
832	{	830	{
833	XChangeProperty (dpy, parent[0],	831	XChangeProperty (dpy, parent,
834	prop, XA_STRING, 8, PropModeReplace,	832	prop, XA_STRING, 8, PropModeReplace,
835	(const unsigned char *)str, len >= 0 ? len : strlen (str));	833	(const unsigned char *)str, len >= 0 ? len : strlen (str));
836	}	834	}
837		835
838	void	836	void
…		…
840	{	838	{
841	XTextProperty ct;	839	XTextProperty ct;
842		840
843	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)	841	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844	{	842	{
845	XSetTextProperty (dpy, parent[0], &ct, prop);	843	XSetTextProperty (dpy, parent, &ct, prop);
846	XFree (ct.value);	844	XFree (ct.value);
847	}	845	}
848	}	846	}
849		847
850	void	848	void
851	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	849	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852	{	850	{
853	wchar_t *ws = rxvt_mbstowcs (str, len);	851	wchar_t *ws = rxvt_mbstowcs (str, len);
854	char *s = rxvt_wcstoutf8 (ws);	852	char *s = rxvt_wcstoutf8 (ws);
855		853
856	XChangeProperty (dpy, parent[0],	854	XChangeProperty (dpy, parent,
857	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	855	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858	(const unsigned char *)s, strlen (s));	856	(const unsigned char *)s, strlen (s));
859		857
860	free (s);	858	free (s);
861	free (ws);	859	free (ws);
…		…
1015		1013
1016	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow	1014	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1017	if (set_hint)	1015	if (set_hint)
1018	{	1016	{
1019	szHint.flags &= ~(PBaseSize \| PResizeInc);	1017	szHint.flags &= ~(PBaseSize \| PResizeInc);
1020	XSetWMNormalHints (dpy, parent[0], &szHint);	1018	XSetWMNormalHints (dpy, parent, &szHint);
1021	szHint.flags \|= PBaseSize \| PResizeInc;	1019	szHint.flags \|= PBaseSize \| PResizeInc;
1022	}	1020	}
1023		1021
1024	if (!ignoreparent)	1022	if (!ignoreparent)
1025	{	1023	{
…		…
1031	int x, y, x1, y1;	1029	int x, y, x1, y1;
1032	int dx, dy;	1030	int dx, dy;
1033	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1031	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1034	Window unused_cr;	1032	Window unused_cr;
1035		1033
1036	XTranslateCoordinates (dpy, parent[0], display->root,	1034	XTranslateCoordinates (dpy, parent, display->root,
1037	0, 0, &x, &y, &unused_cr);	1035	0, 0, &x, &y, &unused_cr);
1038	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1036	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1039	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1037	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1040	/*	1038	/*
1041	* if display->root isn't the parent window, a WM will probably have offset	1039	* if display->root isn't the parent window, a WM will probably have offset
1042	* our position for handles and decorations. Counter it	1040	* our position for handles and decorations. Counter it
1043	*/	1041	*/
…		…
1060	if (y < y1) /* top half */	1058	if (y < y1) /* top half */
1061	dy = 0;	1059	dy = 0;
1062	else if (y == y1) /* exact center */	1060	else if (y == y1) /* exact center */
1063	dy /= 2;	1061	dy /= 2;
1064		1062
1065	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1063	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1066	szHint.width, szHint.height);	1064	szHint.width, szHint.height);
1067	#else	1065	#else
1068	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1066	XResizeWindow (dpy, parent, szHint.width, szHint.height);
1069	#endif	1067	#endif
1070	}	1068	}
1071		1069
1072	if (set_hint)	1070	if (set_hint)
1073	XSetWMNormalHints (dpy, parent[0], &szHint);	1071	XSetWMNormalHints (dpy, parent, &szHint);
1074		1072
1075	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1073	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1076		1074
1077	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1075	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1078	{	1076	{
…		…
1082	XMoveResizeWindow (dpy, vt,	1080	XMoveResizeWindow (dpy, vt,
1083	window_vt_x, window_vt_y,	1081	window_vt_x, window_vt_y,
1084	width, height);	1082	width, height);
1085		1083
1086	#ifdef HAVE_BG_PIXMAP	1084	#ifdef HAVE_BG_PIXMAP
1087	if (bgPixmap.window_size_sensitive ())	1085	if (bg_window_size_sensitive ())
1088	update_background ();	1086	update_background ();
1089	#endif	1087	#endif
1090	}	1088	}
1091		1089
1092	if (fix_screen \|\| old_height == 0)	1090	if (fix_screen \|\| old_height == 0)
1093	scr_reset ();	1091	scr_reset ();
1094		1092
1095	#ifdef USE_XIM	1093	#ifdef USE_XIM
1096	IMSetPosition ();	1094	im_set_position ();
1097	#endif	1095	#endif
1098	}	1096	}
1099		1097
1100	/*	1098	/*
1101	* Set the width/height of the vt window in characters. Units are pixels.	1099	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1162	status_rect.height = fheight;	1160	status_rect.height = fheight;
1163	}	1161	}
1164		1162
1165	/* Checking whether input method is running. */	1163	/* Checking whether input method is running. */
1166	bool	1164	bool
1167	rxvt_term::IMisRunning ()	1165	rxvt_term::im_is_running ()
1168	{	1166	{
1169	Atom atom;	1167	Atom atom;
1170	Window win;	1168	Window win;
1171	char server[IMBUFSIZ];	1169	char server[IMBUFSIZ];
1172		1170
…		…
1181		1179
1182	atom = XInternAtom (dpy, server, False);	1180	atom = XInternAtom (dpy, server, False);
1183	win = XGetSelectionOwner (dpy, atom);	1181	win = XGetSelectionOwner (dpy, atom);
1184		1182
1185	if (win != None)	1183	if (win != None)
1186	return True;	1184	return true;
1187	}	1185	}
1188		1186
1189	return False;	1187	return false;
1190	}	1188	}
1191		1189
1192	void	1190	void
1193	rxvt_term::IMSendSpot ()	1191	rxvt_term::im_send_spot ()
1194	{	1192	{
1195	XPoint nspot;	1193	XPoint nspot;
1196	XVaNestedList preedit_attr;	1194	XVaNestedList preedit_attr;
1197		1195
1198	if (!Input_Context	1196	if (!Input_Context
…		…
1304	/*	1302	/*
1305	* Try to open a XIM with the current modifiers, then see if we can	1303	* Try to open a XIM with the current modifiers, then see if we can
1306	* open a suitable preedit type	1304	* open a suitable preedit type
1307	*/	1305	*/
1308	bool	1306	bool
1309	rxvt_term::IM_get_IC (const char *modifiers)	1307	rxvt_term::im_get_ic (const char *modifiers)
1310	{	1308	{
1311	int i, j, found;	1309	int i, j, found;
1312	XIM xim;	1310	XIM xim;
1313	XPoint spot;	1311	XPoint spot;
1314	XRectangle rect, status_rect, needed_rect;	1312	XRectangle rect, status_rect, needed_rect;
1315	unsigned long fg, bg;	1313	unsigned long fg, bg;
1316	const char *p;	1314	const char *p;
1317	char **s;	1315	char **s;
1318	XIMStyles *xim_styles;	1316	XIMStyles *xim_styles;
1319	#ifdef ENABLE_XIM_ONTHESPOT
1320	XIMCallback xcb[4];
1321	#endif
1322		1317
1323	set_environ (envv);	1318	set_environ (envv);
1324		1319
1325	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1320	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1326	return false;	1321	return false;
…		…
1466	NULL);	1461	NULL);
1467	}	1462	}
1468	#if ENABLE_XIM_ONTHESPOT	1463	#if ENABLE_XIM_ONTHESPOT
1469	else if (input_style & XIMPreeditCallbacks)	1464	else if (input_style & XIMPreeditCallbacks)
1470	{	1465	{
		1466	XIMCallback xcb[4];
		1467
1471	im_set_position (spot);	1468	im_set_position (spot);
1472		1469
1473	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;	1470	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1474	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;	1471	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1475	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;	1472	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
…		…
1490	#endif	1487	#endif
1491		1488
1492	Input_Context = XCreateIC (xim,	1489	Input_Context = XCreateIC (xim,
1493	XNInputStyle, input_style,	1490	XNInputStyle, input_style,
1494	XNClientWindow, vt,	1491	XNClientWindow, vt,
1495	XNFocusWindow, parent[0],	1492	XNFocusWindow, parent,
1496	preedit_attr ? XNPreeditAttributes : NULL,	1493	preedit_attr ? XNPreeditAttributes : NULL,
1497	preedit_attr,	1494	preedit_attr,
1498	status_attr ? XNStatusAttributes : NULL,	1495	status_attr ? XNStatusAttributes : NULL,
1499	status_attr, NULL);	1496	status_attr, NULL);
1500		1497
…		…
1513	// unfortunately, only the focus window is used by XIM, hard to fix	1510	// unfortunately, only the focus window is used by XIM, hard to fix
1514	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1511	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1515	vt_select_input ();	1512	vt_select_input ();
1516	#endif	1513	#endif
1517		1514
1518	IMSetPosition ();	1515	im_set_position ();
1519		1516
1520	return true;	1517	return true;
1521	}	1518	}
1522		1519
1523	void	1520	void
…		…
1551	{	1548	{
1552	if (*s[i])	1549	if (*s[i])
1553	{	1550	{
1554	strcpy (buf, "@im=");	1551	strcpy (buf, "@im=");
1555	strncat (buf, s[i], IMBUFSIZ - 5);	1552	strncat (buf, s[i], IMBUFSIZ - 5);
1556	if (IM_get_IC (buf))	1553	if (im_get_ic (buf))
1557	{	1554	{
1558	found = true;	1555	found = true;
1559	break;	1556	break;
1560	}	1557	}
1561	}	1558	}
…		…
1566	if (found)	1563	if (found)
1567	goto done;	1564	goto done;
1568	}	1565	}
1569		1566
1570	/* try with XMODIFIERS env. var. */	1567	/* try with XMODIFIERS env. var. */
1571	if (IM_get_IC (""))	1568	if (im_get_ic (""))
1572	goto done;	1569	goto done;
1573		1570
1574	/* try with no modifiers base IF the user didn't specify an IM */	1571	/* try with no modifiers base IF the user didn't specify an IM */
1575	if (IM_get_IC ("@im=none"))	1572	if (im_get_ic ("@im=none"))
1576	goto done;	1573	goto done;
1577		1574
1578	done:	1575	done:
1579	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1576	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1580	if (rs[Rs_imLocale])	1577	if (rs[Rs_imLocale])
1581	SET_LOCALE (locale);	1578	SET_LOCALE (locale);
1582	#endif	1579	#endif
1583	}	1580	}
1584		1581
1585	void	1582	void
1586	rxvt_term::IMSetPosition ()	1583	rxvt_term::im_set_position ()
1587	{	1584	{
1588	XRectangle preedit_rect, status_rect, *needed_rect;	1585	XRectangle preedit_rect, status_rect, *needed_rect;
1589	XVaNestedList preedit_attr, status_attr;	1586	XVaNestedList preedit_attr, status_attr;
1590		1587
1591	if (!Input_Context	1588	if (!Input_Context
1592	\|\| !focus	1589	\|\| !focus
1593	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))	1590	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1594	\|\| !IMisRunning ())	1591	\|\| !im_is_running ())
1595	return;	1592	return;
1596		1593
1597	if (input_style & XIMPreeditPosition)	1594	if (input_style & XIMPreeditPosition)
1598	{	1595	{
1599	im_set_size (preedit_rect);	1596	im_set_size (preedit_rect);
…		…
1629		1626
1630	void	1627	void
1631	rxvt_term::get_window_origin (int &x, int &y)	1628	rxvt_term::get_window_origin (int &x, int &y)
1632	{	1629	{
1633	Window cr;	1630	Window cr;
1634	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1631	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1635	}	1632	}
1636		1633
1637	Pixmap	1634	Pixmap
1638	rxvt_term::get_pixmap_property (Atom property)	1635	rxvt_term::get_pixmap_property (Atom property)
1639	{	1636	{
…		…
1662	rxvt_term::update_background ()	1659	rxvt_term::update_background ()
1663	{	1660	{
1664	if (update_background_ev.is_active ())	1661	if (update_background_ev.is_active ())
1665	return;	1662	return;
1666		1663
1667	bgPixmap.invalidate ();	1664	bg_invalidate ();
1668		1665
		1666	if (!mapped)
		1667	return;
		1668
1669	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1669	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1670		1670
1671	if (to_wait <= 0.)	1671	if (to_wait <= 0.)
1672	bgPixmap.render ();	1672	bg_render ();
1673	else	1673	else
1674	update_background_ev.start (to_wait);	1674	update_background_ev.start (to_wait);
1675	}	1675	}
1676		1676
1677	void	1677	void
1678	rxvt_term::update_background_cb (ev::timer &w, int revents)	1678	rxvt_term::update_background_cb (ev::timer &w, int revents)
1679	{	1679	{
1680	make_current ();	1680	make_current ();
1681		1681
1682	update_background_ev.stop ();	1682	update_background_ev.stop ();
1683	bgPixmap.render ();	1683	bg_render ();
1684	refresh_check ();	1684	refresh_check ();
1685	}	1685	}
1686		1686
1687	#endif /* HAVE_BG_PIXMAP */	1687	#endif /* HAVE_BG_PIXMAP */
1688		1688

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.348 by sf-exg, Thu Jan 20 16:41:23 2011 UTC vs. Revision 1.362 by sf-exg, Tue Dec 6 11:29:52 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.348 by sf-exg, Thu Jan 20 16:41:23 2011 UTC vs.
Revision 1.362 by sf-exg, Tue Dec 6 11:29:52 2011 UTC