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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.148 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.164 by root, Fri Jan 6 05:37:59 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
…		…
193	pty.put ();	206	pty.put ();
194	}	207	}
195		208
196	rxvt_term::~rxvt_term ()	209	rxvt_term::~rxvt_term ()
197	{	210	{
		211	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		212
198	termlist.erase (find (termlist.begin (), termlist.end(), this));	213	termlist.erase (find (termlist.begin (), termlist.end(), this));
199		214
200	emergency_cleanup ();	215	emergency_cleanup ();
201		216
202	#if ENABLE_STYLES	217	#if ENABLE_STYLES
203	for (int i = RS_styleCount; --i; )	218	for (int i = RS_styleCount; --i; )
204	if (TermWin.fontset[i] != TermWin.fontset[0])	219	if (fontset[i] != fontset[0])
205	delete TermWin.fontset[i];	220	delete fontset[i];
206	#endif	221	#endif
207	delete TermWin.fontset[0];	222	delete fontset[0];
208		223
209	if (display)	224	if (display)
210	{	225	{
211	dDisp;	226	dDisp;
212		227
…		…
240	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	255	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)
241	if (topShadowGC) XFreeGC (disp, topShadowGC);	256	if (topShadowGC) XFreeGC (disp, topShadowGC);
242	if (botShadowGC) XFreeGC (disp, botShadowGC);	257	if (botShadowGC) XFreeGC (disp, botShadowGC);
243	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	258	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
244	#endif	259	#endif
245	if (TermWin.gc) XFreeGC (disp, TermWin.gc);	260	if (gc) XFreeGC (disp, gc);
246		261
247	#if defined(MENUBAR) && (MENUBAR_MAX > 1)	262	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
248	delete menuBar.drawable;	263	delete menuBar.drawable;
249	//if (menuBar.win)	264	//if (menuBar.win)
250	// XDestroyWindow (disp, menuBar.win);	265	// XDestroyWindow (disp, menuBar.win);
251	#endif	266	#endif
252	delete TermWin.drawable;	267	delete drawable;
253	// destroy all windows	268	// destroy all windows
254	if (TermWin.parent[0])	269	if (parent[0])
255	XDestroyWindow (disp, TermWin.parent[0]);	270	XDestroyWindow (disp, parent[0]);
256	}	271	}
257		272
258	// TODO: free pixcolours, colours should become part of rxvt_display	273	// TODO: free pixcolours, colours should become part of rxvt_display
259		274
260	delete pix_colors_focused;	275	delete pix_colors_focused;
…		…
284	delete argv;	299	delete argv;
285		300
286	#ifdef KEYSYM_RESOURCE	301	#ifdef KEYSYM_RESOURCE
287	delete keyboard;	302	delete keyboard;
288	#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 ();
289	}	313	}
290		314
291	void	315	void
292	rxvt_term::destroy ()	316	rxvt_term::destroy ()
293	{	317	{
…		…
458		482
459	#if MENUBAR_MAX	483	#if MENUBAR_MAX
460	menubar_read (rs[Rs_menu]);	484	menubar_read (rs[Rs_menu]);
461	#endif	485	#endif
462	#ifdef HAVE_SCROLLBARS	486	#ifdef HAVE_SCROLLBARS
463	if (options & Opt_scrollBar)	487	if (OPTION (Opt_scrollBar))
464	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] && *rs[Rs_perl_ext_1])
		493	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		494	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		495	{
		496	rxvt_perl.init ();
		497	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		498	}
465	#endif	499	#endif
466		500
467	create_windows (argc, argv);	501	create_windows (argc, argv);
468		502
469	dDisp;	503	dDisp;
…		…
475	#if 0	509	#if 0
476	XSynchronize (disp, True);	510	XSynchronize (disp, True);
477	#endif	511	#endif
478		512
479	#ifdef HAVE_SCROLLBARS	513	#ifdef HAVE_SCROLLBARS
480	if (options & Opt_scrollBar)	514	if (OPTION (Opt_scrollBar))
481	resize_scrollbar (); /* create and map scrollbar */	515	resize_scrollbar (); /* create and map scrollbar */
482	#endif	516	#endif
483	#if (MENUBAR_MAX)	517	#if (MENUBAR_MAX)
484	if (menubar_visible ())	518	if (menubar_visible ())
485	XMapWindow (disp, menuBar.win);	519	XMapWindow (disp, menuBar.win);
486	#endif	520	#endif
487	#ifdef TRANSPARENT	521	#ifdef TRANSPARENT
488	if (options & Opt_transparent)	522	if (OPTION (Opt_transparent))
489	{	523	{
490	XSelectInput (disp, display->root, PropertyChangeMask);	524	XSelectInput (disp, display->root, PropertyChangeMask);
491	check_our_parents ();	525	check_our_parents ();
492	rootwin_ev.start (display, display->root);	526	rootwin_ev.start (display, display->root);
493	}	527	}
494	#endif	528	#endif
495		529
496	XMapWindow (disp, TermWin.vt);	530	XMapWindow (disp, vt);
497	XMapWindow (disp, TermWin.parent[0]);	531	XMapWindow (disp, parent[0]);
498		532
499	set_colorfgbg ();	533	set_colorfgbg ();
500		534
501	init_command (cmd_argv);	535	init_command (cmd_argv);
502		536
503	free (cmd_argv);	537	free (cmd_argv);
504		538
		539	if (pty.pty >= 0)
505	pty_ev.start (pty.pty, EVENT_READ);	540	pty_ev.start (pty.pty, EVENT_READ);
506		541
507	check_ev.start ();	542	check_ev.start ();
		543
		544	HOOK_INVOKE ((this, HOOK_START, DT_END));
508		545
509	return true;	546	return true;
510	}	547	}
511		548
512	static struct sig_handlers	549	static struct sig_handlers
…		…
520		557
521	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)	558	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	559	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523	if (pid == (*t)->cmd_pid)	560	if (pid == (*t)->cmd_pid)
524	{	561	{
525	(*t)->destroy ();	562	(*t)->child_exit ();
526	break;	563	break;
527	}	564	}
528	}	565	}
529		566
530	/*	567	/*
…		…
670		707
671	#ifdef UTMP_SUPPORT	708	#ifdef UTMP_SUPPORT
672	void	709	void
673	rxvt_term::privileged_utmp (rxvt_privaction action)	710	rxvt_term::privileged_utmp (rxvt_privaction action)
674	{	711	{
675	if ((options & Opt_utmpInhibit)	712	if (OPTION (Opt_utmpInhibit)
676	\|\| !pty.name \|\| !*pty.name)	713	\|\| !pty.name \|\| !*pty.name)
677	return;	714	return;
678		715
679	rxvt_privileges (RESTORE);	716	rxvt_privileges (RESTORE);
680		717
…		…
691	/*	728	/*
692	* window size/position calculcations for XSizeHint and other storage.	729	* window size/position calculcations for XSizeHint and other storage.
693	* if width/height are non-zero then override calculated width/height	730	* if width/height are non-zero then override calculated width/height
694	*/	731	*/
695	void	732	void
696	rxvt_term::window_calc (unsigned int width, unsigned int height)	733	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697	{	734	{
698	short recalc_x, recalc_y;	735	short recalc_x, recalc_y;
699	int x, y, sb_w, mb_h, flags;	736	int x, y, sb_w, mb_h, flags;
700	unsigned int w, h;	737	unsigned int w, h;
701	unsigned int max_width, max_height;	738	unsigned int max_width, max_height;
702	dDisp;	739	dDisp;
703		740
704	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	741	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705	TermWin.ncol, TermWin.nrow, szHint.width,	742	ncol, nrow, szHint.width, szHint.height));
706	szHint.height));	743
707	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	744	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
708	szHint.win_gravity = NorthWestGravity;	745	szHint.win_gravity = NorthWestGravity;
709	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	746	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710		747
711	recalc_x = recalc_y = 0;	748	recalc_x = recalc_y = 0;
712	flags = 0;	749	flags = 0;
		750
713	if (!parsed_geometry)	751	if (!parsed_geometry)
714	{	752	{
715	parsed_geometry = 1;	753	parsed_geometry = 1;
		754
716	if (rs[Rs_geometry])	755	if (rs[Rs_geometry])
717	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	756	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718		757
719	if (flags & WidthValue)	758	if (flags & WidthValue)
720	{	759	{
721	TermWin.ncol = BOUND_POSITIVE_INT16 (w);	760	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
722	szHint.flags \|= USSize;	761	szHint.flags \|= USSize;
723	}	762	}
724		763
725	if (flags & HeightValue)	764	if (flags & HeightValue)
726	{	765	{
727	TermWin.nrow = BOUND_POSITIVE_INT16 (h);	766	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
728	szHint.flags \|= USSize;	767	szHint.flags \|= USSize;
729	}	768	}
730		769
731	if (flags & XValue)	770	if (flags & XValue)
732	{	771	{
733	szHint.x = x;	772	szHint.x = x;
734	szHint.flags \|= USPosition;	773	szHint.flags \|= USPosition;
		774
735	if (flags & XNegative)	775	if (flags & XNegative)
736	{	776	{
737	recalc_x = 1;	777	recalc_x = 1;
738	szHint.win_gravity = NorthEastGravity;	778	szHint.win_gravity = NorthEastGravity;
739	}	779	}
…		…
741		781
742	if (flags & YValue)	782	if (flags & YValue)
743	{	783	{
744	szHint.y = y;	784	szHint.y = y;
745	szHint.flags \|= USPosition;	785	szHint.flags \|= USPosition;
		786
746	if (flags & YNegative)	787	if (flags & YNegative)
747	{	788	{
748	recalc_y = 1;	789	recalc_y = 1;
		790
749	if (szHint.win_gravity == NorthEastGravity)	791	if (szHint.win_gravity == NorthEastGravity)
750	szHint.win_gravity = SouthEastGravity;	792	szHint.win_gravity = SouthEastGravity;
751	else	793	else
752	szHint.win_gravity = SouthWestGravity;	794	szHint.win_gravity = SouthWestGravity;
753	}	795	}
754	}	796	}
755	}	797	}
756		798
757	/* TODO: BOUNDS */	799	/* TODO: BOUNDS */
758	TermWin.width = TermWin.ncol * TermWin.fwidth;	800	width = ncol * fwidth;
759	TermWin.height = TermWin.nrow * TermWin.fheight;	801	height = nrow * fheight;
760	max_width = MAX_COLS * TermWin.fwidth;	802	max_width = MAX_COLS * fwidth;
761	max_height = MAX_ROWS * TermWin.fheight;	803	max_height = MAX_ROWS * fheight;
762		804
763	szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;	805	szHint.base_width = szHint.base_height = 2 * int_bwidth;
764		806
765	sb_w = mb_h = 0;	807	sb_w = mb_h = 0;
766	window_vt_x = window_vt_y = TermWin.int_bwidth;	808	window_vt_x = window_vt_y = int_bwidth;
767		809
768	if (scrollbar_visible ())	810	if (scrollbar_visible ())
769	{	811	{
770	sb_w = scrollbar_TotalWidth ();	812	sb_w = scrollbar_TotalWidth ();
771	szHint.base_width += sb_w;	813	szHint.base_width += sb_w;
772	if (!(options & Opt_scrollBar_right))	814	if (!OPTION (Opt_scrollBar_right))
773	window_vt_x += sb_w;	815	window_vt_x += sb_w;
774	}	816	}
775		817
776	if (menubar_visible ())	818	if (menubar_visible ())
777	{	819	{
778	mb_h = menuBar_TotalHeight ();	820	mb_h = menuBar_TotalHeight ();
779	szHint.base_height += mb_h;	821	szHint.base_height += mb_h;
780	window_vt_y += mb_h;	822	window_vt_y += mb_h;
781	}	823	}
782		824
783	szHint.width_inc = TermWin.fwidth;	825	szHint.width_inc = fwidth;
784	szHint.height_inc = TermWin.fheight;	826	szHint.height_inc = fheight;
785	szHint.min_width = szHint.base_width + szHint.width_inc;	827	szHint.min_width = szHint.base_width + szHint.width_inc;
786	szHint.min_height = szHint.base_height + szHint.height_inc;	828	szHint.min_height = szHint.base_height + szHint.height_inc;
787		829
788	if (width && width - szHint.base_width < max_width)	830	if (newwidth && newwidth - szHint.base_width < max_width)
789	{	831	{
790	szHint.width = width;	832	szHint.width = newwidth;
791	TermWin.width = width - szHint.base_width;	833	width = newwidth - szHint.base_width;
792	}	834	}
793	else	835	else
794	{	836	{
795	MIN_IT (TermWin.width, max_width);	837	min_it (width, max_width);
796	szHint.width = szHint.base_width + TermWin.width;	838	szHint.width = szHint.base_width + width;
797	}	839	}
798		840
799	if (height && height - szHint.base_height < max_height)	841	if (newheight && newheight - szHint.base_height < max_height)
800	{	842	{
801	szHint.height = height;	843	szHint.height = newheight;
802	TermWin.height = height - szHint.base_height;	844	height = newheight - szHint.base_height;
803	}	845	}
804	else	846	else
805	{	847	{
806	MIN_IT (TermWin.height, max_height);	848	min_it (height, max_height);
807	szHint.height = szHint.base_height + TermWin.height;	849	szHint.height = szHint.base_height + height;
808	}	850	}
809		851
810	if (scrollbar_visible () && (options & Opt_scrollBar_right))	852	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
811	window_sb_x = szHint.width - sb_w;	853	window_sb_x = szHint.width - sb_w;
812		854
813	if (recalc_x)	855	if (recalc_x)
814	szHint.x += (DisplayWidth (disp, display->screen)	856	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
815	- szHint.width - 2 * TermWin.ext_bwidth);
816	if (recalc_y)	857	if (recalc_y)
817	szHint.y += (DisplayHeight (disp, display->screen)	858	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
818	- szHint.height - 2 * TermWin.ext_bwidth);
819		859
820	TermWin.ncol = TermWin.width / TermWin.fwidth;	860	ncol = width / fwidth;
821	TermWin.nrow = TermWin.height / TermWin.fheight;	861	nrow = height / fheight;
822	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	862	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
823	TermWin.ncol, TermWin.nrow, szHint.width,	863	ncol, nrow, szHint.width,
824	szHint.height));	864	szHint.height));
825	return;	865	return;
826	}	866	}
827		867
828	/----------------------------------------------------------------------/	868	/----------------------------------------------------------------------/
…		…
836	if (pty.pty < 0)	876	if (pty.pty < 0)
837	return;	877	return;
838		878
839	struct winsize ws;	879	struct winsize ws;
840		880
841	ws.ws_col = TermWin.ncol;	881	ws.ws_col = ncol;
842	ws.ws_row = TermWin.nrow;	882	ws.ws_row = nrow;
843	ws.ws_xpixel = TermWin.width;	883	ws.ws_xpixel = width;
844	ws.ws_ypixel = TermWin.height;	884	ws.ws_ypixel = height;
845	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	885	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);
846		886
847	#if 0	887	#if 0
848	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	888	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
849	if (cmd_pid) /* force through to the command */	889	if (cmd_pid) /* force through to the command */
…		…
873	return false;	913	return false;
874	}	914	}
875		915
876	#if ENABLE_STYLES	916	#if ENABLE_STYLES
877	for (int i = RS_styleCount; --i; )	917	for (int i = RS_styleCount; --i; )
878	if (TermWin.fontset[i] != TermWin.fontset[0])	918	if (fontset[i] != fontset[0])
879	delete TermWin.fontset[i];	919	delete fontset[i];
880	#endif	920	#endif
881		921
882	delete TermWin.fontset[0];	922	delete fontset[0];
883	TermWin.fontset[0] = fs;	923	fontset[0] = fs;
884		924
885	prop = (*fs)[1]->properties ();	925	prop = (*fs)[1]->properties ();
886	prop.height += TermWin.lineSpace;	926	prop.height += lineSpace;
887	fs->set_prop (prop);	927	fs->set_prop (prop);
888		928
889	TermWin.fwidth = prop.width;	929	fwidth = prop.width;
890	TermWin.fheight = prop.height;	930	fheight = prop.height;
891	TermWin.fweight = prop.weight;	931	fbase = prop.ascent;
892	TermWin.fslant = prop.slant;
893	TermWin.fbase = (*fs)[1]->ascent;
894		932
895	for (int style = 1; style < 4; style++)	933	for (int style = 1; style < 4; style++)
896	{	934	{
897	#if ENABLE_STYLES	935	#if ENABLE_STYLES
898	const char *res = rs[Rs_font + style];	936	const char *res = rs[Rs_font + style];
899		937
900	if (res && !*res)	938	if (res && !*res)
901	TermWin.fontset[style] = TermWin.fontset[0];	939	fontset[style] = fontset[0];
902	else	940	else
903	{	941	{
904	TermWin.fontset[style] = fs = new rxvt_fontset (this);	942	fontset[style] = fs = new rxvt_fontset (this);
905	rxvt_fontprop prop2 = prop;	943	rxvt_fontprop prop2 = prop;
906		944
907	if (res)	945	if (res)
908	prop2.weight = prop2.slant = rxvt_fontprop::unset;	946	prop2.weight = prop2.slant = rxvt_fontprop::unset;
909	else	947	else
910	{	948	{
911	res = TermWin.fontset[0]->fontdesc;	949	res = fontset[0]->fontdesc;
912		950
913	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	951	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
914	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	952	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
915	}	953	}
916		954
917	fs->populate (res);	955	fs->populate (res);
918	fs->set_prop (prop2);	956	fs->set_prop (prop2);
919	}	957	}
920	#else	958	#else
921	TermWin.fontset[style] = TermWin.fontset[0];	959	fontset[style] = fontset[0];
922	#endif	960	#endif
923	}	961	}
924		962
925	if (TermWin.parent[0])	963	if (parent[0])
926	{	964	{
927	resize_all_windows (0, 0, 0);	965	resize_all_windows (0, 0, 0);
928	scr_remap_chars ();	966	scr_remap_chars ();
929	scr_touch (true);	967	scr_touch (true);
930	}	968	}
…		…
932	return true;	970	return true;
933	}	971	}
934		972
935	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	973	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
936	{	974	{
937	// TODO: SMART_WINDOW_TITLE
938	XChangeProperty (display->display, TermWin.parent[0],	975	XChangeProperty (display->display, parent[0],
939	prop, XA_STRING, 8, PropModeReplace,	976	prop, XA_STRING, 8, PropModeReplace,
940	(const unsigned char *)str, len >= 0 ? len : strlen (str));	977	(const unsigned char *)str, len >= 0 ? len : strlen (str));
941	}	978	}
942		979
943	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	980	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944	{	981	{
945	// TODO: SMART_WINDOW_TITLE
946	wchar_t *ws = rxvt_mbstowcs (str, len);	982	wchar_t *ws = rxvt_mbstowcs (str, len);
947	char *s = rxvt_wcstoutf8 (ws);	983	char *s = rxvt_wcstoutf8 (ws);
948		984
949	XChangeProperty (display->display, TermWin.parent[0],	985	XChangeProperty (display->display, parent[0],
950	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	986	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951	(const unsigned char *)s, strlen (s));	987	(const unsigned char *)s, strlen (s));
952		988
953	free (s);	989	free (s);
954	free (ws);	990	free (ws);
…		…
991	i = atoi (color);	1027	i = atoi (color);
992		1028
993	if (i >= 8 && i <= 15)	1029	if (i >= 8 && i <= 15)
994	{ /* bright colors */	1030	{ /* bright colors */
995	i -= 8;	1031	i -= 8;
996	# ifndef NO_BRIGHTCOLOR
997	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	1032	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
998	SET_PIXCOLOR (idx);	1033	SET_PIXCOLOR (idx);
999	goto done;	1034	goto done;
1000	# endif
1001	}	1035	}
1002		1036
1003	if (i >= 0 && i <= 7)	1037	if (i >= 0 && i <= 7)
1004	{ /* normal colors */	1038	{ /* normal colors */
1005	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	1039	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1117		1151
1118	/* -------------------------------------------------------------------- *	1152	/* -------------------------------------------------------------------- *
1119	* - WINDOW RESIZING - *	1153	* - WINDOW RESIZING - *
1120	* -------------------------------------------------------------------- */	1154	* -------------------------------------------------------------------- */
1121	void	1155	void
1122	rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)	1156	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1123	{	1157	{
1124	int fix_screen;	1158	int fix_screen;
1125	#ifdef SMART_RESIZE
1126	int old_width = szHint.width, old_height = szHint.height;	1159	int old_width = szHint.width, old_height = szHint.height;
1127	#endif
1128	dDisp;	1160	dDisp;
1129		1161
1130	window_calc (width, height);	1162	window_calc (newwidth, newheight);
1131	XSetWMNormalHints (disp, TermWin.parent[0], &szHint);	1163	XSetWMNormalHints (disp, parent[0], &szHint);
1132		1164
1133	if (!ignoreparent)	1165	if (!ignoreparent)
1134	{	1166	{
1135	#ifdef SMART_RESIZE	1167	#ifdef SMART_RESIZE
1136	/*	1168	/*
…		…
1140	int x, y, x1, y1;	1172	int x, y, x1, y1;
1141	int dx, dy;	1173	int dx, dy;
1142	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1174	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1143	Window unused_cr;	1175	Window unused_cr;
1144		1176
1145	XTranslateCoordinates (disp, TermWin.parent[0], display->root,	1177	XTranslateCoordinates (disp, parent[0], display->root,
1146	0, 0, &x, &y, &unused_cr);	1178	0, 0, &x, &y, &unused_cr);
1147	XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,	1179	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1148	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1180	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1149	/*	1181	/*
1150	* if display->root isn't the parent window, a WM will probably have offset	1182	* if display->root isn't the parent window, a WM will probably have offset
1151	* our position for handles and decorations. Counter it	1183	* our position for handles and decorations. Counter it
1152	*/	1184	*/
…		…
1169	if (y < y1) /* top half */	1201	if (y < y1) /* top half */
1170	dy = 0;	1202	dy = 0;
1171	else if (y == y1) /* exact center */	1203	else if (y == y1) /* exact center */
1172	dy /= 2;	1204	dy /= 2;
1173		1205
1174	XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,	1206	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1175	szHint.width, szHint.height);	1207	szHint.width, szHint.height);
1176	#else	1208	#else
1177	XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);	1209	XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1178	#endif	1210	#endif
1179	}	1211	}
1180		1212
1181	fix_screen = TermWin.ncol != prev_ncol \|\| TermWin.nrow != prev_nrow;	1213	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1182		1214
1183	if (fix_screen \|\| width != old_width \|\| height != old_height)	1215	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1184	{	1216	{
1185	if (scrollbar_visible ())	1217	if (scrollbar_visible ())
1186	{	1218	{
1187	XMoveResizeWindow (disp, scrollBar.win,	1219	XMoveResizeWindow (disp, scrollBar.win,
1188	window_sb_x, 0,	1220	window_sb_x, 0,
…		…
1191	}	1223	}
1192		1224
1193	if (menubar_visible ())	1225	if (menubar_visible ())
1194	XMoveResizeWindow (disp, menuBar.win,	1226	XMoveResizeWindow (disp, menuBar.win,
1195	window_vt_x, 0,	1227	window_vt_x, 0,
1196	TermWin_TotalWidth (), menuBar_TotalHeight ());	1228	width, menuBar_TotalHeight ());
1197		1229
1198	XMoveResizeWindow (disp, TermWin.vt,	1230	XMoveResizeWindow (disp, vt,
1199	window_vt_x, window_vt_y,	1231	window_vt_x, window_vt_y,
1200	TermWin_TotalWidth (), TermWin_TotalHeight ());	1232	width, height);
1201		1233
1202	scr_clear ();	1234	scr_clear ();
1203	#ifdef XPM_BACKGROUND	1235	#ifdef XPM_BACKGROUND
1204	resize_pixmap ();	1236	resize_pixmap ();
1205	#endif	1237	#endif
…		…
1211	int old_ncol = prev_ncol;	1243	int old_ncol = prev_ncol;
1212		1244
1213	/* scr_reset only works on the primary screen */	1245	/* scr_reset only works on the primary screen */
1214	if (old_height) /* this is not the first time through */	1246	if (old_height) /* this is not the first time through */
1215	{	1247	{
1216	unsigned int ncol = TermWin.ncol;	1248	unsigned int ocol = ncol;
1217	TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this	1249	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1218	curr_screen = scr_change_screen (PRIMARY);	1250	curr_screen = scr_change_screen (PRIMARY);
1219	TermWin.ncol = ncol;	1251	ncol = ocol;
1220	}	1252	}
1221		1253
1222	scr_reset ();	1254	scr_reset ();
1223		1255
1224	if (curr_screen >= 0) /* this is not the first time through */	1256	if (curr_screen >= 0) /* this is not the first time through */
1225	{	1257	{
1226	scr_change_screen (curr_screen);	1258	scr_change_screen (curr_screen);
1227	selection_check (old_ncol != TermWin.ncol ? 4 : 0);	1259	selection_check (old_ncol != ncol ? 4 : 0);
1228	}	1260	}
1229	}	1261	}
1230		1262
1231	old_width = szHint.width;	1263	old_width = szHint.width;
1232	old_height = szHint.height;	1264	old_height = szHint.height;
1233		1265
1234	#ifdef XPM_BACKGROUND	1266	#ifdef XPM_BACKGROUND
1235	if (TermWin.pixmap)	1267	if (pixmap)
1236	scr_touch (false);	1268	scr_touch (false);
1237	#endif	1269	#endif
1238		1270
1239	#ifdef USE_XIM	1271	#ifdef USE_XIM
1240	IMSetStatusPosition ();	1272	IMSetStatusPosition ();
…		…
1244	/*	1276	/*
1245	* Set the width/height of the vt window in characters. Units are pixels.	1277	* Set the width/height of the vt window in characters. Units are pixels.
1246	* good for toggling 80/132 columns	1278	* good for toggling 80/132 columns
1247	*/	1279	*/
1248	void	1280	void
1249	rxvt_term::set_widthheight (unsigned int width, unsigned int height)	1281	rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1250	{	1282	{
1251	XWindowAttributes wattr;	1283	XWindowAttributes wattr;
1252		1284
1253	if (width == 0 \|\| height == 0)	1285	if (newwidth == 0 \|\| newheight == 0)
1254	{	1286	{
1255	XGetWindowAttributes (display->display, display->root, &wattr);	1287	XGetWindowAttributes (display->display, display->root, &wattr);
1256		1288
1257	if (width == 0)	1289	if (newwidth == 0)
1258	width = wattr.width - szHint.base_width;	1290	newwidth = wattr.width - szHint.base_width;
1259	if (height == 0)	1291	if (newheight == 0)
1260	height = wattr.height - szHint.base_height;	1292	newheight = wattr.height - szHint.base_height;
1261	}
1262
1263	if (width != TermWin.width \|\| height != TermWin.height)
1264	{	1293	}
		1294
		1295	if (newwidth != width \|\| newheight != height)
		1296	{
1265	width += szHint.base_width;	1297	newwidth += szHint.base_width;
1266	height += szHint.base_height;	1298	newheight += szHint.base_height;
1267	resize_all_windows (width, height, 0);	1299	resize_all_windows (newwidth, newheight, 0);
1268	}	1300	}
1269	}	1301	}
1270		1302
1271	/* -------------------------------------------------------------------- *	1303	/* -------------------------------------------------------------------- *
1272	* - X INPUT METHOD ROUTINES - *	1304	* - X INPUT METHOD ROUTINES - *
…		…
1282		1314
1283	void	1315	void
1284	rxvt_term::im_set_size (XRectangle &size)	1316	rxvt_term::im_set_size (XRectangle &size)
1285	{	1317	{
1286	// the int_bwidth terms make no sense to me	1318	// the int_bwidth terms make no sense to me
1287	size.x = TermWin.int_bwidth;	1319	size.x = int_bwidth;
1288	size.y = TermWin.int_bwidth;	1320	size.y = int_bwidth;
1289	size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;	1321	size.width = Width2Pixel (ncol) + int_bwidth;
1290	size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;	1322	size.height = Height2Pixel (nrow) + int_bwidth;
1291	}	1323	}
1292		1324
1293	void	1325	void
1294	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,	1326	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295	XRectangle &status_rect,	1327	XRectangle &status_rect,
1296	const XRectangle &needed_rect)	1328	const XRectangle &needed_rect)
1297	{	1329	{
1298	preedit_rect.x = needed_rect.width;	1330	preedit_rect.x = needed_rect.width;
1299	preedit_rect.y = 0;	1331	preedit_rect.y = 0;
1300	preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;	1332	preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301	preedit_rect.height = TermWin.fheight;	1333	preedit_rect.height = fheight;
1302		1334
1303	status_rect.x = 0;	1335	status_rect.x = 0;
1304	status_rect.y = 0;	1336	status_rect.y = 0;
1305	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;	1337	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1306	status_rect.height = TermWin.fheight;	1338	status_rect.height = fheight;
1307	}	1339	}
1308		1340
1309	/* Checking whether input method is running. */	1341	/* Checking whether input method is running. */
1310	bool	1342	bool
1311	rxvt_term::IMisRunning ()	1343	rxvt_term::IMisRunning ()
…		…
1339	{	1371	{
1340	XPoint nspot;	1372	XPoint nspot;
1341	XVaNestedList preedit_attr;	1373	XVaNestedList preedit_attr;
1342		1374
1343	if (!Input_Context	1375	if (!Input_Context
1344	\|\| !TermWin.focus	1376	\|\| !focus
1345	\|\| !(input_style & XIMPreeditPosition))	1377	\|\| !(input_style & XIMPreeditPosition))
1346	return;	1378	return;
1347		1379
1348	im_set_position (nspot);	1380	im_set_position (nspot);
1349		1381
…		…
1469	"----R---%d------*,"	1501	"----R---%d------*,"
1470	"----R---%d------*,"	1502	"----R---%d------*,"
1471	"----R---%d------*,"	1503	"----R---%d------*,"
1472	"----R---%d------*,"	1504	"----R---%d------*,"
1473	"*",	1505	"*",
1474	TermWin.fheight,	1506	fheight,
1475	TermWin.fheight + 1, TermWin.fheight - 1,	1507	fheight + 1, fheight - 1,
1476	TermWin.fheight - 2, TermWin.fheight + 2);	1508	fheight - 2, fheight + 2);
1477		1509
1478	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1510	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479	&missing_charset_list, &missing_charset_count, &def_string);	1511	&missing_charset_list, &missing_charset_count, &def_string);
1480		1512
1481	if (missing_charset_list)	1513	if (missing_charset_list)
…		…
1527	NULL);	1559	NULL);
1528	}	1560	}
1529		1561
1530	Input_Context = XCreateIC (xim,	1562	Input_Context = XCreateIC (xim,
1531	XNInputStyle, input_style,	1563	XNInputStyle, input_style,
1532	XNClientWindow, TermWin.vt,	1564	XNClientWindow, vt,
1533	XNFocusWindow, TermWin.parent[0],	1565	XNFocusWindow, parent[0],
1534	preedit_attr ? XNPreeditAttributes : NULL,	1566	preedit_attr ? XNPreeditAttributes : NULL,
1535	preedit_attr,	1567	preedit_attr,
1536	status_attr ? XNStatusAttributes : NULL,	1568	status_attr ? XNStatusAttributes : NULL,
1537	status_attr, NULL);	1569	status_attr, NULL);
1538		1570
…		…
1622	{	1654	{
1623	XRectangle preedit_rect, status_rect, *needed_rect;	1655	XRectangle preedit_rect, status_rect, *needed_rect;
1624	XVaNestedList preedit_attr, status_attr;	1656	XVaNestedList preedit_attr, status_attr;
1625		1657
1626	if (!Input_Context	1658	if (!Input_Context
1627	\|\| !TermWin.focus	1659	\|\| !focus
1628	\|\| !(input_style & XIMPreeditArea)	1660	\|\| !(input_style & XIMPreeditArea)
1629	\|\| !IMisRunning ())	1661	\|\| !IMisRunning ())
1630	return;	1662	return;
1631		1663
1632	/* Getting the necessary width of preedit area */	1664	/* 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.148 by root, Wed Nov 30 21:05:39 2005 UTC vs. Revision 1.164 by root, Fri Jan 6 05:37:59 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.148 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.164 by root, Fri Jan 6 05:37:59 2006 UTC