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.67 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.178 by root, Mon Jan 16 08:29:57 2006 UTC

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

Diff Legend

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