ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.70 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.179 by root, Mon Jan 16 08:48:09 2006 UTC

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

Diff Legend

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