ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.31 by pcg, Fri Feb 13 12:11:05 2004 UTC vs.
Revision 1.181 by root, Tue Jan 17 06:06:42 2006 UTC

1	/*--------------------------------*-C-*---------------------------------*	1	/*--------------------------------*-C-*---------------------------------*
2	* File: main.c	2	* File: main.C
3	*----------------------------------------------------------------------*	3	*----------------------------------------------------------------------*
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7	* - original version	7	* - original version
…		…
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-2006 Marc Lehmann <pcg@goof.com>
16	*	17	*
17	* 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
18	* 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
19	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
20	* (at your option) any later version.	21	* (at your option) any later version.
…		…
29	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
30	*---------------------------------------------------------------------*/	31	*---------------------------------------------------------------------*/
31		32
32	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
33	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
34	#include "main.intpro" /* PROTOS for internal routines */	35	#include "keyboard.h"
		36	#include "rxvtperl.h"
35		37
		38	#include <limits>
		39
36	#include <signal.h>	40	#include <csignal>
		41	#include <cstring>
37		42
38	#ifdef TTY_GID_SUPPORT	43	#ifdef TTY_GID_SUPPORT
39	# include <grp.h>	44	# include <grp.h>
40	#endif	45	#endif
41		46
42	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
43	# include <termios.h>	48	# include <termios.h>
44	#endif	49	#endif
45		50
46	#include <cstring>	51	#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
		52	static uid_t saved_euid;
		53	static gid_t saved_egid;
		54	#endif
47		55
		56	bool
		57	rxvt_tainted ()
		58	{
		59	#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
		60	return getuid () != saved_euid || getgid () != saved_egid;
		61	#else
		62	return false;
		63	#endif
		64	}
		65
		66	vector<rxvt_term *> rxvt_term::termlist;
		67
48	static char curlocale[128];	68	static char curlocale[128], savelocale[128];
49		69
50	void	70	bool
51	rxvt_set_locale (const char *locale)	71	rxvt_set_locale (const char *locale)
52	{	72	{
53	if (locale && STRNCMP (locale, curlocale, 128))	73	if (!locale || !strncmp (locale, curlocale, 128))
54	{	74	return false;
		75
55	STRNCPY (curlocale, locale, 128);	76	strncpy (curlocale, locale, 128);
56	setlocale (LC_CTYPE, curlocale);	77	setlocale (LC_CTYPE, curlocale);
57	}	78	return true;
58	}	79	}
59		80
60	void *	81	void
61	rxvt_term::operator new (size_t s)	82	rxvt_push_locale (const char *locale)
62	{	83	{
63	void *p = malloc (s);	84	strcpy (savelocale, curlocale);
		85	rxvt_set_locale (locale);
		86	}
64		87
65	MEMSET (p, 0, s);	88	void
		89	rxvt_pop_locale ()
		90	{
		91	rxvt_set_locale (savelocale);
		92	}
		93
		94	#if ENABLE_COMBINING
		95	class rxvt_composite_vec rxvt_composite;
		96
		97	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
		98	{
		99	compose_char *cc;
		100
		101	// break compose chains, as stupid readline really likes to duplicate
		102	// composing characters for some reason near the end of a line.
		103	cc = (*this)[c1];
		104	while (cc)
		105	{
		106	if (cc->c2 == c2) return c1;
		107	cc = (*this)[cc->c1];
		108	}
		109
		110	// check to see wether this combination already exists otherwise
		111	for (cc = v.end (); cc-- > v.begin (); )
		112	{
		113	if (cc->c1 == c1 && cc->c2 == c2)
		114	return COMPOSE_LO + (cc - v.begin ());
		115	}
		116
		117	// allocate a new combination
		118	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
		119	{
		120	static int seen;
		121
		122	if (!seen++)
		123	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
		124
		125	return REPLACEMENT_CHAR;
		126	}
		127
		128	v.push_back (compose_char (c1, c2));
		129
		130	return v.size () - 1 + COMPOSE_LO;
		131	}
		132
		133	int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
		134	{
		135	compose_char *cc = (*this)[c];
		136
		137	if (!cc)
		138	{
		139	if (r) *r = c;
		140	return 1;
		141	}
		142
		143	int len = expand (cc->c1, r);
		144
		145	if (r) r += len;
		146
		147	if (cc->c2 != NOCHAR)
		148	{
		149	len++;
		150	if (r) *r++ = cc->c2;
		151	}
		152
66	return p;	153	return len;
67	}
68		154
69	void
70	rxvt_term::operator delete (void *p, size_t s)
71	{
72	free (p);
73	}	155	}
		156	#endif
74		157
75	rxvt_term::rxvt_term ()	158	rxvt_term::rxvt_term ()
76	:	159	:
		160	#if TRANSPARENT
77	rootwin_ev (this, &rxvt_term::rootwin_cb),	161	rootwin_ev (this, &rxvt_term::rootwin_cb),
		162	#endif
		163	#ifdef HAVE_SCROLLBARS
		164	scrollbar_ev (this, &rxvt_term::x_cb),
		165	#endif
		166	#ifdef CURSOR_BLINK
		167	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
		168	#endif
		169	#ifdef TEXT_BLINK
		170	text_blink_ev (this, &rxvt_term::text_blink_cb),
		171	#endif
		172	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		173	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
		174	#endif
		175	#ifdef SELECTION_SCROLLING
		176	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
		177	#endif
		178	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		179	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
		180	#endif
		181	#ifdef POINTER_BLANK
		182	pointer_ev (this, &rxvt_term::pointer_cb),
		183	#endif
		184	#ifdef USE_XIM
		185	im_ev (this, &rxvt_term::im_cb),
		186	#endif
78	termwin_ev (this, &rxvt_term::x_cb),	187	termwin_ev (this, &rxvt_term::x_cb),
79	vt_ev (this, &rxvt_term::x_cb),	188	vt_ev (this, &rxvt_term::x_cb),
80	#ifdef HAVE_SCROLLBARS
81	scrollbar_ev (this, &rxvt_term::x_cb),
82	#endif
83	#ifdef MENUBAR
84	menubar_ev (this, &rxvt_term::x_cb), fixme
85	#endif
86	#ifdef CURSOR_BLINK
87	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88	#endif
89	#ifdef TEXT_BLINK
90	text_blink_ev (this, &rxvt_term::text_blink_cb),
91	#endif
92	#ifdef POINTER_BLANK
93	pointer_ev (this, &rxvt_term::pointer_cb),
94	#endif
95	check_ev (this, &rxvt_term::check_cb),	189	check_ev (this, &rxvt_term::check_cb),
		190	flush_ev (this, &rxvt_term::flush_cb),
96	destroy_ev (this, &rxvt_term::destroy_cb),	191	destroy_ev (this, &rxvt_term::destroy_cb),
97	pty_ev (this, &rxvt_term::pty_cb),	192	pty_ev (this, &rxvt_term::pty_cb),
98	incr_ev (this, &rxvt_term::incr_cb),	193	incr_ev (this, &rxvt_term::incr_cb)
99	#ifdef USE_XIM
100	im_ev (this, &rxvt_term::im_cb)
101	#endif
102	{	194	{
103	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
104	}
105		196
106	rxvt_term::~rxvt_term ()	197	termlist.push_back (this);
		198
		199	#ifdef KEYSYM_RESOURCE
		200	keyboard = new keyboard_manager;
		201
		202	if (!keyboard)
		203	rxvt_fatal ("out of memory, aborting.\n");
		204	#endif
		205	}
		206
		207	// clean up the most important stuff, do *not* call x or free mem etc.
		208	// for use before an emergency exit
		209	void rxvt_term::emergency_cleanup ()
107	{	210	{
108	if (cmd_fd >= 0)	211	if (cmd_pid)
109	close (cmd_fd);	212	kill (-cmd_pid, SIGHUP);
110		213
111	scr_release ();
112
113	free (locale);
114	free (codeset);
115
116	#ifndef NO_SETOWNER_TTYDEV
117	privileged_ttydev (RESTORE);
118	#endif
119	#ifdef UTMP_SUPPORT	214	#ifdef UTMP_SUPPORT
120	privileged_utmp (RESTORE);	215	privileged_utmp (RESTORE);
121	#endif	216	#endif
122		217
		218	pty.put ();
		219	}
		220
		221	rxvt_term::~rxvt_term ()
		222	{
		223	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		224
		225	termlist.erase (find (termlist.begin (), termlist.end(), this));
		226
		227	emergency_cleanup ();
		228
		229	#if ENABLE_STYLES
		230	for (int i = RS_styleCount; --i; )
		231	if (fontset[i] != fontset[0])
		232	delete fontset[i];
		233	#endif
		234	delete fontset[0];
		235
		236	if (display)
		237	{
		238	dDisp;
		239
		240	selection_clear ();
		241
		242	#ifdef USE_XIM
		243	im_destroy ();
		244	#endif
		245	#ifdef XTERM_SCROLLBAR
		246	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
		247	if (ShadowGC) XFreeGC (disp, ShadowGC);
		248	#endif
		249	#ifdef PLAIN_SCROLLBAR
		250	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
		251	#endif
		252	#ifdef NEXT_SCROLLBAR
		253	if (blackGC) XFreeGC (disp, blackGC);
		254	if (whiteGC) XFreeGC (disp, whiteGC);
		255	if (grayGC) XFreeGC (disp, grayGC);
		256	if (darkGC) XFreeGC (disp, darkGC);
		257	if (stippleGC) XFreeGC (disp, stippleGC);
		258	if (dimple) XFreePixmap (disp, dimple);
		259	if (upArrow) XFreePixmap (disp, upArrow);
		260	if (downArrow) XFreePixmap (disp, downArrow);
		261	if (upArrowHi) XFreePixmap (disp, upArrowHi);
		262	if (downArrowHi) XFreePixmap (disp, downArrowHi);
		263	#endif
		264	#ifdef RXVT_SCROLLBAR
		265	if (topShadowGC) XFreeGC (disp, topShadowGC);
		266	if (botShadowGC) XFreeGC (disp, botShadowGC);
		267	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
		268	#endif
		269	if (gc) XFreeGC (disp, gc);
		270
		271	delete drawable;
		272	// destroy all windows
		273	if (parent[0])
		274	XDestroyWindow (disp, parent[0]);
		275	}
		276
123	// TODO: free pixcolours, colours should become part of rxvt_display	277	// TODO: free pixcolours, colours should become part of rxvt_display
124		278	delete pix_colors_focused;
125	delete PixColors;	279	#if OFF_FOCUS_FADING
126	delete TermWin.fontset;	280	delete pix_colors_unfocused;
		281	#endif
127		282
128	displays.put (display);	283	displays.put (display);
		284
		285	scr_release ();
		286
		287	/* clear all resources */
		288	for (int i = 0; i < allocated.size (); i++)
		289	free (allocated [i]);
		290
		291	free (selection.text);
		292	// TODO: manage env vars in child only(!)
		293	free (env_windowid);
		294	free (env_display);
		295	free (env_term);
		296	free (env_colorfgbg);
		297	free (locale);
		298	free (v_buffer);
		299	free (incr_buf);
		300
		301	delete envv;
		302	delete argv;
		303
		304	#ifdef KEYSYM_RESOURCE
		305	delete keyboard;
		306	#endif
		307	}
		308
		309	void
		310	rxvt_term::child_exit ()
		311	{
		312	cmd_pid = 0;
		313
		314	if (!OPTION (Opt_hold))
		315	destroy ();
129	}	316	}
130		317
131	void	318	void
132	rxvt_term::destroy ()	319	rxvt_term::destroy ()
133	{	320	{
		321	if (destroy_ev.active)
		322	return;
		323
		324	#if ENABLE_OVERLAY
		325	scr_overlay_off ();
		326	#endif
		327
134	if (display)	328	if (display)
135	{	329	{
136	if (TermWin.parent[0])	330	#if USE_XIM
137	XDestroyWindow (display->display, TermWin.parent[0]);	331	im_ev.stop (display);
138		332	#endif
		333	#if HAVE_SCROLLBARS
		334	scrollbar_ev.stop (display);
		335	#endif
		336	#if TRANSPARENT
139	rootwin_ev.stop (display);	337	rootwin_ev.stop (display);
		338	#endif
		339	incr_ev.stop ();
140	termwin_ev.stop (display);	340	termwin_ev.stop (display);
141	vt_ev.stop (display);	341	vt_ev.stop (display);
142
143	#ifdef USE_XIM
144	im_destroy ();
145	im_ev.stop (display);
146	#endif
147	#ifdef HAVE_SCROLLBARS
148	scrollbar_ev.stop (display);
149	#endif
150	#ifdef MENUBAR
151	menubar_ev.stop (display);
152	#endif
153	}	342	}
154		343
155	check_ev.stop ();	344	check_ev.stop ();
156	pty_ev.stop ();	345	pty_ev.stop ();
157	#ifdef CURSOR_BLINK	346	#ifdef CURSOR_BLINK
158	cursor_blink_ev.stop ();	347	cursor_blink_ev.stop ();
159	#endif	348	#endif
160	#ifdef TEXT_BLINK	349	#ifdef TEXT_BLINK
161	text_blink_ev.stop ();	350	text_blink_ev.stop ();
162	#endif	351	#endif
		352	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		353	cont_scroll_ev.stop ();
		354	#endif
		355	#ifdef SELECTION_SCROLLING
		356	sel_scroll_ev.stop ();
		357	#endif
163	#ifdef POINTER_BLANK	358	#ifdef POINTER_BLANK
164	pointer_ev.stop ();	359	pointer_ev.stop ();
165	#endif	360	#endif
166		361
167	destroy_ev.start (0);	362	destroy_ev.start (0);
168	}	363	}
169		364
170	void	365	void
171	rxvt_term::destroy_cb (time_watcher &w)	366	rxvt_term::destroy_cb (time_watcher &w)
172	{	367	{
173	SET_R (this);	368	make_current ();
174		369
175	delete this;	370	delete this;
176	}	371	}
177		372
178	/*----------------------------------------------------------------------*/	373	/*----------------------------------------------------------------------*/
179	/* rxvt_init() */	374	/*
180	/* LIBPROTO */	375	* Exit gracefully, clearing the utmp entry and restoring tty attributes
181	rxvt_t	376	* TODO: if debugging, this should free up any known resources if we can
182	rxvt_init (int argc, const char *const *argv)	377	*/
183	{	378	static XErrorHandler old_xerror_handler;
184	SET_R (new rxvt_term);
185		379
186	if (!GET_R->init_vars () || !GET_R->init (argc, argv))	380	static void
		381	rxvt_emergency_cleanup ()
		382	{
		383	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
		384	(*t)->emergency_cleanup ();
		385	}
		386
		387	#if ENABLE_FRILLS
		388	static void
		389	print_x_error (Display *dpy, XErrorEvent *event)
		390	{
		391	char buffer[BUFSIZ];
		392	char mesg[BUFSIZ];
		393	char number[32];
		394	char *mtype = "XlibMessage";
		395	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
		396	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
		397	rxvt_warn ("An X Error occured, trying to continue after report.\n");
		398	rxvt_warn ("%s: %s\n", mesg, buffer);
		399	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
		400	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
		401	sprintf(number, "%d", event->request_code);
		402	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
		403	rxvt_warn ("(which is %s)\n", buffer);
		404	if (event->request_code >= 128) {
		405	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
		406	mesg, BUFSIZ);
		407	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
187	{	408	}
188	delete GET_R;	409	if ((event->error_code == BadWindow) ||
189	SET_R (0);	410	(event->error_code == BadPixmap) ||
		411	(event->error_code == BadCursor) ||
		412	(event->error_code == BadFont) ||
		413	(event->error_code == BadDrawable) ||
		414	(event->error_code == BadColor) ||
		415	(event->error_code == BadGC) ||
		416	(event->error_code == BadIDChoice) ||
		417	(event->error_code == BadValue) ||
		418	(event->error_code == BadAtom)) {
		419	if (event->error_code == BadValue)
		420	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
		421	mesg, BUFSIZ);
		422	else if (event->error_code == BadAtom)
		423	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
		424	mesg, BUFSIZ);
		425	else
		426	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
		427	mesg, BUFSIZ);
		428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
190	}	429	}
191		430	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
192	return GET_R;	431	mesg, BUFSIZ);
		432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
193	}	433	}
		434	#endif
194		435
		436	int
195	static int (*old_xerror_handler)(Display *dpy, XErrorEvent *event);	437	rxvt_xerror_handler (Display *display, XErrorEvent *event)
196
197	void
198	rxvt_init_signals ()
199	{	438	{
200	/* install exit handler for cleanup */	439	if (GET_R->allowedxerror == -1)
201	#if 0	440	GET_R->allowedxerror = event->error_code;
202	#ifdef HAVE_ATEXIT	441	else
203	atexit(rxvt_clean_exit);	442	{
		443	// GET_R is most likely not the terminal which caused the error,
		444	// so just output the error and continue
		445	#if ENABLE_FRILLS
		446	print_x_error (display, event);
204	#else	447	#else
		448	old_xerror_handler (display, event);
205	#endif	449	#endif
206	#endif	450	}
207		451
208	struct sigaction sa;	452	return 0;
209
210	sigfillset (&sa.sa_mask);
211	sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
212	sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
213	sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
214	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
215	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
216	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
217	sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
218
219	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
220	/* signal (SIGURG, SIG_DFL); */
221
222	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
223	//XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
224	}	453	}
225		454
		455	int
		456	rxvt_xioerror_handler (Display *display)
		457	{
		458	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
		459	DisplayString (display));
		460	rxvt_emergency_cleanup ();
		461	_exit (EXIT_FAILURE);
		462	}
		463
		464	/*----------------------------------------------------------------------*/
226	bool	465	bool
227	rxvt_term::init (int argc, const char *const *argv)	466	rxvt_term::init (int argc, const char *const *argv)
228	{	467	{
		468	SET_R (this);
		469	set_locale ("");
		470	set_environ (envv); // few things in X do not call setlocale :(
		471
		472	if (!init_vars ())
		473	return false;
		474
		475	init_secondary ();
		476
		477	const char **cmd_argv = init_resources (argc, argv);
		478
		479	#ifdef KEYSYM_RESOURCE
		480	keyboard->register_done ();
		481	#endif
		482
		483	#ifdef HAVE_SCROLLBARS
		484	if (OPTION (Opt_scrollBar))
		485	scrollBar.setIdle (); /* set existence for size calculations */
		486	#endif
		487
		488	#if ENABLE_PERL
		489	if (!rs[Rs_perl_ext_1])
		490	rs[Rs_perl_ext_1] = "default";
		491
		492	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		493	|| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		494	|| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		495	{
		496	#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
		497	// ignore some perl-related arguments if some bozo installed us set[ug]id
		498	if (rxvt_tainted ())
		499	{
		500	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
		501	|| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		502	{
		503	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
		504	rs[Rs_perl_lib] = 0;
		505	rs[Rs_perl_eval] = 0;
		506	}
		507	}
		508	#endif
		509	rxvt_perl.init (this);
		510	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		511	}
		512	#endif
		513
		514	create_windows (argc, argv);
		515
		516	dDisp;
		517
		518	init_xlocale ();
		519
		520	scr_reset (); // initialize screen
		521
		522	#if 0
		523	XSynchronize (disp, True);
		524	#endif
		525
		526	#ifdef HAVE_SCROLLBARS
		527	if (OPTION (Opt_scrollBar))
		528	resize_scrollbar (); /* create and map scrollbar */
		529	#endif
		530	#ifdef TRANSPARENT
		531	if (OPTION (Opt_transparent))
		532	{
		533	XSelectInput (disp, display->root, PropertyChangeMask);
		534	check_our_parents ();
		535	rootwin_ev.start (display, display->root);
		536	}
		537	#endif
		538
		539	XMapWindow (disp, vt);
		540	XMapWindow (disp, parent[0]);
		541
		542	set_colorfgbg ();
		543
		544	init_command (cmd_argv);
		545
		546	free (cmd_argv);
		547
		548	if (pty.pty >= 0)
		549	pty_ev.start (pty.pty, EVENT_READ);
		550
		551	check_ev.start ();
		552
		553	HOOK_INVOKE ((this, HOOK_START, DT_END));
		554
		555	return true;
		556	}
		557
		558	static struct sig_handlers
		559	{
		560	sig_watcher sw_chld, sw_term, sw_int;
		561
		562	void sig_chld (sig_watcher &w)
		563	{
		564	// we are being called for every SIGCHLD, find the corresponding term
		565	int pid;
		566
		567	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
		568	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
		569	if (pid == (*t)->cmd_pid)
		570	{
		571	(*t)->child_exit ();
		572	break;
		573	}
		574	}
		575
		576	/*
		577	* Catch a fatal signal and tidy up before quitting
		578	*/
		579	void
		580	sig_term (sig_watcher &w)
		581	{
		582	#ifdef DEBUG_CMD
		583	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
		584	#endif
		585	rxvt_emergency_cleanup ();
		586	signal (w.signum, SIG_DFL);
		587	kill (getpid (), w.signum);
		588	}
		589
		590	sig_handlers ()
		591	: sw_chld (this, &sig_handlers::sig_chld),
		592	sw_term (this, &sig_handlers::sig_term),
		593	sw_int (this, &sig_handlers::sig_term)
		594	{
		595	}
		596	} sig_handlers;
		597
		598	char **rxvt_environ; // startup environment
		599
		600	void
		601	rxvt_init ()
		602	{
		603	rxvt_environ = environ;
		604
229	/*	605	/*
230	* Save and then give up any super-user privileges	606	* Save and then give up any super-user privileges
231	* If we need privileges in any area then we must specifically request it.	607	* If we need privileges in any area then we must specifically request it.
232	* We should only need to be root in these cases:	608	* We should only need to be root in these cases:
233	* 1. write utmp entries on some systems	609	* 1. write utmp entries on some systems
234	* 2. chown tty on some systems	610	* 2. chown tty on some systems
235	*/	611	*/
236	privileges (SAVE);	612	rxvt_privileges (SAVE);
237	privileges (IGNORE);	613	rxvt_privileges (IGNORE);
238		614
239	init_secondary ();	615	signal (SIGHUP, SIG_IGN);
		616	signal (SIGPIPE, SIG_IGN);
240		617
241	const char **cmd_argv = init_resources (argc, argv);	618	sig_handlers.sw_chld.start (SIGCHLD);
		619	sig_handlers.sw_term.start (SIGTERM);
		620	sig_handlers.sw_int.start (SIGINT);
242		621
243	set_locale ("");	622	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
		623	/* signal (SIGURG, SIG_DFL); */
244		624
245	#if (MENUBAR_MAX)	625	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
246	menubar_read (rs[Rs_menu]);	626	// TODO: handle this with exceptions and tolerate the memory loss
247	#endif	627	XSetIOErrorHandler (rxvt_xioerror_handler);
248	#ifdef HAVE_SCROLLBARS
249	if (Options & Opt_scrollBar)
250	scrollBar.setIdle (); /* set existence for size calculations */
251	#endif
252		628
253	create_windows (argc, argv);	629	XrmInitialize ();
254
255	init_xlocale ();
256
257	scr_reset (); /* initialize screen */
258	#ifdef RXVT_GRAPHICS
259	Gr_reset (); /* reset graphics */
260	#endif
261
262	#if 0
263	#ifdef DEBUG_X
264	XSynchronize(display->display, True);
265	#endif
266	#endif
267
268	#ifdef HAVE_SCROLLBARS
269	if (Options & Opt_scrollBar)
270	resize_scrollbar (); /* create and map scrollbar */
271	#endif
272	#if (MENUBAR_MAX)
273	if (menubar_visible(r))
274	XMapWindow (display->display, menuBar.win);
275	#endif
276	#ifdef TRANSPARENT
277	if (Options & Opt_transparent)
278	{
279	XSelectInput (display->display, display->root, PropertyChangeMask);
280	check_our_parents ();
281	}
282	#endif
283
284	rootwin_ev.start (display, display->root);
285
286	XMapWindow (display->display, TermWin.vt);
287	XMapWindow (display->display, TermWin.parent[0]);
288
289	init_env ();
290	init_command (cmd_argv);
291
292	pty_ev.start (cmd_fd, EVENT_READ);
293
294	check_ev.start ();
295
296	return true;
297	}
298
299	/* ------------------------------------------------------------------------- *
300	* SIGNAL HANDLING & EXIT HANDLER *
301	* ------------------------------------------------------------------------- */
302	/*
303	* Catch a SIGCHLD signal and exit if the direct child has died
304	*/
305	/* ARGSUSED */
306	/* EXTPROTO */
307	RETSIGTYPE
308	rxvt_Child_signal(int sig __attribute__ ((unused)))
309	{
310	int pid, save_errno = errno;
311	while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
312	;
313	errno = save_errno;
314
315	#if 0
316	if (pid == cmd_pid)
317	exit (EXIT_SUCCESS);
318	#endif
319	}
320
321	/*
322	* Catch a fatal signal and tidy up before quitting
323	*/
324	/* EXTPROTO */
325	RETSIGTYPE
326	rxvt_Exit_signal(int sig)
327	{
328	signal (sig, SIG_DFL);
329	#ifdef DEBUG_CMD
330	rxvt_print_error ("signal %d", sig);
331	#endif
332	rxvt_clean_exit();
333	kill (getpid (), sig);
334	}
335
336	/* INTPROTO */
337	int
338	rxvt_xerror_handler (Display *display, XErrorEvent *event)
339	{
340	if (GET_R->allowedxerror == -1)
341	GET_R->allowedxerror = event->error_code;
342	else
343	{
344	old_xerror_handler (display, event);
345	GET_R->destroy ();
346	}
347
348	return 0;
349	}
350
351	/*----------------------------------------------------------------------*/
352	/*
353	* Exit gracefully, clearing the utmp entry and restoring tty attributes
354	* TODO: if debugging, this should free up any known resources if we can
355	*/
356	/* EXTPROTO */
357	void
358	rxvt_clean_exit ()
359	{
360	// TODO: rxvtd should clean up all ressources
361	if (GET_R)
362	GET_R->destroy ();
363	}	630	}
364		631
365	/* ------------------------------------------------------------------------- *	632	/* ------------------------------------------------------------------------- *
366	* MEMORY ALLOCATION WRAPPERS *	633	* MEMORY ALLOCATION WRAPPERS *
367	* ------------------------------------------------------------------------- */	634	* ------------------------------------------------------------------------- */
368	/* EXTPROTO */	635	void *
		636	rxvt_malloc (size_t size)
		637	{
		638	void *p = malloc (size);
		639
		640	if (!p)
		641	rxvt_fatal ("memory allocation failure. aborting.\n");
		642
		643	return p;
		644	}
		645
		646	void *
		647	rxvt_calloc (size_t number, size_t size)
		648	{
		649	void *p = calloc (number, size);
		650
		651	if (!p)
		652	rxvt_fatal ("memory allocation failure. aborting.\n");
		653
		654	return p;
		655	}
		656
369	void *	657	void *
370	rxvt_malloc(size_t size)
371	{
372	void *p;
373
374	p = malloc(size);
375	if (p)
376	return p;
377
378	fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
379	rxvt_clean_exit();
380	exit(EXIT_FAILURE);
381	/* NOTREACHED */
382	}
383
384	/* EXTPROTO */
385	void *
386	rxvt_calloc(size_t number, size_t size)
387	{
388	void *p;
389
390	p = calloc(number, size);
391	if (p)
392	return p;
393
394	fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
395	rxvt_clean_exit();
396	exit(EXIT_FAILURE);
397	/* NOTREACHED */
398	}
399
400	/* EXTPROTO */
401	void *
402	rxvt_realloc(void *ptr, size_t size)	658	rxvt_realloc (void *ptr, size_t size)
403	{	659	{
404	void *p;
405
406	if (ptr)
407	p = realloc(ptr, size);	660	void *p = realloc (ptr, size);
408	else	661
409	p = malloc(size);
410	if (p)	662	if (!p)
		663	rxvt_fatal ("memory allocation failure. aborting.\n");
		664
411	return p;	665	return p;
412
413	fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
414	rxvt_clean_exit();
415	exit(EXIT_FAILURE);
416	/* NOTREACHED */
417	}	666	}
418		667
419	/* ------------------------------------------------------------------------- *	668	/* ------------------------------------------------------------------------- *
420	* PRIVILEGED OPERATIONS *	669	* PRIVILEGED OPERATIONS *
421	* ------------------------------------------------------------------------- */	670	* ------------------------------------------------------------------------- */
422	/* take care of suid/sgid super-user (root) privileges */	671	/* take care of suid/sgid super-user (root) privileges */
423	void	672	void
424	rxvt_term::privileges (int mode)	673	rxvt_privileges (rxvt_privaction action)
425	{	674	{
426	#if ! defined(__CYGWIN32__)	675	#if ! defined(__CYGWIN32__)
427	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)	676	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
428	/* setreuid() is the poor man's setuid(), seteuid() */	677	/* setreuid () is the poor man's setuid (), seteuid () */
429	# define seteuid(a) setreuid(-1, (a))	678	# define seteuid(a) setreuid(-1, (a))
430	# define setegid(a) setregid(-1, (a))	679	# define setegid(a) setregid(-1, (a))
431	# define HAVE_SETEUID	680	# define HAVE_SETEUID
432	# endif	681	# endif
433	# ifdef HAVE_SETEUID	682	# ifdef HAVE_SETEUID
434	switch (mode)	683	switch (action)
435	{	684	{
436	case IGNORE:	685	case IGNORE:
437	/*	686	/*
438	* change effective uid/gid - not real uid/gid - so we can switch	687	* change effective uid/gid - not real uid/gid - so we can switch
439	* back to root later, as required	688	* back to root later, as required
440	*/	689	*/
441	seteuid(getuid());
442	setegid(getgid());	690	setegid (getgid ());
		691	seteuid (getuid ());
443	break;	692	break;
444	case SAVE:	693	case SAVE:
445	euid = geteuid();
446	egid = getegid();	694	saved_egid = getegid ();
		695	saved_euid = geteuid ();
447	break;	696	break;
448	case RESTORE:	697	case RESTORE:
449	seteuid(euid);
450	setegid(egid);	698	setegid (saved_egid);
		699	seteuid (saved_euid);
451	break;	700	break;
452	}	701	}
453	# else	702	# else
454	switch (mode)	703	switch (action)
455	{	704	{
456	case IGNORE:	705	case IGNORE:
457	setuid(getuid());
458	setgid(getgid());	706	setgid (getgid ());
		707	setuid (getuid ());
459	/* FALLTHROUGH */	708	/* FALLTHROUGH */
460	case SAVE:	709	case SAVE:
461	/* FALLTHROUGH */	710	/* FALLTHROUGH */
462	case RESTORE:	711	case RESTORE:
463	break;	712	break;
…		…
466	#endif	715	#endif
467	}	716	}
468		717
469	#ifdef UTMP_SUPPORT	718	#ifdef UTMP_SUPPORT
470	void	719	void
471	rxvt_term::privileged_utmp (char action)	720	rxvt_term::privileged_utmp (rxvt_privaction action)
472	{	721	{
473	D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)",	722	if (OPTION (Opt_utmpInhibit)
474	action, next_utmp_action, getpid()));	723	|| !pty.name || !*pty.name)
475	if (next_utmp_action != action || (action != SAVE && action != RESTORE)
476	|| (Options & Opt_utmpInhibit)
477	|| ttydev == NULL || *ttydev == '\0')
478	return;	724	return;
479		725
480	privileges (RESTORE);	726	rxvt_privileges (RESTORE);
		727
481	if (action == SAVE)	728	if (action == SAVE)
482	{	729	session.login (pty.name, cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
483	next_utmp_action = RESTORE;
484	makeutent (ttydev, rs[Rs_display_name]);
485	}
486	else	730	else
487	{ /* action == RESTORE */	731	session.logout ();
488	next_utmp_action = IGNORE;	732
489	cleanutent ();
490	}
491	privileges (IGNORE);	733	rxvt_privileges (IGNORE);
492	}
493	#endif
494
495	#ifndef NO_SETOWNER_TTYDEV
496	void
497	rxvt_term::privileged_ttydev (char action)
498	{
499	D_MAIN((stderr,
500	"privileged_ttydev (%c); waiting for: %c (pid: %d)",
501	action, next_tty_action, getpid()));
502	if (next_tty_action != action || (action != SAVE && action != RESTORE)
503	|| ttydev == NULL || *ttydev == '\0')
504	return;
505
506	privileges (RESTORE);
507
508	if (action == SAVE)
509	{
510	next_tty_action = RESTORE;
511	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
512	/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */
513	if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */
514	next_tty_action = IGNORE;
515	else
516	# endif
517
518	{
519	chown(ttydev, getuid(), ttygid); /* fail silently */
520	chmod(ttydev, ttymode);
521	# ifdef HAVE_REVOKE
522	revoke(ttydev);
523	# endif
524
525	}
526	}
527	else
528	{ /* action == RESTORE */
529	next_tty_action = IGNORE;
530	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
531	chmod(ttydev, ttyfd_stat.st_mode);
532	chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
533	# else
534	chmod(ttydev,
535	(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
536	chown(ttydev, 0, 0);
537	# endif
538
539	}
540
541	privileges (IGNORE);
542
543	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
544	D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
545	action == RESTORE ? "Restoring" : (action ==
546	SAVE ? "Saving" :
547	"UNKNOWN ERROR for"), ttydev,
548	ttyfd_stat.st_mode, ttyfd_stat.st_uid,
549	ttyfd_stat.st_gid));
550	# endif
551	}	734	}
552	#endif	735	#endif
553		736
554	/*----------------------------------------------------------------------*/	737	/*----------------------------------------------------------------------*/
555	/*	738	/*
556	* window size/position calculcations for XSizeHint and other storage.	739	* window size/position calculcations for XSizeHint and other storage.
557	* if width/height are non-zero then override calculated width/height	740	* if width/height are non-zero then override calculated width/height
558	*/	741	*/
559	void	742	void
560	rxvt_term::window_calc (unsigned int width, unsigned int height)	743	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
561	{	744	{
562	short recalc_x, recalc_y;	745	short recalc_x, recalc_y;
563	int x, y, sb_w, mb_h, flags;	746	int x, y, sb_w, flags;
564	unsigned int w, h;	747	unsigned int w, h;
565	unsigned int max_width, max_height;	748	unsigned int max_width, max_height;
		749	dDisp;
566		750
567	D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	751	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
568	TermWin.ncol, TermWin.nrow, szHint.width,	752	ncol, nrow, szHint.width, szHint.height));
569	szHint.height));	753
570	szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;	754	szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
571	szHint.win_gravity = NorthWestGravity;	755	szHint.win_gravity = NorthWestGravity;
572	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	756	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
573		757
574	recalc_x = recalc_y = 0;	758	recalc_x = recalc_y = 0;
575	flags = 0;	759	flags = 0;
		760
576	if (!parsed_geometry)	761	if (!parsed_geometry)
577	{	762	{
578	parsed_geometry = 1;	763	parsed_geometry = 1;
		764
579	if (rs[Rs_geometry])	765	if (rs[Rs_geometry])
580	flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);	766	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
		767
581	if (flags & WidthValue)	768	if (flags & WidthValue)
582	{	769	{
583	TermWin.ncol = BOUND_POSITIVE_INT16(w);	770	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
584	szHint.flags |= USSize;	771	szHint.flags |= USSize;
585	}	772	}
		773
586	if (flags & HeightValue)	774	if (flags & HeightValue)
587	{	775	{
588	TermWin.nrow = BOUND_POSITIVE_INT16(h);	776	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
589	szHint.flags |= USSize;	777	szHint.flags |= USSize;
590	}	778	}
		779
591	if (flags & XValue)	780	if (flags & XValue)
592	{	781	{
593	szHint.x = x;	782	szHint.x = x;
594	szHint.flags |= USPosition;	783	szHint.flags |= USPosition;
		784
595	if (flags & XNegative)	785	if (flags & XNegative)
596	{	786	{
597	recalc_x = 1;	787	recalc_x = 1;
598	szHint.win_gravity = NorthEastGravity;	788	szHint.win_gravity = NorthEastGravity;
599	}	789	}
600	}	790	}
		791
601	if (flags & YValue)	792	if (flags & YValue)
602	{	793	{
603	szHint.y = y;	794	szHint.y = y;
604	szHint.flags |= USPosition;	795	szHint.flags |= USPosition;
		796
605	if (flags & YNegative)	797	if (flags & YNegative)
606	{	798	{
607	recalc_y = 1;	799	recalc_y = 1;
		800
608	if (szHint.win_gravity == NorthEastGravity)	801	if (szHint.win_gravity == NorthEastGravity)
609	szHint.win_gravity = SouthEastGravity;	802	szHint.win_gravity = SouthEastGravity;
610	else	803	else
611	szHint.win_gravity = SouthWestGravity;	804	szHint.win_gravity = SouthWestGravity;
612	}	805	}
613	}	806	}
614	}	807	}
		808
615	/* TODO: BOUNDS */	809	/* TODO: BOUNDS */
616	TermWin.width = TermWin.ncol * TermWin.fwidth;	810	width = ncol * fwidth;
617	TermWin.height = TermWin.nrow * TermWin.fheight;	811	height = nrow * fheight;
618	max_width = MAX_COLS * TermWin.fwidth;	812	max_width = MAX_COLS * fwidth;
619	max_height = MAX_ROWS * TermWin.fheight;	813	max_height = MAX_ROWS * fheight;
620		814
621	szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;	815	szHint.base_width = szHint.base_height = 2 * int_bwidth;
622		816
623	sb_w = mb_h = 0;	817	sb_w = 0;
624	window_vt_x = window_vt_y = 0;	818	window_vt_x = window_vt_y = int_bwidth;
625	if (scrollbar_visible ())	819
		820	if (scrollBar.state)
626	{	821	{
627	sb_w = scrollbar_TotalWidth();	822	sb_w = scrollbar_TotalWidth ();
628	szHint.base_width += sb_w;	823	szHint.base_width += sb_w;
629	if (!(Options & Opt_scrollBar_right))	824	if (!OPTION (Opt_scrollBar_right))
630	window_vt_x = sb_w;	825	window_vt_x += sb_w;
631	}
632	if (menubar_visible ())
633	{	826	}
634	mb_h = menuBar_TotalHeight();	827
635	szHint.base_height += mb_h;
636	window_vt_y = mb_h;
637	}
638	szHint.width_inc = TermWin.fwidth;	828	szHint.width_inc = fwidth;
639	szHint.height_inc = TermWin.fheight;	829	szHint.height_inc = fheight;
640	szHint.min_width = szHint.base_width + szHint.width_inc;	830	szHint.min_width = szHint.base_width + szHint.width_inc;
641	szHint.min_height = szHint.base_height + szHint.height_inc;	831	szHint.min_height = szHint.base_height + szHint.height_inc;
642		832
643	if (width && width - szHint.base_width < max_width)	833	if (newwidth && newwidth - szHint.base_width < max_width)
644	{	834	{
645	szHint.width = width;	835	szHint.width = newwidth;
646	TermWin.width = width - szHint.base_width;	836	width = newwidth - szHint.base_width;
647	}	837	}
648	else	838	else
649	{	839	{
650	MIN_IT(TermWin.width, max_width);	840	min_it (width, max_width);
651	szHint.width = szHint.base_width + TermWin.width;	841	szHint.width = szHint.base_width + width;
652	}	842	}
		843
653	if (height && height - szHint.base_height < max_height)	844	if (newheight && newheight - szHint.base_height < max_height)
654	{	845	{
655	szHint.height = height;	846	szHint.height = newheight;
656	TermWin.height = height - szHint.base_height;	847	height = newheight - szHint.base_height;
657	}	848	}
658	else	849	else
659	{	850	{
660	MIN_IT(TermWin.height, max_height);	851	min_it (height, max_height);
661	szHint.height = szHint.base_height + TermWin.height;	852	szHint.height = szHint.base_height + height;
662	}	853	}
663	if (scrollbar_visible () && (Options & Opt_scrollBar_right))	854
		855	if (scrollBar.state && OPTION (Opt_scrollBar_right))
664	window_sb_x = szHint.width - sb_w;	856	window_sb_x = szHint.width - sb_w;
665		857
666	if (recalc_x)	858	if (recalc_x)
667	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))	859	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
668	- szHint.width - 2 * TermWin.ext_bwidth);
669	if (recalc_y)	860	if (recalc_y)
670	szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))	861	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
671	- szHint.height - 2 * TermWin.ext_bwidth);
672		862
673	TermWin.ncol = TermWin.width / TermWin.fwidth;	863	ncol = width / fwidth;
674	TermWin.nrow = TermWin.height / TermWin.fheight;	864	nrow = height / fheight;
675	D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	865	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
676	TermWin.ncol, TermWin.nrow, szHint.width,	866	ncol, nrow, szHint.width,
677	szHint.height));	867	szHint.height));
678	return;	868	return;
679	}	869	}
680		870
681	/*----------------------------------------------------------------------*/	871	/*----------------------------------------------------------------------*/
…		…
684	* Called after a window size change.	874	* Called after a window size change.
685	*/	875	*/
686	void	876	void
687	rxvt_term::tt_winch ()	877	rxvt_term::tt_winch ()
688	{	878	{
		879	if (pty.pty < 0)
		880	return;
		881
689	struct winsize ws;	882	struct winsize ws;
690		883
691	if (cmd_fd < 0)
692	return;
693
694	ws.ws_col = TermWin.ncol;	884	ws.ws_col = ncol;
695	ws.ws_row = TermWin.nrow;	885	ws.ws_row = nrow;
696	ws.ws_xpixel = ws.ws_ypixel = 0;	886	ws.ws_xpixel = width;
697	#ifndef DEBUG_SIZE	887	ws.ws_ypixel = height;
698	(void)ioctl (cmd_fd, TIOCSWINSZ, &ws);	888	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);
699	#else	889
700	if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)	890	#if 0
701	D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));	891	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
702	# ifdef SIGWINCH
703	else if (cmd_pid) /* force through to the command */	892	if (cmd_pid) /* force through to the command */
704	kill (cmd_pid, SIGWINCH);	893	kill (-cmd_pid, SIGWINCH);
705	# endif
706	#endif	894	#endif
707	}	895	}
708		896
709	/*----------------------------------------------------------------------*/	897	/*----------------------------------------------------------------------*/
710	/* rxvt_change_font() - Switch to a new font */	898	/* set_fonts () - load and set the various fonts
711	/*	899	*
712	* init = 1 - initialize	900	* init = 1 - initialize
713	*	901	*
714	* fontname == FONT_UP - switch to bigger font	902	* fontname == FONT_UP - switch to bigger font
715	* fontname == FONT_DN - switch to smaller font	903	* fontname == FONT_DN - switch to smaller font
716	*/	904	*/
717	void	905	bool
718	rxvt_term::change_font (int init, const char *fontname)	906	rxvt_term::set_fonts ()
719	{}	907	{
		908	rxvt_fontset *fs = new rxvt_fontset (this);
		909	rxvt_fontprop prop;
720		910
721	void	911	if (!fs
722	rxvt_term::font_up_down (int n, int direction)	912	|| !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
723	{}	913	|| !fs->realize_font (1))
		914	{
		915	delete fs;
		916	return false;
		917	}
		918
		919	#if ENABLE_STYLES
		920	for (int i = RS_styleCount; --i; )
		921	if (fontset[i] != fontset[0])
		922	delete fontset[i];
		923	#endif
		924
		925	delete fontset[0];
		926	fontset[0] = fs;
		927
		928	prop = (*fs)[1]->properties ();
		929	prop.height += lineSpace;
		930	fs->set_prop (prop);
		931
		932	fwidth = prop.width;
		933	fheight = prop.height;
		934	fbase = prop.ascent;
		935
		936	for (int style = 1; style < 4; style++)
		937	{
		938	#if ENABLE_STYLES
		939	const char *res = rs[Rs_font + style];
		940
		941	if (res && !*res)
		942	fontset[style] = fontset[0];
		943	else
		944	{
		945	fontset[style] = fs = new rxvt_fontset (this);
		946	rxvt_fontprop prop2 = prop;
		947
		948	if (res)
		949	prop2.weight = prop2.slant = rxvt_fontprop::unset;
		950	else
		951	{
		952	res = fontset[0]->fontdesc;
		953
		954	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
		955	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		956	}
		957
		958	fs->populate (res);
		959	fs->set_prop (prop2);
		960	}
		961	#else
		962	fontset[style] = fontset[0];
		963	#endif
		964	}
		965
		966	if (parent[0])
		967	{
		968	resize_all_windows (0, 0, 0);
		969	scr_remap_chars ();
		970	scr_touch (true);
		971	}
		972
		973	return true;
		974	}
		975
		976	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
		977	{
		978	XChangeProperty (display->display, parent[0],
		979	prop, XA_STRING, 8, PropModeReplace,
		980	(const unsigned char *)str, len >= 0 ? len : strlen (str));
		981	}
		982
		983	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
		984	{
		985	wchar_t *ws = rxvt_mbstowcs (str, len);
		986	char *s = rxvt_wcstoutf8 (ws);
		987
		988	XChangeProperty (display->display, parent[0],
		989	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
		990	(const unsigned char *)s, strlen (s));
		991
		992	free (s);
		993	free (ws);
		994	}
724		995
725	/*----------------------------------------------------------------------*/	996	/*----------------------------------------------------------------------*/
726	/*----------------------------------------------------------------------*/	997	/*----------------------------------------------------------------------*/
727	/* xterm sequences - title, iconName, color (exptl) */	998	/* xterm sequences - title, iconName, color (exptl) */
728	void	999	void
729	rxvt_term::set_title (const char *str)	1000	rxvt_term::set_title (const char *str)
730	{	1001	{
731	#ifndef SMART_WINDOW_TITLE	1002	set_string_property (XA_WM_NAME, str);
732	XStoreName(display->display, TermWin.parent[0], str);	1003	#if ENABLE_EWMH
733	#else	1004	set_utf8_property (xa[XA_NET_WM_NAME], str);
734	char *name;
735
736	if (XFetchName(display->display, TermWin.parent[0], &name) == 0)
737	name = NULL;
738	if (name == NULL || STRCMP(name, str))
739	XStoreName(display->display, TermWin.parent[0], str);
740	if (name)
741	XFree(name);
742	#endif	1005	#endif
743	}	1006	}
744		1007
745	void	1008	void
746	rxvt_term::set_iconName (const char *str)	1009	rxvt_term::set_icon_name (const char *str)
747	{	1010	{
748	#ifndef SMART_WINDOW_TITLE	1011	set_string_property (XA_WM_ICON_NAME, str);
749	XSetIconName(display->display, TermWin.parent[0], str);	1012	#if ENABLE_EWMH
750	#else	1013	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
751	char *name;
752
753	if (XGetIconName(display->display, TermWin.parent[0], &name))
754	name = NULL;
755	if (name == NULL || STRCMP(name, str))
756	XSetIconName(display->display, TermWin.parent[0], str);
757	if (name)
758	XFree(name);
759	#endif	1014	#endif
760	}	1015	}
761		1016
762	#ifdef XTERM_COLOR_CHANGE	1017	#ifdef XTERM_COLOR_CHANGE
763	void	1018	void
764	rxvt_term::set_window_color (int idx, const char *color)	1019	rxvt_term::set_window_color (int idx, const char *color)
765	{	1020	{
766	rxvt_color xcol;	1021	rxvt_color xcol;
767	int i;	1022	int i;
768		1023
769	if (color == NULL || *color == '\0')	1024	if (color == NULL || *color == '\0')
770	return;	1025	return;
771		1026
772	/* handle color aliases */	1027	/* handle color aliases */
773	if (isdigit(*color))	1028	if (isdigit (*color))
774	{	1029	{
775	i = atoi(color);	1030	i = atoi (color);
		1031
776	if (i >= 8 && i <= 15)	1032	if (i >= 8 && i <= 15)
777	{ /* bright colors */	1033	{ /* bright colors */
778	i -= 8;	1034	i -= 8;
779	# ifndef NO_BRIGHTCOLOR
780	PixColors[idx] = PixColors[minBrightCOLOR + i];	1035	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
781	SET_PIXCOLOR(idx);	1036	SET_PIXCOLOR (idx);
782	goto Done;	1037	goto done;
783	# endif
784
785	}	1038	}
		1039
786	if (i >= 0 && i <= 7)	1040	if (i >= 0 && i <= 7)
787	{ /* normal colors */	1041	{ /* normal colors */
788	PixColors[idx] = PixColors[minCOLOR + i];	1042	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
789	SET_PIXCOLOR(idx);	1043	SET_PIXCOLOR (idx);
790	goto Done;	1044	goto done;
791	}	1045	}
792	}	1046	}
		1047
793	if (!rXParseAllocColor (& xcol, color))	1048	if (!rXParseAllocColor (&xcol, color))
794	return;	1049	return;
		1050
795	/* XStoreColor (display->display, XCMAP, XColor*); */	1051	/* XStoreColor (display->display, display->cmap, XColor*); */
796		1052
797	/*	1053	/*
798	* FIXME: should free colors here, but no idea how to do it so instead,	1054	* FIXME: should free colors here, but no idea how to do it so instead,
799	* so just keep gobbling up the colormap	1055	* so just keep gobbling up the colormap
800	*/	1056	*/
801	# if 0	1057	# if 0
802	for (i = Color_Black; i <= Color_White; i++)	1058	for (i = Color_Black; i <= Color_White; i++)
803	if (PixColors[idx] == PixColors[i])	1059	if (pix_colors[idx] == pix_colors[i])
804	break;	1060	break;
805	if (i > Color_White)	1061	if (i > Color_White)
806	{	1062	{
807	/* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */	1063	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
808	XFreeColors(display->display, XCMAP, (PixColors + idx), 1,	1064	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
809	DisplayPlanes(display->display, display->screen));	1065	DisplayPlanes (display->display, display->screen));
810	}	1066	}
811	# endif	1067	# endif
812		1068
813	PixColors[idx] = xcol;	1069	pix_colors_focused[idx] = xcol;
814	SET_PIXCOLOR(idx);	1070	SET_PIXCOLOR (idx);
815		1071
816	/* XSetWindowAttributes attr; */	1072	/* XSetWindowAttributes attr; */
817	/* Cursor cursor; */	1073	/* Cursor cursor; */
818	Done:	1074	done:
819	if (idx == Color_bg && !(Options & Opt_transparent))
820	XSetWindowBackground(display->display, TermWin.vt,
821	PixColors[Color_bg]);
822		1075
		1076	#if OFF_FOCUS_FADING
		1077	if (rs[Rs_fade])
		1078	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
		1079	#endif
		1080
823	/* handle Color_BD, scrollbar background, etc. */	1081	/*TODO: handle Color_BD, scrollbar background, etc. */
824		1082
825	set_colorfgbg ();
826	recolour_cursor ();	1083	recolour_cursor ();
827	/* the only reasonable way to enforce a clean update */	1084	scr_recolour ();
828	scr_poweron ();
829	}	1085	}
830		1086
831	#else	1087	#else
832	# define set_window_color (idx,color) ((void)0)	1088	# define set_window_color (idx,color) ((void)0)
833	#endif /* XTERM_COLOR_CHANGE */	1089	#endif /* XTERM_COLOR_CHANGE */
834		1090
835	void	1091	void
836	rxvt_term::recolour_cursor ()	1092	rxvt_term::recolour_cursor ()
837	{	1093	{
838	#if TODO
839	rxvt_color xcol[2];	1094	XColor xcol[2];
840		1095
841	xcol[0] = PixColors[Color_pointer];	1096	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
842	xcol[1] = PixColors[Color_bg];	1097	? pix_colors_focused[Color_pointer_fg]
		1098	: pix_colors_focused[Color_fg];
		1099	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
		1100	? pix_colors_focused[Color_pointer_bg]
		1101	: pix_colors_focused[Color_bg];
		1102
843	XQueryColors (display->display, XCMAP, xcol, 2);	1103	XQueryColors (display->display, display->cmap, xcol, 2);
844	XRecolorCursor (display->display, TermWin_cursor, &(xcol[0]), &(xcol[1]));	1104	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
845	#endif
846	}	1105	}
847		1106
848	/*----------------------------------------------------------------------*/	1107	/*----------------------------------------------------------------------*/
849	/*	1108	/*
850	* find if fg/bg matches any of the normal (low-intensity) colors	1109	* find if fg/bg matches any of the normal (low-intensity) colors
851	*/	1110	*/
852	void	1111	void
853	rxvt_term::set_colorfgbg ()	1112	rxvt_term::set_colorfgbg ()
854	{	1113	{
855	unsigned int i;	1114	unsigned int i;
856	const char *xpmb = "\0";	1115	const char *xpmb = "\0";
857	char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1];	1116	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
858		1117
859	env_colorfgbg =
860	(char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1);	1118	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
861	STRCPY(fstr, "default");	1119	strcpy (fstr, "default");
862	STRCPY(bstr, "default");	1120	strcpy (bstr, "default");
863	for (i = Color_Black; i <= Color_White; i++)	1121	for (i = Color_Black; i <= Color_White; i++)
864	if (PixColors[Color_fg] == PixColors[i])	1122	if (pix_colors[Color_fg] == pix_colors[i])
865	{	1123	{
866	sprintf(fstr, "%d", (i - Color_Black));	1124	sprintf (fstr, "%d", (i - Color_Black));
867	break;	1125	break;
868	}	1126	}
		1127
869	for (i = Color_Black; i <= Color_White; i++)	1128	for (i = Color_Black; i <= Color_White; i++)
870	if (PixColors[Color_bg] == PixColors[i])	1129	if (pix_colors[Color_bg] == pix_colors[i])
871	{	1130	{
872	sprintf(bstr, "%d", (i - Color_Black));	1131	sprintf (bstr, "%d", (i - Color_Black));
873	#ifdef XPM_BACKGROUND	1132	#ifdef XPM_BACKGROUND
874	xpmb = "default;";	1133	xpmb = "default;";
875	#endif	1134	#endif
876	break;	1135	break;
877	}	1136	}
		1137
878	sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1138	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
879	putenv(env_colorfgbg);
880
881	#ifndef NO_BRIGHTCOLOR
882	colorfgbg = DEFAULT_RSTYLE;
883	for (i = minCOLOR; i <= maxCOLOR; i++)
884	{
885	if (PixColors[Color_fg] == PixColors[i])
886	colorfgbg = SET_FGCOLOR(colorfgbg, i);
887	if (PixColors[Color_bg] == PixColors[i])
888	colorfgbg = SET_BGCOLOR(colorfgbg, i);
889	}
890	#endif
891	}	1139	}
892		1140
893	/*----------------------------------------------------------------------*/	1141	/*----------------------------------------------------------------------*/
894	/*
895	* Colour determination for low colour displays, routine from
896	* Hans de Goede <hans@highrise.nl>
897	*/
898		1142
899	int	1143	int
900	rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)	1144	rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
901	{	1145	{
902	if (!screen_in_out->set (display, colour))	1146	if (!screen_in_out->set (display, colour))
903	{	1147	{
904	rxvt_print_error("can't allocate colour: %s", colour);	1148	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
905	return false;	1149	return false;
906	}	1150	}
907		1151
908	return true;	1152	return true;
909	}	1153	}
910		1154
911	/* -------------------------------------------------------------------- *	1155	/* -------------------------------------------------------------------- *
912	* - WINDOW RESIZING - *	1156	* - WINDOW RESIZING - *
913	* -------------------------------------------------------------------- */	1157	* -------------------------------------------------------------------- */
914	void	1158	void
915	rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)	1159	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
916	{	1160	{
917	int fix_screen;	1161	int fix_screen;
918
919	#ifdef SMART_RESIZE
920	int old_width = szHint.width, old_height = szHint.height;	1162	int old_width = szHint.width, old_height = szHint.height;
921	#endif	1163	dDisp;
922		1164
923	window_calc (width, height);	1165	window_calc (newwidth, newheight);
924	XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);	1166	XSetWMNormalHints (disp, parent[0], &szHint);
		1167
925	if (!ignoreparent)	1168	if (!ignoreparent)
926	{	1169	{
927	#ifdef SMART_RESIZE	1170	#ifdef SMART_RESIZE
928	/*	1171	/*
929	* resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>	1172	* resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
…		…
932	int x, y, x1, y1;	1175	int x, y, x1, y1;
933	int dx, dy;	1176	int dx, dy;
934	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1177	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
935	Window unused_cr;	1178	Window unused_cr;
936		1179
937	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	1180	XTranslateCoordinates (disp, parent[0], display->root,
938	0, 0, &x, &y, &unused_cr);	1181	0, 0, &x, &y, &unused_cr);
939	XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,	1182	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
940	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1183	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
941	/*	1184	/*
942	* if display->root isn't the parent window, a WM will probably have offset	1185	* if display->root isn't the parent window, a WM will probably have offset
943	* our position for handles and decorations. Counter it	1186	* our position for handles and decorations. Counter it
944	*/	1187	*/
…		…
946	{	1189	{
947	x -= x1;	1190	x -= x1;
948	y -= y1;	1191	y -= y1;
949	}	1192	}
950		1193
951	x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;	1194	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
952	y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;	1195	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
953	dx = old_width - szHint.width;	1196	dx = old_width - szHint.width;
954	dy = old_height - szHint.height;	1197	dy = old_height - szHint.height;
955		1198
956	/* Check position of the center of the window */	1199	/* Check position of the center of the window */
957	if (x < x1) /* left half */	1200	if (x < x1) /* left half */
…		…
961	if (y < y1) /* top half */	1204	if (y < y1) /* top half */
962	dy = 0;	1205	dy = 0;
963	else if (y == y1) /* exact center */	1206	else if (y == y1) /* exact center */
964	dy /= 2;	1207	dy /= 2;
965		1208
966	XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,	1209	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
967	szHint.width, szHint.height);	1210	szHint.width, szHint.height);
968	#else	1211	#else
969	XResizeWindow (display->display, TermWin.parent[0], szHint.width,	1212	XResizeWindow (disp, parent[0], szHint.width, szHint.height);
970	szHint.height);
971	#endif	1213	#endif
972
973	}	1214	}
974		1215
975	fix_screen = (TermWin.ncol != prev_ncol	1216	fix_screen = ncol != prev_ncol || nrow != prev_nrow;
976	|| TermWin.nrow != prev_nrow);
977		1217
978	if (fix_screen || width != old_width || height != old_height)	1218	if (fix_screen || newwidth != old_width || newheight != old_height)
979	{	1219	{
980	if (scrollbar_visible ())	1220	if (scrollBar.state)
981	{	1221	{
982	XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,	1222	XMoveResizeWindow (disp, scrollBar.win,
		1223	window_sb_x, 0,
983	0, scrollbar_TotalWidth (), szHint.height);	1224	scrollbar_TotalWidth (), szHint.height);
984	resize_scrollbar ();	1225	resize_scrollbar ();
985	}	1226	}
986		1227
987	if (menubar_visible ())	1228	XMoveResizeWindow (disp, vt,
988	XMoveResizeWindow (display->display, menuBar.win, window_vt_x,	1229	window_vt_x, window_vt_y,
989	0, TermWin_TotalWidth (), menuBar_TotalHeight ());
990
991	XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
992	window_vt_y, TermWin_TotalWidth (),
993	TermWin_TotalHeight ());	1230	width, height);
994	#ifdef RXVT_GRAPHICS	1231
995	if (old_height)
996	Gr_Resize (old_width - szHint.base_width,
997	old_height - szHint.base_height);
998	#endif
999	scr_clear ();	1232	scr_clear ();
1000	#ifdef XPM_BACKGROUND	1233	#ifdef XPM_BACKGROUND
1001	resize_pixmap ();	1234	resize_pixmap ();
1002	#endif	1235	#endif
1003
1004	}	1236	}
1005		1237
1006	if (fix_screen || old_height == 0)	1238	if (fix_screen || old_height == 0)
1007	{	1239	{
1008	int curr_screen = -1;	1240	int curr_screen = -1;
1009	int old_ncol = prev_ncol;	1241	int old_ncol = prev_ncol;
1010		1242
1011	/* scr_reset only works on the primary screen */	1243	/* scr_reset only works on the primary screen */
1012	if (old_height) /* this is not the first time through */	1244	if (old_height) /* this is not the first time through */
1013	{	1245	{
1014	unsigned int ncol = TermWin.ncol;	1246	unsigned int ocol = ncol;
1015	TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this	1247	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1016	curr_screen = scr_change_screen (PRIMARY);	1248	curr_screen = scr_change_screen (PRIMARY);
1017	TermWin.ncol = ncol;	1249	ncol = ocol;
1018	}	1250	}
1019		1251
1020	scr_reset();	1252	scr_reset ();
1021		1253
1022	if (curr_screen >= 0) /* this is not the first time through */	1254	if (curr_screen >= 0) /* this is not the first time through */
1023	{	1255	{
1024	scr_change_screen (curr_screen);	1256	scr_change_screen (curr_screen);
1025	selection_check (old_ncol != TermWin.ncol ? 4 : 0);	1257	selection_check (old_ncol != ncol ? 4 : 0);
1026	}	1258	}
1027	}	1259	}
1028		1260
1029	old_width = szHint.width;	1261	old_width = szHint.width;
1030	old_height = szHint.height;	1262	old_height = szHint.height;
		1263
		1264	#ifdef XPM_BACKGROUND
		1265	if (pixmap)
		1266	scr_touch (false);
		1267	#endif
1031		1268
1032	#ifdef USE_XIM	1269	#ifdef USE_XIM
1033	IMSetStatusPosition ();	1270	IMSetStatusPosition ();
1034	#endif	1271	#endif
1035	}	1272	}
…		…
1037	/*	1274	/*
1038	* Set the width/height of the vt window in characters. Units are pixels.	1275	* Set the width/height of the vt window in characters. Units are pixels.
1039	* good for toggling 80/132 columns	1276	* good for toggling 80/132 columns
1040	*/	1277	*/
1041	void	1278	void
1042	rxvt_term::set_widthheight (unsigned int width, unsigned int height)	1279	rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1043	{	1280	{
1044	XWindowAttributes wattr;	1281	XWindowAttributes wattr;
1045		1282
1046	if (width == 0 || height == 0)	1283	if (newwidth == 0 || newheight == 0)
1047	{	1284	{
1048	XGetWindowAttributes(display->display, display->root, &wattr);	1285	XGetWindowAttributes (display->display, display->root, &wattr);
		1286
1049	if (width == 0)	1287	if (newwidth == 0)
1050	width = wattr.width - szHint.base_width;	1288	newwidth = wattr.width - szHint.base_width;
1051	if (height == 0)	1289	if (newheight == 0)
1052	height = wattr.height - szHint.base_height;	1290	newheight = wattr.height - szHint.base_height;
1053	}
1054	if (width != TermWin.width || height != TermWin.height)
1055	{	1291	}
		1292
		1293	if (newwidth != width || newheight != height)
		1294	{
1056	width += szHint.base_width;	1295	newwidth += szHint.base_width;
1057	height += szHint.base_height;	1296	newheight += szHint.base_height;
1058	resize_all_windows (width, height, 0);	1297	resize_all_windows (newwidth, newheight, 0);
1059	}	1298	}
1060	}	1299	}
1061		1300
1062	/* -------------------------------------------------------------------- *	1301	/* -------------------------------------------------------------------- *
1063	* - X INPUT METHOD ROUTINES - *	1302	* - X INPUT METHOD ROUTINES - *
1064	* -------------------------------------------------------------------- */	1303	* -------------------------------------------------------------------- */
1065	#ifdef USE_XIM	1304	#ifdef USE_XIM
1066		1305
1067	void	1306	void
		1307	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
		1308	{
		1309	fg = pix_colors[Color_fg];
		1310	bg = pix_colors[Color_bg];
		1311	}
		1312
		1313	void
1068	rxvt_term::im_set_size (XRectangle *size)	1314	rxvt_term::im_set_size (XRectangle &size)
1069	{	1315	{
1070	size->x = TermWin.int_bwidth;	1316	// the int_bwidth terms make no sense to me
1071	size->y = TermWin.int_bwidth;	1317	size.x = int_bwidth;
1072	size->width = Width2Pixel(TermWin.ncol);	1318	size.y = int_bwidth;
1073	size->height = Height2Pixel(TermWin.nrow);	1319	size.width = Width2Pixel (ncol) + int_bwidth;
		1320	size.height = Height2Pixel (nrow) + int_bwidth;
1074	}	1321	}
1075		1322
1076	void	1323	void
1077	rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)	1324	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
		1325	XRectangle &status_rect,
		1326	const XRectangle &needed_rect)
1078	{	1327	{
1079	*fg = PixColors[Color_fg];	1328	preedit_rect.x = needed_rect.width;
1080	*bg = PixColors[Color_bg];	1329	preedit_rect.y = 0;
		1330	preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
		1331	preedit_rect.height = fheight;
		1332
		1333	status_rect.x = 0;
		1334	status_rect.y = 0;
		1335	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
		1336	status_rect.height = fheight;
1081	}	1337	}
1082		1338
1083	/* Checking whether input method is running. */	1339	/* Checking whether input method is running. */
1084	bool	1340	bool
1085	rxvt_term::IMisRunning ()	1341	rxvt_term::IMisRunning ()
1086	{	1342	{
1087	char *p;	1343	char *p;
1088	Atom atom;	1344	Atom atom;
1089	Window win;	1345	Window win;
1090	char server[IMBUFSIZ];	1346	char server[IMBUFSIZ];
1091		1347
1092	/* get current locale modifier */	1348	/* get current locale modifier */
1093	if ((p = XSetLocaleModifiers(NULL)) != NULL)	1349	if ((p = XSetLocaleModifiers (NULL)) != NULL)
1094	{	1350	{
1095	STRCPY(server, "@server=");	1351	strcpy (server, "@server=");
1096	STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1352	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
		1353
1097	if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */	1354	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1098	*p = '\0';	1355	*p = '\0';
1099		1356
1100	atom = XInternAtom(display->display, server, False);	1357	atom = XInternAtom (display->display, server, False);
1101	win = XGetSelectionOwner(display->display, atom);	1358	win = XGetSelectionOwner (display->display, atom);
		1359
1102	if (win != None)	1360	if (win != None)
1103	return True;	1361	return True;
1104	}	1362	}
		1363
1105	return False;	1364	return False;
1106	}	1365	}
1107		1366
1108	void	1367	void
1109	rxvt_term::IMSendSpot ()	1368	rxvt_term::IMSendSpot ()
1110	{	1369	{
1111	XPoint spot;	1370	XPoint nspot;
1112	XVaNestedList preedit_attr;	1371	XVaNestedList preedit_attr;
1113		1372
1114	if (Input_Context == NULL	1373	if (!Input_Context
		1374	|| !focus
1115	|| !TermWin.focus || !(input_style & XIMPreeditPosition)	1375	|| !(input_style & XIMPreeditPosition))
1116	|| !(event_type == KeyPress
1117	|| event_type == Expose
1118	|| event_type == NoExpose
1119	|| event_type == SelectionNotify
1120	|| event_type == ButtonRelease || event_type == FocusIn)
1121	|| !IMisRunning ())
1122	return;	1376	return;
1123		1377
1124	im_set_position (&spot);	1378	im_set_position (nspot);
1125		1379
		1380	if (nspot.x == spot.x && nspot.y == spot.y)
		1381	return;
		1382
		1383	spot = nspot;
		1384
1126	preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);	1385	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1127	XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL);	1386	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1128	XFree(preedit_attr);	1387	XFree (preedit_attr);
1129	}
1130
1131	void
1132	rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1133	XRectangle * needed_rect)
1134	{
1135	int mbh, vtx = 0;
1136
1137	if (scrollbar_visible () && !(Options & Opt_scrollBar_right))
1138	vtx = scrollbar_TotalWidth();
1139
1140	mbh = menubar_visible () ? menuBar_TotalHeight() : 0;
1141	mbh -= TermWin.lineSpace;
1142
1143	preedit_rect->x = needed_rect->width + vtx;
1144	preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1145
1146	preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx;
1147	preedit_rect->height = Height2Pixel(1);
1148
1149	status_rect->x = vtx;
1150	status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1151
1152	status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1153	status_rect->height = Height2Pixel(1);
1154	}	1388	}
1155		1389
1156	void	1390	void
1157	rxvt_term::im_destroy ()	1391	rxvt_term::im_destroy ()
1158	{	1392	{
1159	if (Input_Context)
1160	{
1161	XDestroyIC (Input_Context);
1162	Input_Context = NULL;
1163	}
1164
1165	if (input_method)	1393	if (input_method)
1166	{	1394	{
		1395	if (Input_Context && input_method->xim)
		1396	XDestroyIC (Input_Context);
		1397
1167	display->put_xim (input_method);	1398	display->put_xim (input_method);
1168	input_method = 0;	1399	input_method = 0;
1169	}	1400	}
		1401
		1402	Input_Context = 0;
1170	}	1403	}
1171		1404
1172	/*	1405	/*
1173	* Try to open a XIM with the current modifiers, then see if we can	1406	* Try to open a XIM with the current modifiers, then see if we can
1174	* open a suitable preedit type	1407	* open a suitable preedit type
1175	*/	1408	*/
1176	bool	1409	bool
1177	rxvt_term::IM_get_IC (const char *modifiers)	1410	rxvt_term::IM_get_IC (const char *modifiers)
1178	{	1411	{
1179	int i, j, found;	1412	int i, j, found;
1180	XIM xim;	1413	XIM xim;
1181	XPoint spot;	1414	XPoint spot;
1182	XRectangle rect, status_rect, needed_rect;	1415	XRectangle rect, status_rect, needed_rect;
1183	unsigned long fg, bg;	1416	unsigned long fg, bg;
1184	const char *p;	1417	const char *p;
1185	char **s;	1418	char **s;
1186	XIMStyles *xim_styles;	1419	XIMStyles *xim_styles;
1187	XVaNestedList preedit_attr, status_attr;
1188		1420
		1421	set_environ (envv);
		1422
1189	if (!((p = XSetLocaleModifiers (modifiers)) && *p))	1423	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1190	return false;	1424	return false;
1191		1425
1192	D_MAIN((stderr, "rxvt_IM_get_IC()"));	1426	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1193	input_method = display->get_xim (locale, modifiers);	1427	input_method = display->get_xim (locale, modifiers);
1194	if (input_method == NULL)	1428	if (input_method == NULL)
1195	return false;	1429	return false;
1196		1430
1197	xim = input_method->xim;	1431	xim = input_method->xim;
		1432	spot.x = spot.y = -1;
1198		1433
1199	xim_styles = NULL;	1434	xim_styles = NULL;
1200	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)	1435	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1201	|| !xim_styles || !xim_styles->count_styles)	1436	|| !xim_styles || !xim_styles->count_styles)
1202	{	1437	{
1203	display->put_xim (input_method);	1438	im_destroy ();
1204	return false;	1439	return false;
1205	}	1440	}
1206		1441
1207	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";	1442	const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
		1443
		1444	for (int pi = 0; pi < 2; pi++)
		1445	{
		1446	p = pet[pi];
		1447
		1448	if (!p)
		1449	continue;
		1450
1208	s = rxvt_splitcommastring(p);	1451	s = rxvt_splitcommastring (p);
		1452
1209	for (i = found = 0; !found && s[i]; i++)	1453	for (i = found = 0; !found && s[i]; i++)
1210	{	1454	{
1211	if (!STRCMP(s[i], "OverTheSpot"))	1455	if (!strcmp (s[i], "OverTheSpot"))
1212	input_style = (XIMPreeditPosition | XIMStatusNothing);	1456	input_style = (XIMPreeditPosition | XIMStatusNothing);
1213	else if (!STRCMP(s[i], "OffTheSpot"))	1457	else if (!strcmp (s[i], "OffTheSpot"))
1214	input_style = (XIMPreeditArea | XIMStatusArea);	1458	input_style = (XIMPreeditArea | XIMStatusArea);
1215	else if (!STRCMP(s[i], "Root"))	1459	else if (!strcmp (s[i], "Root"))
1216	input_style = (XIMPreeditNothing | XIMStatusNothing);	1460	input_style = (XIMPreeditNothing | XIMStatusNothing);
		1461	else if (!strcmp (s[i], "None"))
		1462	input_style = (XIMPreeditNone | XIMStatusNone);
1217		1463
1218	for (j = 0; j < xim_styles->count_styles; j++)	1464	for (j = 0; j < xim_styles->count_styles; j++)
1219	if (input_style == xim_styles->supported_styles[j])	1465	if (input_style == xim_styles->supported_styles[j])
1220	{	1466	{
		1467	rxvt_freecommastring (s);
		1468
1221	found = 1;	1469	found = 1;
1222	break;	1470	goto foundpet;
		1471	}
		1472
1223	}	1473	}
1224	}
1225		1474
1226	for (i = 0; s[i]; i++)	1475	rxvt_freecommastring (s);
1227	free (s[i]);	1476	}
1228		1477
1229	free (s);	1478	foundpet:
		1479
1230	XFree (xim_styles);	1480	XFree (xim_styles);
1231		1481
1232	if (!found)	1482	if (!found)
1233	{	1483	{
1234	display->put_xim (input_method);	1484	im_destroy ();
1235	return false;	1485	return false;
1236	}	1486	}
1237		1487
1238	preedit_attr = status_attr = NULL;	1488	XFontSet fs = 0;
		1489	XVaNestedList preedit_attr = 0, status_attr = 0;
		1490
		1491	if (input_style & (XIMPreeditPosition | XIMPreeditArea))
		1492	{
		1493	// fake us a font-set, please
		1494	char **missing_charset_list;
		1495	int missing_charset_count;
		1496	char *def_string;
		1497	char pat[512];
		1498
		1499	sprintf (pat,
		1500	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1501	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1502	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1503	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1504	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1505	"*",
		1506	fheight,
		1507	fheight + 1, fheight - 1,
		1508	fheight - 2, fheight + 2);
		1509
		1510	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
		1511	&missing_charset_list, &missing_charset_count, &def_string);
		1512
		1513	if (missing_charset_list)
		1514	XFreeStringList (missing_charset_list);
		1515
		1516	if (!fs)
		1517	{
		1518	input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
		1519	rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
		1520	}
		1521	}
1239		1522
1240	if (input_style & XIMPreeditPosition)	1523	if (input_style & XIMPreeditPosition)
1241	{	1524	{
1242	im_set_size (&rect);	1525	im_set_size (rect);
1243	im_set_position (&spot);	1526	im_set_position (spot);
1244	im_set_color (&fg, &bg);	1527	im_set_color (fg, bg);
1245		1528
1246	preedit_attr = XVaCreateNestedList(0, XNArea, &rect,	1529	preedit_attr = XVaCreateNestedList (0,
		1530	XNForeground, fg,
		1531	XNBackground, bg,
		1532	XNArea, &rect,
1247	XNSpotLocation, &spot,	1533	XNSpotLocation, &spot,
1248	XNForeground, fg, XNBackground, bg,
1249	//XNFontSet, TermWin.fontset,	1534	XNFontSet, fs,
1250	NULL);	1535	NULL);
1251	}	1536	}
1252	else if (input_style & XIMPreeditArea)	1537	else if (input_style & XIMPreeditArea)
1253	{	1538	{
1254	im_set_color (&fg, &bg);	1539	im_set_color (fg, bg);
1255		1540
1256	/*	1541	/*
1257	* The necessary width of preedit area is unknown	1542	* The necessary width of preedit area is unknown
1258	* until create input context.	1543	* until create input context.
1259	*/	1544	*/
1260	needed_rect.width = 0;	1545	needed_rect.width = 0;
1261
1262	im_set_preedit_area (&rect, &status_rect, &needed_rect);	1546	im_set_preedit_area (rect, status_rect, needed_rect);
1263		1547
1264	preedit_attr = XVaCreateNestedList(0, XNArea, &rect,	1548	preedit_attr = XVaCreateNestedList (0,
		1549	XNForeground, fg,
1265	XNForeground, fg, XNBackground, bg,	1550	XNBackground, bg,
		1551	XNArea, &rect,
		1552	XNFontSet, fs,
		1553	NULL);
		1554	status_attr = XVaCreateNestedList (0,
		1555	XNForeground, fg,
		1556	XNBackground, bg,
		1557	XNArea, &status_rect,
1266	//XNFontSet, TermWin.fontset,	1558	XNFontSet, fs,
1267	NULL);	1559	NULL);
1268	status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1269	XNForeground, fg, XNBackground, bg,
1270	//XNFontSet, TermWin.fontset,
1271	NULL);
1272	}	1560	}
1273		1561
1274	Input_Context = XCreateIC(xim, XNInputStyle, input_style,	1562	Input_Context = XCreateIC (xim,
		1563	XNInputStyle, input_style,
1275	XNClientWindow, TermWin.parent[0],	1564	XNClientWindow, vt,
1276	XNFocusWindow, TermWin.parent[0],	1565	XNFocusWindow, parent[0],
1277	preedit_attr ? XNPreeditAttributes : NULL,	1566	preedit_attr ? XNPreeditAttributes : NULL,
1278	preedit_attr,	1567	preedit_attr,
1279	status_attr ? XNStatusAttributes : NULL,	1568	status_attr ? XNStatusAttributes : NULL,
1280	status_attr, NULL);	1569	status_attr, NULL);
		1570
1281	if (preedit_attr) XFree(preedit_attr);	1571	if (preedit_attr) XFree (preedit_attr);
1282	if (status_attr) XFree(status_attr);	1572	if (status_attr) XFree (status_attr);
		1573	if (fs) XFreeFontSet (display->display, fs);
1283		1574
1284	if (Input_Context == NULL)	1575	if (Input_Context == NULL)
1285	{	1576	{
1286	rxvt_print_error("failed to create input context");	1577	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1287	display->put_xim (input_method);	1578	im_destroy ();
1288	return false;	1579	return false;
1289	}	1580	}
1290		1581
1291	if (input_style & XIMPreeditArea)	1582	if (input_style & XIMPreeditArea)
1292	IMSetStatusPosition ();	1583	IMSetStatusPosition ();
1293		1584
1294	D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));	1585	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1295	return true;	1586	return true;
1296	}	1587	}
1297		1588
1298	void	1589	void
1299	rxvt_term::im_cb ()	1590	rxvt_term::im_cb ()
1300	{	1591	{
1301	int i, found, had_im;	1592	int i;
1302	const char *p;	1593	const char *p;
1303	char **s;	1594	char **s;
1304	char buf[IMBUFSIZ];	1595	char buf[IMBUFSIZ];
1305		1596
		1597	make_current ();
		1598
1306	im_destroy ();	1599	im_destroy ();
1307		1600
1308	D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));	1601	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1309	if (Input_Context)	1602	if (Input_Context)
1310	return;	1603	return;
1311		1604
1312	#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)	1605	#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1313	if (rs[Rs_imLocale])	1606	if (rs[Rs_imLocale])
1314	setlocale (LC_CTYPE, rs[Rs_imLocale]);	1607	SET_LOCALE (rs[Rs_imLocale]);
1315	#endif	1608	#endif
1316		1609
1317	p = rs[Rs_inputMethod];	1610	p = rs[Rs_inputMethod];
1318	if (p && *p)	1611	if (p && *p)
1319	{	1612	{
1320	bool found = false;	1613	bool found = false;
1321		1614
1322	s = rxvt_splitcommastring (p);	1615	s = rxvt_splitcommastring (p);
		1616
1323	for (i = 0; s[i]; i++)	1617	for (i = 0; s[i]; i++)
1324	{	1618	{
1325	if (*s[i])	1619	if (*s[i])
1326	{	1620	{
1327	STRCPY (buf, "@im=");	1621	strcpy (buf, "@im=");
1328	STRNCAT (buf, s[i], IMBUFSIZ - 5);	1622	strncat (buf, s[i], IMBUFSIZ - 5);
1329	if (IM_get_IC (buf))	1623	if (IM_get_IC (buf))
1330	{	1624	{
1331	found = true;	1625	found = true;
1332	break;	1626	break;
1333	}	1627	}
1334	}	1628	}
1335	}	1629	}
1336	for (i = 0; s[i]; i++)	1630
1337	free(s[i]);	1631	rxvt_freecommastring (s);
1338	free(s);
1339		1632
1340	if (found)	1633	if (found)
1341	goto done;	1634	goto done;
1342	}	1635	}
1343		1636
…		…
1350	goto done;	1643	goto done;
1351		1644
1352	done:	1645	done:
1353	#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)	1646	#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1354	if (rs[Rs_imLocale])	1647	if (rs[Rs_imLocale])
1355	setlocale (LC_CTYPE, locale);	1648	SET_LOCALE (locale);
1356	#endif	1649	#endif
1357	}	1650	}
1358		1651
1359	void	1652	void
1360	rxvt_term::IMSetStatusPosition ()	1653	rxvt_term::IMSetStatusPosition ()
1361	{	1654	{
1362	XRectangle preedit_rect, status_rect, *needed_rect;	1655	XRectangle preedit_rect, status_rect, *needed_rect;
1363	XVaNestedList preedit_attr, status_attr;	1656	XVaNestedList preedit_attr, status_attr;
1364		1657
1365	if (Input_Context == NULL	1658	if (!Input_Context
		1659	|| !focus
1366	|| !TermWin.focus || !(input_style & XIMPreeditArea)	1660	|| !(input_style & XIMPreeditArea)
1367	|| !IMisRunning ())	1661	|| !IMisRunning ())
1368	return;	1662	return;
1369		1663
1370	/* Getting the necessary width of preedit area */	1664	/* Getting the necessary width of preedit area */
1371	status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);	1665	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1372	XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL);	1666	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1373	XFree(status_attr);	1667	XFree (status_attr);
1374		1668
1375	im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);	1669	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
		1670	XFree (needed_rect);
1376		1671
1377	preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);	1672	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1378	status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);	1673	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1379		1674
1380	XSetICValues(Input_Context,	1675	XSetICValues (Input_Context,
1381	XNPreeditAttributes, preedit_attr,	1676	XNPreeditAttributes, preedit_attr,
1382	XNStatusAttributes, status_attr, NULL);	1677	XNStatusAttributes, status_attr, NULL);
1383		1678
1384	XFree(preedit_attr);	1679	XFree (preedit_attr);
1385	XFree(status_attr);	1680	XFree (status_attr);
1386	}	1681	}
1387	#endif /* USE_XIM */	1682	#endif /* USE_XIM */
1388		1683
1389	/*----------------------------------------------------------------------*/	1684	/*----------------------------------------------------------------------*/
1390	rxvt_t rxvt_current_term;	1685	rxvt_t rxvt_current_term;

Diff Legend

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