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

Diff Legend

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