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.27 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.151 by root, Wed Dec 21 19:50:16 2005 UTC

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

Diff Legend

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