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

Diff Legend

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