[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.138 by root, Wed Feb 16 20:32:05 2005 UTC vs.
Revision 1.166 by root, Sun Jan 8 07:55:36 2006 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "keyboard.h"
		36	#include "rxvtperl.h"
		37
		38	#include <limits>
35		39
36	#include <csignal>	40	#include <csignal>
37	#include <cstring>	41	#include <cstring>
38		42
39	#ifdef TTY_GID_SUPPORT	43	#ifdef TTY_GID_SUPPORT
…		…
42		46
43	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
44	# include <termios.h>	48	# include <termios.h>
45	#endif	49	#endif
46		50
47	#ifdef KEYSYM_RESOURCE
48	# include "keyboard.h"
49	#endif
50
51	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
52		52
53	static char curlocale[128];	53	static char curlocale[128], savelocale[128];
54		54
55	bool	55	bool
56	rxvt_set_locale (const char *locale)	56	rxvt_set_locale (const char *locale)
57	{	57	{
58	if (!locale \|\| !strncmp (locale, curlocale, 128))	58	if (!locale \|\| !strncmp (locale, curlocale, 128))
59	return false;	59	return false;
60		60
61	strncpy (curlocale, locale, 128);	61	strncpy (curlocale, locale, 128);
62	setlocale (LC_CTYPE, curlocale);	62	setlocale (LC_CTYPE, curlocale);
63	return true;	63	return true;
		64	}
		65
		66	bool
		67	rxvt_push_locale (const char *locale)
		68	{
		69	strcpy (savelocale, curlocale);
		70	rxvt_set_locale (locale);
		71	}
		72
		73	void
		74	rxvt_pop_locale ()
		75	{
		76	rxvt_set_locale (savelocale);
64	}	77	}
65		78
66	#if ENABLE_COMBINING	79	#if ENABLE_COMBINING
67	class rxvt_composite_vec rxvt_composite;	80	class rxvt_composite_vec rxvt_composite;
68		81
…		…
157	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
158	#endif	171	#endif
159	#ifdef USE_XIM	172	#ifdef USE_XIM
160	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
161	#endif	174	#endif
162	sw_term (this, &rxvt_term::sig_term),
163	sw_int (this, &rxvt_term::sig_term),
164	sw_chld (this, &rxvt_term::sig_chld),
165	termwin_ev (this, &rxvt_term::x_cb),	175	termwin_ev (this, &rxvt_term::x_cb),
166	vt_ev (this, &rxvt_term::x_cb),	176	vt_ev (this, &rxvt_term::x_cb),
167	check_ev (this, &rxvt_term::check_cb),	177	check_ev (this, &rxvt_term::check_cb),
168	flush_ev (this, &rxvt_term::flush_cb),	178	flush_ev (this, &rxvt_term::flush_cb),
169	destroy_ev (this, &rxvt_term::destroy_cb),	179	destroy_ev (this, &rxvt_term::destroy_cb),
…		…
196	pty.put ();	206	pty.put ();
197	}	207	}
198		208
199	rxvt_term::~rxvt_term ()	209	rxvt_term::~rxvt_term ()
200	{	210	{
		211	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		212
201	termlist.erase (find (termlist.begin (), termlist.end(), this));	213	termlist.erase (find (termlist.begin (), termlist.end(), this));
202		214
203	emergency_cleanup ();	215	emergency_cleanup ();
204		216
205	#if ENABLE_STYLES	217	#if ENABLE_STYLES
206	for (int i = RS_styleCount; --i; )	218	for (int i = RS_styleCount; --i; )
207	if (TermWin.fontset[i] != TermWin.fontset[0])	219	if (fontset[i] != fontset[0])
208	delete TermWin.fontset[i];	220	delete fontset[i];
209	#endif	221	#endif
210	delete TermWin.fontset[0];	222	delete fontset[0];
211		223
212	if (display)	224	if (display)
213	{	225	{
214	dDisp;	226	dDisp;
215		227
…		…
243	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	255	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)
244	if (topShadowGC) XFreeGC (disp, topShadowGC);	256	if (topShadowGC) XFreeGC (disp, topShadowGC);
245	if (botShadowGC) XFreeGC (disp, botShadowGC);	257	if (botShadowGC) XFreeGC (disp, botShadowGC);
246	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	258	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247	#endif	259	#endif
248	if (TermWin.gc) XFreeGC (disp, TermWin.gc);	260	if (gc) XFreeGC (disp, gc);
249		261
250	#if defined(MENUBAR) && (MENUBAR_MAX > 1)	262	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251	delete menuBar.drawable;	263	delete menuBar.drawable;
252	//if (menuBar.win)	264	//if (menuBar.win)
253	// XDestroyWindow (disp, menuBar.win);	265	// XDestroyWindow (disp, menuBar.win);
254	#endif	266	#endif
255	delete TermWin.drawable;	267	delete drawable;
256	// destroy all windows	268	// destroy all windows
257	if (TermWin.parent[0]	269	if (parent[0])
258	#if ENABLE_FRILLS
259	&& !rs[Rs_embed]
260	#endif
261	)
262	XDestroyWindow (disp, TermWin.parent[0]);	270	XDestroyWindow (disp, parent[0]);
263	}	271	}
264		272
265	// TODO: free pixcolours, colours should become part of rxvt_display	273	// TODO: free pixcolours, colours should become part of rxvt_display
266		274
267	delete pix_colors_focused;	275	delete pix_colors_focused;
268	#ifdef OFF_FOCUS_FADING	276	#if OFF_FOCUS_FADING
269	delete pix_colors_unfocused;	277	delete pix_colors_unfocused;
		278	#endif
		279	#if USE_XGETDEFAULT
		280	XrmDestroyDatabase (xrmdatabase);
270	#endif	281	#endif
271		282
272	displays.put (display);	283	displays.put (display);
273		284
274	scr_release ();	285	scr_release ();
…		…
291	delete argv;	302	delete argv;
292		303
293	#ifdef KEYSYM_RESOURCE	304	#ifdef KEYSYM_RESOURCE
294	delete keyboard;	305	delete keyboard;
295	#endif	306	#endif
		307	}
		308
		309	void
		310	rxvt_term::child_exit ()
		311	{
		312	cmd_pid = 0;
		313
		314	if (!OPTION (Opt_hold))
		315	destroy ();
296	}	316	}
297		317
298	void	318	void
299	rxvt_term::destroy ()	319	rxvt_term::destroy ()
300	{	320	{
…		…
421	{	441	{
422	if (GET_R->allowedxerror == -1)	442	if (GET_R->allowedxerror == -1)
423	GET_R->allowedxerror = event->error_code;	443	GET_R->allowedxerror = event->error_code;
424	else	444	else
425	{	445	{
426	//TODO: GET_R is most likely not the terminal which caused the error	446	// GET_R is most likely not the terminal which caused the error,
427	//TODO: maybe just output the error and continue?	447	// so just output the error and continue
428	#if ENABLE_FRILLS	448	#if ENABLE_FRILLS
429	print_x_error (display, event);	449	print_x_error (display, event);
430	#else	450	#else
431	old_xerror_handler (display, event);	451	old_xerror_handler (display, event);
432	#endif	452	#endif
…		…
442	DisplayString (display));	462	DisplayString (display));
443	rxvt_emergency_cleanup ();	463	rxvt_emergency_cleanup ();
444	_exit (EXIT_FAILURE);	464	_exit (EXIT_FAILURE);
445	}	465	}
446		466
447	/*
448	* Catch a fatal signal and tidy up before quitting
449	*/
450	void
451	rxvt_term::sig_term (sig_watcher &w)
452	{
453	#ifdef DEBUG_CMD
454	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
455	#endif
456	rxvt_emergency_cleanup ();
457	signal (w.signum, SIG_DFL);
458	kill (getpid (), w.signum);
459	}
460
461	/----------------------------------------------------------------------/	467	/----------------------------------------------------------------------/
462	/* rxvt_init () */
463	bool	468	bool
464	rxvt_term::init (int argc, const char const argv)	469	rxvt_term::init (int argc, const char const argv)
465	{	470	{
466	SET_R (this);	471	SET_R (this);
467		472
…		…
480		485
481	#if MENUBAR_MAX	486	#if MENUBAR_MAX
482	menubar_read (rs[Rs_menu]);	487	menubar_read (rs[Rs_menu]);
483	#endif	488	#endif
484	#ifdef HAVE_SCROLLBARS	489	#ifdef HAVE_SCROLLBARS
485	if (options & Opt_scrollBar)	490	if (OPTION (Opt_scrollBar))
486	scrollBar.setIdle (); /* set existence for size calculations */	491	scrollBar.setIdle (); /* set existence for size calculations */
		492	#endif
		493
		494	#if ENABLE_PERL
		495	if (!rs[Rs_perl_ext_1])
		496	rs[Rs_perl_ext_1] = "default";
		497
		498	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		499	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		500	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		501	{
		502	rxvt_perl.init ();
		503	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		504	}
487	#endif	505	#endif
488		506
489	create_windows (argc, argv);	507	create_windows (argc, argv);
490		508
491	dDisp;	509	dDisp;
…		…
497	#if 0	515	#if 0
498	XSynchronize (disp, True);	516	XSynchronize (disp, True);
499	#endif	517	#endif
500		518
501	#ifdef HAVE_SCROLLBARS	519	#ifdef HAVE_SCROLLBARS
502	if (options & Opt_scrollBar)	520	if (OPTION (Opt_scrollBar))
503	resize_scrollbar (); /* create and map scrollbar */	521	resize_scrollbar (); /* create and map scrollbar */
504	#endif	522	#endif
505	#if (MENUBAR_MAX)	523	#if (MENUBAR_MAX)
506	if (menubar_visible ())	524	if (menubar_visible ())
507	XMapWindow (disp, menuBar.win);	525	XMapWindow (disp, menuBar.win);
508	#endif	526	#endif
509	#ifdef TRANSPARENT	527	#ifdef TRANSPARENT
510	if (options & Opt_transparent)	528	if (OPTION (Opt_transparent))
511	{	529	{
512	XSelectInput (disp, display->root, PropertyChangeMask);	530	XSelectInput (disp, display->root, PropertyChangeMask);
513	check_our_parents ();	531	check_our_parents ();
514	rootwin_ev.start (display, display->root);	532	rootwin_ev.start (display, display->root);
515	}	533	}
516	#endif	534	#endif
517		535
518	XMapWindow (disp, TermWin.vt);	536	XMapWindow (disp, vt);
519	XMapWindow (disp, TermWin.parent[0]);	537	XMapWindow (disp, parent[0]);
520		538
521	set_colorfgbg ();	539	set_colorfgbg ();
522		540
523	init_command (cmd_argv);	541	init_command (cmd_argv);
524		542
525	free (cmd_argv);	543	free (cmd_argv);
526		544
		545	if (pty.pty >= 0)
527	pty_ev.start (pty.pty, EVENT_READ);	546	pty_ev.start (pty.pty, EVENT_READ);
528		547
529	check_ev.start ();	548	check_ev.start ();
530		549
		550	HOOK_INVOKE ((this, HOOK_START, DT_END));
		551
531	return true;	552	return true;
532	}	553	}
		554
		555	static struct sig_handlers
		556	{
		557	sig_watcher sw_chld, sw_term, sw_int;
		558
		559	void sig_chld (sig_watcher &w)
		560	{
		561	// we are being called for every SIGCHLD, find the corresponding term
		562	int pid;
		563
		564	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
		565	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
		566	if (pid == (*t)->cmd_pid)
		567	{
		568	(*t)->child_exit ();
		569	break;
		570	}
		571	}
		572
		573	/*
		574	* Catch a fatal signal and tidy up before quitting
		575	*/
		576	void
		577	sig_term (sig_watcher &w)
		578	{
		579	#ifdef DEBUG_CMD
		580	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
		581	#endif
		582	rxvt_emergency_cleanup ();
		583	signal (w.signum, SIG_DFL);
		584	kill (getpid (), w.signum);
		585	}
		586
		587	sig_handlers ()
		588	: sw_chld (this, &sig_handlers::sig_chld),
		589	sw_term (this, &sig_handlers::sig_term),
		590	sw_int (this, &sig_handlers::sig_term)
		591	{
		592	}
		593	} sig_handlers;
533		594
534	void	595	void
535	rxvt_init ()	596	rxvt_init ()
536	{	597	{
537	/*	598	/*
…		…
545	rxvt_privileges (IGNORE);	606	rxvt_privileges (IGNORE);
546		607
547	signal (SIGHUP, SIG_IGN);	608	signal (SIGHUP, SIG_IGN);
548	signal (SIGPIPE, SIG_IGN);	609	signal (SIGPIPE, SIG_IGN);
549		610
		611	sig_handlers.sw_chld.start (SIGCHLD);
		612	sig_handlers.sw_term.start (SIGTERM);
		613	sig_handlers.sw_int.start (SIGINT);
		614
550	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	615	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
551	/* signal (SIGURG, SIG_DFL); */	616	/* signal (SIGURG, SIG_DFL); */
552		617
553	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	618	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
554	// TODO: handle this with exceptions and tolerate the memory loss	619	// TODO: handle this with exceptions and tolerate the memory loss
555	XSetIOErrorHandler (rxvt_xioerror_handler);	620	XSetIOErrorHandler (rxvt_xioerror_handler);
556	}
557		621
558	/* ------------------------------------------------------------------------- *	622	#ifdef USE_XGETDEFAULT
559	* SIGNAL HANDLING & EXIT HANDLER *	623	XrmInitialize ();
560	* ------------------------------------------------------------------------- */	624	#endif
561	/*
562	* Catch a SIGCHLD signal and exit if the direct child has died
563	*/
564
565	void
566	rxvt_term::sig_chld (sig_watcher &w)
567	{
568	// we are being called for every SIGCHLD, not just ours
569	int pid;
570
571	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
572	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
573	if (pid == (*t)->cmd_pid)
574	{
575	(*t)->destroy ();
576	break;
577	}
578	}	625	}
579		626
580	/* ------------------------------------------------------------------------- *	627	/* ------------------------------------------------------------------------- *
581	* MEMORY ALLOCATION WRAPPERS *	628	* MEMORY ALLOCATION WRAPPERS *
582	* ------------------------------------------------------------------------- */	629	* ------------------------------------------------------------------------- */
…		…
589	rxvt_fatal ("memory allocation failure. aborting.\n");	636	rxvt_fatal ("memory allocation failure. aborting.\n");
590		637
591	return p;	638	return p;
592	}	639	}
593		640
594	/* INTPROTO */	641	void *
595	void *
596	rxvt_calloc (size_t number, size_t size)	642	rxvt_calloc (size_t number, size_t size)
597	{	643	{
598	void *p = calloc (number, size);	644	void *p = calloc (number, size);
599		645
600	if (!p)	646	if (!p)
601	rxvt_fatal ("memory allocation failure. aborting.\n");	647	rxvt_fatal ("memory allocation failure. aborting.\n");
602		648
603	return p;	649	return p;
604	}	650	}
605		651
606	/* INTPROTO */
607	void *	652	void *
608	rxvt_realloc (void *ptr, size_t size)	653	rxvt_realloc (void *ptr, size_t size)
609	{	654	{
610	void *p = realloc (ptr, size);	655	void *p = realloc (ptr, size);
611		656
…		…
672		717
673	#ifdef UTMP_SUPPORT	718	#ifdef UTMP_SUPPORT
674	void	719	void
675	rxvt_term::privileged_utmp (rxvt_privaction action)	720	rxvt_term::privileged_utmp (rxvt_privaction action)
676	{	721	{
677	if ((options & Opt_utmpInhibit)	722	if (OPTION (Opt_utmpInhibit)
678	\|\| !pty.name \|\| !*pty.name)	723	\|\| !pty.name \|\| !*pty.name)
679	return;	724	return;
680		725
681	rxvt_privileges (RESTORE);	726	rxvt_privileges (RESTORE);
682		727
…		…
693	/*	738	/*
694	* window size/position calculcations for XSizeHint and other storage.	739	* window size/position calculcations for XSizeHint and other storage.
695	* if width/height are non-zero then override calculated width/height	740	* if width/height are non-zero then override calculated width/height
696	*/	741	*/
697	void	742	void
698	rxvt_term::window_calc (unsigned int width, unsigned int height)	743	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
699	{	744	{
700	short recalc_x, recalc_y;	745	short recalc_x, recalc_y;
701	int x, y, sb_w, mb_h, flags;	746	int x, y, sb_w, mb_h, flags;
702	unsigned int w, h;	747	unsigned int w, h;
703	unsigned int max_width, max_height;	748	unsigned int max_width, max_height;
704	dDisp;	749	dDisp;
705		750
706	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	751	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
707	TermWin.ncol, TermWin.nrow, szHint.width,	752	ncol, nrow, szHint.width, szHint.height));
708	szHint.height));	753
709	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	754	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
710	szHint.win_gravity = NorthWestGravity;	755	szHint.win_gravity = NorthWestGravity;
711	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	756	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
712		757
713	recalc_x = recalc_y = 0;	758	recalc_x = recalc_y = 0;
714	flags = 0;	759	flags = 0;
		760
715	if (!parsed_geometry)	761	if (!parsed_geometry)
716	{	762	{
717	parsed_geometry = 1;	763	parsed_geometry = 1;
		764
718	if (rs[Rs_geometry])	765	if (rs[Rs_geometry])
719	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	766	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720		767
721	if (flags & WidthValue)	768	if (flags & WidthValue)
722	{	769	{
723	TermWin.ncol = BOUND_POSITIVE_INT16 (w);	770	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724	szHint.flags \|= USSize;	771	szHint.flags \|= USSize;
725	}	772	}
726		773
727	if (flags & HeightValue)	774	if (flags & HeightValue)
728	{	775	{
729	TermWin.nrow = BOUND_POSITIVE_INT16 (h);	776	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730	szHint.flags \|= USSize;	777	szHint.flags \|= USSize;
731	}	778	}
732		779
733	if (flags & XValue)	780	if (flags & XValue)
734	{	781	{
735	szHint.x = x;	782	szHint.x = x;
736	szHint.flags \|= USPosition;	783	szHint.flags \|= USPosition;
		784
737	if (flags & XNegative)	785	if (flags & XNegative)
738	{	786	{
739	recalc_x = 1;	787	recalc_x = 1;
740	szHint.win_gravity = NorthEastGravity;	788	szHint.win_gravity = NorthEastGravity;
741	}	789	}
…		…
743		791
744	if (flags & YValue)	792	if (flags & YValue)
745	{	793	{
746	szHint.y = y;	794	szHint.y = y;
747	szHint.flags \|= USPosition;	795	szHint.flags \|= USPosition;
		796
748	if (flags & YNegative)	797	if (flags & YNegative)
749	{	798	{
750	recalc_y = 1;	799	recalc_y = 1;
		800
751	if (szHint.win_gravity == NorthEastGravity)	801	if (szHint.win_gravity == NorthEastGravity)
752	szHint.win_gravity = SouthEastGravity;	802	szHint.win_gravity = SouthEastGravity;
753	else	803	else
754	szHint.win_gravity = SouthWestGravity;	804	szHint.win_gravity = SouthWestGravity;
755	}	805	}
756	}	806	}
757	}	807	}
758		808
759	/* TODO: BOUNDS */	809	/* TODO: BOUNDS */
760	TermWin.width = TermWin.ncol * TermWin.fwidth;	810	width = ncol * fwidth;
761	TermWin.height = TermWin.nrow * TermWin.fheight;	811	height = nrow * fheight;
762	max_width = MAX_COLS * TermWin.fwidth;	812	max_width = MAX_COLS * fwidth;
763	max_height = MAX_ROWS * TermWin.fheight;	813	max_height = MAX_ROWS * fheight;
764		814
765	szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;	815	szHint.base_width = szHint.base_height = 2 * int_bwidth;
766		816
767	sb_w = mb_h = 0;	817	sb_w = mb_h = 0;
768	window_vt_x = window_vt_y = TermWin.int_bwidth;	818	window_vt_x = window_vt_y = int_bwidth;
769		819
770	if (scrollbar_visible ())	820	if (scrollbar_visible ())
771	{	821	{
772	sb_w = scrollbar_TotalWidth ();	822	sb_w = scrollbar_TotalWidth ();
773	szHint.base_width += sb_w;	823	szHint.base_width += sb_w;
774	if (!(options & Opt_scrollBar_right))	824	if (!OPTION (Opt_scrollBar_right))
775	window_vt_x += sb_w;	825	window_vt_x += sb_w;
776	}	826	}
777		827
778	if (menubar_visible ())	828	if (menubar_visible ())
779	{	829	{
780	mb_h = menuBar_TotalHeight ();	830	mb_h = menuBar_TotalHeight ();
781	szHint.base_height += mb_h;	831	szHint.base_height += mb_h;
782	window_vt_y += mb_h;	832	window_vt_y += mb_h;
783	}	833	}
784		834
785	szHint.width_inc = TermWin.fwidth;	835	szHint.width_inc = fwidth;
786	szHint.height_inc = TermWin.fheight;	836	szHint.height_inc = fheight;
787	szHint.min_width = szHint.base_width + szHint.width_inc;	837	szHint.min_width = szHint.base_width + szHint.width_inc;
788	szHint.min_height = szHint.base_height + szHint.height_inc;	838	szHint.min_height = szHint.base_height + szHint.height_inc;
789		839
790	if (width && width - szHint.base_width < max_width)	840	if (newwidth && newwidth - szHint.base_width < max_width)
791	{	841	{
792	szHint.width = width;	842	szHint.width = newwidth;
793	TermWin.width = width - szHint.base_width;	843	width = newwidth - szHint.base_width;
794	}	844	}
795	else	845	else
796	{	846	{
797	MIN_IT (TermWin.width, max_width);	847	min_it (width, max_width);
798	szHint.width = szHint.base_width + TermWin.width;	848	szHint.width = szHint.base_width + width;
799	}	849	}
800		850
801	if (height && height - szHint.base_height < max_height)	851	if (newheight && newheight - szHint.base_height < max_height)
802	{	852	{
803	szHint.height = height;	853	szHint.height = newheight;
804	TermWin.height = height - szHint.base_height;	854	height = newheight - szHint.base_height;
805	}	855	}
806	else	856	else
807	{	857	{
808	MIN_IT (TermWin.height, max_height);	858	min_it (height, max_height);
809	szHint.height = szHint.base_height + TermWin.height;	859	szHint.height = szHint.base_height + height;
810	}	860	}
811		861
812	if (scrollbar_visible () && (options & Opt_scrollBar_right))	862	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
813	window_sb_x = szHint.width - sb_w;	863	window_sb_x = szHint.width - sb_w;
814		864
815	if (recalc_x)	865	if (recalc_x)
816	szHint.x += (DisplayWidth (disp, display->screen)	866	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
817	- szHint.width - 2 * TermWin.ext_bwidth);
818	if (recalc_y)	867	if (recalc_y)
819	szHint.y += (DisplayHeight (disp, display->screen)	868	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
820	- szHint.height - 2 * TermWin.ext_bwidth);
821		869
822	TermWin.ncol = TermWin.width / TermWin.fwidth;	870	ncol = width / fwidth;
823	TermWin.nrow = TermWin.height / TermWin.fheight;	871	nrow = height / fheight;
824	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	872	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
825	TermWin.ncol, TermWin.nrow, szHint.width,	873	ncol, nrow, szHint.width,
826	szHint.height));	874	szHint.height));
827	return;	875	return;
828	}	876	}
829		877
830	/----------------------------------------------------------------------/	878	/----------------------------------------------------------------------/
…		…
838	if (pty.pty < 0)	886	if (pty.pty < 0)
839	return;	887	return;
840		888
841	struct winsize ws;	889	struct winsize ws;
842		890
843	ws.ws_col = TermWin.ncol;	891	ws.ws_col = ncol;
844	ws.ws_row = TermWin.nrow;	892	ws.ws_row = nrow;
845	ws.ws_xpixel = TermWin.width;	893	ws.ws_xpixel = width;
846	ws.ws_ypixel = TermWin.height;	894	ws.ws_ypixel = height;
847	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	895	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);
848		896
849	#if 0	897	#if 0
850	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	898	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
851	if (cmd_pid) /* force through to the command */	899	if (cmd_pid) /* force through to the command */
852	kill (cmd_pid, SIGWINCH);	900	kill (-cmd_pid, SIGWINCH);
853	#endif	901	#endif
854	}	902	}
855		903
856	/----------------------------------------------------------------------/	904	/----------------------------------------------------------------------/
857	/* set_fonts () - load and set the various fonts	905	/* set_fonts () - load and set the various fonts
858	/*	906	*
859	* init = 1 - initialize	907	* init = 1 - initialize
860	*	908	*
861	* fontname == FONT_UP - switch to bigger font	909	* fontname == FONT_UP - switch to bigger font
862	* fontname == FONT_DN - switch to smaller font	910	* fontname == FONT_DN - switch to smaller font
863	*/	911	*/
…		…
875	return false;	923	return false;
876	}	924	}
877		925
878	#if ENABLE_STYLES	926	#if ENABLE_STYLES
879	for (int i = RS_styleCount; --i; )	927	for (int i = RS_styleCount; --i; )
880	if (TermWin.fontset[i] != TermWin.fontset[0])	928	if (fontset[i] != fontset[0])
881	delete TermWin.fontset[i];	929	delete fontset[i];
882	#endif	930	#endif
883		931
884	delete TermWin.fontset[0];	932	delete fontset[0];
885	TermWin.fontset[0] = fs;	933	fontset[0] = fs;
886		934
887	prop = (*fs)[1]->properties ();	935	prop = (*fs)[1]->properties ();
888	prop.height += TermWin.lineSpace;	936	prop.height += lineSpace;
889	fs->set_prop (prop);	937	fs->set_prop (prop);
890		938
891	TermWin.fwidth = prop.width;	939	fwidth = prop.width;
892	TermWin.fheight = prop.height;	940	fheight = prop.height;
893	TermWin.fweight = prop.weight;	941	fbase = prop.ascent;
894	TermWin.fslant = prop.slant;
895	TermWin.fbase = (*fs)[1]->ascent;
896		942
897	for (int style = 1; style < 4; style++)	943	for (int style = 1; style < 4; style++)
898	{	944	{
899	#if ENABLE_STYLES	945	#if ENABLE_STYLES
900	const char *res = rs[Rs_font + style];	946	const char *res = rs[Rs_font + style];
901		947
902	if (res && !*res)	948	if (res && !*res)
903	TermWin.fontset[style] = TermWin.fontset[0];	949	fontset[style] = fontset[0];
904	else	950	else
905	{	951	{
906	TermWin.fontset[style] = fs = new rxvt_fontset (this);	952	fontset[style] = fs = new rxvt_fontset (this);
907	rxvt_fontprop prop2 = prop;	953	rxvt_fontprop prop2 = prop;
908		954
909	if (res)	955	if (res)
910	prop2.weight = prop2.slant = rxvt_fontprop::unset;	956	prop2.weight = prop2.slant = rxvt_fontprop::unset;
911	else	957	else
912	{	958	{
913	res = TermWin.fontset[0]->fontdesc;	959	res = fontset[0]->fontdesc;
914		960
915	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	961	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
916	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	962	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
917	}	963	}
918		964
919	fs->populate (res);	965	fs->populate (res);
920	fs->set_prop (prop2);	966	fs->set_prop (prop2);
921	}	967	}
922	#else	968	#else
923	TermWin.fontset[style] = TermWin.fontset[0];	969	fontset[style] = fontset[0];
924	#endif	970	#endif
925	}	971	}
926		972
927	if (TermWin.parent[0])	973	if (parent[0])
928	{	974	{
929	resize_all_windows (0, 0, 0);	975	resize_all_windows (0, 0, 0);
930	scr_remap_chars ();	976	scr_remap_chars ();
931	scr_touch (true);	977	scr_touch (true);
932	}	978	}
…		…
934	return true;	980	return true;
935	}	981	}
936		982
937	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	983	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
938	{	984	{
939	// TODO: SMART_WINDOW_TITLE
940	XChangeProperty (display->display, TermWin.parent[0],	985	XChangeProperty (display->display, parent[0],
941	prop, XA_STRING, 8, PropModeReplace,	986	prop, XA_STRING, 8, PropModeReplace,
942	(const unsigned char *)str, len >= 0 ? len : strlen (str));	987	(const unsigned char *)str, len >= 0 ? len : strlen (str));
943	}	988	}
944		989
945	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	990	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
946	{	991	{
947	// TODO: SMART_WINDOW_TITLE
948	wchar_t *ws = rxvt_mbstowcs (str, len);	992	wchar_t *ws = rxvt_mbstowcs (str, len);
949	char *s = rxvt_wcstoutf8 (ws);	993	char *s = rxvt_wcstoutf8 (ws);
950		994
951	XChangeProperty (display->display, TermWin.parent[0],	995	XChangeProperty (display->display, parent[0],
952	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	996	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
953	(const unsigned char *)s, strlen (s));	997	(const unsigned char *)s, strlen (s));
954		998
955	free (s);	999	free (s);
956	free (ws);	1000	free (ws);
…		…
961	/* xterm sequences - title, iconName, color (exptl) */	1005	/* xterm sequences - title, iconName, color (exptl) */
962	void	1006	void
963	rxvt_term::set_title (const char *str)	1007	rxvt_term::set_title (const char *str)
964	{	1008	{
965	set_string_property (XA_WM_NAME, str);	1009	set_string_property (XA_WM_NAME, str);
966	#if ENABLE_FRILLS	1010	#if ENABLE_EWMH
967	set_utf8_property (xa[XA_NET_WM_NAME], str);	1011	set_utf8_property (xa[XA_NET_WM_NAME], str);
968	#endif	1012	#endif
969	}	1013	}
970		1014
971	void	1015	void
972	rxvt_term::set_icon_name (const char *str)	1016	rxvt_term::set_icon_name (const char *str)
973	{	1017	{
974	set_string_property (XA_WM_ICON_NAME, str);	1018	set_string_property (XA_WM_ICON_NAME, str);
975	#if ENABLE_FRILLS	1019	#if ENABLE_EWMH
976	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	1020	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
977	#endif	1021	#endif
978	}	1022	}
979		1023
980	#ifdef XTERM_COLOR_CHANGE	1024	#ifdef XTERM_COLOR_CHANGE
…		…
993	i = atoi (color);	1037	i = atoi (color);
994		1038
995	if (i >= 8 && i <= 15)	1039	if (i >= 8 && i <= 15)
996	{ /* bright colors */	1040	{ /* bright colors */
997	i -= 8;	1041	i -= 8;
998	# ifndef NO_BRIGHTCOLOR
999	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	1042	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1000	SET_PIXCOLOR (idx);	1043	SET_PIXCOLOR (idx);
1001	goto Done;	1044	goto done;
1002	# endif
1003	}	1045	}
1004		1046
1005	if (i >= 0 && i <= 7)	1047	if (i >= 0 && i <= 7)
1006	{ /* normal colors */	1048	{ /* normal colors */
1007	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	1049	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1008	SET_PIXCOLOR (idx);	1050	SET_PIXCOLOR (idx);
1009	goto Done;	1051	goto done;
1010	}	1052	}
1011	}	1053	}
1012		1054
1013	if (!rXParseAllocColor (&xcol, color))	1055	if (!rXParseAllocColor (&xcol, color))
1014	return;	1056	return;
…		…
1034	pix_colors_focused[idx] = xcol;	1076	pix_colors_focused[idx] = xcol;
1035	SET_PIXCOLOR (idx);	1077	SET_PIXCOLOR (idx);
1036		1078
1037	/* XSetWindowAttributes attr; */	1079	/* XSetWindowAttributes attr; */
1038	/* Cursor cursor; */	1080	/* Cursor cursor; */
1039	Done:	1081	done:
		1082
1040	#ifdef OFF_FOCUS_FADING	1083	#if OFF_FOCUS_FADING
1041	if (rs[Rs_fade])	1084	if (rs[Rs_fade])
1042	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));	1085	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1043	#endif	1086	#endif
1044		1087
1045	/TODO: handle Color_BD, scrollbar background, etc. /	1088	/TODO: handle Color_BD, scrollbar background, etc. /
1046		1089
1047	recolour_cursor ();	1090	recolour_cursor ();
…		…
1118		1161
1119	/* -------------------------------------------------------------------- *	1162	/* -------------------------------------------------------------------- *
1120	* - WINDOW RESIZING - *	1163	* - WINDOW RESIZING - *
1121	* -------------------------------------------------------------------- */	1164	* -------------------------------------------------------------------- */
1122	void	1165	void
1123	rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)	1166	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1124	{	1167	{
1125	int fix_screen;	1168	int fix_screen;
1126	#ifdef SMART_RESIZE
1127	int old_width = szHint.width, old_height = szHint.height;	1169	int old_width = szHint.width, old_height = szHint.height;
1128	#endif
1129	dDisp;	1170	dDisp;
1130		1171
1131	window_calc (width, height);	1172	window_calc (newwidth, newheight);
1132	XSetWMNormalHints (disp, TermWin.parent[0], &szHint);	1173	XSetWMNormalHints (disp, parent[0], &szHint);
1133		1174
1134	if (!ignoreparent)	1175	if (!ignoreparent)
1135	{	1176	{
1136	#ifdef SMART_RESIZE	1177	#ifdef SMART_RESIZE
1137	/*	1178	/*
…		…
1141	int x, y, x1, y1;	1182	int x, y, x1, y1;
1142	int dx, dy;	1183	int dx, dy;
1143	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1184	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1144	Window unused_cr;	1185	Window unused_cr;
1145		1186
1146	XTranslateCoordinates (disp, TermWin.parent[0], display->root,	1187	XTranslateCoordinates (disp, parent[0], display->root,
1147	0, 0, &x, &y, &unused_cr);	1188	0, 0, &x, &y, &unused_cr);
1148	XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,	1189	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1149	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1190	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1150	/*	1191	/*
1151	* if display->root isn't the parent window, a WM will probably have offset	1192	* if display->root isn't the parent window, a WM will probably have offset
1152	* our position for handles and decorations. Counter it	1193	* our position for handles and decorations. Counter it
1153	*/	1194	*/
…		…
1170	if (y < y1) /* top half */	1211	if (y < y1) /* top half */
1171	dy = 0;	1212	dy = 0;
1172	else if (y == y1) /* exact center */	1213	else if (y == y1) /* exact center */
1173	dy /= 2;	1214	dy /= 2;
1174		1215
1175	XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,	1216	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1176	szHint.width, szHint.height);	1217	szHint.width, szHint.height);
1177	#else	1218	#else
1178	XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);	1219	XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1179	#endif	1220	#endif
1180	}	1221	}
1181		1222
1182	fix_screen = TermWin.ncol != prev_ncol \|\| TermWin.nrow != prev_nrow;	1223	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1183		1224
1184	if (fix_screen \|\| width != old_width \|\| height != old_height)	1225	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1185	{	1226	{
1186	if (scrollbar_visible ())	1227	if (scrollbar_visible ())
1187	{	1228	{
1188	XMoveResizeWindow (disp, scrollBar.win,	1229	XMoveResizeWindow (disp, scrollBar.win,
1189	window_sb_x, 0,	1230	window_sb_x, 0,
…		…
1192	}	1233	}
1193		1234
1194	if (menubar_visible ())	1235	if (menubar_visible ())
1195	XMoveResizeWindow (disp, menuBar.win,	1236	XMoveResizeWindow (disp, menuBar.win,
1196	window_vt_x, 0,	1237	window_vt_x, 0,
1197	TermWin_TotalWidth (), menuBar_TotalHeight ());	1238	width, menuBar_TotalHeight ());
1198		1239
1199	XMoveResizeWindow (disp, TermWin.vt,	1240	XMoveResizeWindow (disp, vt,
1200	window_vt_x, window_vt_y,	1241	window_vt_x, window_vt_y,
1201	TermWin_TotalWidth (), TermWin_TotalHeight ());	1242	width, height);
1202		1243
1203	scr_clear ();	1244	scr_clear ();
1204	#ifdef XPM_BACKGROUND	1245	#ifdef XPM_BACKGROUND
1205	resize_pixmap ();	1246	resize_pixmap ();
1206	#endif	1247	#endif
…		…
1212	int old_ncol = prev_ncol;	1253	int old_ncol = prev_ncol;
1213		1254
1214	/* scr_reset only works on the primary screen */	1255	/* scr_reset only works on the primary screen */
1215	if (old_height) /* this is not the first time through */	1256	if (old_height) /* this is not the first time through */
1216	{	1257	{
1217	unsigned int ncol = TermWin.ncol;	1258	unsigned int ocol = ncol;
1218	TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this	1259	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1219	curr_screen = scr_change_screen (PRIMARY);	1260	curr_screen = scr_change_screen (PRIMARY);
1220	TermWin.ncol = ncol;	1261	ncol = ocol;
1221	}	1262	}
1222		1263
1223	scr_reset ();	1264	scr_reset ();
1224		1265
1225	if (curr_screen >= 0) /* this is not the first time through */	1266	if (curr_screen >= 0) /* this is not the first time through */
1226	{	1267	{
1227	scr_change_screen (curr_screen);	1268	scr_change_screen (curr_screen);
1228	selection_check (old_ncol != TermWin.ncol ? 4 : 0);	1269	selection_check (old_ncol != ncol ? 4 : 0);
1229	}	1270	}
1230	}	1271	}
1231		1272
1232	old_width = szHint.width;	1273	old_width = szHint.width;
1233	old_height = szHint.height;	1274	old_height = szHint.height;
1234		1275
1235	#ifdef XPM_BACKGROUND	1276	#ifdef XPM_BACKGROUND
1236	if (TermWin.pixmap)	1277	if (pixmap)
1237	scr_touch (false);	1278	scr_touch (false);
1238	#endif	1279	#endif
1239		1280
1240	#ifdef USE_XIM	1281	#ifdef USE_XIM
1241	IMSetStatusPosition ();	1282	IMSetStatusPosition ();
…		…
1245	/*	1286	/*
1246	* Set the width/height of the vt window in characters. Units are pixels.	1287	* Set the width/height of the vt window in characters. Units are pixels.
1247	* good for toggling 80/132 columns	1288	* good for toggling 80/132 columns
1248	*/	1289	*/
1249	void	1290	void
1250	rxvt_term::set_widthheight (unsigned int width, unsigned int height)	1291	rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1251	{	1292	{
1252	XWindowAttributes wattr;	1293	XWindowAttributes wattr;
1253		1294
1254	if (width == 0 \|\| height == 0)	1295	if (newwidth == 0 \|\| newheight == 0)
1255	{	1296	{
1256	XGetWindowAttributes (display->display, display->root, &wattr);	1297	XGetWindowAttributes (display->display, display->root, &wattr);
		1298
1257	if (width == 0)	1299	if (newwidth == 0)
1258	width = wattr.width - szHint.base_width;	1300	newwidth = wattr.width - szHint.base_width;
1259	if (height == 0)	1301	if (newheight == 0)
1260	height = wattr.height - szHint.base_height;	1302	newheight = wattr.height - szHint.base_height;
1261	}
1262
1263	if (width != TermWin.width \|\| height != TermWin.height)
1264	{	1303	}
		1304
		1305	if (newwidth != width \|\| newheight != height)
		1306	{
1265	width += szHint.base_width;	1307	newwidth += szHint.base_width;
1266	height += szHint.base_height;	1308	newheight += szHint.base_height;
1267	resize_all_windows (width, height, 0);	1309	resize_all_windows (newwidth, newheight, 0);
1268	}	1310	}
1269	}	1311	}
1270		1312
1271	/* -------------------------------------------------------------------- *	1313	/* -------------------------------------------------------------------- *
1272	* - X INPUT METHOD ROUTINES - *	1314	* - X INPUT METHOD ROUTINES - *
…		…
1282		1324
1283	void	1325	void
1284	rxvt_term::im_set_size (XRectangle &size)	1326	rxvt_term::im_set_size (XRectangle &size)
1285	{	1327	{
1286	// the int_bwidth terms make no sense to me	1328	// the int_bwidth terms make no sense to me
1287	size.x = TermWin.int_bwidth;	1329	size.x = int_bwidth;
1288	size.y = TermWin.int_bwidth;	1330	size.y = int_bwidth;
1289	size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;	1331	size.width = Width2Pixel (ncol) + int_bwidth;
1290	size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;	1332	size.height = Height2Pixel (nrow) + int_bwidth;
1291	}	1333	}
1292		1334
1293	void	1335	void
1294	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,	1336	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295	XRectangle &status_rect,	1337	XRectangle &status_rect,
1296	const XRectangle &needed_rect)	1338	const XRectangle &needed_rect)
1297	{	1339	{
1298	preedit_rect.x = needed_rect.width;	1340	preedit_rect.x = needed_rect.width;
1299	preedit_rect.y = 0;	1341	preedit_rect.y = 0;
1300	preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;	1342	preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301	preedit_rect.height = TermWin.fheight;	1343	preedit_rect.height = fheight;
1302		1344
1303	status_rect.x = 0;	1345	status_rect.x = 0;
1304	status_rect.y = 0;	1346	status_rect.y = 0;
1305	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;	1347	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1306	status_rect.height = TermWin.fheight;	1348	status_rect.height = fheight;
1307	}	1349	}
1308		1350
1309	/* Checking whether input method is running. */	1351	/* Checking whether input method is running. */
1310	bool	1352	bool
1311	rxvt_term::IMisRunning ()	1353	rxvt_term::IMisRunning ()
…		…
1339	{	1381	{
1340	XPoint nspot;	1382	XPoint nspot;
1341	XVaNestedList preedit_attr;	1383	XVaNestedList preedit_attr;
1342		1384
1343	if (!Input_Context	1385	if (!Input_Context
1344	\|\| !TermWin.focus	1386	\|\| !focus
1345	\|\| !(input_style & XIMPreeditPosition))	1387	\|\| !(input_style & XIMPreeditPosition))
1346	return;	1388	return;
1347		1389
1348	im_set_position (nspot);	1390	im_set_position (nspot);
1349		1391
…		…
1469	"----R---%d------*,"	1511	"----R---%d------*,"
1470	"----R---%d------*,"	1512	"----R---%d------*,"
1471	"----R---%d------*,"	1513	"----R---%d------*,"
1472	"----R---%d------*,"	1514	"----R---%d------*,"
1473	"*",	1515	"*",
1474	TermWin.fheight,	1516	fheight,
1475	TermWin.fheight + 1, TermWin.fheight - 1,	1517	fheight + 1, fheight - 1,
1476	TermWin.fheight - 2, TermWin.fheight + 2);	1518	fheight - 2, fheight + 2);
1477		1519
1478	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1520	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479	&missing_charset_list, &missing_charset_count, &def_string);	1521	&missing_charset_list, &missing_charset_count, &def_string);
1480		1522
1481	if (missing_charset_list)	1523	if (missing_charset_list)
…		…
1527	NULL);	1569	NULL);
1528	}	1570	}
1529		1571
1530	Input_Context = XCreateIC (xim,	1572	Input_Context = XCreateIC (xim,
1531	XNInputStyle, input_style,	1573	XNInputStyle, input_style,
1532	XNClientWindow, TermWin.vt,	1574	XNClientWindow, vt,
1533	XNFocusWindow, TermWin.parent[0],	1575	XNFocusWindow, parent[0],
1534	preedit_attr ? XNPreeditAttributes : NULL,	1576	preedit_attr ? XNPreeditAttributes : NULL,
1535	preedit_attr,	1577	preedit_attr,
1536	status_attr ? XNStatusAttributes : NULL,	1578	status_attr ? XNStatusAttributes : NULL,
1537	status_attr, NULL);	1579	status_attr, NULL);
1538		1580
…		…
1555	}	1597	}
1556		1598
1557	void	1599	void
1558	rxvt_term::im_cb ()	1600	rxvt_term::im_cb ()
1559	{	1601	{
1560	int i, found, had_im;	1602	int i;
1561	const char *p;	1603	const char *p;
1562	char **s;	1604	char **s;
1563	char buf[IMBUFSIZ];	1605	char buf[IMBUFSIZ];
1564		1606
1565	SET_R (this);	1607	SET_R (this);
…		…
1622	{	1664	{
1623	XRectangle preedit_rect, status_rect, *needed_rect;	1665	XRectangle preedit_rect, status_rect, *needed_rect;
1624	XVaNestedList preedit_attr, status_attr;	1666	XVaNestedList preedit_attr, status_attr;
1625		1667
1626	if (!Input_Context	1668	if (!Input_Context
1627	\|\| !TermWin.focus	1669	\|\| !focus
1628	\|\| !(input_style & XIMPreeditArea)	1670	\|\| !(input_style & XIMPreeditArea)
1629	\|\| !IMisRunning ())	1671	\|\| !IMisRunning ())
1630	return;	1672	return;
1631		1673
1632	/* Getting the necessary width of preedit area */	1674	/* Getting the necessary width of preedit area */

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.138 by root, Wed Feb 16 20:32:05 2005 UTC vs. Revision 1.166 by root, Sun Jan 8 07:55:36 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.138 by root, Wed Feb 16 20:32:05 2005 UTC vs.
Revision 1.166 by root, Sun Jan 8 07:55:36 2006 UTC