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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.341 by sf-exg, Sun Dec 12 23:13:29 2010 UTC vs.
Revision 1.355 by sf-exg, Thu Apr 7 12:19:40 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.
…		…
96	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)
97	{	97	{
98	compose_char *cc;	98	compose_char *cc;
99		99
100	// break compose chains, as stupid readline really likes to duplicate	100	// break compose chains, as stupid readline really likes to duplicate
101	// composing characters for some reason near the end of a line.	101	// composing characters for some reason, near the end of a line.
102	cc = (*this)[c1];	102	cc = (*this)[c1];
103	while (cc)	103	while (cc)
104	{	104	{
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.end (); cc-- > v.begin (); )
111	{
112	if (cc->c1 == c1 && cc->c2 == c2)	111	if (cc->c1 == c1 && cc->c2 == c2)
113	return COMPOSE_LO + (cc - v.begin ());	112	return COMPOSE_LO + (cc - v.begin ());
114	}
115		113
116	// allocate a new combination	114	// allocate a new combination
117	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	115	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
118	{	116	{
119	static int seen;	117	static int seen;
120		118
121	if (!seen++)	119	if (!seen++)
122	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");	120	rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
123		121
124	return REPLACEMENT_CHAR;	122	return REPLACEMENT_CHAR;
125	}	123	}
126		124
127	v.push_back (compose_char (c1, c2));	125	v.push_back (compose_char (c1, c2));
…		…
189	#endif	187	#endif
190	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	188	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
191	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);	189	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	190	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	191	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197		194
198	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199		196
…		…
228	delete fontset[i];	225	delete fontset[i];
229	#endif	226	#endif
230	delete fontset[0];	227	delete fontset[0];
231		228
232	#ifdef HAVE_BG_PIXMAP	229	#ifdef HAVE_BG_PIXMAP
233	bgPixmap.destroy ();	230	bg_destroy ();
234	#endif
235	#ifdef HAVE_AFTERIMAGE
236	if (asv)
237	destroy_asvisual (asv, 0);
238	if (asimman)
239	destroy_image_manager (asimman, 0);
240	#endif	231	#endif
241		232
242	if (display)	233	if (display)
243	{	234	{
244	selection_clear ();	235	selection_clear ();
…		…
250	scrollBar.destroy ();	241	scrollBar.destroy ();
251	if (gc) XFreeGC (dpy, gc);	242	if (gc) XFreeGC (dpy, gc);
252		243
253	delete drawable;	244	delete drawable;
254	// destroy all windows	245	// destroy all windows
255	if (parent[0])	246	if (parent)
256	XDestroyWindow (dpy, parent[0]);	247	XDestroyWindow (dpy, parent);
257		248
258	for (int i = 0; i < TOTAL_COLORS; i++)	249	for (int i = 0; i < TOTAL_COLORS; i++)
259	if (ISSET_PIXCOLOR (i))	250	if (ISSET_PIXCOLOR (i))
260	{	251	{
261	pix_colors_focused [i].free (this);	252	pix_colors_focused [i].free (this);
…		…
281	// TODO: manage env vars in child only(!)	272	// TODO: manage env vars in child only(!)
282	free (env_display);	273	free (env_display);
283	free (env_term);	274	free (env_term);
284	free (locale);	275	free (locale);
285	free (v_buffer);	276	free (v_buffer);
286	free (incr_buf);	277
		278	delete selection_req;
287		279
288	delete envv;	280	delete envv;
289	delete argv;	281	delete argv;
290		282
291	#ifdef KEYSYM_RESOURCE	283	#ifdef KEYSYM_RESOURCE
…		…
327	#endif	319	#endif
328	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
329	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
330	rootwin_ev.stop (display);	322	rootwin_ev.stop (display);
331	#endif	323	#endif
332	incr_ev.stop ();
333	termwin_ev.stop (display);	324	termwin_ev.stop (display);
334	vt_ev.stop (display);	325	vt_ev.stop (display);
335	}	326	}
336		327
337	flush_ev.stop ();	328	flush_ev.stop ();
…		…
394	print_x_error (Display dpy, XErrorEvent event)	385	print_x_error (Display dpy, XErrorEvent event)
395	{	386	{
396	char buffer[BUFSIZ];	387	char buffer[BUFSIZ];
397	char mesg[BUFSIZ];	388	char mesg[BUFSIZ];
398	char number[32];	389	char number[32];
399	char *mtype = "XlibMessage";	390	const char mtype[] = "XlibMessage";
400	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	391	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	392	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402	rxvt_warn ("An X Error occurred, trying to continue after report.\n");	393	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403	rxvt_warn ("%s: %s\n", mesg, buffer);	394	rxvt_warn ("%s: %s\n", mesg, buffer);
404	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	395	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
…		…
817	#else	808	#else
818	fontset[style] = fontset[0];	809	fontset[style] = fontset[0];
819	#endif	810	#endif
820	}	811	}
821		812
822	if (parent[0])	813	if (parent)
823	{	814	{
824	resize_all_windows (0, 0, 0);	815	resize_all_windows (0, 0, 0);
825	scr_remap_chars ();	816	scr_remap_chars ();
826	scr_touch (true);	817	scr_touch (true);
827	}	818	}
…		…
830	}	821	}
831		822
832	void	823	void
833	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)
834	{	825	{
835	XChangeProperty (dpy, parent[0],	826	XChangeProperty (dpy, parent,
836	prop, XA_STRING, 8, PropModeReplace,	827	prop, XA_STRING, 8, PropModeReplace,
837	(const unsigned char *)str, len >= 0 ? len : strlen (str));	828	(const unsigned char *)str, len >= 0 ? len : strlen (str));
838	}	829	}
839		830
840	void	831	void
…		…
842	{	833	{
843	XTextProperty ct;	834	XTextProperty ct;
844		835
845	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)	836	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846	{	837	{
847	XSetTextProperty (dpy, parent[0], &ct, prop);	838	XSetTextProperty (dpy, parent, &ct, prop);
848	XFree (ct.value);	839	XFree (ct.value);
849	}	840	}
850	}	841	}
851		842
852	void	843	void
853	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)
854	{	845	{
855	wchar_t *ws = rxvt_mbstowcs (str, len);	846	wchar_t *ws = rxvt_mbstowcs (str, len);
856	char *s = rxvt_wcstoutf8 (ws);	847	char *s = rxvt_wcstoutf8 (ws);
857		848
858	XChangeProperty (dpy, parent[0],	849	XChangeProperty (dpy, parent,
859	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	850	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
860	(const unsigned char *)s, strlen (s));	851	(const unsigned char *)s, strlen (s));
861		852
862	free (s);	853	free (s);
863	free (ws);	854	free (ws);
…		…
958	void	949	void
959	rxvt_term::set_colorfgbg ()	950	rxvt_term::set_colorfgbg ()
960	{	951	{
961	unsigned int i;	952	unsigned int i;
962	const char *xpmb = "";	953	const char *xpmb = "";
963	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	954	char fstr[] = "default";
		955	char bstr[] = "default";
964		956
965	strcpy (fstr, "default");
966	strcpy (bstr, "default");
967	for (i = Color_Black; i <= Color_White; i++)	957	for (i = Color_Black; i <= Color_White; i++)
968	if (pix_colors[Color_fg] == pix_colors[i])	958	if (pix_colors[Color_fg] == pix_colors[i])
969	{	959	{
970	sprintf (fstr, "%d", (i - Color_Black));	960	sprintf (fstr, "%d", i - Color_Black);
971	break;	961	break;
972	}	962	}
973		963
974	for (i = Color_Black; i <= Color_White; i++)	964	for (i = Color_Black; i <= Color_White; i++)
975	if (pix_colors[Color_bg] == pix_colors[i])	965	if (pix_colors[Color_bg] == pix_colors[i])
976	{	966	{
977	sprintf (bstr, "%d", (i - Color_Black));	967	sprintf (bstr, "%d", i - Color_Black);
978	#ifdef BG_IMAGE_FROM_FILE	968	#ifdef BG_IMAGE_FROM_FILE
979	xpmb = "default;";	969	xpmb = "default;";
980	#endif	970	#endif
981	break;	971	break;
982	}	972	}
…		…
1018		1008
1019	// 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
1020	if (set_hint)	1010	if (set_hint)
1021	{	1011	{
1022	szHint.flags &= ~(PBaseSize \| PResizeInc);	1012	szHint.flags &= ~(PBaseSize \| PResizeInc);
1023	XSetWMNormalHints (dpy, parent[0], &szHint);	1013	XSetWMNormalHints (dpy, parent, &szHint);
1024	szHint.flags \|= PBaseSize \| PResizeInc;	1014	szHint.flags \|= PBaseSize \| PResizeInc;
1025	}	1015	}
1026		1016
1027	if (!ignoreparent)	1017	if (!ignoreparent)
1028	{	1018	{
…		…
1034	int x, y, x1, y1;	1024	int x, y, x1, y1;
1035	int dx, dy;	1025	int dx, dy;
1036	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1026	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1037	Window unused_cr;	1027	Window unused_cr;
1038		1028
1039	XTranslateCoordinates (dpy, parent[0], display->root,	1029	XTranslateCoordinates (dpy, parent, display->root,
1040	0, 0, &x, &y, &unused_cr);	1030	0, 0, &x, &y, &unused_cr);
1041	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1031	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1042	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1032	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1043	/*	1033	/*
1044	* 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
1045	* our position for handles and decorations. Counter it	1035	* our position for handles and decorations. Counter it
1046	*/	1036	*/
…		…
1063	if (y < y1) /* top half */	1053	if (y < y1) /* top half */
1064	dy = 0;	1054	dy = 0;
1065	else if (y == y1) /* exact center */	1055	else if (y == y1) /* exact center */
1066	dy /= 2;	1056	dy /= 2;
1067		1057
1068	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1058	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1069	szHint.width, szHint.height);	1059	szHint.width, szHint.height);
1070	#else	1060	#else
1071	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1061	XResizeWindow (dpy, parent, szHint.width, szHint.height);
1072	#endif	1062	#endif
1073	}	1063	}
1074		1064
1075	if (set_hint)	1065	if (set_hint)
1076	XSetWMNormalHints (dpy, parent[0], &szHint);	1066	XSetWMNormalHints (dpy, parent, &szHint);
1077		1067
1078	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1068	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1079		1069
1080	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1070	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1081	{	1071	{
…		…
1085	XMoveResizeWindow (dpy, vt,	1075	XMoveResizeWindow (dpy, vt,
1086	window_vt_x, window_vt_y,	1076	window_vt_x, window_vt_y,
1087	width, height);	1077	width, height);
1088		1078
1089	#ifdef HAVE_BG_PIXMAP	1079	#ifdef HAVE_BG_PIXMAP
1090	if (bgPixmap.window_size_sensitive ())	1080	if (bg_window_size_sensitive ())
1091	update_background ();	1081	update_background ();
1092	#endif	1082	#endif
1093	}	1083	}
1094		1084
1095	if (fix_screen \|\| old_height == 0)	1085	if (fix_screen \|\| old_height == 0)
1096	scr_reset ();	1086	scr_reset ();
1097
1098	#ifdef HAVE_BG_PIXMAP
1099	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1100	// if (bgPixmap.pixmap)
1101	// scr_touch (false);
1102	#endif
1103		1087
1104	#ifdef USE_XIM	1088	#ifdef USE_XIM
1105	IMSetPosition ();	1089	IMSetPosition ();
1106	#endif	1090	#endif
1107	}	1091	}
…		…
1190		1174
1191	atom = XInternAtom (dpy, server, False);	1175	atom = XInternAtom (dpy, server, False);
1192	win = XGetSelectionOwner (dpy, atom);	1176	win = XGetSelectionOwner (dpy, atom);
1193		1177
1194	if (win != None)	1178	if (win != None)
1195	return True;	1179	return true;
1196	}	1180	}
1197		1181
1198	return False;	1182	return false;
1199	}	1183	}
1200		1184
1201	void	1185	void
1202	rxvt_term::IMSendSpot ()	1186	rxvt_term::IMSendSpot ()
1203	{	1187	{
…		…
1356	p = pet[pi];	1340	p = pet[pi];
1357		1341
1358	if (!p)	1342	if (!p)
1359	continue;	1343	continue;
1360		1344
1361	s = rxvt_splitcommastring (p);	1345	s = rxvt_strsplit (',', p);
1362		1346
1363	for (i = found = 0; !found && s[i]; i++)	1347	for (i = found = 0; !found && s[i]; i++)
1364	{	1348	{
1365	if (!strcmp (s[i], "OverTheSpot"))	1349	if (!strcmp (s[i], "OverTheSpot"))
1366	input_style = XIMPreeditPosition \| XIMStatusNothing;	1350	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1378	input_style = XIMPreeditNothing \| XIMStatusNothing;	1362	input_style = XIMPreeditNothing \| XIMStatusNothing;
1379		1363
1380	for (j = 0; j < xim_styles->count_styles; j++)	1364	for (j = 0; j < xim_styles->count_styles; j++)
1381	if (input_style == xim_styles->supported_styles[j])	1365	if (input_style == xim_styles->supported_styles[j])
1382	{	1366	{
1383	rxvt_freecommastring (s);	1367	rxvt_free_strsplit (s);
1384		1368
1385	found = 1;	1369	found = 1;
1386	goto foundpet;	1370	goto foundpet;
1387	}	1371	}
1388		1372
1389	}	1373	}
1390		1374
1391	rxvt_freecommastring (s);	1375	rxvt_free_strsplit (s);
1392	}	1376	}
1393		1377
1394	foundpet:	1378	foundpet:
1395		1379
1396	XFree (xim_styles);	1380	XFree (xim_styles);
…		…
1499	#endif	1483	#endif
1500		1484
1501	Input_Context = XCreateIC (xim,	1485	Input_Context = XCreateIC (xim,
1502	XNInputStyle, input_style,	1486	XNInputStyle, input_style,
1503	XNClientWindow, vt,	1487	XNClientWindow, vt,
1504	XNFocusWindow, parent[0],	1488	XNFocusWindow, parent,
1505	preedit_attr ? XNPreeditAttributes : NULL,	1489	preedit_attr ? XNPreeditAttributes : NULL,
1506	preedit_attr,	1490	preedit_attr,
1507	status_attr ? XNStatusAttributes : NULL,	1491	status_attr ? XNStatusAttributes : NULL,
1508	status_attr, NULL);	1492	status_attr, NULL);
1509		1493
…		…
1552	p = rs[Rs_inputMethod];	1536	p = rs[Rs_inputMethod];
1553	if (p && *p)	1537	if (p && *p)
1554	{	1538	{
1555	bool found = false;	1539	bool found = false;
1556		1540
1557	s = rxvt_splitcommastring (p);	1541	s = rxvt_strsplit (',', p);
1558		1542
1559	for (i = 0; s[i]; i++)	1543	for (i = 0; s[i]; i++)
1560	{	1544	{
1561	if (*s[i])	1545	if (*s[i])
1562	{	1546	{
…		…
1568	break;	1552	break;
1569	}	1553	}
1570	}	1554	}
1571	}	1555	}
1572		1556
1573	rxvt_freecommastring (s);	1557	rxvt_free_strsplit (s);
1574		1558
1575	if (found)	1559	if (found)
1576	goto done;	1560	goto done;
1577	}	1561	}
1578		1562
…		…
1638		1622
1639	void	1623	void
1640	rxvt_term::get_window_origin (int &x, int &y)	1624	rxvt_term::get_window_origin (int &x, int &y)
1641	{	1625	{
1642	Window cr;	1626	Window cr;
1643	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1627	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1644	}	1628	}
1645		1629
1646	Pixmap	1630	Pixmap
1647	rxvt_term::get_pixmap_property (int prop_id)	1631	rxvt_term::get_pixmap_property (Atom property)
1648	{	1632	{
1649	Pixmap pixmap = None;	1633	Pixmap pixmap = None;
1650		1634
1651	if (prop_id > 0 && prop_id < NUM_XA)
1652	if (xa[prop_id])
1653	{
1654	int aformat;	1635	int aformat;
1655	unsigned long nitems, bytes_after;	1636	unsigned long nitems, bytes_after;
1656	Atom atype;	1637	Atom atype;
1657	unsigned char *prop;	1638	unsigned char *prop;
1658	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1639	int result = XGetWindowProperty (dpy, display->root, property,
1659	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1640	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1660	&nitems, &bytes_after, &prop);	1641	&nitems, &bytes_after, &prop);
1661	if (result == Success)	1642	if (result == Success)
1662	{	1643	{
1663	if (atype == XA_PIXMAP)	1644	if (atype == XA_PIXMAP)
1664	pixmap = (Pixmap )prop;	1645	pixmap = (Pixmap )prop;
1665	XFree (prop);	1646	XFree (prop);
1666	}
1667	}	1647	}
1668		1648
1669	return pixmap;	1649	return pixmap;
1670	}	1650	}
1671		1651
1672	#ifdef HAVE_BG_PIXMAP	1652	#ifdef HAVE_BG_PIXMAP
…		…
1675	rxvt_term::update_background ()	1655	rxvt_term::update_background ()
1676	{	1656	{
1677	if (update_background_ev.is_active ())	1657	if (update_background_ev.is_active ())
1678	return;	1658	return;
1679		1659
1680	bgPixmap.invalidate ();	1660	bg_invalidate ();
1681		1661
1682	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1662	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1683		1663
1684	if (to_wait <= 0.)	1664	if (to_wait <= 0.)
1685	bgPixmap.render ();	1665	bg_render ();
1686	else	1666	else
1687	update_background_ev.start (to_wait);	1667	update_background_ev.start (to_wait);
1688	}	1668	}
1689		1669
1690	void	1670	void
1691	rxvt_term::update_background_cb (ev::timer &w, int revents)	1671	rxvt_term::update_background_cb (ev::timer &w, int revents)
1692	{	1672	{
1693	make_current ();	1673	make_current ();
1694		1674
1695	update_background_ev.stop ();	1675	update_background_ev.stop ();
1696	bgPixmap.render ();	1676	bg_render ();
1697	refresh_check ();	1677	refresh_check ();
1698	}	1678	}
1699		1679
1700	#endif /* HAVE_BG_PIXMAP */	1680	#endif /* HAVE_BG_PIXMAP */
1701		1681

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.341 by sf-exg, Sun Dec 12 23:13:29 2010 UTC vs. Revision 1.355 by sf-exg, Thu Apr 7 12:19:40 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.341 by sf-exg, Sun Dec 12 23:13:29 2010 UTC vs.
Revision 1.355 by sf-exg, Thu Apr 7 12:19:40 2011 UTC