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

Diff Legend

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