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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.336 by sf-exg, Tue Nov 2 13:32:50 2010 UTC vs.
Revision 1.349 by sf-exg, Thu Jan 27 17:37:19 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 <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
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));
…		…
228	delete fontset[i];	226	delete fontset[i];
229	#endif	227	#endif
230	delete fontset[0];	228	delete fontset[0];
231		229
232	#ifdef HAVE_BG_PIXMAP	230	#ifdef HAVE_BG_PIXMAP
233	bgPixmap.destroy ();	231	bg_destroy ();
234	#endif	232	#endif
235	#ifdef HAVE_AFTERIMAGE	233	#ifdef HAVE_AFTERIMAGE
236	if (asv)	234	if (asv)
237	destroy_asvisual (asv, 0);	235	destroy_asvisual (asv, 0);
238	if (asimman)	236	if (asimman)
…		…
361	make_current ();	359	make_current ();
362		360
363	delete this;	361	delete this;
364	}	362	}
365		363
		364	void
		365	rxvt_term::set_option (uint8_t opt, bool set)
		366	{
		367	if (!opt)
		368	return;
		369
		370	uint8_t mask = 1 << (opt & 7);
		371	uint8_t &val = options [opt >> 3];
		372
		373	val = val & ~mask \| (set ? mask : 0);
		374	}
		375
366	/----------------------------------------------------------------------/	376	/----------------------------------------------------------------------/
367	/*	377	/*
368	* Exit gracefully, clearing the utmp entry and restoring tty attributes	378	* Exit gracefully, clearing the utmp entry and restoring tty attributes
369	* TODO: if debugging, this should free up any known resources if we can	379	* TODO: if debugging, this should free up any known resources if we can
370	*/	380	*/
…		…
382	print_x_error (Display dpy, XErrorEvent event)	392	print_x_error (Display dpy, XErrorEvent event)
383	{	393	{
384	char buffer[BUFSIZ];	394	char buffer[BUFSIZ];
385	char mesg[BUFSIZ];	395	char mesg[BUFSIZ];
386	char number[32];	396	char number[32];
387	char *mtype = "XlibMessage";	397	const char mtype[] = "XlibMessage";
388	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	398	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	399	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390	rxvt_warn ("An X Error occurred, trying to continue after report.\n");	400	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
391	rxvt_warn ("%s: %s\n", mesg, buffer);	401	rxvt_warn ("%s: %s\n", mesg, buffer);
392	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	402	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
…		…
946	void	956	void
947	rxvt_term::set_colorfgbg ()	957	rxvt_term::set_colorfgbg ()
948	{	958	{
949	unsigned int i;	959	unsigned int i;
950	const char *xpmb = "";	960	const char *xpmb = "";
951	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	961	char fstr[] = "default";
		962	char bstr[] = "default";
952		963
953	strcpy (fstr, "default");
954	strcpy (bstr, "default");
955	for (i = Color_Black; i <= Color_White; i++)	964	for (i = Color_Black; i <= Color_White; i++)
956	if (pix_colors[Color_fg] == pix_colors[i])	965	if (pix_colors[Color_fg] == pix_colors[i])
957	{	966	{
958	sprintf (fstr, "%d", (i - Color_Black));	967	sprintf (fstr, "%d", i - Color_Black);
959	break;	968	break;
960	}	969	}
961		970
962	for (i = Color_Black; i <= Color_White; i++)	971	for (i = Color_Black; i <= Color_White; i++)
963	if (pix_colors[Color_bg] == pix_colors[i])	972	if (pix_colors[Color_bg] == pix_colors[i])
964	{	973	{
965	sprintf (bstr, "%d", (i - Color_Black));	974	sprintf (bstr, "%d", i - Color_Black);
966	#ifdef BG_IMAGE_FROM_FILE	975	#ifdef BG_IMAGE_FROM_FILE
967	xpmb = "default;";	976	xpmb = "default;";
968	#endif	977	#endif
969	break;	978	break;
970	}	979	}
…		…
1073	XMoveResizeWindow (dpy, vt,	1082	XMoveResizeWindow (dpy, vt,
1074	window_vt_x, window_vt_y,	1083	window_vt_x, window_vt_y,
1075	width, height);	1084	width, height);
1076		1085
1077	#ifdef HAVE_BG_PIXMAP	1086	#ifdef HAVE_BG_PIXMAP
1078	if (bgPixmap.window_size_sensitive ())	1087	if (bg_window_size_sensitive ())
1079	update_background ();	1088	update_background ();
1080	#endif	1089	#endif
1081	}	1090	}
1082		1091
1083	if (fix_screen \|\| old_height == 0)	1092	if (fix_screen \|\| old_height == 0)
1084	scr_reset ();	1093	scr_reset ();
1085
1086	#ifdef HAVE_BG_PIXMAP
1087	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1088	// if (bgPixmap.pixmap)
1089	// scr_touch (false);
1090	#endif
1091		1094
1092	#ifdef USE_XIM	1095	#ifdef USE_XIM
1093	IMSetPosition ();	1096	IMSetPosition ();
1094	#endif	1097	#endif
1095	}	1098	}
…		…
1344	p = pet[pi];	1347	p = pet[pi];
1345		1348
1346	if (!p)	1349	if (!p)
1347	continue;	1350	continue;
1348		1351
1349	s = rxvt_splitcommastring (p);	1352	s = rxvt_strsplit (',', p);
1350		1353
1351	for (i = found = 0; !found && s[i]; i++)	1354	for (i = found = 0; !found && s[i]; i++)
1352	{	1355	{
1353	if (!strcmp (s[i], "OverTheSpot"))	1356	if (!strcmp (s[i], "OverTheSpot"))
1354	input_style = XIMPreeditPosition \| XIMStatusNothing;	1357	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1366	input_style = XIMPreeditNothing \| XIMStatusNothing;	1369	input_style = XIMPreeditNothing \| XIMStatusNothing;
1367		1370
1368	for (j = 0; j < xim_styles->count_styles; j++)	1371	for (j = 0; j < xim_styles->count_styles; j++)
1369	if (input_style == xim_styles->supported_styles[j])	1372	if (input_style == xim_styles->supported_styles[j])
1370	{	1373	{
1371	rxvt_freecommastring (s);	1374	rxvt_free_strsplit (s);
1372		1375
1373	found = 1;	1376	found = 1;
1374	goto foundpet;	1377	goto foundpet;
1375	}	1378	}
1376		1379
1377	}	1380	}
1378		1381
1379	rxvt_freecommastring (s);	1382	rxvt_free_strsplit (s);
1380	}	1383	}
1381		1384
1382	foundpet:	1385	foundpet:
1383		1386
1384	XFree (xim_styles);	1387	XFree (xim_styles);
…		…
1540	p = rs[Rs_inputMethod];	1543	p = rs[Rs_inputMethod];
1541	if (p && *p)	1544	if (p && *p)
1542	{	1545	{
1543	bool found = false;	1546	bool found = false;
1544		1547
1545	s = rxvt_splitcommastring (p);	1548	s = rxvt_strsplit (',', p);
1546		1549
1547	for (i = 0; s[i]; i++)	1550	for (i = 0; s[i]; i++)
1548	{	1551	{
1549	if (*s[i])	1552	if (*s[i])
1550	{	1553	{
…		…
1556	break;	1559	break;
1557	}	1560	}
1558	}	1561	}
1559	}	1562	}
1560		1563
1561	rxvt_freecommastring (s);	1564	rxvt_free_strsplit (s);
1562		1565
1563	if (found)	1566	if (found)
1564	goto done;	1567	goto done;
1565	}	1568	}
1566		1569
…		…
1630	Window cr;	1633	Window cr;
1631	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1634	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1632	}	1635	}
1633		1636
1634	Pixmap	1637	Pixmap
1635	rxvt_term::get_pixmap_property (int prop_id)	1638	rxvt_term::get_pixmap_property (Atom property)
1636	{	1639	{
1637	if (prop_id > 0 && prop_id < NUM_XA)	1640	Pixmap pixmap = None;
1638	if (xa[prop_id])	1641
1639	{
1640	int aformat;	1642	int aformat;
1641	unsigned long nitems, bytes_after;	1643	unsigned long nitems, bytes_after;
1642	Atom atype;	1644	Atom atype;
1643	unsigned char *prop = NULL;	1645	unsigned char *prop;
1644	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1646	int result = XGetWindowProperty (dpy, display->root, property,
1645	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1647	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1646	&nitems, &bytes_after, &prop);	1648	&nitems, &bytes_after, &prop);
1647	if (result == Success && prop && atype == XA_PIXMAP)	1649	if (result == Success)
		1650	{
		1651	if (atype == XA_PIXMAP)
1648	return (Pixmap )prop;	1652	pixmap = (Pixmap )prop;
		1653	XFree (prop);
1649	}	1654	}
1650		1655
1651	return None;	1656	return pixmap;
1652	}	1657	}
1653		1658
1654	#ifdef HAVE_BG_PIXMAP	1659	#ifdef HAVE_BG_PIXMAP
1655		1660
1656	void	1661	void
1657	rxvt_term::update_background ()	1662	rxvt_term::update_background ()
1658	{	1663	{
1659	if (update_background_ev.is_active ())	1664	if (update_background_ev.is_active ())
1660	return;	1665	return;
1661		1666
1662	bgPixmap.invalidate ();	1667	bg_invalidate ();
1663		1668
1664	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1669	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1665		1670
1666	if (to_wait <= 0.)	1671	if (to_wait <= 0.)
1667	bgPixmap.render ();	1672	bg_render ();
1668	else	1673	else
1669	update_background_ev.start (to_wait);	1674	update_background_ev.start (to_wait);
1670	}	1675	}
1671		1676
1672	void	1677	void
1673	rxvt_term::update_background_cb (ev::timer &w, int revents)	1678	rxvt_term::update_background_cb (ev::timer &w, int revents)
1674	{	1679	{
1675	make_current ();	1680	make_current ();
1676		1681
1677	update_background_ev.stop ();	1682	update_background_ev.stop ();
1678	bgPixmap.render ();	1683	bg_render ();
1679	refresh_check ();	1684	refresh_check ();
1680	}	1685	}
1681		1686
1682	#endif /* HAVE_BG_PIXMAP */	1687	#endif /* HAVE_BG_PIXMAP */
1683		1688

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.336 by sf-exg, Tue Nov 2 13:32:50 2010 UTC vs. Revision 1.349 by sf-exg, Thu Jan 27 17:37:19 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.336 by sf-exg, Tue Nov 2 13:32:50 2010 UTC vs.
Revision 1.349 by sf-exg, Thu Jan 27 17:37:19 2011 UTC