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.30 by pcg, Thu Feb 12 01:53:25 2004 UTC vs.
Revision 1.166 by root, Sun Jan 8 07:55:36 2006 UTC

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

Diff Legend

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