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.70 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.171 by root, Wed Jan 11 03:13:26 2006 UTC

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

Diff Legend

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