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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.333 by root, Fri Oct 22 05:57:59 2010 UTC vs.
Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 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);
…		…
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
…		…
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		564
559	ptytty::init ();
560
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;
565		569
…		…
731	kill (-cmd_pid, SIGWINCH);	735	kill (-cmd_pid, SIGWINCH);
732	#endif	736	#endif
733	}	737	}
734		738
735	/----------------------------------------------------------------------/	739	/----------------------------------------------------------------------/
736	/* set_fonts () - load and set the various fonts	740	/* load and set the various fonts */
737	*
738	* init = 1 - initialize
739	*
740	* fontname == FONT_UP - switch to bigger font
741	* fontname == FONT_DN - switch to smaller font
742	*/
743	bool	741	bool
744	rxvt_term::set_fonts ()	742	rxvt_term::set_fonts ()
745	{	743	{
746	rxvt_fontset *fs = new rxvt_fontset (this);	744	rxvt_fontset *fs = new rxvt_fontset (this);
747	rxvt_fontprop prop;	745	rxvt_fontprop prop;
…		…
804	#else	802	#else
805	fontset[style] = fontset[0];	803	fontset[style] = fontset[0];
806	#endif	804	#endif
807	}	805	}
808		806
809	if (parent[0])	807	if (parent)
810	{	808	{
811	resize_all_windows (0, 0, 0);	809	resize_all_windows (0, 0, 0);
812	scr_remap_chars ();	810	scr_remap_chars ();
813	scr_touch (true);	811	scr_touch (true);
814	}	812	}
…		…
817	}	815	}
818		816
819	void	817	void
820	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)
821	{	819	{
822	XChangeProperty (dpy, parent[0],	820	XChangeProperty (dpy, parent,
823	prop, XA_STRING, 8, PropModeReplace,	821	prop, XA_STRING, 8, PropModeReplace,
824	(const unsigned char *)str, len >= 0 ? len : strlen (str));	822	(const unsigned char *)str, len >= 0 ? len : strlen (str));
825	}	823	}
826		824
827	void	825	void
…		…
829	{	827	{
830	XTextProperty ct;	828	XTextProperty ct;
831		829
832	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)	830	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
833	{	831	{
834	XSetTextProperty (dpy, parent[0], &ct, prop);	832	XSetTextProperty (dpy, parent, &ct, prop);
835	XFree (ct.value);	833	XFree (ct.value);
836	}	834	}
837	}	835	}
838		836
839	void	837	void
840	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)
841	{	839	{
842	wchar_t *ws = rxvt_mbstowcs (str, len);	840	wchar_t *ws = rxvt_mbstowcs (str, len);
843	char *s = rxvt_wcstoutf8 (ws);	841	char *s = rxvt_wcstoutf8 (ws);
844		842
845	XChangeProperty (dpy, parent[0],	843	XChangeProperty (dpy, parent,
846	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	844	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
847	(const unsigned char *)s, strlen (s));	845	(const unsigned char *)s, strlen (s));
848		846
849	free (s);	847	free (s);
850	free (ws);	848	free (ws);
…		…
945	void	943	void
946	rxvt_term::set_colorfgbg ()	944	rxvt_term::set_colorfgbg ()
947	{	945	{
948	unsigned int i;	946	unsigned int i;
949	const char *xpmb = "";	947	const char *xpmb = "";
950	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	948	char fstr[] = "default";
		949	char bstr[] = "default";
951		950
952	strcpy (fstr, "default");
953	strcpy (bstr, "default");
954	for (i = Color_Black; i <= Color_White; i++)	951	for (i = Color_Black; i <= Color_White; i++)
955	if (pix_colors[Color_fg] == pix_colors[i])	952	if (pix_colors[Color_fg] == pix_colors[i])
956	{	953	{
957	sprintf (fstr, "%d", (i - Color_Black));	954	sprintf (fstr, "%d", i - Color_Black);
958	break;	955	break;
959	}	956	}
960		957
961	for (i = Color_Black; i <= Color_White; i++)	958	for (i = Color_Black; i <= Color_White; i++)
962	if (pix_colors[Color_bg] == pix_colors[i])	959	if (pix_colors[Color_bg] == pix_colors[i])
963	{	960	{
964	sprintf (bstr, "%d", (i - Color_Black));	961	sprintf (bstr, "%d", i - Color_Black);
965	#ifdef BG_IMAGE_FROM_FILE	962	#ifdef BG_IMAGE_FROM_FILE
966	xpmb = "default;";	963	xpmb = "default;";
967	#endif	964	#endif
968	break;	965	break;
969	}	966	}
…		…
1005		1002
1006	// 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
1007	if (set_hint)	1004	if (set_hint)
1008	{	1005	{
1009	szHint.flags &= ~(PBaseSize \| PResizeInc);	1006	szHint.flags &= ~(PBaseSize \| PResizeInc);
1010	XSetWMNormalHints (dpy, parent[0], &szHint);	1007	XSetWMNormalHints (dpy, parent, &szHint);
1011	szHint.flags \|= PBaseSize \| PResizeInc;	1008	szHint.flags \|= PBaseSize \| PResizeInc;
1012	}	1009	}
1013		1010
1014	if (!ignoreparent)	1011	if (!ignoreparent)
1015	{	1012	{
…		…
1021	int x, y, x1, y1;	1018	int x, y, x1, y1;
1022	int dx, dy;	1019	int dx, dy;
1023	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1020	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1024	Window unused_cr;	1021	Window unused_cr;
1025		1022
1026	XTranslateCoordinates (dpy, parent[0], display->root,	1023	XTranslateCoordinates (dpy, parent, display->root,
1027	0, 0, &x, &y, &unused_cr);	1024	0, 0, &x, &y, &unused_cr);
1028	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1025	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1029	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1026	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1030	/*	1027	/*
1031	* 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
1032	* our position for handles and decorations. Counter it	1029	* our position for handles and decorations. Counter it
1033	*/	1030	*/
…		…
1050	if (y < y1) /* top half */	1047	if (y < y1) /* top half */
1051	dy = 0;	1048	dy = 0;
1052	else if (y == y1) /* exact center */	1049	else if (y == y1) /* exact center */
1053	dy /= 2;	1050	dy /= 2;
1054		1051
1055	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1052	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1056	szHint.width, szHint.height);	1053	szHint.width, szHint.height);
1057	#else	1054	#else
1058	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1055	XResizeWindow (dpy, parent, szHint.width, szHint.height);
1059	#endif	1056	#endif
1060	}	1057	}
1061		1058
1062	if (set_hint)	1059	if (set_hint)
1063	XSetWMNormalHints (dpy, parent[0], &szHint);	1060	XSetWMNormalHints (dpy, parent, &szHint);
1064		1061
1065	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1062	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1066		1063
1067	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1064	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1068	{	1065	{
…		…
1072	XMoveResizeWindow (dpy, vt,	1069	XMoveResizeWindow (dpy, vt,
1073	window_vt_x, window_vt_y,	1070	window_vt_x, window_vt_y,
1074	width, height);	1071	width, height);
1075		1072
1076	#ifdef HAVE_BG_PIXMAP	1073	#ifdef HAVE_BG_PIXMAP
1077	if (bgPixmap.window_size_sensitive ())	1074	if (bg_window_size_sensitive ())
1078	update_background ();	1075	update_background ();
1079	#endif	1076	#endif
1080	}	1077	}
1081		1078
1082	if (fix_screen \|\| old_height == 0)	1079	if (fix_screen \|\| old_height == 0)
1083	scr_reset ();	1080	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		1081
1091	#ifdef USE_XIM	1082	#ifdef USE_XIM
1092	IMSetPosition ();	1083	IMSetPosition ();
1093	#endif	1084	#endif
1094	}	1085	}
…		…
1177		1168
1178	atom = XInternAtom (dpy, server, False);	1169	atom = XInternAtom (dpy, server, False);
1179	win = XGetSelectionOwner (dpy, atom);	1170	win = XGetSelectionOwner (dpy, atom);
1180		1171
1181	if (win != None)	1172	if (win != None)
1182	return True;	1173	return true;
1183	}	1174	}
1184		1175
1185	return False;	1176	return false;
1186	}	1177	}
1187		1178
1188	void	1179	void
1189	rxvt_term::IMSendSpot ()	1180	rxvt_term::IMSendSpot ()
1190	{	1181	{
…		…
1310	XRectangle rect, status_rect, needed_rect;	1301	XRectangle rect, status_rect, needed_rect;
1311	unsigned long fg, bg;	1302	unsigned long fg, bg;
1312	const char *p;	1303	const char *p;
1313	char **s;	1304	char **s;
1314	XIMStyles *xim_styles;	1305	XIMStyles *xim_styles;
1315	#ifdef ENABLE_XIM_ONTHESPOT
1316	XIMCallback xcb[4];
1317	#endif
1318		1306
1319	set_environ (envv);	1307	set_environ (envv);
1320		1308
1321	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1309	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1322	return false;	1310	return false;
…		…
1343	p = pet[pi];	1331	p = pet[pi];
1344		1332
1345	if (!p)	1333	if (!p)
1346	continue;	1334	continue;
1347		1335
1348	s = rxvt_splitcommastring (p);	1336	s = rxvt_strsplit (',', p);
1349		1337
1350	for (i = found = 0; !found && s[i]; i++)	1338	for (i = found = 0; !found && s[i]; i++)
1351	{	1339	{
1352	if (!strcmp (s[i], "OverTheSpot"))	1340	if (!strcmp (s[i], "OverTheSpot"))
1353	input_style = XIMPreeditPosition \| XIMStatusNothing;	1341	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1365	input_style = XIMPreeditNothing \| XIMStatusNothing;	1353	input_style = XIMPreeditNothing \| XIMStatusNothing;
1366		1354
1367	for (j = 0; j < xim_styles->count_styles; j++)	1355	for (j = 0; j < xim_styles->count_styles; j++)
1368	if (input_style == xim_styles->supported_styles[j])	1356	if (input_style == xim_styles->supported_styles[j])
1369	{	1357	{
1370	rxvt_freecommastring (s);	1358	rxvt_free_strsplit (s);
1371		1359
1372	found = 1;	1360	found = 1;
1373	goto foundpet;	1361	goto foundpet;
1374	}	1362	}
1375		1363
1376	}	1364	}
1377		1365
1378	rxvt_freecommastring (s);	1366	rxvt_free_strsplit (s);
1379	}	1367	}
1380		1368
1381	foundpet:	1369	foundpet:
1382		1370
1383	XFree (xim_styles);	1371	XFree (xim_styles);
…		…
1462	NULL);	1450	NULL);
1463	}	1451	}
1464	#if ENABLE_XIM_ONTHESPOT	1452	#if ENABLE_XIM_ONTHESPOT
1465	else if (input_style & XIMPreeditCallbacks)	1453	else if (input_style & XIMPreeditCallbacks)
1466	{	1454	{
		1455	XIMCallback xcb[4];
		1456
1467	im_set_position (spot);	1457	im_set_position (spot);
1468		1458
1469	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;
1470	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;
1471	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;
…		…
1486	#endif	1476	#endif
1487		1477
1488	Input_Context = XCreateIC (xim,	1478	Input_Context = XCreateIC (xim,
1489	XNInputStyle, input_style,	1479	XNInputStyle, input_style,
1490	XNClientWindow, vt,	1480	XNClientWindow, vt,
1491	XNFocusWindow, parent[0],	1481	XNFocusWindow, parent,
1492	preedit_attr ? XNPreeditAttributes : NULL,	1482	preedit_attr ? XNPreeditAttributes : NULL,
1493	preedit_attr,	1483	preedit_attr,
1494	status_attr ? XNStatusAttributes : NULL,	1484	status_attr ? XNStatusAttributes : NULL,
1495	status_attr, NULL);	1485	status_attr, NULL);
1496		1486
…		…
1539	p = rs[Rs_inputMethod];	1529	p = rs[Rs_inputMethod];
1540	if (p && *p)	1530	if (p && *p)
1541	{	1531	{
1542	bool found = false;	1532	bool found = false;
1543		1533
1544	s = rxvt_splitcommastring (p);	1534	s = rxvt_strsplit (',', p);
1545		1535
1546	for (i = 0; s[i]; i++)	1536	for (i = 0; s[i]; i++)
1547	{	1537	{
1548	if (*s[i])	1538	if (*s[i])
1549	{	1539	{
…		…
1555	break;	1545	break;
1556	}	1546	}
1557	}	1547	}
1558	}	1548	}
1559		1549
1560	rxvt_freecommastring (s);	1550	rxvt_free_strsplit (s);
1561		1551
1562	if (found)	1552	if (found)
1563	goto done;	1553	goto done;
1564	}	1554	}
1565		1555
…		…
1625		1615
1626	void	1616	void
1627	rxvt_term::get_window_origin (int &x, int &y)	1617	rxvt_term::get_window_origin (int &x, int &y)
1628	{	1618	{
1629	Window cr;	1619	Window cr;
1630	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1620	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1631	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
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	# if TRACE_PIXMAPS
1656	# undef update_background
1657	void
1658	rxvt_term::trace_update_background (const char *file, int line)
1659	{
1660	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1661	update_background ();
1662	}
1663	# endif
1664		1646
1665	void	1647	void
1666	rxvt_term::update_background ()	1648	rxvt_term::update_background ()
1667	{	1649	{
1668	if (update_background_ev.is_active ())	1650	if (update_background_ev.is_active ())
1669	return;	1651	return;
1670		1652
1671	bgPixmap.invalidate ();	1653	bg_invalidate ();
1672		1654
1673	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1655	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1674		1656
1675	if (to_wait <= 0.)	1657	if (to_wait <= 0.)
1676	bgPixmap.render ();	1658	bg_render ();
1677	else	1659	else
1678	update_background_ev.start (to_wait);	1660	update_background_ev.start (to_wait);
1679	}	1661	}
1680		1662
1681	void	1663	void
1682	rxvt_term::update_background_cb (ev::timer &w, int revents)	1664	rxvt_term::update_background_cb (ev::timer &w, int revents)
1683	{	1665	{
1684	make_current ();	1666	make_current ();
1685		1667
1686	update_background_ev.stop ();	1668	update_background_ev.stop ();
1687	bgPixmap.render ();	1669	bg_render ();
1688	refresh_check ();	1670	refresh_check ();
1689	}	1671	}
1690		1672
1691	#endif /* HAVE_BG_PIXMAP */	1673	#endif /* HAVE_BG_PIXMAP */
1692		1674

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.333 by root, Fri Oct 22 05:57:59 2010 UTC vs. Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.333 by root, Fri Oct 22 05:57:59 2010 UTC vs.
Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 2011 UTC