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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.347 by sf-exg, Mon Jan 10 14:07:19 2011 UTC vs.
Revision 1.364 by sf-exg, Mon Jan 9 15:30:17 2012 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
…		…
226	delete fontset[i];	225	delete fontset[i];
227	#endif	226	#endif
228	delete fontset[0];	227	delete fontset[0];
229		228
230	#ifdef HAVE_BG_PIXMAP	229	#ifdef HAVE_BG_PIXMAP
231	bgPixmap.destroy ();	230	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	231	#endif
239		232
240	if (display)	233	if (display)
241	{	234	{
242	selection_clear ();	235	selection_clear ();
…		…
248	scrollBar.destroy ();	241	scrollBar.destroy ();
249	if (gc) XFreeGC (dpy, gc);	242	if (gc) XFreeGC (dpy, gc);
250		243
251	delete drawable;	244	delete drawable;
252	// destroy all windows	245	// destroy all windows
253	if (parent[0])	246	if (parent)
254	XDestroyWindow (dpy, parent[0]);	247	XDestroyWindow (dpy, parent);
255		248
256	for (int i = 0; i < TOTAL_COLORS; i++)	249	for (int i = 0; i < TOTAL_COLORS; i++)
257	if (ISSET_PIXCOLOR (i))	250	if (ISSET_PIXCOLOR (i))
258	{	251	{
259	pix_colors_focused [i].free (this);	252	pix_colors_focused [i].free (this);
…		…
274	for (int i = 0; i < allocated.size (); i++)	267	for (int i = 0; i < allocated.size (); i++)
275	free (allocated [i]);	268	free (allocated [i]);
276		269
277	free (selection.text);	270	free (selection.text);
278	free (selection.clip_text);	271	free (selection.clip_text);
279	// TODO: manage env vars in child only(!)
280	free (env_display);
281	free (env_term);
282	free (locale);	272	free (locale);
283	free (v_buffer);	273	free (v_buffer);
284	free (incr_buf);	274
		275	delete selection_req;
285		276
286	delete envv;	277	delete envv;
287	delete argv;	278	delete argv;
288		279
289	#ifdef KEYSYM_RESOURCE	280	#ifdef KEYSYM_RESOURCE
…		…
325	#endif	316	#endif
326	scrollbar_ev.stop (display);	317	scrollbar_ev.stop (display);
327	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
328	rootwin_ev.stop (display);	319	rootwin_ev.stop (display);
329	#endif	320	#endif
330	incr_ev.stop ();
331	termwin_ev.stop (display);	321	termwin_ev.stop (display);
332	vt_ev.stop (display);	322	vt_ev.stop (display);
333	}	323	}
334		324
335	flush_ev.stop ();	325	flush_ev.stop ();
…		…
713	if (recalc_y)	703	if (recalc_y)
714	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	704	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
715		705
716	ncol = width / fwidth;	706	ncol = width / fwidth;
717	nrow = height / fheight;	707	nrow = height / fheight;
		708
		709	// When the size of the vt window is not a multiple of the cell
		710	// size, i.e., when the wm does not honour our size hints, there are
		711	// extra areas not covered by the terminal screen. Such gaps, when a
		712	// bg pixmap is set, would have to be cleared manually to properly
		713	// refresh the background. We take the simpler route and shrink the
		714	// vt window so as to avoid creating gaps.
		715	width = ncol * fwidth;
		716	height = nrow * fheight;
718	}	717	}
719		718
720	/----------------------------------------------------------------------/	719	/----------------------------------------------------------------------/
721	/*	720	/*
722	* Tell the teletype handler what size the window is.	721	* Tell the teletype handler what size the window is.
…		…
742	kill (-cmd_pid, SIGWINCH);	741	kill (-cmd_pid, SIGWINCH);
743	#endif	742	#endif
744	}	743	}
745		744
746	/----------------------------------------------------------------------/	745	/----------------------------------------------------------------------/
747	/* set_fonts () - load and set the various fonts	746	/* 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	747	bool
755	rxvt_term::set_fonts ()	748	rxvt_term::set_fonts ()
756	{	749	{
757	rxvt_fontset *fs = new rxvt_fontset (this);	750	rxvt_fontset *fs = new rxvt_fontset (this);
758	rxvt_fontprop prop;	751	rxvt_fontprop prop;
…		…
815	#else	808	#else
816	fontset[style] = fontset[0];	809	fontset[style] = fontset[0];
817	#endif	810	#endif
818	}	811	}
819		812
820	if (parent[0])	813	if (parent)
821	{	814	{
822	resize_all_windows (0, 0, 0);	815	resize_all_windows (0, 0, 0);
823	scr_remap_chars ();	816	scr_remap_chars ();
824	scr_touch (true);	817	scr_touch (true);
825	}	818	}
…		…
828	}	821	}
829		822
830	void	823	void
831	rxvt_term::set_string_property (Atom prop, const char *str, int len)	824	rxvt_term::set_string_property (Atom prop, const char *str, int len)
832	{	825	{
833	XChangeProperty (dpy, parent[0],	826	XChangeProperty (dpy, parent,
834	prop, XA_STRING, 8, PropModeReplace,	827	prop, XA_STRING, 8, PropModeReplace,
835	(const unsigned char *)str, len >= 0 ? len : strlen (str));	828	(const unsigned char *)str, len >= 0 ? len : strlen (str));
836	}	829	}
837		830
838	void	831	void
…		…
840	{	833	{
841	XTextProperty ct;	834	XTextProperty ct;
842		835
843	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)	836	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844	{	837	{
845	XSetTextProperty (dpy, parent[0], &ct, prop);	838	XSetTextProperty (dpy, parent, &ct, prop);
846	XFree (ct.value);	839	XFree (ct.value);
847	}	840	}
848	}	841	}
849		842
850	void	843	void
851	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	844	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852	{	845	{
853	wchar_t *ws = rxvt_mbstowcs (str, len);	846	wchar_t *ws = rxvt_mbstowcs (str, len);
854	char *s = rxvt_wcstoutf8 (ws);	847	char *s = rxvt_wcstoutf8 (ws);
855		848
856	XChangeProperty (dpy, parent[0],	849	XChangeProperty (dpy, parent,
857	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	850	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858	(const unsigned char *)s, strlen (s));	851	(const unsigned char *)s, strlen (s));
859		852
860	free (s);	853	free (s);
861	free (ws);	854	free (ws);
…		…
1015		1008
1016	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow	1009	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1017	if (set_hint)	1010	if (set_hint)
1018	{	1011	{
1019	szHint.flags &= ~(PBaseSize \| PResizeInc);	1012	szHint.flags &= ~(PBaseSize \| PResizeInc);
1020	XSetWMNormalHints (dpy, parent[0], &szHint);	1013	XSetWMNormalHints (dpy, parent, &szHint);
1021	szHint.flags \|= PBaseSize \| PResizeInc;	1014	szHint.flags \|= PBaseSize \| PResizeInc;
1022	}	1015	}
1023		1016
1024	if (!ignoreparent)	1017	if (!ignoreparent)
1025	{	1018	{
…		…
1031	int x, y, x1, y1;	1024	int x, y, x1, y1;
1032	int dx, dy;	1025	int dx, dy;
1033	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1026	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1034	Window unused_cr;	1027	Window unused_cr;
1035		1028
1036	XTranslateCoordinates (dpy, parent[0], display->root,	1029	XTranslateCoordinates (dpy, parent, display->root,
1037	0, 0, &x, &y, &unused_cr);	1030	0, 0, &x, &y, &unused_cr);
1038	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1031	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1039	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1032	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1040	/*	1033	/*
1041	* if display->root isn't the parent window, a WM will probably have offset	1034	* if display->root isn't the parent window, a WM will probably have offset
1042	* our position for handles and decorations. Counter it	1035	* our position for handles and decorations. Counter it
1043	*/	1036	*/
…		…
1060	if (y < y1) /* top half */	1053	if (y < y1) /* top half */
1061	dy = 0;	1054	dy = 0;
1062	else if (y == y1) /* exact center */	1055	else if (y == y1) /* exact center */
1063	dy /= 2;	1056	dy /= 2;
1064		1057
1065	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1058	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1066	szHint.width, szHint.height);	1059	szHint.width, szHint.height);
1067	#else	1060	#else
1068	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1061	XResizeWindow (dpy, parent, szHint.width, szHint.height);
1069	#endif	1062	#endif
1070	}	1063	}
1071		1064
1072	if (set_hint)	1065	if (set_hint)
1073	XSetWMNormalHints (dpy, parent[0], &szHint);	1066	XSetWMNormalHints (dpy, parent, &szHint);
1074		1067
1075	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1068	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1076		1069
1077	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1070	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1078	{	1071	{
…		…
1082	XMoveResizeWindow (dpy, vt,	1075	XMoveResizeWindow (dpy, vt,
1083	window_vt_x, window_vt_y,	1076	window_vt_x, window_vt_y,
1084	width, height);	1077	width, height);
1085		1078
1086	#ifdef HAVE_BG_PIXMAP	1079	#ifdef HAVE_BG_PIXMAP
1087	if (bgPixmap.window_size_sensitive ())	1080	if (bg_window_size_sensitive ())
1088	update_background ();	1081	update_background ();
1089	#endif	1082	#endif
1090	}	1083	}
1091		1084
1092	if (fix_screen \|\| old_height == 0)	1085	if (fix_screen \|\| old_height == 0)
1093	scr_reset ();	1086	scr_reset ();
1094		1087
1095	#ifdef HAVE_BG_PIXMAP
1096	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1097	// if (bgPixmap.pixmap)
1098	// scr_touch (false);
1099	#endif
1100
1101	#ifdef USE_XIM	1088	#ifdef USE_XIM
1102	IMSetPosition ();	1089	im_set_position ();
1103	#endif	1090	#endif
1104	}	1091	}
1105		1092
1106	/*	1093	/*
1107	* Set the width/height of the vt window in characters. Units are pixels.	1094	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1168	status_rect.height = fheight;	1155	status_rect.height = fheight;
1169	}	1156	}
1170		1157
1171	/* Checking whether input method is running. */	1158	/* Checking whether input method is running. */
1172	bool	1159	bool
1173	rxvt_term::IMisRunning ()	1160	rxvt_term::im_is_running ()
1174	{	1161	{
1175	Atom atom;	1162	Atom atom;
1176	Window win;	1163	Window win;
1177	char server[IMBUFSIZ];	1164	char server[IMBUFSIZ];
1178		1165
…		…
1187		1174
1188	atom = XInternAtom (dpy, server, False);	1175	atom = XInternAtom (dpy, server, False);
1189	win = XGetSelectionOwner (dpy, atom);	1176	win = XGetSelectionOwner (dpy, atom);
1190		1177
1191	if (win != None)	1178	if (win != None)
1192	return True;	1179	return true;
1193	}	1180	}
1194		1181
1195	return False;	1182	return false;
1196	}	1183	}
1197		1184
1198	void	1185	void
1199	rxvt_term::IMSendSpot ()	1186	rxvt_term::im_send_spot ()
1200	{	1187	{
1201	XPoint nspot;	1188	XPoint nspot;
1202	XVaNestedList preedit_attr;	1189	XVaNestedList preedit_attr;
1203		1190
1204	if (!Input_Context	1191	if (!Input_Context
…		…
1310	/*	1297	/*
1311	* Try to open a XIM with the current modifiers, then see if we can	1298	* Try to open a XIM with the current modifiers, then see if we can
1312	* open a suitable preedit type	1299	* open a suitable preedit type
1313	*/	1300	*/
1314	bool	1301	bool
1315	rxvt_term::IM_get_IC (const char *modifiers)	1302	rxvt_term::im_get_ic (const char *modifiers)
1316	{	1303	{
1317	int i, j, found;	1304	int i, j, found;
1318	XIM xim;	1305	XIM xim;
1319	XPoint spot;	1306	XPoint spot;
1320	XRectangle rect, status_rect, needed_rect;	1307	XRectangle rect, status_rect, needed_rect;
1321	unsigned long fg, bg;	1308	unsigned long fg, bg;
1322	const char *p;	1309	const char *p;
1323	char **s;	1310	char **s;
1324	XIMStyles *xim_styles;	1311	XIMStyles *xim_styles;
1325	#ifdef ENABLE_XIM_ONTHESPOT
1326	XIMCallback xcb[4];
1327	#endif
1328		1312
1329	set_environ (envv);	1313	set_environ (envv);
1330		1314
1331	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1315	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1332	return false;	1316	return false;
…		…
1472	NULL);	1456	NULL);
1473	}	1457	}
1474	#if ENABLE_XIM_ONTHESPOT	1458	#if ENABLE_XIM_ONTHESPOT
1475	else if (input_style & XIMPreeditCallbacks)	1459	else if (input_style & XIMPreeditCallbacks)
1476	{	1460	{
		1461	XIMCallback xcb[4];
		1462
1477	im_set_position (spot);	1463	im_set_position (spot);
1478		1464
1479	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;	1465	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1480	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;	1466	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1481	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;	1467	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
…		…
1496	#endif	1482	#endif
1497		1483
1498	Input_Context = XCreateIC (xim,	1484	Input_Context = XCreateIC (xim,
1499	XNInputStyle, input_style,	1485	XNInputStyle, input_style,
1500	XNClientWindow, vt,	1486	XNClientWindow, vt,
1501	XNFocusWindow, parent[0],	1487	XNFocusWindow, parent,
1502	preedit_attr ? XNPreeditAttributes : NULL,	1488	preedit_attr ? XNPreeditAttributes : NULL,
1503	preedit_attr,	1489	preedit_attr,
1504	status_attr ? XNStatusAttributes : NULL,	1490	status_attr ? XNStatusAttributes : NULL,
1505	status_attr, NULL);	1491	status_attr, NULL);
1506		1492
…		…
1519	// unfortunately, only the focus window is used by XIM, hard to fix	1505	// unfortunately, only the focus window is used by XIM, hard to fix
1520	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1506	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1521	vt_select_input ();	1507	vt_select_input ();
1522	#endif	1508	#endif
1523		1509
1524	IMSetPosition ();	1510	im_set_position ();
1525		1511
1526	return true;	1512	return true;
1527	}	1513	}
1528		1514
1529	void	1515	void
…		…
1557	{	1543	{
1558	if (*s[i])	1544	if (*s[i])
1559	{	1545	{
1560	strcpy (buf, "@im=");	1546	strcpy (buf, "@im=");
1561	strncat (buf, s[i], IMBUFSIZ - 5);	1547	strncat (buf, s[i], IMBUFSIZ - 5);
1562	if (IM_get_IC (buf))	1548	if (im_get_ic (buf))
1563	{	1549	{
1564	found = true;	1550	found = true;
1565	break;	1551	break;
1566	}	1552	}
1567	}	1553	}
…		…
1572	if (found)	1558	if (found)
1573	goto done;	1559	goto done;
1574	}	1560	}
1575		1561
1576	/* try with XMODIFIERS env. var. */	1562	/* try with XMODIFIERS env. var. */
1577	if (IM_get_IC (""))	1563	if (im_get_ic (""))
1578	goto done;	1564	goto done;
1579		1565
1580	/* try with no modifiers base IF the user didn't specify an IM */	1566	/* try with no modifiers base IF the user didn't specify an IM */
1581	if (IM_get_IC ("@im=none"))	1567	if (im_get_ic ("@im=none"))
1582	goto done;	1568	goto done;
1583		1569
1584	done:	1570	done:
1585	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1571	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1586	if (rs[Rs_imLocale])	1572	if (rs[Rs_imLocale])
1587	SET_LOCALE (locale);	1573	SET_LOCALE (locale);
1588	#endif	1574	#endif
1589	}	1575	}
1590		1576
1591	void	1577	void
1592	rxvt_term::IMSetPosition ()	1578	rxvt_term::im_set_position ()
1593	{	1579	{
1594	XRectangle preedit_rect, status_rect, *needed_rect;	1580	XRectangle preedit_rect, status_rect, *needed_rect;
1595	XVaNestedList preedit_attr, status_attr;	1581	XVaNestedList preedit_attr, status_attr;
1596		1582
1597	if (!Input_Context	1583	if (!Input_Context
1598	\|\| !focus	1584	\|\| !focus
1599	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))	1585	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1600	\|\| !IMisRunning ())	1586	\|\| !im_is_running ())
1601	return;	1587	return;
1602		1588
1603	if (input_style & XIMPreeditPosition)	1589	if (input_style & XIMPreeditPosition)
1604	{	1590	{
1605	im_set_size (preedit_rect);	1591	im_set_size (preedit_rect);
…		…
1635		1621
1636	void	1622	void
1637	rxvt_term::get_window_origin (int &x, int &y)	1623	rxvt_term::get_window_origin (int &x, int &y)
1638	{	1624	{
1639	Window cr;	1625	Window cr;
1640	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1626	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1641	}	1627	}
1642		1628
1643	Pixmap	1629	Pixmap
1644	rxvt_term::get_pixmap_property (Atom property)	1630	rxvt_term::get_pixmap_property (Atom property)
1645	{	1631	{
…		…
1668	rxvt_term::update_background ()	1654	rxvt_term::update_background ()
1669	{	1655	{
1670	if (update_background_ev.is_active ())	1656	if (update_background_ev.is_active ())
1671	return;	1657	return;
1672		1658
1673	bgPixmap.invalidate ();	1659	bg_invalidate ();
1674		1660
		1661	if (!mapped)
		1662	return;
		1663
1675	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1664	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1676		1665
1677	if (to_wait <= 0.)	1666	if (to_wait <= 0.)
1678	bgPixmap.render ();	1667	bg_render ();
1679	else	1668	else
1680	update_background_ev.start (to_wait);	1669	update_background_ev.start (to_wait);
1681	}	1670	}
1682		1671
1683	void	1672	void
1684	rxvt_term::update_background_cb (ev::timer &w, int revents)	1673	rxvt_term::update_background_cb (ev::timer &w, int revents)
1685	{	1674	{
1686	make_current ();	1675	make_current ();
1687		1676
1688	update_background_ev.stop ();	1677	update_background_ev.stop ();
1689	bgPixmap.render ();	1678	bg_render ();
1690	refresh_check ();	1679	refresh_check ();
1691	}	1680	}
1692		1681
1693	#endif /* HAVE_BG_PIXMAP */	1682	#endif /* HAVE_BG_PIXMAP */
1694		1683

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.347 by sf-exg, Mon Jan 10 14:07:19 2011 UTC vs. Revision 1.364 by sf-exg, Mon Jan 9 15:30:17 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.347 by sf-exg, Mon Jan 10 14:07:19 2011 UTC vs.
Revision 1.364 by sf-exg, Mon Jan 9 15:30:17 2012 UTC