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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.334 by sf-exg, Fri Oct 22 16:49:26 2010 UTC vs.
Revision 1.354 by root, Mon Feb 21 07:41:02 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.
…		…
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 ();
…		…
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 ();
…		…
359	rxvt_term::destroy_cb (ev::idle &w, int revents)	350	rxvt_term::destroy_cb (ev::idle &w, int revents)
360	{	351	{
361	make_current ();	352	make_current ();
362		353
363	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);
364	}	367	}
365		368
366	/----------------------------------------------------------------------/	369	/----------------------------------------------------------------------/
367	/*	370	/*
368	* Exit gracefully, clearing the utmp entry and restoring tty attributes	371	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
382	print_x_error (Display dpy, XErrorEvent event)	385	print_x_error (Display dpy, XErrorEvent event)
383	{	386	{
384	char buffer[BUFSIZ];	387	char buffer[BUFSIZ];
385	char mesg[BUFSIZ];	388	char mesg[BUFSIZ];
386	char number[32];	389	char number[32];
387	char *mtype = "XlibMessage";	390	const char mtype[] = "XlibMessage";
388	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	391	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	392	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390	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");
391	rxvt_warn ("%s: %s\n", mesg, buffer);	394	rxvt_warn ("%s: %s\n", mesg, buffer);
392	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	395	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
…		…
511	tio->c_cc[VWERSE] = CWERASE;	514	tio->c_cc[VWERSE] = CWERASE;
512	# endif	515	# endif
513	# ifdef VLNEXT	516	# ifdef VLNEXT
514	tio->c_cc[VLNEXT] = CLNEXT;	517	tio->c_cc[VLNEXT] = CLNEXT;
515	# endif	518	# endif
		519	# ifdef VSTATUS
		520	tio->c_cc[VSTATUS] = CSTATUS;
		521	# endif
516		522
517	# if VMIN != VEOF	523	# if VMIN != VEOF
518	tio->c_cc[VMIN] = 1;	524	tio->c_cc[VMIN] = 1;
519	# endif	525	# endif
520	# if VTIME != VEOL	526	# if VTIME != VEOL
…		…
553	rxvt_get_ttymode (&rxvt_term::def_tio);	559	rxvt_get_ttymode (&rxvt_term::def_tio);
554		560
555	// get rid of stdin/stdout as we don't need them, to free resources	561	// get rid of stdin/stdout as we don't need them, to free resources
556	dup2 (STDERR_FILENO, STDIN_FILENO);	562	dup2 (STDERR_FILENO, STDIN_FILENO);
557	dup2 (STDERR_FILENO, STDOUT_FILENO);	563	dup2 (STDERR_FILENO, STDOUT_FILENO);
558
559	ptytty::init ();
560		564
561	if (!ev_default_loop ())	565	if (!ev_default_loop ())
562	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	566	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
563		567
564	rxvt_environ = environ;	568	rxvt_environ = environ;
…		…
945	void	949	void
946	rxvt_term::set_colorfgbg ()	950	rxvt_term::set_colorfgbg ()
947	{	951	{
948	unsigned int i;	952	unsigned int i;
949	const char *xpmb = "";	953	const char *xpmb = "";
950	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	954	char fstr[] = "default";
		955	char bstr[] = "default";
951		956
952	strcpy (fstr, "default");
953	strcpy (bstr, "default");
954	for (i = Color_Black; i <= Color_White; i++)	957	for (i = Color_Black; i <= Color_White; i++)
955	if (pix_colors[Color_fg] == pix_colors[i])	958	if (pix_colors[Color_fg] == pix_colors[i])
956	{	959	{
957	sprintf (fstr, "%d", (i - Color_Black));	960	sprintf (fstr, "%d", i - Color_Black);
958	break;	961	break;
959	}	962	}
960		963
961	for (i = Color_Black; i <= Color_White; i++)	964	for (i = Color_Black; i <= Color_White; i++)
962	if (pix_colors[Color_bg] == pix_colors[i])	965	if (pix_colors[Color_bg] == pix_colors[i])
963	{	966	{
964	sprintf (bstr, "%d", (i - Color_Black));	967	sprintf (bstr, "%d", i - Color_Black);
965	#ifdef BG_IMAGE_FROM_FILE	968	#ifdef BG_IMAGE_FROM_FILE
966	xpmb = "default;";	969	xpmb = "default;";
967	#endif	970	#endif
968	break;	971	break;
969	}	972	}
…		…
1072	XMoveResizeWindow (dpy, vt,	1075	XMoveResizeWindow (dpy, vt,
1073	window_vt_x, window_vt_y,	1076	window_vt_x, window_vt_y,
1074	width, height);	1077	width, height);
1075		1078
1076	#ifdef HAVE_BG_PIXMAP	1079	#ifdef HAVE_BG_PIXMAP
1077	if (bgPixmap.window_size_sensitive ())	1080	if (bg_window_size_sensitive ())
1078	update_background ();	1081	update_background ();
1079	#endif	1082	#endif
1080	}	1083	}
1081		1084
1082	if (fix_screen \|\| old_height == 0)	1085	if (fix_screen \|\| old_height == 0)
1083	scr_reset ();	1086	scr_reset ();
1084
1085	#ifdef HAVE_BG_PIXMAP
1086	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1087	// if (bgPixmap.pixmap)
1088	// scr_touch (false);
1089	#endif
1090		1087
1091	#ifdef USE_XIM	1088	#ifdef USE_XIM
1092	IMSetPosition ();	1089	IMSetPosition ();
1093	#endif	1090	#endif
1094	}	1091	}
…		…
1177		1174
1178	atom = XInternAtom (dpy, server, False);	1175	atom = XInternAtom (dpy, server, False);
1179	win = XGetSelectionOwner (dpy, atom);	1176	win = XGetSelectionOwner (dpy, atom);
1180		1177
1181	if (win != None)	1178	if (win != None)
1182	return True;	1179	return true;
1183	}	1180	}
1184		1181
1185	return False;	1182	return false;
1186	}	1183	}
1187		1184
1188	void	1185	void
1189	rxvt_term::IMSendSpot ()	1186	rxvt_term::IMSendSpot ()
1190	{	1187	{
…		…
1343	p = pet[pi];	1340	p = pet[pi];
1344		1341
1345	if (!p)	1342	if (!p)
1346	continue;	1343	continue;
1347		1344
1348	s = rxvt_splitcommastring (p);	1345	s = rxvt_strsplit (',', p);
1349		1346
1350	for (i = found = 0; !found && s[i]; i++)	1347	for (i = found = 0; !found && s[i]; i++)
1351	{	1348	{
1352	if (!strcmp (s[i], "OverTheSpot"))	1349	if (!strcmp (s[i], "OverTheSpot"))
1353	input_style = XIMPreeditPosition \| XIMStatusNothing;	1350	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1365	input_style = XIMPreeditNothing \| XIMStatusNothing;	1362	input_style = XIMPreeditNothing \| XIMStatusNothing;
1366		1363
1367	for (j = 0; j < xim_styles->count_styles; j++)	1364	for (j = 0; j < xim_styles->count_styles; j++)
1368	if (input_style == xim_styles->supported_styles[j])	1365	if (input_style == xim_styles->supported_styles[j])
1369	{	1366	{
1370	rxvt_freecommastring (s);	1367	rxvt_free_strsplit (s);
1371		1368
1372	found = 1;	1369	found = 1;
1373	goto foundpet;	1370	goto foundpet;
1374	}	1371	}
1375		1372
1376	}	1373	}
1377		1374
1378	rxvt_freecommastring (s);	1375	rxvt_free_strsplit (s);
1379	}	1376	}
1380		1377
1381	foundpet:	1378	foundpet:
1382		1379
1383	XFree (xim_styles);	1380	XFree (xim_styles);
…		…
1539	p = rs[Rs_inputMethod];	1536	p = rs[Rs_inputMethod];
1540	if (p && *p)	1537	if (p && *p)
1541	{	1538	{
1542	bool found = false;	1539	bool found = false;
1543		1540
1544	s = rxvt_splitcommastring (p);	1541	s = rxvt_strsplit (',', p);
1545		1542
1546	for (i = 0; s[i]; i++)	1543	for (i = 0; s[i]; i++)
1547	{	1544	{
1548	if (*s[i])	1545	if (*s[i])
1549	{	1546	{
…		…
1555	break;	1552	break;
1556	}	1553	}
1557	}	1554	}
1558	}	1555	}
1559		1556
1560	rxvt_freecommastring (s);	1557	rxvt_free_strsplit (s);
1561		1558
1562	if (found)	1559	if (found)
1563	goto done;	1560	goto done;
1564	}	1561	}
1565		1562
…		…
1629	Window cr;	1626	Window cr;
1630	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1627	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1631	}	1628	}
1632		1629
1633	Pixmap	1630	Pixmap
1634	rxvt_term::get_pixmap_property (int prop_id)	1631	rxvt_term::get_pixmap_property (Atom property)
1635	{	1632	{
1636	if (prop_id > 0 && prop_id < NUM_XA)	1633	Pixmap pixmap = None;
1637	if (xa[prop_id])	1634
1638	{
1639	int aformat;	1635	int aformat;
1640	unsigned long nitems, bytes_after;	1636	unsigned long nitems, bytes_after;
1641	Atom atype;	1637	Atom atype;
1642	unsigned char *prop = NULL;	1638	unsigned char *prop;
1643	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1639	int result = XGetWindowProperty (dpy, display->root, property,
1644	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1640	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1645	&nitems, &bytes_after, &prop);	1641	&nitems, &bytes_after, &prop);
1646	if (result == Success && prop && atype == XA_PIXMAP)	1642	if (result == Success)
		1643	{
		1644	if (atype == XA_PIXMAP)
1647	return (Pixmap )prop;	1645	pixmap = (Pixmap )prop;
		1646	XFree (prop);
1648	}	1647	}
1649		1648
1650	return None;	1649	return pixmap;
1651	}	1650	}
1652		1651
1653	#ifdef HAVE_BG_PIXMAP	1652	#ifdef HAVE_BG_PIXMAP
1654		1653
1655	void	1654	void
1656	rxvt_term::update_background ()	1655	rxvt_term::update_background ()
1657	{	1656	{
1658	if (update_background_ev.is_active ())	1657	if (update_background_ev.is_active ())
1659	return;	1658	return;
1660		1659
1661	bgPixmap.invalidate ();	1660	bg_invalidate ();
1662		1661
1663	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1662	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1664		1663
1665	if (to_wait <= 0.)	1664	if (to_wait <= 0.)
1666	bgPixmap.render ();	1665	bg_render ();
1667	else	1666	else
1668	update_background_ev.start (to_wait);	1667	update_background_ev.start (to_wait);
1669	}	1668	}
1670		1669
1671	void	1670	void
1672	rxvt_term::update_background_cb (ev::timer &w, int revents)	1671	rxvt_term::update_background_cb (ev::timer &w, int revents)
1673	{	1672	{
1674	make_current ();	1673	make_current ();
1675		1674
1676	update_background_ev.stop ();	1675	update_background_ev.stop ();
1677	bgPixmap.render ();	1676	bg_render ();
1678	refresh_check ();	1677	refresh_check ();
1679	}	1678	}
1680		1679
1681	#endif /* HAVE_BG_PIXMAP */	1680	#endif /* HAVE_BG_PIXMAP */
1682		1681

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.334 by sf-exg, Fri Oct 22 16:49:26 2010 UTC vs. Revision 1.354 by root, Mon Feb 21 07:41:02 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.334 by sf-exg, Fri Oct 22 16:49:26 2010 UTC vs.
Revision 1.354 by root, Mon Feb 21 07:41:02 2011 UTC