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

Diff Legend

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