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

Diff Legend

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