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

Diff Legend

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