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.67 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.134 by root, Fri Feb 4 11:41:23 2005 UTC

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

Diff Legend

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