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

Diff Legend

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