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.108 by root, Wed Aug 25 05:03:33 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
…		…
166	incr_ev (this, &rxvt_term::incr_cb)	196	incr_ev (this, &rxvt_term::incr_cb)
167	{	197	{
168	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	198	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
169		199
170	termlist.push_back (this);	200	termlist.push_back (this);
171	}
172		201
173	rxvt_term::~rxvt_term ()	202	#ifdef KEYSYM_RESOURCE
174	{	203	keyboard = new keyboard_manager;
175	termlist.erase (find (termlist.begin (), termlist.end(), this));
176		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	{
177	if (cmd_pid)	214	if (cmd_pid)
178	kill (-cmd_pid, SIGHUP);	215	kill (-cmd_pid, SIGHUP);
179		216
180	pty.put ();
181
182	#ifdef UTMP_SUPPORT	217	#ifdef UTMP_SUPPORT
183	privileged_utmp (RESTORE);	218	privileged_utmp (RESTORE);
184	#endif	219	#endif
185		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
186	#if ENABLE_STYLES	232	#if ENABLE_STYLES
187	for (int i = RS_styleCount; --i; )	233	for (int i = RS_styleCount; --i; )
188	if (TermWin.fontset[i] != TermWin.fontset[0])	234	if (fontset[i] != fontset[0])
189	delete TermWin.fontset[i];	235	delete fontset[i];
190	#endif	236	#endif
191	delete TermWin.fontset[0];	237	delete fontset[0];
192		238
193	if (display)	239	if (display)
194	{	240	{
		241	dDisp;
		242
195	selection_clear ();	243	selection_clear ();
196		244
197	#ifdef USE_XIM	245	#ifdef USE_XIM
198	im_destroy ();	246	im_destroy ();
199	#endif	247	#endif
200	#ifdef MENUBAR	248	#ifdef MENUBAR
201	if (menubarGC) XFreeGC (display->display, menubarGC);	249	if (menubarGC) XFreeGC (disp, menubarGC);
202	#endif	250	#endif
203	#ifdef XTERM_SCROLLBAR	251	#ifdef XTERM_SCROLLBAR
204	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);	252	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
205	if (ShadowGC) XFreeGC (display->display, ShadowGC);	253	if (ShadowGC) XFreeGC (disp, ShadowGC);
206	#endif	254	#endif
207	#ifdef PLAIN_SCROLLBAR	255	#ifdef PLAIN_SCROLLBAR
208	if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);	256	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
209	#endif	257	#endif
210	#ifdef NEXT_SCROLLBAR	258	#ifdef NEXT_SCROLLBAR
211	if (blackGC) XFreeGC (display->display, blackGC);	259	if (blackGC) XFreeGC (disp, blackGC);
212	if (whiteGC) XFreeGC (display->display, whiteGC);	260	if (whiteGC) XFreeGC (disp, whiteGC);
213	if (grayGC) XFreeGC (display->display, grayGC);	261	if (grayGC) XFreeGC (disp, grayGC);
214	if (darkGC) XFreeGC (display->display, darkGC);	262	if (darkGC) XFreeGC (disp, darkGC);
215	if (stippleGC) XFreeGC (display->display, stippleGC);	263	if (stippleGC) XFreeGC (disp, stippleGC);
216	if (dimple) XFreePixmap (display->display, dimple);	264	if (dimple) XFreePixmap (disp, dimple);
217	if (upArrow) XFreePixmap (display->display, upArrow);	265	if (upArrow) XFreePixmap (disp, upArrow);
218	if (downArrow) XFreePixmap (display->display, downArrow);	266	if (downArrow) XFreePixmap (disp, downArrow);
219	if (upArrowHi) XFreePixmap (display->display, upArrowHi);	267	if (upArrowHi) XFreePixmap (disp, upArrowHi);
220	if (downArrowHi) XFreePixmap (display->display, downArrowHi);	268	if (downArrowHi) XFreePixmap (disp, downArrowHi);
221	#endif	269	#endif
222	#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)	270	#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
223	if (topShadowGC) XFreeGC (display->display, topShadowGC);	271	if (topShadowGC) XFreeGC (disp, topShadowGC);
224	if (botShadowGC) XFreeGC (display->display, botShadowGC);	272	if (botShadowGC) XFreeGC (disp, botShadowGC);
225	if (scrollbarGC) XFreeGC (display->display, scrollbarGC);	273	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
226	#endif	274	#endif
227	if (TermWin.gc) XFreeGC (display->display, TermWin.gc);	275	if (gc) XFreeGC (disp, gc);
228		276
229	#if defined(MENUBAR) && (MENUBAR_MAX > 1)	277	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
230	delete menuBar.drawable;	278	delete menuBar.drawable;
231	//if (menuBar.win)	279	//if (menuBar.win)
232	// XDestroyWindow (display->display, menuBar.win);	280	// XDestroyWindow (disp, menuBar.win);
233	#endif	281	#endif
234	delete TermWin.drawable;	282	delete drawable;
235	// destroy all windows	283	// destroy all windows
236	if (TermWin.parent[0])	284	if (parent[0])
237	XDestroyWindow (display->display, TermWin.parent[0]);	285	XDestroyWindow (disp, parent[0]);
238	}	286	}
239		287
240	// TODO: free pixcolours, colours should become part of rxvt_display	288	// TODO: free pixcolours, colours should become part of rxvt_display
241
242	delete pix_colors_focused;	289	delete pix_colors_focused;
243	#ifdef OFF_FOCUS_FADING	290	#if OFF_FOCUS_FADING
244	delete pix_colors_unfocused;	291	delete pix_colors_unfocused;
245	#endif	292	#endif
246		293
247	displays.put (display);	294	displays.put (display);
248		295
249	scr_release ();	296	scr_release ();
250		297
251	/* clear all resources */	298	/* clear all resources */
252	for (int i = 0; i < allocated.size (); i++)	299	for (int i = 0; i < allocated.size (); i++)
253	free (allocated[i]);	300	free (allocated [i]);
254		301
255	free (selection.text);	302	free (selection.text);
256	// TODO: manage env vars in child only(!)	303	// TODO: manage env vars in child only(!)
257	free (env_windowid);	304	free (env_windowid);
258	free (env_display);	305	free (env_display);
259	free (env_term);	306	free (env_term);
260	free (env_colorfgbg);	307	free (env_colorfgbg);
261	free (locale);	308	free (locale);
262	#if 0	309	free (v_buffer);
263	free (codeset);	310	free (incr_buf);
264	#endif
265		311
266	delete envv;	312	delete envv;
267	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 ();
268	}	327	}
269		328
270	void	329	void
271	rxvt_term::destroy ()	330	rxvt_term::destroy ()
272	{	331	{
…		…
324		383
325	delete this;	384	delete this;
326	}	385	}
327		386
328	/*----------------------------------------------------------------------*/	387	/*----------------------------------------------------------------------*/
329	/* 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	/*----------------------------------------------------------------------*/
330	bool	479	bool
331	rxvt_term::init (int argc, const char *const *argv)	480	rxvt_term::init (int argc, const char *const *argv)
332	{	481	{
333	SET_R (this);	482	SET_R (this);
334		483
		484	const char **cmd_argv;
		485
		486	{
		487	TEMP_ENV; // few things in X do not call setlocale :(
		488
		489	set_locale ("");
		490
335	if (!init_vars ())	491	if (!init_vars ())
336	return false;	492	return false;
337		493
338	init_secondary ();	494	init_secondary ();
339		495
340	const char **cmd_argv = init_resources (argc, argv);	496	cmd_argv = init_resources (argc, argv);
341		497
342	set_locale ("");	498	#ifdef KEYSYM_RESOURCE
		499	keyboard->register_done ();
		500	#endif
343		501
344	#if MENUBAR_MAX	502	#if MENUBAR_MAX
345	menubar_read (rs[Rs_menu]);	503	menubar_read (rs[Rs_menu]);
346	#endif	504	#endif
347	#ifdef HAVE_SCROLLBARS	505	#ifdef HAVE_SCROLLBARS
348	if (options & Opt_scrollBar)	506	if (OPTION (Opt_scrollBar))
349	scrollBar.setIdle (); /* set existence for size calculations */	507	scrollBar.setIdle (); /* set existence for size calculations */
350	#endif	508	#endif
		509	}
351		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
352	create_windows (argc, argv);	541	create_windows (argc, argv);
353		542
		543	dDisp;
		544
354	init_xlocale ();	545	init_xlocale ();
355		546
356	scr_reset (); /* initialize screen */	547	scr_reset (); // initialize screen
357		548
358	#if 0	549	#if 0
359	XSynchronize (display->display, True);	550	XSynchronize (disp, True);
360	#endif	551	#endif
361		552
362	#ifdef HAVE_SCROLLBARS	553	#ifdef HAVE_SCROLLBARS
363	if (options & Opt_scrollBar)	554	if (OPTION (Opt_scrollBar))
364	resize_scrollbar (); /* create and map scrollbar */	555	resize_scrollbar (); /* create and map scrollbar */
365	#endif	556	#endif
366	#if (MENUBAR_MAX)	557	#if (MENUBAR_MAX)
367	if (menubar_visible ())	558	if (menubar_visible ())
368	XMapWindow (display->display, menuBar.win);	559	XMapWindow (disp, menuBar.win);
369	#endif	560	#endif
370	#ifdef TRANSPARENT	561	#ifdef TRANSPARENT
371	if (options & Opt_transparent)	562	if (OPTION (Opt_transparent))
372	{	563	{
373	XSelectInput (display->display, display->root, PropertyChangeMask);	564	XSelectInput (disp, display->root, PropertyChangeMask);
374	check_our_parents ();	565	check_our_parents ();
375	rootwin_ev.start (display, display->root);	566	rootwin_ev.start (display, display->root);
376	}	567	}
377	#endif	568	#endif
378		569
379	XMapWindow (display->display, TermWin.vt);	570	XMapWindow (disp, vt);
380	XMapWindow (display->display, TermWin.parent[0]);	571	XMapWindow (disp, parent[0]);
381		572
382	set_colorfgbg ();	573	set_colorfgbg ();
383		574
384	init_command (cmd_argv);	575	init_command (cmd_argv);
385		576
		577	free (cmd_argv);
		578
		579	if (pty.pty >= 0)
386	pty_ev.start (pty.pty, EVENT_READ);	580	pty_ev.start (pty.pty, EVENT_READ);
387		581
388	check_ev.start ();	582	check_ev.start ();
		583
		584	HOOK_INVOKE ((this, HOOK_START, DT_END));
		585	}
389		586
390	return true;	587	return true;
391	}	588	}
392		589
393	static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);	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;
394		629
395	void	630	void
396	rxvt_init ()	631	rxvt_init ()
397	{	632	{
398	/* install exit handler for cleanup */
399	#if 0
400	#ifdef HAVE_ATEXIT
401	atexit (rxvt_clean_exit);
402	#else
403	#endif
404	#endif
405	/*	633	/*
406	* Save and then give up any super-user privileges	634	* Save and then give up any super-user privileges
407	* 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.
408	* We should only need to be root in these cases:	636	* We should only need to be root in these cases:
409	* 1. write utmp entries on some systems	637	* 1. write utmp entries on some systems
410	* 2. chown tty on some systems	638	* 2. chown tty on some systems
411	*/	639	*/
412	rxvt_privileges (SAVE);	640	rxvt_privileges (SAVE);
413	rxvt_privileges (IGNORE);	641	rxvt_privileges (IGNORE);
414		642
415	struct sigaction sa;	643	signal (SIGHUP, SIG_IGN);
		644	signal (SIGPIPE, SIG_IGN);
416		645
417	sigfillset (&sa.sa_mask);	646	sig_handlers.sw_chld.start (SIGCHLD);
418	sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;	647	sig_handlers.sw_term.start (SIGTERM);
419	sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);	648	sig_handlers.sw_int.start (SIGINT);
420	sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
421	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
422	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
423	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
424	sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
425		649
426	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	650	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
427	/* signal (SIGURG, SIG_DFL); */	651	/* signal (SIGURG, SIG_DFL); */
428		652
429	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
430	//XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);	655	XSetIOErrorHandler (rxvt_xioerror_handler);
431	}
432		656
433	/* ------------------------------------------------------------------------- *	657	XrmInitialize ();
434	* SIGNAL HANDLING & EXIT HANDLER *
435	* ------------------------------------------------------------------------- */
436	/*
437	* Catch a SIGCHLD signal and exit if the direct child has died
438	*/
439
440	void rxvt_term::child_exited (int pid)
441	{
442	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
443	if (pid == (*t)->cmd_pid)
444	{
445	(*t)->destroy ();
446	break;
447	}
448	}
449
450	/* ARGSUSED */
451	/* INTPROTO */
452	RETSIGTYPE
453	rxvt_Child_signal (int sig __attribute__ ((unused)))
454	{
455	int pid, save_errno = errno;
456
457	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
458	rxvt_term::child_exited (pid);
459
460	errno = save_errno;
461	}
462
463	/*
464	* Catch a fatal signal and tidy up before quitting
465	*/
466	/* INTPROTO */
467	RETSIGTYPE
468	rxvt_Exit_signal (int sig)
469	{
470	signal (sig, SIG_DFL);
471	#ifdef DEBUG_CMD
472	rxvt_warn ("caught signal %d, exiting.\n", sig);
473	#endif
474	rxvt_clean_exit ();
475	kill (getpid (), sig);
476	}
477
478	/* INTPROTO */
479	int
480	rxvt_xerror_handler (Display *display, XErrorEvent *event)
481	{
482	if (GET_R->allowedxerror == -1)
483	GET_R->allowedxerror = event->error_code;
484	else
485	{
486	old_xerror_handler (display, event);
487	GET_R->destroy ();
488	}
489
490	return 0;
491	}
492
493	/*----------------------------------------------------------------------*/
494	/*
495	* Exit gracefully, clearing the utmp entry and restoring tty attributes
496	* TODO: if debugging, this should free up any known resources if we can
497	*/
498	/* INTPROTO */
499	void
500	rxvt_clean_exit ()
501	{
502	// TODO: rxvtd should clean up all ressources
503	if (GET_R)
504	GET_R->destroy ();
505	}	658	}
506		659
507	/* ------------------------------------------------------------------------- *	660	/* ------------------------------------------------------------------------- *
508	* MEMORY ALLOCATION WRAPPERS *	661	* MEMORY ALLOCATION WRAPPERS *
509	* ------------------------------------------------------------------------- */	662	* ------------------------------------------------------------------------- */
510	/* INTPROTO */	663	void *
511	void *
512	rxvt_malloc (size_t size)	664	rxvt_malloc (size_t size)
513	{	665	{
514	void *p;
515
516	p = malloc (size);	666	void *p = malloc (size);
		667
517	if (p)	668	if (!p)
518	return p;
519
520	rxvt_fatal ("memory allocation failure. aborting.\n");	669	rxvt_fatal ("memory allocation failure. aborting.\n");
521	/* NOTREACHED */
522	}
523		670
524	/* INTPROTO */	671	return p;
525	void *	672	}
		673
		674	void *
526	rxvt_calloc (size_t number, size_t size)	675	rxvt_calloc (size_t number, size_t size)
527	{	676	{
528	void *p;
529
530	p = calloc (number, size);	677	void *p = calloc (number, size);
		678
531	if (p)	679	if (!p)
532	return p;
533
534	rxvt_fatal ("memory allocation failure. aborting.\n");	680	rxvt_fatal ("memory allocation failure. aborting.\n");
535	/* NOTREACHED */
536	}
537		681
538	/* INTPROTO */	682	return p;
		683	}
		684
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
547	p = malloc (size);
548		689
549	if (p)	690	if (!p)
550	return p;
551
552	rxvt_fatal ("memory allocation failure. aborting.\n");	691	rxvt_fatal ("memory allocation failure. aborting.\n");
553	/* NOTREACHED */	692
		693	return p;
554	}	694	}
555		695
556	/* ------------------------------------------------------------------------- *	696	/* ------------------------------------------------------------------------- *
557	* PRIVILEGED OPERATIONS *	697	* PRIVILEGED OPERATIONS *
558	* ------------------------------------------------------------------------- */	698	* ------------------------------------------------------------------------- */
559	/* take care of suid/sgid super-user (root) privileges */	699	/* take care of suid/sgid super-user (root) privileges */
560	void	700	void
561	rxvt_privileges (rxvt_privaction action)	701	rxvt_privileges (rxvt_privaction action)
562	{	702	{
563	#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
564	static uid_t euid;
565	static gid_t egid;
566	#endif
567
568	#if ! defined(__CYGWIN32__)	703	#if ! defined(__CYGWIN32__)
569	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)	704	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
570	/* setreuid () is the poor man's setuid (), seteuid () */	705	/* setreuid () is the poor man's setuid (), seteuid () */
571	# define seteuid(a) setreuid(-1, (a))	706	# define seteuid(a) setreuid(-1, (a))
572	# define setegid(a) setregid(-1, (a))	707	# define setegid(a) setregid(-1, (a))
…		…
578	case IGNORE:	713	case IGNORE:
579	/*	714	/*
580	* 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
581	* back to root later, as required	716	* back to root later, as required
582	*/	717	*/
		718	setegid (getgid ());
583	seteuid (getuid ());	719	seteuid (getuid ());
584	setegid (getgid ());
585	break;	720	break;
586	case SAVE:	721	case SAVE:
587	euid = geteuid ();
588	egid = getegid ();	722	saved_egid = getegid ();
		723	saved_euid = geteuid ();
589	break;	724	break;
590	case RESTORE:	725	case RESTORE:
591	seteuid (euid);
592	setegid (egid);	726	setegid (saved_egid);
		727	seteuid (saved_euid);
593	break;	728	break;
594	}	729	}
595	# else	730	# else
596	switch (action)	731	switch (action)
597	{	732	{
598	case IGNORE:	733	case IGNORE:
		734	setgid (getgid ());
599	setuid (getuid ());	735	setuid (getuid ());
600	setgid (getgid ());
601	/* FALLTHROUGH */	736	/* FALLTHROUGH */
602	case SAVE:	737	case SAVE:
603	/* FALLTHROUGH */	738	/* FALLTHROUGH */
604	case RESTORE:	739	case RESTORE:
605	break;	740	break;
…		…
610		745
611	#ifdef UTMP_SUPPORT	746	#ifdef UTMP_SUPPORT
612	void	747	void
613	rxvt_term::privileged_utmp (rxvt_privaction action)	748	rxvt_term::privileged_utmp (rxvt_privaction action)
614	{	749	{
615	if ((options & Opt_utmpInhibit)	750	if (OPTION (Opt_utmpInhibit)
616	|| !pty.name || !*pty.name)	751	|| !pty.name || !*pty.name)
617	return;	752	return;
618		753
619	rxvt_privileges (RESTORE);	754	rxvt_privileges (RESTORE);
620		755
…		…
631	/*	766	/*
632	* window size/position calculcations for XSizeHint and other storage.	767	* window size/position calculcations for XSizeHint and other storage.
633	* if width/height are non-zero then override calculated width/height	768	* if width/height are non-zero then override calculated width/height
634	*/	769	*/
635	void	770	void
636	rxvt_term::window_calc (unsigned int width, unsigned int height)	771	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637	{	772	{
638	short recalc_x, recalc_y;	773	short recalc_x, recalc_y;
639	int x, y, sb_w, mb_h, flags;	774	int x, y, sb_w, mb_h, flags;
640	unsigned int w, h;	775	unsigned int w, h;
641	unsigned int max_width, max_height;	776	unsigned int max_width, max_height;
		777	dDisp;
642		778
643	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",
644	TermWin.ncol, TermWin.nrow, szHint.width,	780	ncol, nrow, szHint.width, szHint.height));
645	szHint.height));	781
646	szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;	782	szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
647	szHint.win_gravity = NorthWestGravity;	783	szHint.win_gravity = NorthWestGravity;
648	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	784	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
649		785
650	recalc_x = recalc_y = 0;	786	recalc_x = recalc_y = 0;
651	flags = 0;	787	flags = 0;
		788
652	if (!parsed_geometry)	789	if (!parsed_geometry)
653	{	790	{
654	parsed_geometry = 1;	791	parsed_geometry = 1;
		792
655	if (rs[Rs_geometry])	793	if (rs[Rs_geometry])
656	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	794	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
		795
657	if (flags & WidthValue)	796	if (flags & WidthValue)
658	{	797	{
659	TermWin.ncol = BOUND_POSITIVE_INT16 (w);	798	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
660	szHint.flags |= USSize;	799	szHint.flags |= USSize;
661	}	800	}
		801
662	if (flags & HeightValue)	802	if (flags & HeightValue)
663	{	803	{
664	TermWin.nrow = BOUND_POSITIVE_INT16 (h);	804	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
665	szHint.flags |= USSize;	805	szHint.flags |= USSize;
666	}	806	}
		807
667	if (flags & XValue)	808	if (flags & XValue)
668	{	809	{
669	szHint.x = x;	810	szHint.x = x;
670	szHint.flags |= USPosition;	811	szHint.flags |= USPosition;
		812
671	if (flags & XNegative)	813	if (flags & XNegative)
672	{	814	{
673	recalc_x = 1;	815	recalc_x = 1;
674	szHint.win_gravity = NorthEastGravity;	816	szHint.win_gravity = NorthEastGravity;
675	}	817	}
676	}	818	}
		819
677	if (flags & YValue)	820	if (flags & YValue)
678	{	821	{
679	szHint.y = y;	822	szHint.y = y;
680	szHint.flags |= USPosition;	823	szHint.flags |= USPosition;
		824
681	if (flags & YNegative)	825	if (flags & YNegative)
682	{	826	{
683	recalc_y = 1;	827	recalc_y = 1;
		828
684	if (szHint.win_gravity == NorthEastGravity)	829	if (szHint.win_gravity == NorthEastGravity)
685	szHint.win_gravity = SouthEastGravity;	830	szHint.win_gravity = SouthEastGravity;
686	else	831	else
687	szHint.win_gravity = SouthWestGravity;	832	szHint.win_gravity = SouthWestGravity;
688	}	833	}
689	}	834	}
690	}	835	}
691		836
692	/* TODO: BOUNDS */	837	/* TODO: BOUNDS */
693	TermWin.width = TermWin.ncol * TermWin.fwidth;	838	width = ncol * fwidth;
694	TermWin.height = TermWin.nrow * TermWin.fheight;	839	height = nrow * fheight;
695	max_width = MAX_COLS * TermWin.fwidth;	840	max_width = MAX_COLS * fwidth;
696	max_height = MAX_ROWS * TermWin.fheight;	841	max_height = MAX_ROWS * fheight;
697		842
698	szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;	843	szHint.base_width = szHint.base_height = 2 * int_bwidth;
699		844
700	sb_w = mb_h = 0;	845	sb_w = mb_h = 0;
701	window_vt_x = window_vt_y = TermWin.int_bwidth;	846	window_vt_x = window_vt_y = int_bwidth;
702		847
703	if (scrollbar_visible ())	848	if (scrollbar_visible ())
704	{	849	{
705	sb_w = scrollbar_TotalWidth ();	850	sb_w = scrollbar_TotalWidth ();
706	szHint.base_width += sb_w;	851	szHint.base_width += sb_w;
707	if (!(options & Opt_scrollBar_right))	852	if (!OPTION (Opt_scrollBar_right))
708	window_vt_x += sb_w;	853	window_vt_x += sb_w;
709	}	854	}
710		855
711	if (menubar_visible ())	856	if (menubar_visible ())
712	{	857	{
713	mb_h = menuBar_TotalHeight ();	858	mb_h = menuBar_TotalHeight ();
714	szHint.base_height += mb_h;	859	szHint.base_height += mb_h;
715	window_vt_y += mb_h;	860	window_vt_y += mb_h;
716	}	861	}
717		862
718	szHint.width_inc = TermWin.fwidth;	863	szHint.width_inc = fwidth;
719	szHint.height_inc = TermWin.fheight;	864	szHint.height_inc = fheight;
720	szHint.min_width = szHint.base_width + szHint.width_inc;	865	szHint.min_width = szHint.base_width + szHint.width_inc;
721	szHint.min_height = szHint.base_height + szHint.height_inc;	866	szHint.min_height = szHint.base_height + szHint.height_inc;
722		867
723	if (width && width - szHint.base_width < max_width)	868	if (newwidth && newwidth - szHint.base_width < max_width)
724	{	869	{
725	szHint.width = width;	870	szHint.width = newwidth;
726	TermWin.width = width - szHint.base_width;	871	width = newwidth - szHint.base_width;
727	}	872	}
728	else	873	else
729	{	874	{
730	MIN_IT (TermWin.width, max_width);	875	min_it (width, max_width);
731	szHint.width = szHint.base_width + TermWin.width;	876	szHint.width = szHint.base_width + width;
732	}	877	}
733		878
734	if (height && height - szHint.base_height < max_height)	879	if (newheight && newheight - szHint.base_height < max_height)
735	{	880	{
736	szHint.height = height;	881	szHint.height = newheight;
737	TermWin.height = height - szHint.base_height;	882	height = newheight - szHint.base_height;
738	}	883	}
739	else	884	else
740	{	885	{
741	MIN_IT (TermWin.height, max_height);	886	min_it (height, max_height);
742	szHint.height = szHint.base_height + TermWin.height;	887	szHint.height = szHint.base_height + height;
743	}	888	}
744		889
745	if (scrollbar_visible () && (options & Opt_scrollBar_right))	890	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
746	window_sb_x = szHint.width - sb_w;	891	window_sb_x = szHint.width - sb_w;
747		892
748	if (recalc_x)	893	if (recalc_x)
749	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))	894	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
750	- szHint.width - 2 * TermWin.ext_bwidth);
751	if (recalc_y)	895	if (recalc_y)
752	szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))	896	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
753	- szHint.height - 2 * TermWin.ext_bwidth);
754		897
755	TermWin.ncol = TermWin.width / TermWin.fwidth;	898	ncol = width / fwidth;
756	TermWin.nrow = TermWin.height / TermWin.fheight;	899	nrow = height / fheight;
757	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",
758	TermWin.ncol, TermWin.nrow, szHint.width,	901	ncol, nrow, szHint.width,
759	szHint.height));	902	szHint.height));
760	return;	903	return;
761	}	904	}
762		905
763	/*----------------------------------------------------------------------*/	906	/*----------------------------------------------------------------------*/
…		…
771	if (pty.pty < 0)	914	if (pty.pty < 0)
772	return;	915	return;
773		916
774	struct winsize ws;	917	struct winsize ws;
775		918
776	ws.ws_col = TermWin.ncol;	919	ws.ws_col = ncol;
777	ws.ws_row = TermWin.nrow;	920	ws.ws_row = nrow;
778	ws.ws_xpixel = TermWin.width;	921	ws.ws_xpixel = width;
779	ws.ws_ypixel = TermWin.height;	922	ws.ws_ypixel = height;
780	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	923	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);
781		924
782	#if 0	925	#if 0
783	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	926	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
784	if (cmd_pid) /* force through to the command */	927	if (cmd_pid) /* force through to the command */
785	kill (cmd_pid, SIGWINCH);	928	kill (-cmd_pid, SIGWINCH);
786	#endif	929	#endif
787	}	930	}
788		931
789	/*----------------------------------------------------------------------*/	932	/*----------------------------------------------------------------------*/
790	/* set_fonts () - load and set the various fonts	933	/* set_fonts () - load and set the various fonts
791	/*	934	*
792	* init = 1 - initialize	935	* init = 1 - initialize
793	*	936	*
794	* fontname == FONT_UP - switch to bigger font	937	* fontname == FONT_UP - switch to bigger font
795	* fontname == FONT_DN - switch to smaller font	938	* fontname == FONT_DN - switch to smaller font
796	*/	939	*/
…		…
798	rxvt_term::set_fonts ()	941	rxvt_term::set_fonts ()
799	{	942	{
800	rxvt_fontset *fs = new rxvt_fontset (this);	943	rxvt_fontset *fs = new rxvt_fontset (this);
801	rxvt_fontprop prop;	944	rxvt_fontprop prop;
802		945
803	prop.width = prop.height = prop.weight = prop.slant
804	= rxvt_fontprop::unset;
805
806	if (!fs	946	if (!fs
807	|| !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed", prop)	947	|| !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
808	|| !fs->realize_font (1))	948	|| !fs->realize_font (1))
809	{	949	{
810	delete fs;	950	delete fs;
811	return false;	951	return false;
812	}	952	}
813		953
814	#if ENABLE_STYLES	954	#if ENABLE_STYLES
815	for (int i = RS_styleCount; --i; )	955	for (int i = RS_styleCount; --i; )
816	if (TermWin.fontset[i] != TermWin.fontset[0])	956	if (fontset[i] != fontset[0])
817	delete TermWin.fontset[i];	957	delete fontset[i];
818	#endif	958	#endif
819		959
820	delete TermWin.fontset[0];	960	delete fontset[0];
821	TermWin.fontset[0] = fs;	961	fontset[0] = fs;
822		962
823	fs->prop = prop = (*fs)[1]->properties ();	963	prop = (*fs)[1]->properties ();
		964	prop.height += lineSpace;
		965	fs->set_prop (prop);
824		966
825	TermWin.fwidth = prop.width;	967	fwidth = prop.width;
826	TermWin.fheight = prop.height;	968	fheight = prop.height;
827	TermWin.fweight = prop.weight;	969	fbase = prop.ascent;
828	TermWin.fslant = prop.slant;
829	TermWin.fbase = (*fs)[1]->ascent;
830		970
831	for (int style = 1; style < 4; style++)	971	for (int style = 1; style < 4; style++)
832	{	972	{
833	#if ENABLE_STYLES	973	#if ENABLE_STYLES
834	const char *res = rs[Rs_font + style];	974	const char *res = rs[Rs_font + style];
835		975
836	if (res && !*res)	976	if (res && !*res)
837	TermWin.fontset[style] = TermWin.fontset[0];	977	fontset[style] = fontset[0];
838	else	978	else
839	{	979	{
840	TermWin.fontset[style] = fs = new rxvt_fontset (this);	980	fontset[style] = fs = new rxvt_fontset (this);
841	rxvt_fontprop prop2 = prop;	981	rxvt_fontprop prop2 = prop;
842		982
843	if (res)	983	if (res)
844	prop2.weight = prop2.slant = rxvt_fontprop::unset;	984	prop2.weight = prop2.slant = rxvt_fontprop::unset;
845	else	985	else
846	{	986	{
847	res = TermWin.fontset[0]->fontdesc;	987	res = fontset[0]->fontdesc;
848		988
849	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	989	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
850	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	990	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
851	}	991	}
852		992
853	fs->populate (res, prop2);	993	fs->populate (res);
		994	fs->set_prop (prop2);
854	}	995	}
855	#else	996	#else
856	TermWin.fontset[style] = TermWin.fontset[0];	997	fontset[style] = fontset[0];
857	#endif	998	#endif
858	}	999	}
859		1000
860	if (TermWin.parent[0])	1001	if (parent[0])
861	{	1002	{
862	resize_all_windows (0, 0, 0);	1003	resize_all_windows (0, 0, 0);
863	scr_remap_chars ();	1004	scr_remap_chars ();
864	scr_touch (true);	1005	scr_touch (true);
865	}	1006	}
866		1007
867	return true;	1008	return true;
868	}	1009	}
869		1010
		1011	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
		1012	{
		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);
		1029	}
		1030
870	/*----------------------------------------------------------------------*/	1031	/*----------------------------------------------------------------------*/
871	/*----------------------------------------------------------------------*/	1032	/*----------------------------------------------------------------------*/
872	/* xterm sequences - title, iconName, color (exptl) */	1033	/* xterm sequences - title, iconName, color (exptl) */
873	void	1034	void
874	rxvt_term::set_title (const char *str)	1035	rxvt_term::set_title (const char *str)
875	{	1036	{
876	#ifdef SMART_WINDOW_TITLE	1037	set_string_property (XA_WM_NAME, str);
877	char *name;	1038	#if ENABLE_EWMH
878		1039	set_utf8_property (xa[XA_NET_WM_NAME], str);
879	if (!XFetchName (display->display, TermWin.parent[0], &name))
880	name = NULL;
881
882	if (name == NULL || strcmp (name, str))
883	#endif
884	XStoreName (display->display, TermWin.parent[0], str);
885
886	#ifdef SMART_WINDOW_TITLE
887	if (name)
888	XFree (name);
889	#endif	1040	#endif
890	}	1041	}
891		1042
892	void	1043	void
893	rxvt_term::set_icon_name (const char *str)	1044	rxvt_term::set_icon_name (const char *str)
894	{	1045	{
895	#ifdef SMART_WINDOW_TITLE	1046	set_string_property (XA_WM_ICON_NAME, str);
896	char *name;	1047	#if ENABLE_EWMH
897		1048	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
898	if (!XGetIconName (display->display, TermWin.parent[0], &name))
899	name = NULL;
900
901	if (name == NULL || strcmp (name, str))
902	#endif
903	XSetIconName (display->display, TermWin.parent[0], str);
904
905	#ifdef SMART_WINDOW_TITLE
906	if (name)
907	XFree (name);
908	#endif	1049	#endif
909	}	1050	}
910		1051
911	#ifdef XTERM_COLOR_CHANGE	1052	#ifdef XTERM_COLOR_CHANGE
912	void	1053	void
…		…
920		1061
921	/* handle color aliases */	1062	/* handle color aliases */
922	if (isdigit (*color))	1063	if (isdigit (*color))
923	{	1064	{
924	i = atoi (color);	1065	i = atoi (color);
		1066
925	if (i >= 8 && i <= 15)	1067	if (i >= 8 && i <= 15)
926	{ /* bright colors */	1068	{ /* bright colors */
927	i -= 8;	1069	i -= 8;
928	# ifndef NO_BRIGHTCOLOR
929	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	1070	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
930	SET_PIXCOLOR (idx);	1071	SET_PIXCOLOR (idx);
931	goto Done;	1072	goto done;
932	# endif
933
934	}	1073	}
		1074
935	if (i >= 0 && i <= 7)	1075	if (i >= 0 && i <= 7)
936	{ /* normal colors */	1076	{ /* normal colors */
937	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	1077	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
938	SET_PIXCOLOR (idx);	1078	SET_PIXCOLOR (idx);
939	goto Done;	1079	goto done;
940	}	1080	}
941	}	1081	}
942		1082
943	if (!rXParseAllocColor (& xcol, color))	1083	if (!rXParseAllocColor (&xcol, color))
944	return;	1084	return;
945		1085
946	/* XStoreColor (display->display, display->cmap, XColor*); */	1086	/* XStoreColor (display->display, display->cmap, XColor*); */
947		1087
948	/*	1088	/*
…		…
964	pix_colors_focused[idx] = xcol;	1104	pix_colors_focused[idx] = xcol;
965	SET_PIXCOLOR (idx);	1105	SET_PIXCOLOR (idx);
966		1106
967	/* XSetWindowAttributes attr; */	1107	/* XSetWindowAttributes attr; */
968	/* Cursor cursor; */	1108	/* Cursor cursor; */
969	Done:	1109	done:
		1110
970	#ifdef OFF_FOCUS_FADING	1111	#if OFF_FOCUS_FADING
971	if (rs[Rs_fade])	1112	if (rs[Rs_fade])
972	pix_colors_unfocused[idx] = pix_colors_focused[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]);
973	#endif	1114	#endif
974		1115
975	/*TODO: handle Color_BD, scrollbar background, etc. */	1116	/*TODO: handle Color_BD, scrollbar background, etc. */
976		1117
977	recolour_cursor ();	1118	recolour_cursor ();
…		…
1031		1172
1032	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1173	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1033	}	1174	}
1034		1175
1035	/*----------------------------------------------------------------------*/	1176	/*----------------------------------------------------------------------*/
1036	/*
1037	* Colour determination for low colour displays, routine from
1038	* Hans de Goede <hans@highrise.nl>
1039	*/
1040		1177
1041	int	1178	int
1042	rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)	1179	rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1043	{	1180	{
1044	if (!screen_in_out->set (display, colour))	1181	if (!screen_in_out->set (display, colour))
…		…
1052		1189
1053	/* -------------------------------------------------------------------- *	1190	/* -------------------------------------------------------------------- *
1054	* - WINDOW RESIZING - *	1191	* - WINDOW RESIZING - *
1055	* -------------------------------------------------------------------- */	1192	* -------------------------------------------------------------------- */
1056	void	1193	void
1057	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)
1058	{	1195	{
1059	int fix_screen;	1196	int fix_screen;
1060
1061	#ifdef SMART_RESIZE
1062	int old_width = szHint.width, old_height = szHint.height;	1197	int old_width = szHint.width, old_height = szHint.height;
1063	#endif	1198	dDisp;
1064		1199
1065	window_calc (width, height);	1200	window_calc (newwidth, newheight);
1066	XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);	1201	XSetWMNormalHints (disp, parent[0], &szHint);
1067		1202
1068	if (!ignoreparent)	1203	if (!ignoreparent)
1069	{	1204	{
1070	#ifdef SMART_RESIZE	1205	#ifdef SMART_RESIZE
1071	/*	1206	/*
…		…
1075	int x, y, x1, y1;	1210	int x, y, x1, y1;
1076	int dx, dy;	1211	int dx, dy;
1077	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1212	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1078	Window unused_cr;	1213	Window unused_cr;
1079		1214
1080	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	1215	XTranslateCoordinates (disp, parent[0], display->root,
1081	0, 0, &x, &y, &unused_cr);	1216	0, 0, &x, &y, &unused_cr);
1082	XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,	1217	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1083	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1218	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1084	/*	1219	/*
1085	* 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
1086	* our position for handles and decorations. Counter it	1221	* our position for handles and decorations. Counter it
1087	*/	1222	*/
…		…
1089	{	1224	{
1090	x -= x1;	1225	x -= x1;
1091	y -= y1;	1226	y -= y1;
1092	}	1227	}
1093		1228
1094	x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;	1229	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1095	y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;	1230	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1096	dx = old_width - szHint.width;	1231	dx = old_width - szHint.width;
1097	dy = old_height - szHint.height;	1232	dy = old_height - szHint.height;
1098		1233
1099	/* Check position of the center of the window */	1234	/* Check position of the center of the window */
1100	if (x < x1) /* left half */	1235	if (x < x1) /* left half */
…		…
1104	if (y < y1) /* top half */	1239	if (y < y1) /* top half */
1105	dy = 0;	1240	dy = 0;
1106	else if (y == y1) /* exact center */	1241	else if (y == y1) /* exact center */
1107	dy /= 2;	1242	dy /= 2;
1108		1243
1109	XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,	1244	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1110	szHint.width, szHint.height);	1245	szHint.width, szHint.height);
1111	#else	1246	#else
1112	XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);	1247	XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1113	#endif	1248	#endif
1114	}	1249	}
1115		1250
1116	fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;	1251	fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1117		1252
1118	if (fix_screen || width != old_width || height != old_height)	1253	if (fix_screen || newwidth != old_width || newheight != old_height)
1119	{	1254	{
1120	if (scrollbar_visible ())	1255	if (scrollbar_visible ())
1121	{	1256	{
1122	XMoveResizeWindow (display->display, scrollBar.win,	1257	XMoveResizeWindow (disp, scrollBar.win,
1123	window_sb_x, 0,	1258	window_sb_x, 0,
1124	scrollbar_TotalWidth (), szHint.height);	1259	scrollbar_TotalWidth (), szHint.height);
1125	resize_scrollbar ();	1260	resize_scrollbar ();
1126	}	1261	}
1127		1262
1128	if (menubar_visible ())	1263	if (menubar_visible ())
1129	XMoveResizeWindow (display->display, menuBar.win,	1264	XMoveResizeWindow (disp, menuBar.win,
1130	window_vt_x, 0,	1265	window_vt_x, 0,
1131	TermWin_TotalWidth (), menuBar_TotalHeight ());	1266	width, menuBar_TotalHeight ());
1132		1267
1133	XMoveResizeWindow (display->display, TermWin.vt,	1268	XMoveResizeWindow (disp, vt,
1134	window_vt_x, window_vt_y,	1269	window_vt_x, window_vt_y,
1135	TermWin_TotalWidth (), TermWin_TotalHeight ());	1270	width, height);
		1271
1136	scr_clear ();	1272	scr_clear ();
1137	#ifdef XPM_BACKGROUND	1273	#ifdef XPM_BACKGROUND
1138	resize_pixmap ();	1274	resize_pixmap ();
1139	#endif	1275	#endif
1140	}	1276	}
…		…
1145	int old_ncol = prev_ncol;	1281	int old_ncol = prev_ncol;
1146		1282
1147	/* scr_reset only works on the primary screen */	1283	/* scr_reset only works on the primary screen */
1148	if (old_height) /* this is not the first time through */	1284	if (old_height) /* this is not the first time through */
1149	{	1285	{
1150	unsigned int ncol = TermWin.ncol;	1286	unsigned int ocol = ncol;
1151	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
1152	curr_screen = scr_change_screen (PRIMARY);	1288	curr_screen = scr_change_screen (PRIMARY);
1153	TermWin.ncol = ncol;	1289	ncol = ocol;
1154	}	1290	}
1155		1291
1156	scr_reset ();	1292	scr_reset ();
1157		1293
1158	if (curr_screen >= 0) /* this is not the first time through */	1294	if (curr_screen >= 0) /* this is not the first time through */
1159	{	1295	{
1160	scr_change_screen (curr_screen);	1296	scr_change_screen (curr_screen);
1161	selection_check (old_ncol != TermWin.ncol ? 4 : 0);	1297	selection_check (old_ncol != ncol ? 4 : 0);
1162	}	1298	}
1163	}	1299	}
1164		1300
1165	old_width = szHint.width;	1301	old_width = szHint.width;
1166	old_height = szHint.height;	1302	old_height = szHint.height;
		1303
		1304	#ifdef XPM_BACKGROUND
		1305	if (pixmap)
		1306	scr_touch (false);
		1307	#endif
1167		1308
1168	#ifdef USE_XIM	1309	#ifdef USE_XIM
1169	IMSetStatusPosition ();	1310	IMSetStatusPosition ();
1170	#endif	1311	#endif
1171	}	1312	}
…		…
1173	/*	1314	/*
1174	* 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.
1175	* good for toggling 80/132 columns	1316	* good for toggling 80/132 columns
1176	*/	1317	*/
1177	void	1318	void
1178	rxvt_term::set_widthheight (unsigned int width, unsigned int height)	1319	rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1179	{	1320	{
1180	XWindowAttributes wattr;	1321	XWindowAttributes wattr;
1181		1322
1182	if (width == 0 || height == 0)	1323	if (newwidth == 0 || newheight == 0)
1183	{	1324	{
1184	XGetWindowAttributes (display->display, display->root, &wattr);	1325	XGetWindowAttributes (display->display, display->root, &wattr);
		1326
1185	if (width == 0)	1327	if (newwidth == 0)
1186	width = wattr.width - szHint.base_width;	1328	newwidth = wattr.width - szHint.base_width;
1187	if (height == 0)	1329	if (newheight == 0)
1188	height = wattr.height - szHint.base_height;	1330	newheight = wattr.height - szHint.base_height;
1189	}
1190
1191	if (width != TermWin.width || height != TermWin.height)
1192	{	1331	}
		1332
		1333	if (newwidth != width || newheight != height)
		1334	{
1193	width += szHint.base_width;	1335	newwidth += szHint.base_width;
1194	height += szHint.base_height;	1336	newheight += szHint.base_height;
1195	resize_all_windows (width, height, 0);	1337	resize_all_windows (newwidth, newheight, 0);
1196	}	1338	}
1197	}	1339	}
1198		1340
1199	/* -------------------------------------------------------------------- *	1341	/* -------------------------------------------------------------------- *
1200	* - X INPUT METHOD ROUTINES - *	1342	* - X INPUT METHOD ROUTINES - *
…		…
1210		1352
1211	void	1353	void
1212	rxvt_term::im_set_size (XRectangle &size)	1354	rxvt_term::im_set_size (XRectangle &size)
1213	{	1355	{
1214	// the int_bwidth terms make no sense to me	1356	// the int_bwidth terms make no sense to me
1215	size.x = TermWin.int_bwidth;	1357	size.x = int_bwidth;
1216	size.y = TermWin.int_bwidth;	1358	size.y = int_bwidth;
1217	size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;	1359	size.width = Width2Pixel (ncol) + int_bwidth;
1218	size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;	1360	size.height = Height2Pixel (nrow) + int_bwidth;
1219	}	1361	}
1220		1362
1221	void	1363	void
1222	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,	1364	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1223	XRectangle &status_rect,	1365	XRectangle &status_rect,
1224	const XRectangle &needed_rect)	1366	const XRectangle &needed_rect)
1225	{	1367	{
1226	preedit_rect.x = needed_rect.width;	1368	preedit_rect.x = needed_rect.width;
1227	preedit_rect.y = 0;	1369	preedit_rect.y = 0;
1228	preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;	1370	preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1229	preedit_rect.height = TermWin.fheight;	1371	preedit_rect.height = fheight;
1230		1372
1231	status_rect.x = 0;	1373	status_rect.x = 0;
1232	status_rect.y = 0;	1374	status_rect.y = 0;
1233	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;	1375	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1234	status_rect.height = TermWin.fheight;	1376	status_rect.height = fheight;
1235	}	1377	}
1236		1378
1237	/* Checking whether input method is running. */	1379	/* Checking whether input method is running. */
1238	bool	1380	bool
1239	rxvt_term::IMisRunning ()	1381	rxvt_term::IMisRunning ()
…		…
1263	}	1405	}
1264		1406
1265	void	1407	void
1266	rxvt_term::IMSendSpot ()	1408	rxvt_term::IMSendSpot ()
1267	{	1409	{
1268	XPoint spot;	1410	XPoint nspot;
1269	XVaNestedList preedit_attr;	1411	XVaNestedList preedit_attr;
1270		1412
1271	if (!Input_Context	1413	if (!Input_Context
1272	|| !TermWin.focus	1414	|| !focus
1273	|| !(input_style & XIMPreeditPosition)	1415	|| !(input_style & XIMPreeditPosition))
1274	#if 0
1275	|| !(event_type == KeyPress
1276	|| event_type == Expose
1277	|| event_type == NoExpose
1278	|| event_type == SelectionNotify
1279	|| event_type == ButtonRelease || event_type == FocusIn)
1280	#endif
1281	|| !IMisRunning ())
1282	return;	1416	return;
1283		1417
1284	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;
1285		1424
1286	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);	1425	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1287	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);	1426	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1288	XFree (preedit_attr);	1427	XFree (preedit_attr);
1289	}	1428	}
1290		1429
1291	void	1430	void
1292	rxvt_term::im_destroy ()	1431	rxvt_term::im_destroy ()
1293	{	1432	{
1294	if (Input_Context)
1295	{
1296	XDestroyIC (Input_Context);
1297	Input_Context = 0;
1298	}
1299
1300	if (input_method)	1433	if (input_method)
1301	{	1434	{
		1435	if (Input_Context && input_method->xim)
		1436	XDestroyIC (Input_Context);
		1437
1302	display->put_xim (input_method);	1438	display->put_xim (input_method);
1303	input_method = 0;	1439	input_method = 0;
1304	}	1440	}
		1441
		1442	Input_Context = 0;
1305	}	1443	}
1306		1444
1307	/*	1445	/*
1308	* 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
1309	* open a suitable preedit type	1447	* open a suitable preedit type
…		…
1318	unsigned long fg, bg;	1456	unsigned long fg, bg;
1319	const char *p;	1457	const char *p;
1320	char **s;	1458	char **s;
1321	XIMStyles *xim_styles;	1459	XIMStyles *xim_styles;
1322		1460
		1461	TEMP_ENV;
		1462
1323	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1463	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1324	return false;	1464	return false;
1325		1465
1326	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1466	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1327	input_method = display->get_xim (locale, modifiers);	1467	input_method = display->get_xim (locale, modifiers);
1328	if (input_method == NULL)	1468	if (input_method == NULL)
1329	return false;	1469	return false;
1330		1470
1331	xim = input_method->xim;	1471	xim = input_method->xim;
		1472	spot.x = spot.y = -1;
1332		1473
1333	xim_styles = NULL;	1474	xim_styles = NULL;
1334	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)	1475	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1335	|| !xim_styles || !xim_styles->count_styles)	1476	|| !xim_styles || !xim_styles->count_styles)
1336	{	1477	{
1337	im_destroy ();	1478	im_destroy ();
1338	return false;	1479	return false;
1339	}	1480	}
1340		1481
1341	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
1342	s = rxvt_splitcommastring (p);	1491	s = rxvt_splitcommastring (p);
1343		1492
1344	for (i = found = 0; !found && s[i]; i++)	1493	for (i = found = 0; !found && s[i]; i++)
1345	{	1494	{
1346	if (!strcmp (s[i], "OverTheSpot"))	1495	if (!strcmp (s[i], "OverTheSpot"))
1347	input_style = (XIMPreeditPosition | XIMStatusNothing);	1496	input_style = (XIMPreeditPosition | XIMStatusNothing);
1348	else if (!strcmp (s[i], "OffTheSpot"))	1497	else if (!strcmp (s[i], "OffTheSpot"))
1349	input_style = (XIMPreeditArea | XIMStatusArea);	1498	input_style = (XIMPreeditArea | XIMStatusArea);
1350	else if (!strcmp (s[i], "Root"))	1499	else if (!strcmp (s[i], "Root"))
1351	input_style = (XIMPreeditNothing | XIMStatusNothing);	1500	input_style = (XIMPreeditNothing | XIMStatusNothing);
		1501	else if (!strcmp (s[i], "None"))
		1502	input_style = (XIMPreeditNone | XIMStatusNone);
1352		1503
1353	for (j = 0; j < xim_styles->count_styles; j++)	1504	for (j = 0; j < xim_styles->count_styles; j++)
1354	if (input_style == xim_styles->supported_styles[j])	1505	if (input_style == xim_styles->supported_styles[j])
1355	{	1506	{
		1507	rxvt_freecommastring (s);
		1508
1356	found = 1;	1509	found = 1;
1357	break;	1510	goto foundpet;
		1511	}
		1512
1358	}	1513	}
1359	}
1360		1514
1361	for (i = 0; s[i]; i++)	1515	rxvt_freecommastring (s);
1362	free (s[i]);	1516	}
1363		1517
1364	free (s);	1518	foundpet:
		1519
1365	XFree (xim_styles);	1520	XFree (xim_styles);
1366		1521
1367	if (!found)	1522	if (!found)
1368	{	1523	{
1369	im_destroy ();	1524	im_destroy ();
…		…
1386	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"	1541	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1387	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"	1542	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1388	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"	1543	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1389	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"	1544	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1390	"*",	1545	"*",
1391	TermWin.fheight,	1546	fheight,
1392	TermWin.fheight + 1, TermWin.fheight - 1,	1547	fheight + 1, fheight - 1,
1393	TermWin.fheight - 2, TermWin.fheight + 2);	1548	fheight - 2, fheight + 2);
1394		1549
1395	fs = XCreateFontSet (display->display, pat,	1550	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1396	&missing_charset_list, &missing_charset_count, &def_string);	1551	&missing_charset_list, &missing_charset_count, &def_string);
1397		1552
1398	if (missing_charset_list)	1553	if (missing_charset_list)
1399	XFreeStringList (missing_charset_list);	1554	XFreeStringList (missing_charset_list);
1400		1555
…		…
1444	NULL);	1599	NULL);
1445	}	1600	}
1446		1601
1447	Input_Context = XCreateIC (xim,	1602	Input_Context = XCreateIC (xim,
1448	XNInputStyle, input_style,	1603	XNInputStyle, input_style,
1449	XNClientWindow, TermWin.vt,	1604	XNClientWindow, vt,
1450	XNFocusWindow, TermWin.parent[0],	1605	XNFocusWindow, parent[0],
1451	preedit_attr ? XNPreeditAttributes : NULL,	1606	preedit_attr ? XNPreeditAttributes : NULL,
1452	preedit_attr,	1607	preedit_attr,
1453	status_attr ? XNStatusAttributes : NULL,	1608	status_attr ? XNStatusAttributes : NULL,
1454	status_attr, NULL);	1609	status_attr, NULL);
1455		1610
…		…
1472	}	1627	}
1473		1628
1474	void	1629	void
1475	rxvt_term::im_cb ()	1630	rxvt_term::im_cb ()
1476	{	1631	{
1477	int i, found, had_im;	1632	int i;
1478	const char *p;	1633	const char *p;
1479	char **s;	1634	char **s;
1480	char buf[IMBUFSIZ];	1635	char buf[IMBUFSIZ];
1481		1636
		1637	SET_R (this);
		1638
1482	im_destroy ();	1639	im_destroy ();
1483		1640
1484	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1641	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1485	if (Input_Context)	1642	if (Input_Context)
1486	return;	1643	return;
…		…
1494	if (p && *p)	1651	if (p && *p)
1495	{	1652	{
1496	bool found = false;	1653	bool found = false;
1497		1654
1498	s = rxvt_splitcommastring (p);	1655	s = rxvt_splitcommastring (p);
		1656
1499	for (i = 0; s[i]; i++)	1657	for (i = 0; s[i]; i++)
1500	{	1658	{
1501	if (*s[i])	1659	if (*s[i])
1502	{	1660	{
1503	strcpy (buf, "@im=");	1661	strcpy (buf, "@im=");
…		…
1507	found = true;	1665	found = true;
1508	break;	1666	break;
1509	}	1667	}
1510	}	1668	}
1511	}	1669	}
1512	for (i = 0; s[i]; i++)	1670
1513	free (s[i]);	1671	rxvt_freecommastring (s);
1514	free (s);
1515		1672
1516	if (found)	1673	if (found)
1517	goto done;	1674	goto done;
1518	}	1675	}
1519		1676
…		…
1537	{	1694	{
1538	XRectangle preedit_rect, status_rect, *needed_rect;	1695	XRectangle preedit_rect, status_rect, *needed_rect;
1539	XVaNestedList preedit_attr, status_attr;	1696	XVaNestedList preedit_attr, status_attr;
1540		1697
1541	if (!Input_Context	1698	if (!Input_Context
1542	|| !TermWin.focus	1699	|| !focus
1543	|| !(input_style & XIMPreeditArea)	1700	|| !(input_style & XIMPreeditArea)
1544	|| !IMisRunning ())	1701	|| !IMisRunning ())
1545	return;	1702	return;
1546		1703
1547	/* Getting the necessary width of preedit area */	1704	/* Getting the necessary width of preedit area */

Diff Legend

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