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

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

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.135 by root, Sun Feb 13 11:07:57 2005 UTC vs.
Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC