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.60 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.132 by root, Thu Feb 3 07:18:30 2005 UTC

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

Diff Legend

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