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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.344 by root, Fri Jan 7 21:17:08 2011 UTC vs.
Revision 1.356 by sf-exg, Fri Apr 29 10:10:20 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.
…		…
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);
…		…
279	// TODO: manage env vars in child only(!)	272	// TODO: manage env vars in child only(!)
280	free (env_display);	273	free (env_display);
281	free (env_term);	274	free (env_term);
282	free (locale);	275	free (locale);
283	free (v_buffer);	276	free (v_buffer);
284	free (incr_buf);	277
		278	delete selection_req;
285		279
286	delete envv;	280	delete envv;
287	delete argv;	281	delete argv;
288		282
289	#ifdef KEYSYM_RESOURCE	283	#ifdef KEYSYM_RESOURCE
…		…
325	#endif	319	#endif
326	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
327	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
328	rootwin_ev.stop (display);	322	rootwin_ev.stop (display);
329	#endif	323	#endif
330	incr_ev.stop ();
331	termwin_ev.stop (display);	324	termwin_ev.stop (display);
332	vt_ev.stop (display);	325	vt_ev.stop (display);
333	}	326	}
334		327
335	flush_ev.stop ();	328	flush_ev.stop ();
…		…
742	kill (-cmd_pid, SIGWINCH);	735	kill (-cmd_pid, SIGWINCH);
743	#endif	736	#endif
744	}	737	}
745		738
746	/----------------------------------------------------------------------/	739	/----------------------------------------------------------------------/
747	/* set_fonts () - load and set the various fonts	740	/* 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	741	bool
755	rxvt_term::set_fonts ()	742	rxvt_term::set_fonts ()
756	{	743	{
757	rxvt_fontset *fs = new rxvt_fontset (this);	744	rxvt_fontset *fs = new rxvt_fontset (this);
758	rxvt_fontprop prop;	745	rxvt_fontprop prop;
…		…
815	#else	802	#else
816	fontset[style] = fontset[0];	803	fontset[style] = fontset[0];
817	#endif	804	#endif
818	}	805	}
819		806
820	if (parent[0])	807	if (parent)
821	{	808	{
822	resize_all_windows (0, 0, 0);	809	resize_all_windows (0, 0, 0);
823	scr_remap_chars ();	810	scr_remap_chars ();
824	scr_touch (true);	811	scr_touch (true);
825	}	812	}
…		…
828	}	815	}
829		816
830	void	817	void
831	rxvt_term::set_string_property (Atom prop, const char *str, int len)	818	rxvt_term::set_string_property (Atom prop, const char *str, int len)
832	{	819	{
833	XChangeProperty (dpy, parent[0],	820	XChangeProperty (dpy, parent,
834	prop, XA_STRING, 8, PropModeReplace,	821	prop, XA_STRING, 8, PropModeReplace,
835	(const unsigned char *)str, len >= 0 ? len : strlen (str));	822	(const unsigned char *)str, len >= 0 ? len : strlen (str));
836	}	823	}
837		824
838	void	825	void
…		…
840	{	827	{
841	XTextProperty ct;	828	XTextProperty ct;
842		829
843	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)	830	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844	{	831	{
845	XSetTextProperty (dpy, parent[0], &ct, prop);	832	XSetTextProperty (dpy, parent, &ct, prop);
846	XFree (ct.value);	833	XFree (ct.value);
847	}	834	}
848	}	835	}
849		836
850	void	837	void
851	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	838	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852	{	839	{
853	wchar_t *ws = rxvt_mbstowcs (str, len);	840	wchar_t *ws = rxvt_mbstowcs (str, len);
854	char *s = rxvt_wcstoutf8 (ws);	841	char *s = rxvt_wcstoutf8 (ws);
855		842
856	XChangeProperty (dpy, parent[0],	843	XChangeProperty (dpy, parent,
857	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	844	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858	(const unsigned char *)s, strlen (s));	845	(const unsigned char *)s, strlen (s));
859		846
860	free (s);	847	free (s);
861	free (ws);	848	free (ws);
…		…
956	void	943	void
957	rxvt_term::set_colorfgbg ()	944	rxvt_term::set_colorfgbg ()
958	{	945	{
959	unsigned int i;	946	unsigned int i;
960	const char *xpmb = "";	947	const char *xpmb = "";
961	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	948	char fstr[] = "default";
		949	char bstr[] = "default";
962		950
963	strcpy (fstr, "default");
964	strcpy (bstr, "default");
965	for (i = Color_Black; i <= Color_White; i++)	951	for (i = Color_Black; i <= Color_White; i++)
966	if (pix_colors[Color_fg] == pix_colors[i])	952	if (pix_colors[Color_fg] == pix_colors[i])
967	{	953	{
968	sprintf (fstr, "%d", (i - Color_Black));	954	sprintf (fstr, "%d", i - Color_Black);
969	break;	955	break;
970	}	956	}
971		957
972	for (i = Color_Black; i <= Color_White; i++)	958	for (i = Color_Black; i <= Color_White; i++)
973	if (pix_colors[Color_bg] == pix_colors[i])	959	if (pix_colors[Color_bg] == pix_colors[i])
974	{	960	{
975	sprintf (bstr, "%d", (i - Color_Black));	961	sprintf (bstr, "%d", i - Color_Black);
976	#ifdef BG_IMAGE_FROM_FILE	962	#ifdef BG_IMAGE_FROM_FILE
977	xpmb = "default;";	963	xpmb = "default;";
978	#endif	964	#endif
979	break;	965	break;
980	}	966	}
…		…
1016		1002
1017	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow	1003	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1018	if (set_hint)	1004	if (set_hint)
1019	{	1005	{
1020	szHint.flags &= ~(PBaseSize \| PResizeInc);	1006	szHint.flags &= ~(PBaseSize \| PResizeInc);
1021	XSetWMNormalHints (dpy, parent[0], &szHint);	1007	XSetWMNormalHints (dpy, parent, &szHint);
1022	szHint.flags \|= PBaseSize \| PResizeInc;	1008	szHint.flags \|= PBaseSize \| PResizeInc;
1023	}	1009	}
1024		1010
1025	if (!ignoreparent)	1011	if (!ignoreparent)
1026	{	1012	{
…		…
1032	int x, y, x1, y1;	1018	int x, y, x1, y1;
1033	int dx, dy;	1019	int dx, dy;
1034	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1020	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1035	Window unused_cr;	1021	Window unused_cr;
1036		1022
1037	XTranslateCoordinates (dpy, parent[0], display->root,	1023	XTranslateCoordinates (dpy, parent, display->root,
1038	0, 0, &x, &y, &unused_cr);	1024	0, 0, &x, &y, &unused_cr);
1039	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1025	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1040	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1026	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1041	/*	1027	/*
1042	* if display->root isn't the parent window, a WM will probably have offset	1028	* if display->root isn't the parent window, a WM will probably have offset
1043	* our position for handles and decorations. Counter it	1029	* our position for handles and decorations. Counter it
1044	*/	1030	*/
…		…
1061	if (y < y1) /* top half */	1047	if (y < y1) /* top half */
1062	dy = 0;	1048	dy = 0;
1063	else if (y == y1) /* exact center */	1049	else if (y == y1) /* exact center */
1064	dy /= 2;	1050	dy /= 2;
1065		1051
1066	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1052	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1067	szHint.width, szHint.height);	1053	szHint.width, szHint.height);
1068	#else	1054	#else
1069	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1055	XResizeWindow (dpy, parent, szHint.width, szHint.height);
1070	#endif	1056	#endif
1071	}	1057	}
1072		1058
1073	if (set_hint)	1059	if (set_hint)
1074	XSetWMNormalHints (dpy, parent[0], &szHint);	1060	XSetWMNormalHints (dpy, parent, &szHint);
1075		1061
1076	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1062	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1077		1063
1078	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1064	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1079	{	1065	{
…		…
1083	XMoveResizeWindow (dpy, vt,	1069	XMoveResizeWindow (dpy, vt,
1084	window_vt_x, window_vt_y,	1070	window_vt_x, window_vt_y,
1085	width, height);	1071	width, height);
1086		1072
1087	#ifdef HAVE_BG_PIXMAP	1073	#ifdef HAVE_BG_PIXMAP
1088	if (bgPixmap.window_size_sensitive ())	1074	if (bg_window_size_sensitive ())
1089	update_background ();	1075	update_background ();
1090	#endif	1076	#endif
1091	}	1077	}
1092		1078
1093	if (fix_screen \|\| old_height == 0)	1079	if (fix_screen \|\| old_height == 0)
1094	scr_reset ();	1080	scr_reset ();
1095
1096	#ifdef HAVE_BG_PIXMAP
1097	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1098	// if (bgPixmap.pixmap)
1099	// scr_touch (false);
1100	#endif
1101		1081
1102	#ifdef USE_XIM	1082	#ifdef USE_XIM
1103	IMSetPosition ();	1083	IMSetPosition ();
1104	#endif	1084	#endif
1105	}	1085	}
…		…
1188		1168
1189	atom = XInternAtom (dpy, server, False);	1169	atom = XInternAtom (dpy, server, False);
1190	win = XGetSelectionOwner (dpy, atom);	1170	win = XGetSelectionOwner (dpy, atom);
1191		1171
1192	if (win != None)	1172	if (win != None)
1193	return True;	1173	return true;
1194	}	1174	}
1195		1175
1196	return False;	1176	return false;
1197	}	1177	}
1198		1178
1199	void	1179	void
1200	rxvt_term::IMSendSpot ()	1180	rxvt_term::IMSendSpot ()
1201	{	1181	{
…		…
1354	p = pet[pi];	1334	p = pet[pi];
1355		1335
1356	if (!p)	1336	if (!p)
1357	continue;	1337	continue;
1358		1338
1359	s = rxvt_splitcommastring (p);	1339	s = rxvt_strsplit (',', p);
1360		1340
1361	for (i = found = 0; !found && s[i]; i++)	1341	for (i = found = 0; !found && s[i]; i++)
1362	{	1342	{
1363	if (!strcmp (s[i], "OverTheSpot"))	1343	if (!strcmp (s[i], "OverTheSpot"))
1364	input_style = XIMPreeditPosition \| XIMStatusNothing;	1344	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1376	input_style = XIMPreeditNothing \| XIMStatusNothing;	1356	input_style = XIMPreeditNothing \| XIMStatusNothing;
1377		1357
1378	for (j = 0; j < xim_styles->count_styles; j++)	1358	for (j = 0; j < xim_styles->count_styles; j++)
1379	if (input_style == xim_styles->supported_styles[j])	1359	if (input_style == xim_styles->supported_styles[j])
1380	{	1360	{
1381	rxvt_freecommastring (s);	1361	rxvt_free_strsplit (s);
1382		1362
1383	found = 1;	1363	found = 1;
1384	goto foundpet;	1364	goto foundpet;
1385	}	1365	}
1386		1366
1387	}	1367	}
1388		1368
1389	rxvt_freecommastring (s);	1369	rxvt_free_strsplit (s);
1390	}	1370	}
1391		1371
1392	foundpet:	1372	foundpet:
1393		1373
1394	XFree (xim_styles);	1374	XFree (xim_styles);
…		…
1497	#endif	1477	#endif
1498		1478
1499	Input_Context = XCreateIC (xim,	1479	Input_Context = XCreateIC (xim,
1500	XNInputStyle, input_style,	1480	XNInputStyle, input_style,
1501	XNClientWindow, vt,	1481	XNClientWindow, vt,
1502	XNFocusWindow, parent[0],	1482	XNFocusWindow, parent,
1503	preedit_attr ? XNPreeditAttributes : NULL,	1483	preedit_attr ? XNPreeditAttributes : NULL,
1504	preedit_attr,	1484	preedit_attr,
1505	status_attr ? XNStatusAttributes : NULL,	1485	status_attr ? XNStatusAttributes : NULL,
1506	status_attr, NULL);	1486	status_attr, NULL);
1507		1487
…		…
1550	p = rs[Rs_inputMethod];	1530	p = rs[Rs_inputMethod];
1551	if (p && *p)	1531	if (p && *p)
1552	{	1532	{
1553	bool found = false;	1533	bool found = false;
1554		1534
1555	s = rxvt_splitcommastring (p);	1535	s = rxvt_strsplit (',', p);
1556		1536
1557	for (i = 0; s[i]; i++)	1537	for (i = 0; s[i]; i++)
1558	{	1538	{
1559	if (*s[i])	1539	if (*s[i])
1560	{	1540	{
…		…
1566	break;	1546	break;
1567	}	1547	}
1568	}	1548	}
1569	}	1549	}
1570		1550
1571	rxvt_freecommastring (s);	1551	rxvt_free_strsplit (s);
1572		1552
1573	if (found)	1553	if (found)
1574	goto done;	1554	goto done;
1575	}	1555	}
1576		1556
…		…
1636		1616
1637	void	1617	void
1638	rxvt_term::get_window_origin (int &x, int &y)	1618	rxvt_term::get_window_origin (int &x, int &y)
1639	{	1619	{
1640	Window cr;	1620	Window cr;
1641	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1621	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1642	}	1622	}
1643		1623
1644	Pixmap	1624	Pixmap
1645	rxvt_term::get_pixmap_property (Atom property)	1625	rxvt_term::get_pixmap_property (Atom property)
1646	{	1626	{
…		…
1669	rxvt_term::update_background ()	1649	rxvt_term::update_background ()
1670	{	1650	{
1671	if (update_background_ev.is_active ())	1651	if (update_background_ev.is_active ())
1672	return;	1652	return;
1673		1653
1674	bgPixmap.invalidate ();	1654	bg_invalidate ();
1675		1655
1676	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1656	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1677		1657
1678	if (to_wait <= 0.)	1658	if (to_wait <= 0.)
1679	bgPixmap.render ();	1659	bg_render ();
1680	else	1660	else
1681	update_background_ev.start (to_wait);	1661	update_background_ev.start (to_wait);
1682	}	1662	}
1683		1663
1684	void	1664	void
1685	rxvt_term::update_background_cb (ev::timer &w, int revents)	1665	rxvt_term::update_background_cb (ev::timer &w, int revents)
1686	{	1666	{
1687	make_current ();	1667	make_current ();
1688		1668
1689	update_background_ev.stop ();	1669	update_background_ev.stop ();
1690	bgPixmap.render ();	1670	bg_render ();
1691	refresh_check ();	1671	refresh_check ();
1692	}	1672	}
1693		1673
1694	#endif /* HAVE_BG_PIXMAP */	1674	#endif /* HAVE_BG_PIXMAP */
1695		1675

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.344 by root, Fri Jan 7 21:17:08 2011 UTC vs. Revision 1.356 by sf-exg, Fri Apr 29 10:10:20 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.344 by root, Fri Jan 7 21:17:08 2011 UTC vs.
Revision 1.356 by sf-exg, Fri Apr 29 10:10:20 2011 UTC