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

Diff Legend

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