[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.360 by sf-exg, Fri Aug 19 16:01:37 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.
…		…
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);
…		…
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 ();
…		…
713	if (recalc_y)	706	if (recalc_y)
714	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	707	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
715		708
716	ncol = width / fwidth;	709	ncol = width / fwidth;
717	nrow = height / fheight;	710	nrow = height / fheight;
		711
		712	// When the size of the vt window is not a multiple of the cell
		713	// size, i.e., when the wm does not honour our size hints, there are
		714	// extra areas not covered by the terminal screen. Such gaps, when a
		715	// bg pixmap is set, would have to be cleared manually to properly
		716	// refresh the background. We take the simpler route and shrink the
		717	// vt window so as to avoid creating gaps.
		718	width = ncol * fwidth;
		719	height = nrow * fheight;
718	}	720	}
719		721
720	/----------------------------------------------------------------------/	722	/----------------------------------------------------------------------/
721	/*	723	/*
722	* Tell the teletype handler what size the window is.	724	* Tell the teletype handler what size the window is.
…		…
742	kill (-cmd_pid, SIGWINCH);	744	kill (-cmd_pid, SIGWINCH);
743	#endif	745	#endif
744	}	746	}
745		747
746	/----------------------------------------------------------------------/	748	/----------------------------------------------------------------------/
747	/* set_fonts () - load and set the various fonts	749	/* 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	750	bool
755	rxvt_term::set_fonts ()	751	rxvt_term::set_fonts ()
756	{	752	{
757	rxvt_fontset *fs = new rxvt_fontset (this);	753	rxvt_fontset *fs = new rxvt_fontset (this);
758	rxvt_fontprop prop;	754	rxvt_fontprop prop;
…		…
815	#else	811	#else
816	fontset[style] = fontset[0];	812	fontset[style] = fontset[0];
817	#endif	813	#endif
818	}	814	}
819		815
820	if (parent[0])	816	if (parent)
821	{	817	{
822	resize_all_windows (0, 0, 0);	818	resize_all_windows (0, 0, 0);
823	scr_remap_chars ();	819	scr_remap_chars ();
824	scr_touch (true);	820	scr_touch (true);
825	}	821	}
…		…
828	}	824	}
829		825
830	void	826	void
831	rxvt_term::set_string_property (Atom prop, const char *str, int len)	827	rxvt_term::set_string_property (Atom prop, const char *str, int len)
832	{	828	{
833	XChangeProperty (dpy, parent[0],	829	XChangeProperty (dpy, parent,
834	prop, XA_STRING, 8, PropModeReplace,	830	prop, XA_STRING, 8, PropModeReplace,
835	(const unsigned char *)str, len >= 0 ? len : strlen (str));	831	(const unsigned char *)str, len >= 0 ? len : strlen (str));
836	}	832	}
837		833
838	void	834	void
…		…
840	{	836	{
841	XTextProperty ct;	837	XTextProperty ct;
842		838
843	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)	839	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844	{	840	{
845	XSetTextProperty (dpy, parent[0], &ct, prop);	841	XSetTextProperty (dpy, parent, &ct, prop);
846	XFree (ct.value);	842	XFree (ct.value);
847	}	843	}
848	}	844	}
849		845
850	void	846	void
851	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	847	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852	{	848	{
853	wchar_t *ws = rxvt_mbstowcs (str, len);	849	wchar_t *ws = rxvt_mbstowcs (str, len);
854	char *s = rxvt_wcstoutf8 (ws);	850	char *s = rxvt_wcstoutf8 (ws);
855		851
856	XChangeProperty (dpy, parent[0],	852	XChangeProperty (dpy, parent,
857	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	853	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858	(const unsigned char *)s, strlen (s));	854	(const unsigned char *)s, strlen (s));
859		855
860	free (s);	856	free (s);
861	free (ws);	857	free (ws);
…		…
956	void	952	void
957	rxvt_term::set_colorfgbg ()	953	rxvt_term::set_colorfgbg ()
958	{	954	{
959	unsigned int i;	955	unsigned int i;
960	const char *xpmb = "";	956	const char *xpmb = "";
961	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	957	char fstr[] = "default";
		958	char bstr[] = "default";
962		959
963	strcpy (fstr, "default");
964	strcpy (bstr, "default");
965	for (i = Color_Black; i <= Color_White; i++)	960	for (i = Color_Black; i <= Color_White; i++)
966	if (pix_colors[Color_fg] == pix_colors[i])	961	if (pix_colors[Color_fg] == pix_colors[i])
967	{	962	{
968	sprintf (fstr, "%d", (i - Color_Black));	963	sprintf (fstr, "%d", i - Color_Black);
969	break;	964	break;
970	}	965	}
971		966
972	for (i = Color_Black; i <= Color_White; i++)	967	for (i = Color_Black; i <= Color_White; i++)
973	if (pix_colors[Color_bg] == pix_colors[i])	968	if (pix_colors[Color_bg] == pix_colors[i])
974	{	969	{
975	sprintf (bstr, "%d", (i - Color_Black));	970	sprintf (bstr, "%d", i - Color_Black);
976	#ifdef BG_IMAGE_FROM_FILE	971	#ifdef BG_IMAGE_FROM_FILE
977	xpmb = "default;";	972	xpmb = "default;";
978	#endif	973	#endif
979	break;	974	break;
980	}	975	}
…		…
1016		1011
1017	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow	1012	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1018	if (set_hint)	1013	if (set_hint)
1019	{	1014	{
1020	szHint.flags &= ~(PBaseSize \| PResizeInc);	1015	szHint.flags &= ~(PBaseSize \| PResizeInc);
1021	XSetWMNormalHints (dpy, parent[0], &szHint);	1016	XSetWMNormalHints (dpy, parent, &szHint);
1022	szHint.flags \|= PBaseSize \| PResizeInc;	1017	szHint.flags \|= PBaseSize \| PResizeInc;
1023	}	1018	}
1024		1019
1025	if (!ignoreparent)	1020	if (!ignoreparent)
1026	{	1021	{
…		…
1032	int x, y, x1, y1;	1027	int x, y, x1, y1;
1033	int dx, dy;	1028	int dx, dy;
1034	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1029	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1035	Window unused_cr;	1030	Window unused_cr;
1036		1031
1037	XTranslateCoordinates (dpy, parent[0], display->root,	1032	XTranslateCoordinates (dpy, parent, display->root,
1038	0, 0, &x, &y, &unused_cr);	1033	0, 0, &x, &y, &unused_cr);
1039	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1034	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1040	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1035	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1041	/*	1036	/*
1042	* if display->root isn't the parent window, a WM will probably have offset	1037	* if display->root isn't the parent window, a WM will probably have offset
1043	* our position for handles and decorations. Counter it	1038	* our position for handles and decorations. Counter it
1044	*/	1039	*/
…		…
1061	if (y < y1) /* top half */	1056	if (y < y1) /* top half */
1062	dy = 0;	1057	dy = 0;
1063	else if (y == y1) /* exact center */	1058	else if (y == y1) /* exact center */
1064	dy /= 2;	1059	dy /= 2;
1065		1060
1066	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1061	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1067	szHint.width, szHint.height);	1062	szHint.width, szHint.height);
1068	#else	1063	#else
1069	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1064	XResizeWindow (dpy, parent, szHint.width, szHint.height);
1070	#endif	1065	#endif
1071	}	1066	}
1072		1067
1073	if (set_hint)	1068	if (set_hint)
1074	XSetWMNormalHints (dpy, parent[0], &szHint);	1069	XSetWMNormalHints (dpy, parent, &szHint);
1075		1070
1076	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1071	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1077		1072
1078	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1073	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1079	{	1074	{
…		…
1083	XMoveResizeWindow (dpy, vt,	1078	XMoveResizeWindow (dpy, vt,
1084	window_vt_x, window_vt_y,	1079	window_vt_x, window_vt_y,
1085	width, height);	1080	width, height);
1086		1081
1087	#ifdef HAVE_BG_PIXMAP	1082	#ifdef HAVE_BG_PIXMAP
1088	if (bgPixmap.window_size_sensitive ())	1083	if (bg_window_size_sensitive ())
1089	update_background ();	1084	update_background ();
1090	#endif	1085	#endif
1091	}	1086	}
1092		1087
1093	if (fix_screen \|\| old_height == 0)	1088	if (fix_screen \|\| old_height == 0)
1094	scr_reset ();	1089	scr_reset ();
1095		1090
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
1102	#ifdef USE_XIM	1091	#ifdef USE_XIM
1103	IMSetPosition ();	1092	im_set_position ();
1104	#endif	1093	#endif
1105	}	1094	}
1106		1095
1107	/*	1096	/*
1108	* Set the width/height of the vt window in characters. Units are pixels.	1097	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1169	status_rect.height = fheight;	1158	status_rect.height = fheight;
1170	}	1159	}
1171		1160
1172	/* Checking whether input method is running. */	1161	/* Checking whether input method is running. */
1173	bool	1162	bool
1174	rxvt_term::IMisRunning ()	1163	rxvt_term::im_is_running ()
1175	{	1164	{
1176	Atom atom;	1165	Atom atom;
1177	Window win;	1166	Window win;
1178	char server[IMBUFSIZ];	1167	char server[IMBUFSIZ];
1179		1168
…		…
1188		1177
1189	atom = XInternAtom (dpy, server, False);	1178	atom = XInternAtom (dpy, server, False);
1190	win = XGetSelectionOwner (dpy, atom);	1179	win = XGetSelectionOwner (dpy, atom);
1191		1180
1192	if (win != None)	1181	if (win != None)
1193	return True;	1182	return true;
1194	}	1183	}
1195		1184
1196	return False;	1185	return false;
1197	}	1186	}
1198		1187
1199	void	1188	void
1200	rxvt_term::IMSendSpot ()	1189	rxvt_term::im_send_spot ()
1201	{	1190	{
1202	XPoint nspot;	1191	XPoint nspot;
1203	XVaNestedList preedit_attr;	1192	XVaNestedList preedit_attr;
1204		1193
1205	if (!Input_Context	1194	if (!Input_Context
…		…
1311	/*	1300	/*
1312	* Try to open a XIM with the current modifiers, then see if we can	1301	* Try to open a XIM with the current modifiers, then see if we can
1313	* open a suitable preedit type	1302	* open a suitable preedit type
1314	*/	1303	*/
1315	bool	1304	bool
1316	rxvt_term::IM_get_IC (const char *modifiers)	1305	rxvt_term::im_get_ic (const char *modifiers)
1317	{	1306	{
1318	int i, j, found;	1307	int i, j, found;
1319	XIM xim;	1308	XIM xim;
1320	XPoint spot;	1309	XPoint spot;
1321	XRectangle rect, status_rect, needed_rect;	1310	XRectangle rect, status_rect, needed_rect;
1322	unsigned long fg, bg;	1311	unsigned long fg, bg;
1323	const char *p;	1312	const char *p;
1324	char **s;	1313	char **s;
1325	XIMStyles *xim_styles;	1314	XIMStyles *xim_styles;
1326	#ifdef ENABLE_XIM_ONTHESPOT
1327	XIMCallback xcb[4];
1328	#endif
1329		1315
1330	set_environ (envv);	1316	set_environ (envv);
1331		1317
1332	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1318	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1333	return false;	1319	return false;
…		…
1354	p = pet[pi];	1340	p = pet[pi];
1355		1341
1356	if (!p)	1342	if (!p)
1357	continue;	1343	continue;
1358		1344
1359	s = rxvt_splitcommastring (p);	1345	s = rxvt_strsplit (',', p);
1360		1346
1361	for (i = found = 0; !found && s[i]; i++)	1347	for (i = found = 0; !found && s[i]; i++)
1362	{	1348	{
1363	if (!strcmp (s[i], "OverTheSpot"))	1349	if (!strcmp (s[i], "OverTheSpot"))
1364	input_style = XIMPreeditPosition \| XIMStatusNothing;	1350	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1376	input_style = XIMPreeditNothing \| XIMStatusNothing;	1362	input_style = XIMPreeditNothing \| XIMStatusNothing;
1377		1363
1378	for (j = 0; j < xim_styles->count_styles; j++)	1364	for (j = 0; j < xim_styles->count_styles; j++)
1379	if (input_style == xim_styles->supported_styles[j])	1365	if (input_style == xim_styles->supported_styles[j])
1380	{	1366	{
1381	rxvt_freecommastring (s);	1367	rxvt_free_strsplit (s);
1382		1368
1383	found = 1;	1369	found = 1;
1384	goto foundpet;	1370	goto foundpet;
1385	}	1371	}
1386		1372
1387	}	1373	}
1388		1374
1389	rxvt_freecommastring (s);	1375	rxvt_free_strsplit (s);
1390	}	1376	}
1391		1377
1392	foundpet:	1378	foundpet:
1393		1379
1394	XFree (xim_styles);	1380	XFree (xim_styles);
…		…
1473	NULL);	1459	NULL);
1474	}	1460	}
1475	#if ENABLE_XIM_ONTHESPOT	1461	#if ENABLE_XIM_ONTHESPOT
1476	else if (input_style & XIMPreeditCallbacks)	1462	else if (input_style & XIMPreeditCallbacks)
1477	{	1463	{
		1464	XIMCallback xcb[4];
		1465
1478	im_set_position (spot);	1466	im_set_position (spot);
1479		1467
1480	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;	1468	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1481	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;	1469	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1482	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;	1470	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
…		…
1497	#endif	1485	#endif
1498		1486
1499	Input_Context = XCreateIC (xim,	1487	Input_Context = XCreateIC (xim,
1500	XNInputStyle, input_style,	1488	XNInputStyle, input_style,
1501	XNClientWindow, vt,	1489	XNClientWindow, vt,
1502	XNFocusWindow, parent[0],	1490	XNFocusWindow, parent,
1503	preedit_attr ? XNPreeditAttributes : NULL,	1491	preedit_attr ? XNPreeditAttributes : NULL,
1504	preedit_attr,	1492	preedit_attr,
1505	status_attr ? XNStatusAttributes : NULL,	1493	status_attr ? XNStatusAttributes : NULL,
1506	status_attr, NULL);	1494	status_attr, NULL);
1507		1495
…		…
1520	// unfortunately, only the focus window is used by XIM, hard to fix	1508	// unfortunately, only the focus window is used by XIM, hard to fix
1521	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1509	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1522	vt_select_input ();	1510	vt_select_input ();
1523	#endif	1511	#endif
1524		1512
1525	IMSetPosition ();	1513	im_set_position ();
1526		1514
1527	return true;	1515	return true;
1528	}	1516	}
1529		1517
1530	void	1518	void
…		…
1550	p = rs[Rs_inputMethod];	1538	p = rs[Rs_inputMethod];
1551	if (p && *p)	1539	if (p && *p)
1552	{	1540	{
1553	bool found = false;	1541	bool found = false;
1554		1542
1555	s = rxvt_splitcommastring (p);	1543	s = rxvt_strsplit (',', p);
1556		1544
1557	for (i = 0; s[i]; i++)	1545	for (i = 0; s[i]; i++)
1558	{	1546	{
1559	if (*s[i])	1547	if (*s[i])
1560	{	1548	{
1561	strcpy (buf, "@im=");	1549	strcpy (buf, "@im=");
1562	strncat (buf, s[i], IMBUFSIZ - 5);	1550	strncat (buf, s[i], IMBUFSIZ - 5);
1563	if (IM_get_IC (buf))	1551	if (im_get_ic (buf))
1564	{	1552	{
1565	found = true;	1553	found = true;
1566	break;	1554	break;
1567	}	1555	}
1568	}	1556	}
1569	}	1557	}
1570		1558
1571	rxvt_freecommastring (s);	1559	rxvt_free_strsplit (s);
1572		1560
1573	if (found)	1561	if (found)
1574	goto done;	1562	goto done;
1575	}	1563	}
1576		1564
1577	/* try with XMODIFIERS env. var. */	1565	/* try with XMODIFIERS env. var. */
1578	if (IM_get_IC (""))	1566	if (im_get_ic (""))
1579	goto done;	1567	goto done;
1580		1568
1581	/* try with no modifiers base IF the user didn't specify an IM */	1569	/* try with no modifiers base IF the user didn't specify an IM */
1582	if (IM_get_IC ("@im=none"))	1570	if (im_get_ic ("@im=none"))
1583	goto done;	1571	goto done;
1584		1572
1585	done:	1573	done:
1586	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1574	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1587	if (rs[Rs_imLocale])	1575	if (rs[Rs_imLocale])
1588	SET_LOCALE (locale);	1576	SET_LOCALE (locale);
1589	#endif	1577	#endif
1590	}	1578	}
1591		1579
1592	void	1580	void
1593	rxvt_term::IMSetPosition ()	1581	rxvt_term::im_set_position ()
1594	{	1582	{
1595	XRectangle preedit_rect, status_rect, *needed_rect;	1583	XRectangle preedit_rect, status_rect, *needed_rect;
1596	XVaNestedList preedit_attr, status_attr;	1584	XVaNestedList preedit_attr, status_attr;
1597		1585
1598	if (!Input_Context	1586	if (!Input_Context
1599	\|\| !focus	1587	\|\| !focus
1600	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))	1588	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1601	\|\| !IMisRunning ())	1589	\|\| !im_is_running ())
1602	return;	1590	return;
1603		1591
1604	if (input_style & XIMPreeditPosition)	1592	if (input_style & XIMPreeditPosition)
1605	{	1593	{
1606	im_set_size (preedit_rect);	1594	im_set_size (preedit_rect);
…		…
1636		1624
1637	void	1625	void
1638	rxvt_term::get_window_origin (int &x, int &y)	1626	rxvt_term::get_window_origin (int &x, int &y)
1639	{	1627	{
1640	Window cr;	1628	Window cr;
1641	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1629	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1642	}	1630	}
1643		1631
1644	Pixmap	1632	Pixmap
1645	rxvt_term::get_pixmap_property (Atom property)	1633	rxvt_term::get_pixmap_property (Atom property)
1646	{	1634	{
…		…
1669	rxvt_term::update_background ()	1657	rxvt_term::update_background ()
1670	{	1658	{
1671	if (update_background_ev.is_active ())	1659	if (update_background_ev.is_active ())
1672	return;	1660	return;
1673		1661
1674	bgPixmap.invalidate ();	1662	bg_invalidate ();
1675		1663
1676	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1664	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1677		1665
1678	if (to_wait <= 0.)	1666	if (to_wait <= 0.)
1679	bgPixmap.render ();	1667	bg_render ();
1680	else	1668	else
1681	update_background_ev.start (to_wait);	1669	update_background_ev.start (to_wait);
1682	}	1670	}
1683		1671
1684	void	1672	void
1685	rxvt_term::update_background_cb (ev::timer &w, int revents)	1673	rxvt_term::update_background_cb (ev::timer &w, int revents)
1686	{	1674	{
1687	make_current ();	1675	make_current ();
1688		1676
1689	update_background_ev.stop ();	1677	update_background_ev.stop ();
1690	bgPixmap.render ();	1678	bg_render ();
1691	refresh_check ();	1679	refresh_check ();
1692	}	1680	}
1693		1681
1694	#endif /* HAVE_BG_PIXMAP */	1682	#endif /* HAVE_BG_PIXMAP */
1695		1683

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.360 by sf-exg, Fri Aug 19 16:01:37 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.360 by sf-exg, Fri Aug 19 16:01:37 2011 UTC