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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.345 by root, Sat Jan 8 10:17:43 2011 UTC vs.
Revision 1.376 by root, Mon Jun 4 15:18:52 2012 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.
…		…
36	#include "keyboard.h"	36	#include "keyboard.h"
37	#include "rxvtperl.h"	37	#include "rxvtperl.h"
38		38
39	#include <limits>	39	#include <limits>
40		40
41	#include <cassert>	41	#include <assert.h>
42	#include <csignal>	42	#include <signal.h>
43	#include <cstring>	43	#include <string.h>
44		44
45	#include <termios.h>	45	#include <termios.h>
46		46
47	#ifdef HAVE_XSETLOCALE	47	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	48	# define X_LOCALE
49	# include <X11/Xlocale.h>	49	# include <X11/Xlocale.h>
50	#else	50	#else
51	# ifdef HAVE_SETLOCALE
52	# include <clocale>	51	# include <locale.h>
53	# endif
54	#endif	52	#endif
55		53
56	struct termios rxvt_term::def_tio;	54	struct termios rxvt_term::def_tio;
57	vector<rxvt_term *> rxvt_term::termlist;	55	vector<rxvt_term *> rxvt_term::termlist;
58		56
…		…
105	if (cc->c2 == c2) return c1;	103	if (cc->c2 == c2) return c1;
106	cc = (*this)[cc->c1];	104	cc = (*this)[cc->c1];
107	}	105	}
108		106
109	// check to see whether this combination already exists otherwise	107	// check to see whether this combination already exists otherwise
110	for (cc = v.end (); cc-- > v.begin (); )	108	for (cc = v.begin (); cc < v.end (); cc++)
111	if (cc->c1 == c1 && cc->c2 == c2)	109	if (cc->c1 == c1 && cc->c2 == c2)
112	return COMPOSE_LO + (cc - v.begin ());	110	return COMPOSE_LO + (cc - v.begin ());
113		111
114	// allocate a new combination	112	// allocate a new combination
115	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	113	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
…		…
174	#endif	172	#endif
175	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	173	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
176	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	174	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177	#endif	175	#endif
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	176	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#ifdef USE_XIM	177	#if USE_XIM
180	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	178	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181	#endif	179	#endif
182	#ifdef POINTER_BLANK	180	#ifdef POINTER_BLANK
183	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	181	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184	#endif	182	#endif
…		…
187	#endif	185	#endif
188	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	186	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);	187	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	188	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	189	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);	190	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	191	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195		192
196	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	193	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197		194
…		…
226	delete fontset[i];	223	delete fontset[i];
227	#endif	224	#endif
228	delete fontset[0];	225	delete fontset[0];
229		226
230	#ifdef HAVE_BG_PIXMAP	227	#ifdef HAVE_BG_PIXMAP
231	bgPixmap.destroy ();	228	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	229	#endif
239		230
240	if (display)	231	if (display)
241	{	232	{
242	selection_clear ();	233	selection_clear ();
243	selection_clear (true);	234	selection_clear (true);
244		235
245	#ifdef USE_XIM	236	#if USE_XIM
246	im_destroy ();	237	im_destroy ();
247	#endif	238	#endif
248	scrollBar.destroy ();	239	scrollBar.destroy ();
249	if (gc) XFreeGC (dpy, gc);	240	if (gc) XFreeGC (dpy, gc);
250		241
251	delete drawable;	242	delete drawable;
252	// destroy all windows	243	// destroy all windows
253	if (parent[0])	244	if (parent)
254	XDestroyWindow (dpy, parent[0]);	245	XDestroyWindow (dpy, parent);
255		246
256	for (int i = 0; i < TOTAL_COLORS; i++)	247	for (int i = 0; i < TOTAL_COLORS; i++)
257	if (ISSET_PIXCOLOR (i))	248	if (ISSET_PIXCOLOR (i))
258	{	249	{
259	pix_colors_focused [i].free (this);	250	pix_colors_focused [i].free (this);
…		…
274	for (int i = 0; i < allocated.size (); i++)	265	for (int i = 0; i < allocated.size (); i++)
275	free (allocated [i]);	266	free (allocated [i]);
276		267
277	free (selection.text);	268	free (selection.text);
278	free (selection.clip_text);	269	free (selection.clip_text);
279	// TODO: manage env vars in child only(!)
280	free (env_display);
281	free (env_term);
282	free (locale);	270	free (locale);
283	free (v_buffer);	271	free (v_buffer);
284	free (incr_buf);	272
		273	delete selection_req;
285		274
286	delete envv;	275	delete envv;
287	delete argv;	276	delete argv;
288		277
289	#ifdef KEYSYM_RESOURCE	278	#ifdef KEYSYM_RESOURCE
…		…
325	#endif	314	#endif
326	scrollbar_ev.stop (display);	315	scrollbar_ev.stop (display);
327	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	316	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
328	rootwin_ev.stop (display);	317	rootwin_ev.stop (display);
329	#endif	318	#endif
330	incr_ev.stop ();
331	termwin_ev.stop (display);	319	termwin_ev.stop (display);
332	vt_ev.stop (display);	320	vt_ev.stop (display);
333	}	321	}
334		322
335	flush_ev.stop ();	323	flush_ev.stop ();
…		…
360		348
361	delete this;	349	delete this;
362	}	350	}
363		351
364	void	352	void
365	rxvt_term::set_option (uint8_t opt, bool set)	353	rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
366	{	354	{
367	if (!opt)	355	if (!opt)
368	return;	356	return;
369		357
370	uint8_t mask = 1 << (opt & 7);	358	uint8_t mask = 1 << (opt & 7);
…		…
386	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	374	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
387	(*t)->emergency_cleanup ();	375	(*t)->emergency_cleanup ();
388	}	376	}
389		377
390	#if !ENABLE_MINIMAL	378	#if !ENABLE_MINIMAL
391	static void	379	static void ecb_cold
392	print_x_error (Display dpy, XErrorEvent event)	380	print_x_error (Display dpy, XErrorEvent event)
393	{	381	{
394	char buffer[BUFSIZ];	382	char buffer[BUFSIZ];
395	char mesg[BUFSIZ];	383	char mesg[BUFSIZ];
396	char number[32];	384	char number[32];
…		…
434	mesg, BUFSIZ);	422	mesg, BUFSIZ);
435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	423	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436	}	424	}
437	#endif	425	#endif
438		426
439	int	427	int ecb_cold
440	rxvt_xerror_handler (Display display, XErrorEvent event)	428	rxvt_xerror_handler (Display display, XErrorEvent event)
441	{	429	{
442	if (GET_R->allowedxerror == -1)	430	if (GET_R->allowedxerror == -1)
443	GET_R->allowedxerror = event->error_code;	431	GET_R->allowedxerror = event->error_code;
444	else	432	else
…		…
453	}	441	}
454		442
455	return 0;	443	return 0;
456	}	444	}
457		445
458	int	446	int ecb_cold
459	rxvt_xioerror_handler (Display *display)	447	rxvt_xioerror_handler (Display *display)
460	{	448	{
461	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",	449	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
462	DisplayString (display));	450	DisplayString (display));
463	rxvt_emergency_cleanup ();	451	rxvt_emergency_cleanup ();
…		…
583	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	571	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
584	// TODO: handle this with exceptions and tolerate the memory loss	572	// TODO: handle this with exceptions and tolerate the memory loss
585	XSetIOErrorHandler (rxvt_xioerror_handler);	573	XSetIOErrorHandler (rxvt_xioerror_handler);
586		574
587	XrmInitialize ();	575	XrmInitialize ();
		576
		577	#if HAVE_PIXBUF
		578	g_type_init ();
		579	#endif
588	}	580	}
589		581
590	/----------------------------------------------------------------------/	582	/----------------------------------------------------------------------/
591	/*	583	/*
592	* window size/position calculations for XSizeHint and other storage.	584	* window size/position calculations for XSizeHint and other storage.
…		…
713	if (recalc_y)	705	if (recalc_y)
714	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	706	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
715		707
716	ncol = width / fwidth;	708	ncol = width / fwidth;
717	nrow = height / fheight;	709	nrow = height / fheight;
		710
		711	// When the size of the vt window is not a multiple of the cell
		712	// size, i.e., when the wm does not honour our size hints, there are
		713	// extra areas not covered by the terminal screen. Such gaps, when a
		714	// bg pixmap is set, would have to be cleared manually to properly
		715	// refresh the background. We take the simpler route and shrink the
		716	// vt window so as to avoid creating gaps.
		717	vt_width = ncol * fwidth;
		718	vt_height = nrow * fheight;
718	}	719	}
719		720
720	/----------------------------------------------------------------------/	721	/----------------------------------------------------------------------/
721	/*	722	/*
722	* Tell the teletype handler what size the window is.	723	* Tell the teletype handler what size the window is.
…		…
730		731
731	struct winsize ws;	732	struct winsize ws;
732		733
733	ws.ws_col = ncol;	734	ws.ws_col = ncol;
734	ws.ws_row = nrow;	735	ws.ws_row = nrow;
735	ws.ws_xpixel = width;	736	ws.ws_xpixel = vt_width;
736	ws.ws_ypixel = height;	737	ws.ws_ypixel = vt_height;
737	ioctl (pty->pty, TIOCSWINSZ, &ws);	738	ioctl (pty->pty, TIOCSWINSZ, &ws);
738		739
739	#if 0	740	#if 0
740	// TIOCSWINSZ is supposed to do this automatically and correctly	741	// TIOCSWINSZ is supposed to do this automatically and correctly
741	if (cmd_pid) /* force through to the command */	742	if (cmd_pid) /* force through to the command */
742	kill (-cmd_pid, SIGWINCH);	743	kill (-cmd_pid, SIGWINCH);
743	#endif	744	#endif
744	}	745	}
745		746
746	/----------------------------------------------------------------------/	747	/----------------------------------------------------------------------/
747	/* set_fonts () - load and set the various fonts	748	/* 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	749	bool
755	rxvt_term::set_fonts ()	750	rxvt_term::set_fonts ()
756	{	751	{
757	rxvt_fontset *fs = new rxvt_fontset (this);	752	rxvt_fontset *fs = new rxvt_fontset (this);
758	rxvt_fontprop prop;	753	rxvt_fontprop prop;
…		…
773		768
774	delete fontset[0];	769	delete fontset[0];
775	fontset[0] = fs;	770	fontset[0] = fs;
776		771
777	prop = (*fs)[rxvt_fontset::firstFont]->properties ();	772	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
778	prop.height += lineSpace;
779	prop.width += letterSpace;	773	prop.width += letterSpace;
780		774
781	fs->set_prop (prop, false);	775	fs->set_prop (prop, false);
782		776
783	fwidth = prop.width;	777	fwidth = prop.width;
784	fheight = prop.height;	778	fheight = prop.height + lineSpace;
785	fbase = prop.ascent;	779	fbase = prop.ascent;
786		780
787	for (int style = 1; style < 4; style++)	781	for (int style = 1; style < 4; style++)
788	{	782	{
789	#if ENABLE_STYLES	783	#if ENABLE_STYLES
…		…
815	#else	809	#else
816	fontset[style] = fontset[0];	810	fontset[style] = fontset[0];
817	#endif	811	#endif
818	}	812	}
819		813
820	if (parent[0])	814	if (parent)
821	{	815	{
822	resize_all_windows (0, 0, 0);	816	resize_all_windows (0, 0, 0);
823	scr_remap_chars ();	817	scr_remap_chars ();
824	scr_touch (true);	818	scr_touch (true);
825	}	819	}
…		…
828	}	822	}
829		823
830	void	824	void
831	rxvt_term::set_string_property (Atom prop, const char *str, int len)	825	rxvt_term::set_string_property (Atom prop, const char *str, int len)
832	{	826	{
833	XChangeProperty (dpy, parent[0],	827	XChangeProperty (dpy, parent,
834	prop, XA_STRING, 8, PropModeReplace,	828	prop, XA_STRING, 8, PropModeReplace,
835	(const unsigned char *)str, len >= 0 ? len : strlen (str));	829	(const unsigned char *)str, len >= 0 ? len : strlen (str));
836	}	830	}
837		831
838	void	832	void
…		…
840	{	834	{
841	XTextProperty ct;	835	XTextProperty ct;
842		836
843	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)	837	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844	{	838	{
845	XSetTextProperty (dpy, parent[0], &ct, prop);	839	XSetTextProperty (dpy, parent, &ct, prop);
846	XFree (ct.value);	840	XFree (ct.value);
847	}	841	}
848	}	842	}
849		843
850	void	844	void
851	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	845	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852	{	846	{
853	wchar_t *ws = rxvt_mbstowcs (str, len);	847	wchar_t *ws = rxvt_mbstowcs (str, len);
854	char *s = rxvt_wcstoutf8 (ws);	848	char *s = rxvt_wcstoutf8 (ws);
855		849
856	XChangeProperty (dpy, parent[0],	850	XChangeProperty (dpy, parent,
857	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	851	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858	(const unsigned char *)s, strlen (s));	852	(const unsigned char *)s, strlen (s));
859		853
860	free (s);	854	free (s);
861	free (ws);	855	free (ws);
…		…
951		945
952	/----------------------------------------------------------------------/	946	/----------------------------------------------------------------------/
953	/*	947	/*
954	* find if fg/bg matches any of the normal (low-intensity) colors	948	* find if fg/bg matches any of the normal (low-intensity) colors
955	*/	949	*/
956	void	950	char *
957	rxvt_term::set_colorfgbg ()	951	rxvt_term::get_colorfgbg ()
958	{	952	{
959	unsigned int i;	953	unsigned int i;
960	const char *xpmb = "";	954	const char *xpmb = "";
961	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	955	char fstr[] = "default";
		956	char bstr[] = "default";
		957	char *env_colorfgbg;
962		958
963	strcpy (fstr, "default");
964	strcpy (bstr, "default");
965	for (i = Color_Black; i <= Color_White; i++)	959	for (i = Color_Black; i <= Color_White; i++)
966	if (pix_colors[Color_fg] == pix_colors[i])	960	if (pix_colors[Color_fg] == pix_colors[i])
967	{	961	{
968	sprintf (fstr, "%d", i - Color_Black);	962	sprintf (fstr, "%d", i - Color_Black);
969	break;	963	break;
…		…
971		965
972	for (i = Color_Black; i <= Color_White; i++)	966	for (i = Color_Black; i <= Color_White; i++)
973	if (pix_colors[Color_bg] == pix_colors[i])	967	if (pix_colors[Color_bg] == pix_colors[i])
974	{	968	{
975	sprintf (bstr, "%d", i - Color_Black);	969	sprintf (bstr, "%d", i - Color_Black);
976	#ifdef BG_IMAGE_FROM_FILE	970	#if BG_IMAGE_FROM_FILE
977	xpmb = "default;";	971	xpmb = "default;";
978	#endif	972	#endif
979	break;	973	break;
980	}	974	}
981		975
		976	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
982	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	977	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
		978	return env_colorfgbg;
983	}	979	}
984		980
985	/----------------------------------------------------------------------/	981	/----------------------------------------------------------------------/
986		982
987	bool	983	bool
…		…
1016		1012
1017	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow	1013	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1018	if (set_hint)	1014	if (set_hint)
1019	{	1015	{
1020	szHint.flags &= ~(PBaseSize \| PResizeInc);	1016	szHint.flags &= ~(PBaseSize \| PResizeInc);
1021	XSetWMNormalHints (dpy, parent[0], &szHint);	1017	XSetWMNormalHints (dpy, parent, &szHint);
1022	szHint.flags \|= PBaseSize \| PResizeInc;	1018	szHint.flags \|= PBaseSize \| PResizeInc;
1023	}	1019	}
1024		1020
1025	if (!ignoreparent)	1021	if (!ignoreparent)
1026	{	1022	{
…		…
1032	int x, y, x1, y1;	1028	int x, y, x1, y1;
1033	int dx, dy;	1029	int dx, dy;
1034	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1030	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1035	Window unused_cr;	1031	Window unused_cr;
1036		1032
1037	XTranslateCoordinates (dpy, parent[0], display->root,	1033	XTranslateCoordinates (dpy, parent, display->root,
1038	0, 0, &x, &y, &unused_cr);	1034	0, 0, &x, &y, &unused_cr);
1039	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1035	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1040	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1036	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1041	/*	1037	/*
1042	* if display->root isn't the parent window, a WM will probably have offset	1038	* if display->root isn't the parent window, a WM will probably have offset
1043	* our position for handles and decorations. Counter it	1039	* our position for handles and decorations. Counter it
1044	*/	1040	*/
…		…
1061	if (y < y1) /* top half */	1057	if (y < y1) /* top half */
1062	dy = 0;	1058	dy = 0;
1063	else if (y == y1) /* exact center */	1059	else if (y == y1) /* exact center */
1064	dy /= 2;	1060	dy /= 2;
1065		1061
1066	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1062	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1067	szHint.width, szHint.height);	1063	szHint.width, szHint.height);
1068	#else	1064	#else
1069	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1065	XResizeWindow (dpy, parent, szHint.width, szHint.height);
1070	#endif	1066	#endif
1071	}	1067	}
1072		1068
1073	if (set_hint)	1069	if (set_hint)
1074	XSetWMNormalHints (dpy, parent[0], &szHint);	1070	XSetWMNormalHints (dpy, parent, &szHint);
1075		1071
1076	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1072	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1077		1073
1078	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1074	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1079	{	1075	{
1080	if (scrollBar.state)	1076	if (scrollBar.state)
1081	scrollBar.resize ();	1077	scrollBar.resize ();
1082		1078
1083	XMoveResizeWindow (dpy, vt,	1079	XMoveResizeWindow (dpy, vt,
1084	window_vt_x, window_vt_y,	1080	window_vt_x, window_vt_y,
1085	width, height);	1081	vt_width, vt_height);
1086		1082
1087	#ifdef HAVE_BG_PIXMAP	1083	#ifdef HAVE_BG_PIXMAP
1088	if (bgPixmap.window_size_sensitive ())	1084	if (bg_window_size_sensitive ())
1089	update_background ();	1085	update_background ();
1090	#endif	1086	#endif
1091	}	1087	}
1092		1088
1093	if (fix_screen \|\| old_height == 0)	1089	if (fix_screen \|\| old_height == 0)
1094	scr_reset ();	1090	scr_reset ();
1095		1091
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	1092	#if USE_XIM
1103	IMSetPosition ();	1093	im_set_position ();
1104	#endif	1094	#endif
1105	}	1095	}
1106		1096
1107	/*	1097	/*
1108	* Set the width/height of the vt window in characters. Units are pixels.	1098	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1121	newwidth = wattr.width - szHint.base_width;	1111	newwidth = wattr.width - szHint.base_width;
1122	if (newheight == 0)	1112	if (newheight == 0)
1123	newheight = wattr.height - szHint.base_height;	1113	newheight = wattr.height - szHint.base_height;
1124	}	1114	}
1125		1115
1126	if (newwidth != width \|\| newheight != height)	1116	if (newwidth != vt_width \|\| newheight != vt_height)
1127	{	1117	{
1128	newwidth += szHint.base_width;	1118	newwidth += szHint.base_width;
1129	newheight += szHint.base_height;	1119	newheight += szHint.base_height;
1130	resize_all_windows (newwidth, newheight, 0);	1120	resize_all_windows (newwidth, newheight, 0);
1131	}	1121	}
1132	}	1122	}
1133		1123
1134	/* -------------------------------------------------------------------- *	1124	/* -------------------------------------------------------------------- *
1135	* - X INPUT METHOD ROUTINES - *	1125	* - X INPUT METHOD ROUTINES - *
1136	* -------------------------------------------------------------------- */	1126	* -------------------------------------------------------------------- */
1137	#ifdef USE_XIM	1127	#if USE_XIM
1138		1128
1139	void	1129	void
1140	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1130	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1141	{	1131	{
1142	fg = pix_colors [Color_fg];	1132	fg = pix_colors [Color_fg];
…		…
1169	status_rect.height = fheight;	1159	status_rect.height = fheight;
1170	}	1160	}
1171		1161
1172	/* Checking whether input method is running. */	1162	/* Checking whether input method is running. */
1173	bool	1163	bool
1174	rxvt_term::IMisRunning ()	1164	rxvt_term::im_is_running ()
1175	{	1165	{
1176	Atom atom;	1166	Atom atom;
1177	Window win;	1167	Window win;
1178	char server[IMBUFSIZ];	1168	char server[IMBUFSIZ];
1179		1169
…		…
1188		1178
1189	atom = XInternAtom (dpy, server, False);	1179	atom = XInternAtom (dpy, server, False);
1190	win = XGetSelectionOwner (dpy, atom);	1180	win = XGetSelectionOwner (dpy, atom);
1191		1181
1192	if (win != None)	1182	if (win != None)
1193	return True;	1183	return true;
1194	}	1184	}
1195		1185
1196	return False;	1186	return false;
1197	}	1187	}
1198		1188
1199	void	1189	void
1200	rxvt_term::IMSendSpot ()	1190	rxvt_term::im_send_spot ()
1201	{	1191	{
1202	XPoint nspot;	1192	XPoint nspot;
1203	XVaNestedList preedit_attr;	1193	XVaNestedList preedit_attr;
1204		1194
1205	if (!Input_Context	1195	if (!Input_Context
…		…
1311	/*	1301	/*
1312	* Try to open a XIM with the current modifiers, then see if we can	1302	* Try to open a XIM with the current modifiers, then see if we can
1313	* open a suitable preedit type	1303	* open a suitable preedit type
1314	*/	1304	*/
1315	bool	1305	bool
1316	rxvt_term::IM_get_IC (const char *modifiers)	1306	rxvt_term::im_get_ic (const char *modifiers)
1317	{	1307	{
1318	int i, j, found;	1308	int i, j, found;
1319	XIM xim;	1309	XIM xim;
1320	XPoint spot;	1310	XPoint spot;
1321	XRectangle rect, status_rect, needed_rect;	1311	XRectangle rect, status_rect, needed_rect;
1322	unsigned long fg, bg;	1312	unsigned long fg, bg;
1323	const char *p;	1313	const char *p;
1324	char **s;	1314	char **s;
1325	XIMStyles *xim_styles;	1315	XIMStyles *xim_styles;
1326	#ifdef ENABLE_XIM_ONTHESPOT
1327	XIMCallback xcb[4];
1328	#endif
1329		1316
1330	set_environ (envv);	1317	set_environ (envv);
1331		1318
1332	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1319	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1333	return false;	1320	return false;
…		…
1354	p = pet[pi];	1341	p = pet[pi];
1355		1342
1356	if (!p)	1343	if (!p)
1357	continue;	1344	continue;
1358		1345
1359	s = rxvt_splitcommastring (p);	1346	s = rxvt_strsplit (',', p);
1360		1347
1361	for (i = found = 0; !found && s[i]; i++)	1348	for (i = found = 0; !found && s[i]; i++)
1362	{	1349	{
1363	if (!strcmp (s[i], "OverTheSpot"))	1350	if (!strcmp (s[i], "OverTheSpot"))
1364	input_style = XIMPreeditPosition \| XIMStatusNothing;	1351	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1376	input_style = XIMPreeditNothing \| XIMStatusNothing;	1363	input_style = XIMPreeditNothing \| XIMStatusNothing;
1377		1364
1378	for (j = 0; j < xim_styles->count_styles; j++)	1365	for (j = 0; j < xim_styles->count_styles; j++)
1379	if (input_style == xim_styles->supported_styles[j])	1366	if (input_style == xim_styles->supported_styles[j])
1380	{	1367	{
1381	rxvt_freecommastring (s);	1368	rxvt_free_strsplit (s);
1382		1369
1383	found = 1;	1370	found = 1;
1384	goto foundpet;	1371	goto foundpet;
1385	}	1372	}
1386		1373
1387	}	1374	}
1388		1375
1389	rxvt_freecommastring (s);	1376	rxvt_free_strsplit (s);
1390	}	1377	}
1391		1378
1392	foundpet:	1379	foundpet:
1393		1380
1394	XFree (xim_styles);	1381	XFree (xim_styles);
…		…
1473	NULL);	1460	NULL);
1474	}	1461	}
1475	#if ENABLE_XIM_ONTHESPOT	1462	#if ENABLE_XIM_ONTHESPOT
1476	else if (input_style & XIMPreeditCallbacks)	1463	else if (input_style & XIMPreeditCallbacks)
1477	{	1464	{
		1465	XIMCallback xcb[4];
		1466
1478	im_set_position (spot);	1467	im_set_position (spot);
1479		1468
1480	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;	1469	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;	1470	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;	1471	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
…		…
1497	#endif	1486	#endif
1498		1487
1499	Input_Context = XCreateIC (xim,	1488	Input_Context = XCreateIC (xim,
1500	XNInputStyle, input_style,	1489	XNInputStyle, input_style,
1501	XNClientWindow, vt,	1490	XNClientWindow, vt,
1502	XNFocusWindow, parent[0],	1491	XNFocusWindow, parent,
1503	preedit_attr ? XNPreeditAttributes : NULL,	1492	preedit_attr ? XNPreeditAttributes : NULL,
1504	preedit_attr,	1493	preedit_attr,
1505	status_attr ? XNStatusAttributes : NULL,	1494	status_attr ? XNStatusAttributes : NULL,
1506	status_attr, NULL);	1495	status_attr, NULL);
1507		1496
…		…
1520	// unfortunately, only the focus window is used by XIM, hard to fix	1509	// unfortunately, only the focus window is used by XIM, hard to fix
1521	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1510	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1522	vt_select_input ();	1511	vt_select_input ();
1523	#endif	1512	#endif
1524		1513
1525	IMSetPosition ();	1514	im_set_position ();
1526		1515
1527	return true;	1516	return true;
1528	}	1517	}
1529		1518
1530	void	1519	void
…		…
1540	im_destroy ();	1529	im_destroy ();
1541		1530
1542	if (Input_Context)	1531	if (Input_Context)
1543	return;	1532	return;
1544		1533
1545	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1546	if (rs[Rs_imLocale])	1534	if (rs[Rs_imLocale])
1547	SET_LOCALE (rs[Rs_imLocale]);	1535	SET_LOCALE (rs[Rs_imLocale]);
1548	#endif
1549		1536
1550	p = rs[Rs_inputMethod];	1537	p = rs[Rs_inputMethod];
1551	if (p && *p)	1538	if (p && *p)
1552	{	1539	{
1553	bool found = false;	1540	bool found = false;
1554		1541
1555	s = rxvt_splitcommastring (p);	1542	s = rxvt_strsplit (',', p);
1556		1543
1557	for (i = 0; s[i]; i++)	1544	for (i = 0; s[i]; i++)
1558	{	1545	{
1559	if (*s[i])	1546	if (*s[i])
1560	{	1547	{
1561	strcpy (buf, "@im=");	1548	strcpy (buf, "@im=");
1562	strncat (buf, s[i], IMBUFSIZ - 5);	1549	strncat (buf, s[i], IMBUFSIZ - 5);
1563	if (IM_get_IC (buf))	1550	if (im_get_ic (buf))
1564	{	1551	{
1565	found = true;	1552	found = true;
1566	break;	1553	break;
1567	}	1554	}
1568	}	1555	}
1569	}	1556	}
1570		1557
1571	rxvt_freecommastring (s);	1558	rxvt_free_strsplit (s);
1572		1559
1573	if (found)	1560	if (found)
1574	goto done;	1561	goto done;
1575	}	1562	}
1576		1563
1577	/* try with XMODIFIERS env. var. */	1564	/* try with XMODIFIERS env. var. */
1578	if (IM_get_IC (""))	1565	if (im_get_ic (""))
1579	goto done;	1566	goto done;
1580		1567
1581	/* try with no modifiers base IF the user didn't specify an IM */	1568	/* try with no modifiers base IF the user didn't specify an IM */
1582	if (IM_get_IC ("@im=none"))	1569	if (im_get_ic ("@im=none"))
1583	goto done;	1570	goto done;
1584		1571
1585	done:	1572	done:
1586	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1587	if (rs[Rs_imLocale])	1573	if (rs[Rs_imLocale])
1588	SET_LOCALE (locale);	1574	SET_LOCALE (locale);
1589	#endif
1590	}	1575	}
1591		1576
1592	void	1577	void
1593	rxvt_term::IMSetPosition ()	1578	rxvt_term::im_set_position ()
1594	{	1579	{
1595	XRectangle preedit_rect, status_rect, *needed_rect;	1580	XRectangle preedit_rect, status_rect, *needed_rect;
1596	XVaNestedList preedit_attr, status_attr;	1581	XVaNestedList preedit_attr, status_attr;
1597		1582
1598	if (!Input_Context	1583	if (!Input_Context
1599	\|\| !focus	1584	\|\| !focus
1600	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))	1585	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1601	\|\| !IMisRunning ())	1586	\|\| !im_is_running ())
1602	return;	1587	return;
1603		1588
1604	if (input_style & XIMPreeditPosition)	1589	if (input_style & XIMPreeditPosition)
1605	{	1590	{
1606	im_set_size (preedit_rect);	1591	im_set_size (preedit_rect);
…		…
1636		1621
1637	void	1622	void
1638	rxvt_term::get_window_origin (int &x, int &y)	1623	rxvt_term::get_window_origin (int &x, int &y)
1639	{	1624	{
1640	Window cr;	1625	Window cr;
1641	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1626	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1642	}
1643
1644	Pixmap
1645	rxvt_term::get_pixmap_property (Atom property)
1646	{
1647	Pixmap pixmap = None;
1648
1649	int aformat;
1650	unsigned long nitems, bytes_after;
1651	Atom atype;
1652	unsigned char *prop;
1653	int result = XGetWindowProperty (dpy, display->root, property,
1654	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1655	&nitems, &bytes_after, &prop);
1656	if (result == Success)
1657	{
1658	if (atype == XA_PIXMAP)
1659	pixmap = (Pixmap )prop;
1660	XFree (prop);
1661	}
1662
1663	return pixmap;
1664	}	1627	}
1665		1628
1666	#ifdef HAVE_BG_PIXMAP	1629	#ifdef HAVE_BG_PIXMAP
1667		1630
1668	void	1631	void
1669	rxvt_term::update_background ()	1632	rxvt_term::update_background ()
1670	{	1633	{
1671	if (update_background_ev.is_active ())	1634	if (update_background_ev.is_active ())
1672	return;	1635	return;
1673		1636
1674	bgPixmap.invalidate ();	1637	bg_invalidate ();
1675		1638
		1639	if (!mapped)
		1640	return;
		1641
1676	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1642	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1677		1643
1678	if (to_wait <= 0.)	1644	if (to_wait <= 0.)
1679	bgPixmap.render ();	1645	bg_render ();
1680	else	1646	else
1681	update_background_ev.start (to_wait);	1647	update_background_ev.start (to_wait);
1682	}	1648	}
1683		1649
1684	void	1650	void
1685	rxvt_term::update_background_cb (ev::timer &w, int revents)	1651	rxvt_term::update_background_cb (ev::timer &w, int revents)
1686	{	1652	{
1687	make_current ();	1653	make_current ();
1688		1654
1689	update_background_ev.stop ();	1655	update_background_ev.stop ();
1690	bgPixmap.render ();	1656	bg_render ();
1691	refresh_check ();	1657	refresh_check ();
1692	}	1658	}
1693		1659
1694	#endif /* HAVE_BG_PIXMAP */	1660	#endif /* HAVE_BG_PIXMAP */
1695		1661

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.345 by root, Sat Jan 8 10:17:43 2011 UTC vs. Revision 1.376 by root, Mon Jun 4 15:18:52 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.345 by root, Sat Jan 8 10:17:43 2011 UTC vs.
Revision 1.376 by root, Mon Jun 4 15:18:52 2012 UTC