ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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