[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.358 by sf-exg, Sat Jul 9 13:40:13 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 ();
…		…
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 ();
…		…
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);
…		…
732	kill (-cmd_pid, SIGWINCH);	735	kill (-cmd_pid, SIGWINCH);
733	#endif	736	#endif
734	}	737	}
735		738
736	/----------------------------------------------------------------------/	739	/----------------------------------------------------------------------/
737	/* set_fonts () - load and set the various fonts	740	/* load and set the various fonts */
738	*
739	* init = 1 - initialize
740	*
741	* fontname == FONT_UP - switch to bigger font
742	* fontname == FONT_DN - switch to smaller font
743	*/
744	bool	741	bool
745	rxvt_term::set_fonts ()	742	rxvt_term::set_fonts ()
746	{	743	{
747	rxvt_fontset *fs = new rxvt_fontset (this);	744	rxvt_fontset *fs = new rxvt_fontset (this);
748	rxvt_fontprop prop;	745	rxvt_fontprop prop;
…		…
805	#else	802	#else
806	fontset[style] = fontset[0];	803	fontset[style] = fontset[0];
807	#endif	804	#endif
808	}	805	}
809		806
810	if (parent[0])	807	if (parent)
811	{	808	{
812	resize_all_windows (0, 0, 0);	809	resize_all_windows (0, 0, 0);
813	scr_remap_chars ();	810	scr_remap_chars ();
814	scr_touch (true);	811	scr_touch (true);
815	}	812	}
…		…
818	}	815	}
819		816
820	void	817	void
821	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)
822	{	819	{
823	XChangeProperty (dpy, parent[0],	820	XChangeProperty (dpy, parent,
824	prop, XA_STRING, 8, PropModeReplace,	821	prop, XA_STRING, 8, PropModeReplace,
825	(const unsigned char *)str, len >= 0 ? len : strlen (str));	822	(const unsigned char *)str, len >= 0 ? len : strlen (str));
826	}	823	}
827		824
828	void	825	void
…		…
830	{	827	{
831	XTextProperty ct;	828	XTextProperty ct;
832		829
833	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)	830	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
834	{	831	{
835	XSetTextProperty (dpy, parent[0], &ct, prop);	832	XSetTextProperty (dpy, parent, &ct, prop);
836	XFree (ct.value);	833	XFree (ct.value);
837	}	834	}
838	}	835	}
839		836
840	void	837	void
841	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)
842	{	839	{
843	wchar_t *ws = rxvt_mbstowcs (str, len);	840	wchar_t *ws = rxvt_mbstowcs (str, len);
844	char *s = rxvt_wcstoutf8 (ws);	841	char *s = rxvt_wcstoutf8 (ws);
845		842
846	XChangeProperty (dpy, parent[0],	843	XChangeProperty (dpy, parent,
847	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	844	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
848	(const unsigned char *)s, strlen (s));	845	(const unsigned char *)s, strlen (s));
849		846
850	free (s);	847	free (s);
851	free (ws);	848	free (ws);
…		…
946	void	943	void
947	rxvt_term::set_colorfgbg ()	944	rxvt_term::set_colorfgbg ()
948	{	945	{
949	unsigned int i;	946	unsigned int i;
950	const char *xpmb = "";	947	const char *xpmb = "";
951	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	948	char fstr[] = "default";
		949	char bstr[] = "default";
952		950
953	strcpy (fstr, "default");
954	strcpy (bstr, "default");
955	for (i = Color_Black; i <= Color_White; i++)	951	for (i = Color_Black; i <= Color_White; i++)
956	if (pix_colors[Color_fg] == pix_colors[i])	952	if (pix_colors[Color_fg] == pix_colors[i])
957	{	953	{
958	sprintf (fstr, "%d", (i - Color_Black));	954	sprintf (fstr, "%d", i - Color_Black);
959	break;	955	break;
960	}	956	}
961		957
962	for (i = Color_Black; i <= Color_White; i++)	958	for (i = Color_Black; i <= Color_White; i++)
963	if (pix_colors[Color_bg] == pix_colors[i])	959	if (pix_colors[Color_bg] == pix_colors[i])
964	{	960	{
965	sprintf (bstr, "%d", (i - Color_Black));	961	sprintf (bstr, "%d", i - Color_Black);
966	#ifdef BG_IMAGE_FROM_FILE	962	#ifdef BG_IMAGE_FROM_FILE
967	xpmb = "default;";	963	xpmb = "default;";
968	#endif	964	#endif
969	break;	965	break;
970	}	966	}
…		…
1006		1002
1007	// 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
1008	if (set_hint)	1004	if (set_hint)
1009	{	1005	{
1010	szHint.flags &= ~(PBaseSize \| PResizeInc);	1006	szHint.flags &= ~(PBaseSize \| PResizeInc);
1011	XSetWMNormalHints (dpy, parent[0], &szHint);	1007	XSetWMNormalHints (dpy, parent, &szHint);
1012	szHint.flags \|= PBaseSize \| PResizeInc;	1008	szHint.flags \|= PBaseSize \| PResizeInc;
1013	}	1009	}
1014		1010
1015	if (!ignoreparent)	1011	if (!ignoreparent)
1016	{	1012	{
…		…
1022	int x, y, x1, y1;	1018	int x, y, x1, y1;
1023	int dx, dy;	1019	int dx, dy;
1024	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1020	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1025	Window unused_cr;	1021	Window unused_cr;
1026		1022
1027	XTranslateCoordinates (dpy, parent[0], display->root,	1023	XTranslateCoordinates (dpy, parent, display->root,
1028	0, 0, &x, &y, &unused_cr);	1024	0, 0, &x, &y, &unused_cr);
1029	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1025	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1030	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1026	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1031	/*	1027	/*
1032	* 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
1033	* our position for handles and decorations. Counter it	1029	* our position for handles and decorations. Counter it
1034	*/	1030	*/
…		…
1051	if (y < y1) /* top half */	1047	if (y < y1) /* top half */
1052	dy = 0;	1048	dy = 0;
1053	else if (y == y1) /* exact center */	1049	else if (y == y1) /* exact center */
1054	dy /= 2;	1050	dy /= 2;
1055		1051
1056	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1052	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1057	szHint.width, szHint.height);	1053	szHint.width, szHint.height);
1058	#else	1054	#else
1059	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1055	XResizeWindow (dpy, parent, szHint.width, szHint.height);
1060	#endif	1056	#endif
1061	}	1057	}
1062		1058
1063	if (set_hint)	1059	if (set_hint)
1064	XSetWMNormalHints (dpy, parent[0], &szHint);	1060	XSetWMNormalHints (dpy, parent, &szHint);
1065		1061
1066	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1062	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1067		1063
1068	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1064	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1069	{	1065	{
…		…
1073	XMoveResizeWindow (dpy, vt,	1069	XMoveResizeWindow (dpy, vt,
1074	window_vt_x, window_vt_y,	1070	window_vt_x, window_vt_y,
1075	width, height);	1071	width, height);
1076		1072
1077	#ifdef HAVE_BG_PIXMAP	1073	#ifdef HAVE_BG_PIXMAP
1078	if (bgPixmap.window_size_sensitive ())	1074	if (bg_window_size_sensitive ())
1079	update_background ();	1075	update_background ();
1080	#endif	1076	#endif
1081	}	1077	}
1082		1078
1083	if (fix_screen \|\| old_height == 0)	1079	if (fix_screen \|\| old_height == 0)
1084	scr_reset ();	1080	scr_reset ();
1085		1081
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
1092	#ifdef USE_XIM	1082	#ifdef USE_XIM
1093	IMSetPosition ();	1083	im_set_position ();
1094	#endif	1084	#endif
1095	}	1085	}
1096		1086
1097	/*	1087	/*
1098	* Set the width/height of the vt window in characters. Units are pixels.	1088	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1159	status_rect.height = fheight;	1149	status_rect.height = fheight;
1160	}	1150	}
1161		1151
1162	/* Checking whether input method is running. */	1152	/* Checking whether input method is running. */
1163	bool	1153	bool
1164	rxvt_term::IMisRunning ()	1154	rxvt_term::im_is_running ()
1165	{	1155	{
1166	Atom atom;	1156	Atom atom;
1167	Window win;	1157	Window win;
1168	char server[IMBUFSIZ];	1158	char server[IMBUFSIZ];
1169		1159
…		…
1178		1168
1179	atom = XInternAtom (dpy, server, False);	1169	atom = XInternAtom (dpy, server, False);
1180	win = XGetSelectionOwner (dpy, atom);	1170	win = XGetSelectionOwner (dpy, atom);
1181		1171
1182	if (win != None)	1172	if (win != None)
1183	return True;	1173	return true;
1184	}	1174	}
1185		1175
1186	return False;	1176	return false;
1187	}	1177	}
1188		1178
1189	void	1179	void
1190	rxvt_term::IMSendSpot ()	1180	rxvt_term::im_send_spot ()
1191	{	1181	{
1192	XPoint nspot;	1182	XPoint nspot;
1193	XVaNestedList preedit_attr;	1183	XVaNestedList preedit_attr;
1194		1184
1195	if (!Input_Context	1185	if (!Input_Context
…		…
1301	/*	1291	/*
1302	* Try to open a XIM with the current modifiers, then see if we can	1292	* Try to open a XIM with the current modifiers, then see if we can
1303	* open a suitable preedit type	1293	* open a suitable preedit type
1304	*/	1294	*/
1305	bool	1295	bool
1306	rxvt_term::IM_get_IC (const char *modifiers)	1296	rxvt_term::im_get_ic (const char *modifiers)
1307	{	1297	{
1308	int i, j, found;	1298	int i, j, found;
1309	XIM xim;	1299	XIM xim;
1310	XPoint spot;	1300	XPoint spot;
1311	XRectangle rect, status_rect, needed_rect;	1301	XRectangle rect, status_rect, needed_rect;
1312	unsigned long fg, bg;	1302	unsigned long fg, bg;
1313	const char *p;	1303	const char *p;
1314	char **s;	1304	char **s;
1315	XIMStyles *xim_styles;	1305	XIMStyles *xim_styles;
1316	#ifdef ENABLE_XIM_ONTHESPOT
1317	XIMCallback xcb[4];
1318	#endif
1319		1306
1320	set_environ (envv);	1307	set_environ (envv);
1321		1308
1322	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1309	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1323	return false;	1310	return false;
…		…
1344	p = pet[pi];	1331	p = pet[pi];
1345		1332
1346	if (!p)	1333	if (!p)
1347	continue;	1334	continue;
1348		1335
1349	s = rxvt_splitcommastring (p);	1336	s = rxvt_strsplit (',', p);
1350		1337
1351	for (i = found = 0; !found && s[i]; i++)	1338	for (i = found = 0; !found && s[i]; i++)
1352	{	1339	{
1353	if (!strcmp (s[i], "OverTheSpot"))	1340	if (!strcmp (s[i], "OverTheSpot"))
1354	input_style = XIMPreeditPosition \| XIMStatusNothing;	1341	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1366	input_style = XIMPreeditNothing \| XIMStatusNothing;	1353	input_style = XIMPreeditNothing \| XIMStatusNothing;
1367		1354
1368	for (j = 0; j < xim_styles->count_styles; j++)	1355	for (j = 0; j < xim_styles->count_styles; j++)
1369	if (input_style == xim_styles->supported_styles[j])	1356	if (input_style == xim_styles->supported_styles[j])
1370	{	1357	{
1371	rxvt_freecommastring (s);	1358	rxvt_free_strsplit (s);
1372		1359
1373	found = 1;	1360	found = 1;
1374	goto foundpet;	1361	goto foundpet;
1375	}	1362	}
1376		1363
1377	}	1364	}
1378		1365
1379	rxvt_freecommastring (s);	1366	rxvt_free_strsplit (s);
1380	}	1367	}
1381		1368
1382	foundpet:	1369	foundpet:
1383		1370
1384	XFree (xim_styles);	1371	XFree (xim_styles);
…		…
1463	NULL);	1450	NULL);
1464	}	1451	}
1465	#if ENABLE_XIM_ONTHESPOT	1452	#if ENABLE_XIM_ONTHESPOT
1466	else if (input_style & XIMPreeditCallbacks)	1453	else if (input_style & XIMPreeditCallbacks)
1467	{	1454	{
		1455	XIMCallback xcb[4];
		1456
1468	im_set_position (spot);	1457	im_set_position (spot);
1469		1458
1470	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;	1459	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1471	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;	1460	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1472	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;	1461	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
…		…
1487	#endif	1476	#endif
1488		1477
1489	Input_Context = XCreateIC (xim,	1478	Input_Context = XCreateIC (xim,
1490	XNInputStyle, input_style,	1479	XNInputStyle, input_style,
1491	XNClientWindow, vt,	1480	XNClientWindow, vt,
1492	XNFocusWindow, parent[0],	1481	XNFocusWindow, parent,
1493	preedit_attr ? XNPreeditAttributes : NULL,	1482	preedit_attr ? XNPreeditAttributes : NULL,
1494	preedit_attr,	1483	preedit_attr,
1495	status_attr ? XNStatusAttributes : NULL,	1484	status_attr ? XNStatusAttributes : NULL,
1496	status_attr, NULL);	1485	status_attr, NULL);
1497		1486
…		…
1510	// unfortunately, only the focus window is used by XIM, hard to fix	1499	// unfortunately, only the focus window is used by XIM, hard to fix
1511	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1500	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1512	vt_select_input ();	1501	vt_select_input ();
1513	#endif	1502	#endif
1514		1503
1515	IMSetPosition ();	1504	im_set_position ();
1516		1505
1517	return true;	1506	return true;
1518	}	1507	}
1519		1508
1520	void	1509	void
…		…
1540	p = rs[Rs_inputMethod];	1529	p = rs[Rs_inputMethod];
1541	if (p && *p)	1530	if (p && *p)
1542	{	1531	{
1543	bool found = false;	1532	bool found = false;
1544		1533
1545	s = rxvt_splitcommastring (p);	1534	s = rxvt_strsplit (',', p);
1546		1535
1547	for (i = 0; s[i]; i++)	1536	for (i = 0; s[i]; i++)
1548	{	1537	{
1549	if (*s[i])	1538	if (*s[i])
1550	{	1539	{
1551	strcpy (buf, "@im=");	1540	strcpy (buf, "@im=");
1552	strncat (buf, s[i], IMBUFSIZ - 5);	1541	strncat (buf, s[i], IMBUFSIZ - 5);
1553	if (IM_get_IC (buf))	1542	if (im_get_ic (buf))
1554	{	1543	{
1555	found = true;	1544	found = true;
1556	break;	1545	break;
1557	}	1546	}
1558	}	1547	}
1559	}	1548	}
1560		1549
1561	rxvt_freecommastring (s);	1550	rxvt_free_strsplit (s);
1562		1551
1563	if (found)	1552	if (found)
1564	goto done;	1553	goto done;
1565	}	1554	}
1566		1555
1567	/* try with XMODIFIERS env. var. */	1556	/* try with XMODIFIERS env. var. */
1568	if (IM_get_IC (""))	1557	if (im_get_ic (""))
1569	goto done;	1558	goto done;
1570		1559
1571	/* try with no modifiers base IF the user didn't specify an IM */	1560	/* try with no modifiers base IF the user didn't specify an IM */
1572	if (IM_get_IC ("@im=none"))	1561	if (im_get_ic ("@im=none"))
1573	goto done;	1562	goto done;
1574		1563
1575	done:	1564	done:
1576	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1565	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1577	if (rs[Rs_imLocale])	1566	if (rs[Rs_imLocale])
1578	SET_LOCALE (locale);	1567	SET_LOCALE (locale);
1579	#endif	1568	#endif
1580	}	1569	}
1581		1570
1582	void	1571	void
1583	rxvt_term::IMSetPosition ()	1572	rxvt_term::im_set_position ()
1584	{	1573	{
1585	XRectangle preedit_rect, status_rect, *needed_rect;	1574	XRectangle preedit_rect, status_rect, *needed_rect;
1586	XVaNestedList preedit_attr, status_attr;	1575	XVaNestedList preedit_attr, status_attr;
1587		1576
1588	if (!Input_Context	1577	if (!Input_Context
1589	\|\| !focus	1578	\|\| !focus
1590	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))	1579	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1591	\|\| !IMisRunning ())	1580	\|\| !im_is_running ())
1592	return;	1581	return;
1593		1582
1594	if (input_style & XIMPreeditPosition)	1583	if (input_style & XIMPreeditPosition)
1595	{	1584	{
1596	im_set_size (preedit_rect);	1585	im_set_size (preedit_rect);
…		…
1626		1615
1627	void	1616	void
1628	rxvt_term::get_window_origin (int &x, int &y)	1617	rxvt_term::get_window_origin (int &x, int &y)
1629	{	1618	{
1630	Window cr;	1619	Window cr;
1631	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1620	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1632	}	1621	}
1633		1622
1634	Pixmap	1623	Pixmap
1635	rxvt_term::get_pixmap_property (int prop_id)	1624	rxvt_term::get_pixmap_property (Atom property)
1636	{	1625	{
1637	if (prop_id > 0 && prop_id < NUM_XA)	1626	Pixmap pixmap = None;
1638	if (xa[prop_id])	1627
1639	{
1640	int aformat;	1628	int aformat;
1641	unsigned long nitems, bytes_after;	1629	unsigned long nitems, bytes_after;
1642	Atom atype;	1630	Atom atype;
1643	unsigned char *prop = NULL;	1631	unsigned char *prop;
1644	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1632	int result = XGetWindowProperty (dpy, display->root, property,
1645	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1633	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1646	&nitems, &bytes_after, &prop);	1634	&nitems, &bytes_after, &prop);
1647	if (result == Success && prop && atype == XA_PIXMAP)	1635	if (result == Success)
		1636	{
		1637	if (atype == XA_PIXMAP)
1648	return (Pixmap )prop;	1638	pixmap = (Pixmap )prop;
		1639	XFree (prop);
1649	}	1640	}
1650		1641
1651	return None;	1642	return pixmap;
1652	}	1643	}
1653		1644
1654	#ifdef HAVE_BG_PIXMAP	1645	#ifdef HAVE_BG_PIXMAP
1655		1646
1656	void	1647	void
1657	rxvt_term::update_background ()	1648	rxvt_term::update_background ()
1658	{	1649	{
1659	if (update_background_ev.is_active ())	1650	if (update_background_ev.is_active ())
1660	return;	1651	return;
1661		1652
1662	bgPixmap.invalidate ();	1653	bg_invalidate ();
1663		1654
1664	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1655	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1665		1656
1666	if (to_wait <= 0.)	1657	if (to_wait <= 0.)
1667	bgPixmap.render ();	1658	bg_render ();
1668	else	1659	else
1669	update_background_ev.start (to_wait);	1660	update_background_ev.start (to_wait);
1670	}	1661	}
1671		1662
1672	void	1663	void
1673	rxvt_term::update_background_cb (ev::timer &w, int revents)	1664	rxvt_term::update_background_cb (ev::timer &w, int revents)
1674	{	1665	{
1675	make_current ();	1666	make_current ();
1676		1667
1677	update_background_ev.stop ();	1668	update_background_ev.stop ();
1678	bgPixmap.render ();	1669	bg_render ();
1679	refresh_check ();	1670	refresh_check ();
1680	}	1671	}
1681		1672
1682	#endif /* HAVE_BG_PIXMAP */	1673	#endif /* HAVE_BG_PIXMAP */
1683		1674

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.358 by sf-exg, Sat Jul 9 13:40:13 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.358 by sf-exg, Sat Jul 9 13:40:13 2011 UTC