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.167 by root, Sun Jan 8 08:43:11 2006 UTC

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

Diff Legend

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