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.94 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.160 by root, Wed Jan 4 05:35:34 2006 UTC

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

Diff Legend

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