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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.151 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.188 by root, Wed Jan 18 08:33:34 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"
35		37
36	#include <limits>	38	#include <limits>
37		39
38	#include <csignal>	40	#include <csignal>
39	#include <cstring>	41	#include <cstring>
…		…
44		46
45	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
46	# include <termios.h>	48	# include <termios.h>
47	#endif	49	#endif
48		50
49	#ifdef KEYSYM_RESOURCE
50	# include "keyboard.h"
51	#endif
52
53	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
54		52
55	static char curlocale[128];	53	static char curlocale[128], savelocale[128];
56		54
57	bool	55	bool
58	rxvt_set_locale (const char *locale)	56	rxvt_set_locale (const char *locale)
59	{	57	{
60	if (!locale \|\| !strncmp (locale, curlocale, 128))	58	if (!locale \|\| !strncmp (locale, curlocale, 128))
61	return false;	59	return false;
62		60
63	strncpy (curlocale, locale, 128);	61	strncpy (curlocale, locale, 128);
64	setlocale (LC_CTYPE, curlocale);	62	setlocale (LC_CTYPE, curlocale);
65	return true;	63	return true;
		64	}
		65
		66	void
		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);
66	}	77	}
67		78
68	#if ENABLE_COMBINING	79	#if ENABLE_COMBINING
69	class rxvt_composite_vec rxvt_composite;	80	class rxvt_composite_vec rxvt_composite;
70		81
…		…
134	#if TRANSPARENT	145	#if TRANSPARENT
135	rootwin_ev (this, &rxvt_term::rootwin_cb),	146	rootwin_ev (this, &rxvt_term::rootwin_cb),
136	#endif	147	#endif
137	#ifdef HAVE_SCROLLBARS	148	#ifdef HAVE_SCROLLBARS
138	scrollbar_ev (this, &rxvt_term::x_cb),	149	scrollbar_ev (this, &rxvt_term::x_cb),
139	#endif
140	#ifdef MENUBAR
141	menubar_ev (this, &rxvt_term::x_cb),
142	#endif	150	#endif
143	#ifdef CURSOR_BLINK	151	#ifdef CURSOR_BLINK
144	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	152	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
145	#endif	153	#endif
146	#ifdef TEXT_BLINK	154	#ifdef TEXT_BLINK
…		…
186	void rxvt_term::emergency_cleanup ()	194	void rxvt_term::emergency_cleanup ()
187	{	195	{
188	if (cmd_pid)	196	if (cmd_pid)
189	kill (-cmd_pid, SIGHUP);	197	kill (-cmd_pid, SIGHUP);
190		198
191	#ifdef UTMP_SUPPORT	199	delete pty; pty = 0;
192	privileged_utmp (RESTORE);
193	#endif
194
195	pty.put ();
196	}	200	}
197		201
198	rxvt_term::~rxvt_term ()	202	rxvt_term::~rxvt_term ()
199	{	203	{
		204	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		205
200	termlist.erase (find (termlist.begin (), termlist.end(), this));	206	termlist.erase (find (termlist.begin (), termlist.end(), this));
201		207
202	emergency_cleanup ();	208	emergency_cleanup ();
203		209
204	#if ENABLE_STYLES	210	#if ENABLE_STYLES
…		…
214		220
215	selection_clear ();	221	selection_clear ();
216		222
217	#ifdef USE_XIM	223	#ifdef USE_XIM
218	im_destroy ();	224	im_destroy ();
219	#endif
220	#ifdef MENUBAR
221	if (menubarGC) XFreeGC (disp, menubarGC);
222	#endif	225	#endif
223	#ifdef XTERM_SCROLLBAR	226	#ifdef XTERM_SCROLLBAR
224	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	227	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
225	if (ShadowGC) XFreeGC (disp, ShadowGC);	228	if (ShadowGC) XFreeGC (disp, ShadowGC);
226	#endif	229	#endif
…		…
237	if (upArrow) XFreePixmap (disp, upArrow);	240	if (upArrow) XFreePixmap (disp, upArrow);
238	if (downArrow) XFreePixmap (disp, downArrow);	241	if (downArrow) XFreePixmap (disp, downArrow);
239	if (upArrowHi) XFreePixmap (disp, upArrowHi);	242	if (upArrowHi) XFreePixmap (disp, upArrowHi);
240	if (downArrowHi) XFreePixmap (disp, downArrowHi);	243	if (downArrowHi) XFreePixmap (disp, downArrowHi);
241	#endif	244	#endif
242	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	245	#ifdef RXVT_SCROLLBAR
243	if (topShadowGC) XFreeGC (disp, topShadowGC);	246	if (topShadowGC) XFreeGC (disp, topShadowGC);
244	if (botShadowGC) XFreeGC (disp, botShadowGC);	247	if (botShadowGC) XFreeGC (disp, botShadowGC);
245	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	248	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
246	#endif	249	#endif
247	if (gc) XFreeGC (disp, gc);	250	if (gc) XFreeGC (disp, gc);
248		251
249	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
250	delete menuBar.drawable;
251	//if (menuBar.win)
252	// XDestroyWindow (disp, menuBar.win);
253	#endif
254	delete drawable;	252	delete drawable;
255	// destroy all windows	253	// destroy all windows
256	if (parent[0])	254	if (parent[0])
257	XDestroyWindow (disp, parent[0]);	255	XDestroyWindow (disp, parent[0]);
258	}	256	}
259		257
260	// TODO: free pixcolours, colours should become part of rxvt_display	258	// TODO: free pixcolours, colours should become part of rxvt_display
261
262	delete pix_colors_focused;	259	delete pix_colors_focused;
263	#if OFF_FOCUS_FADING	260	#if OFF_FOCUS_FADING
264	delete pix_colors_unfocused;	261	delete pix_colors_unfocused;
265	#endif	262	#endif
266		263
…		…
289	delete keyboard;	286	delete keyboard;
290	#endif	287	#endif
291	}	288	}
292		289
293	void	290	void
		291	rxvt_term::child_exit ()
		292	{
		293	cmd_pid = 0;
		294
		295	if (!OPTION (Opt_hold))
		296	destroy ();
		297	}
		298
		299	void
294	rxvt_term::destroy ()	300	rxvt_term::destroy ()
295	{	301	{
296	if (destroy_ev.active)	302	if (destroy_ev.active)
297	return;	303	return;
298		304
…		…
305	#if USE_XIM	311	#if USE_XIM
306	im_ev.stop (display);	312	im_ev.stop (display);
307	#endif	313	#endif
308	#if HAVE_SCROLLBARS	314	#if HAVE_SCROLLBARS
309	scrollbar_ev.stop (display);	315	scrollbar_ev.stop (display);
310	#endif
311	#if MENUBAR
312	menubar_ev.stop (display);
313	#endif	316	#endif
314	#if TRANSPARENT	317	#if TRANSPARENT
315	rootwin_ev.stop (display);	318	rootwin_ev.stop (display);
316	#endif	319	#endif
317	incr_ev.stop ();	320	incr_ev.stop ();
…		…
341	}	344	}
342		345
343	void	346	void
344	rxvt_term::destroy_cb (time_watcher &w)	347	rxvt_term::destroy_cb (time_watcher &w)
345	{	348	{
346	SET_R (this);	349	make_current ();
347		350
348	delete this;	351	delete this;
349	}	352	}
350		353
351	/----------------------------------------------------------------------/	354	/----------------------------------------------------------------------/
…		…
442	/----------------------------------------------------------------------/	445	/----------------------------------------------------------------------/
443	bool	446	bool
444	rxvt_term::init (int argc, const char const argv)	447	rxvt_term::init (int argc, const char const argv)
445	{	448	{
446	SET_R (this);	449	SET_R (this);
447
448	set_locale ("");	450	set_locale ("");
		451	set_environ (envv); // few things in X do not call setlocale :(
449		452
450	if (!init_vars ())	453	if (!init_vars ())
451	return false;	454	return false;
452		455
453	init_secondary ();	456	init_secondary ();
…		…
456		459
457	#ifdef KEYSYM_RESOURCE	460	#ifdef KEYSYM_RESOURCE
458	keyboard->register_done ();	461	keyboard->register_done ();
459	#endif	462	#endif
460		463
461	#if MENUBAR_MAX
462	menubar_read (rs[Rs_menu]);
463	#endif
464	#ifdef HAVE_SCROLLBARS	464	#ifdef HAVE_SCROLLBARS
465	if (options & Opt_scrollBar)	465	if (OPTION (Opt_scrollBar))
466	scrollBar.setIdle (); /* set existence for size calculations */	466	scrollBar.setIdle (); /* set existence for size calculations */
467	#endif	467	#endif
468		468
		469	#if ENABLE_PERL
		470	if (!rs[Rs_perl_ext_1])
		471	rs[Rs_perl_ext_1] = "default";
		472
		473	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		474	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		475	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		476	{
		477	rxvt_perl.init (this);
		478	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		479	}
		480	#endif
		481
		482	pty = rxvt_new_ptytty ();
		483
469	create_windows (argc, argv);	484	create_windows (argc, argv);
470		485
471	dDisp;	486	dDisp;
472		487
473	init_xlocale ();	488	init_xlocale ();
474		489
475	scr_reset (); /* initialize screen */	490	scr_reset (); // initialize screen
476		491
477	#if 0	492	#if 0
478	XSynchronize (disp, True);	493	XSynchronize (disp, True);
479	#endif	494	#endif
480		495
481	#ifdef HAVE_SCROLLBARS	496	#ifdef HAVE_SCROLLBARS
482	if (options & Opt_scrollBar)	497	if (OPTION (Opt_scrollBar))
483	resize_scrollbar (); /* create and map scrollbar */	498	resize_scrollbar (); /* create and map scrollbar */
484	#endif	499	#endif
485	#if (MENUBAR_MAX)
486	if (menubar_visible ())
487	XMapWindow (disp, menuBar.win);
488	#endif
489	#ifdef TRANSPARENT	500	#ifdef TRANSPARENT
490	if (options & Opt_transparent)	501	if (OPTION (Opt_transparent))
491	{	502	{
492	XSelectInput (disp, display->root, PropertyChangeMask);	503	XSelectInput (disp, display->root, PropertyChangeMask);
493	check_our_parents ();	504	check_our_parents ();
494	rootwin_ev.start (display, display->root);	505	rootwin_ev.start (display, display->root);
495	}	506	}
…		…
502		513
503	init_command (cmd_argv);	514	init_command (cmd_argv);
504		515
505	free (cmd_argv);	516	free (cmd_argv);
506		517
		518	if (pty->pty >= 0)
507	pty_ev.start (pty.pty, EVENT_READ);	519	pty_ev.start (pty->pty, EVENT_READ);
508		520
509	check_ev.start ();	521	check_ev.start ();
		522
		523	HOOK_INVOKE ((this, HOOK_START, DT_END));
510		524
511	return true;	525	return true;
512	}	526	}
513		527
514	static struct sig_handlers	528	static struct sig_handlers
…		…
522		536
523	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)	537	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
524	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	538	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
525	if (pid == (*t)->cmd_pid)	539	if (pid == (*t)->cmd_pid)
526	{	540	{
527	(*t)->destroy ();	541	(*t)->child_exit ();
528	break;	542	break;
529	}	543	}
530	}	544	}
531		545
532	/*	546	/*
…		…
549	sw_int (this, &sig_handlers::sig_term)	563	sw_int (this, &sig_handlers::sig_term)
550	{	564	{
551	}	565	}
552	} sig_handlers;	566	} sig_handlers;
553		567
		568	char **rxvt_environ; // startup environment
		569
554	void	570	void
555	rxvt_init ()	571	rxvt_init ()
556	{	572	{
557	/*	573	uid_t uid = getuid ();
558	* Save and then give up any super-user privileges	574	gid_t gid = getgid ();
559	* If we need privileges in any area then we must specifically request it.	575
560	* We should only need to be root in these cases:	576	// before doing anything else, check for setuid/setgid operation,
561	* 1. write utmp entries on some systems	577	// start the helper process and drop privileges
562	* 2. chown tty on some systems	578	if (uid != geteuid ()
563	*/	579	\|\| gid != getegid ())
564	rxvt_privileges (SAVE);	580	{
565	rxvt_privileges (IGNORE);	581	#if PTYTTY_HELPER
		582	rxvt_ptytty_server ();
		583	#else
		584	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
		585	#endif
		586
		587	// drop privileges
		588	#if HAVE_SETRESUID
		589	setresgid (gid, gid, gid);
		590	setresuid (uid, uid, uid);
		591	#elif HAVE_SETREUID
		592	setregid (gid, gid);
		593	setreuid (uid, uid);
		594	#elif HAVE_SETUID
		595	setgid (gid);
		596	setuid (uid);
		597	#endif
		598
		599	if (uid != geteuid ()
		600	\|\| gid != getegid ())
		601	rxvt_fatal ("unable to drop privileges, aborting.\n");
		602	}
		603
		604	rxvt_environ = environ;
566		605
567	signal (SIGHUP, SIG_IGN);	606	signal (SIGHUP, SIG_IGN);
568	signal (SIGPIPE, SIG_IGN);	607	signal (SIGPIPE, SIG_IGN);
569		608
570	sig_handlers.sw_chld.start (SIGCHLD);	609	sig_handlers.sw_chld.start (SIGCHLD);
…		…
575	/* signal (SIGURG, SIG_DFL); */	614	/* signal (SIGURG, SIG_DFL); */
576		615
577	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	616	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
578	// TODO: handle this with exceptions and tolerate the memory loss	617	// TODO: handle this with exceptions and tolerate the memory loss
579	XSetIOErrorHandler (rxvt_xioerror_handler);	618	XSetIOErrorHandler (rxvt_xioerror_handler);
		619
		620	XrmInitialize ();
580	}	621	}
581		622
582	/* ------------------------------------------------------------------------- *	623	/* ------------------------------------------------------------------------- *
583	* MEMORY ALLOCATION WRAPPERS *	624	* MEMORY ALLOCATION WRAPPERS *
584	* ------------------------------------------------------------------------- */	625	* ------------------------------------------------------------------------- */
…		…
613	rxvt_fatal ("memory allocation failure. aborting.\n");	654	rxvt_fatal ("memory allocation failure. aborting.\n");
614		655
615	return p;	656	return p;
616	}	657	}
617		658
618	/* ------------------------------------------------------------------------- *
619	* PRIVILEGED OPERATIONS *
620	* ------------------------------------------------------------------------- */
621	/* take care of suid/sgid super-user (root) privileges */
622	void
623	rxvt_privileges (rxvt_privaction action)
624	{
625	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
626	static uid_t euid;
627	static gid_t egid;
628	#endif
629
630	#if ! defined(__CYGWIN32__)
631	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
632	/* setreuid () is the poor man's setuid (), seteuid () */
633	# define seteuid(a) setreuid(-1, (a))
634	# define setegid(a) setregid(-1, (a))
635	# define HAVE_SETEUID
636	# endif
637	# ifdef HAVE_SETEUID
638	switch (action)
639	{
640	case IGNORE:
641	/*
642	* change effective uid/gid - not real uid/gid - so we can switch
643	* back to root later, as required
644	*/
645	seteuid (getuid ());
646	setegid (getgid ());
647	break;
648	case SAVE:
649	euid = geteuid ();
650	egid = getegid ();
651	break;
652	case RESTORE:
653	seteuid (euid);
654	setegid (egid);
655	break;
656	}
657	# else
658	switch (action)
659	{
660	case IGNORE:
661	setuid (getuid ());
662	setgid (getgid ());
663	/* FALLTHROUGH */
664	case SAVE:
665	/* FALLTHROUGH */
666	case RESTORE:
667	break;
668	}
669	# endif
670	#endif
671	}
672
673	#ifdef UTMP_SUPPORT
674	void
675	rxvt_term::privileged_utmp (rxvt_privaction action)
676	{
677	if ((options & Opt_utmpInhibit)
678	\|\| !pty.name \|\| !*pty.name)
679	return;
680
681	rxvt_privileges (RESTORE);
682
683	if (action == SAVE)
684	makeutent (pty.name, rs[Rs_display_name]);
685	else
686	cleanutent ();
687
688	rxvt_privileges (IGNORE);
689	}
690	#endif
691
692	/----------------------------------------------------------------------/	659	/----------------------------------------------------------------------/
693	/*	660	/*
694	* window size/position calculcations for XSizeHint and other storage.	661	* window size/position calculcations for XSizeHint and other storage.
695	* if width/height are non-zero then override calculated width/height	662	* if width/height are non-zero then override calculated width/height
696	*/	663	*/
697	void	664	void
698	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	665	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
699	{	666	{
700	short recalc_x, recalc_y;	667	short recalc_x, recalc_y;
701	int x, y, sb_w, mb_h, flags;	668	int x, y, sb_w, flags;
702	unsigned int w, h;	669	unsigned int w, h;
703	unsigned int max_width, max_height;	670	unsigned int max_width, max_height;
704	dDisp;	671	dDisp;
705		672
706	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	673	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
…		…
767	max_width = MAX_COLS * fwidth;	734	max_width = MAX_COLS * fwidth;
768	max_height = MAX_ROWS * fheight;	735	max_height = MAX_ROWS * fheight;
769		736
770	szHint.base_width = szHint.base_height = 2 * int_bwidth;	737	szHint.base_width = szHint.base_height = 2 * int_bwidth;
771		738
772	sb_w = mb_h = 0;	739	sb_w = 0;
773	window_vt_x = window_vt_y = int_bwidth;	740	window_vt_x = window_vt_y = int_bwidth;
774		741
775	if (scrollbar_visible ())	742	if (scrollBar.state)
776	{	743	{
777	sb_w = scrollbar_TotalWidth ();	744	sb_w = scrollbar_TotalWidth ();
778	szHint.base_width += sb_w;	745	szHint.base_width += sb_w;
779	if (!(options & Opt_scrollBar_right))	746	if (!OPTION (Opt_scrollBar_right))
780	window_vt_x += sb_w;	747	window_vt_x += sb_w;
781	}
782
783	if (menubar_visible ())
784	{
785	mb_h = menuBar_TotalHeight ();
786	szHint.base_height += mb_h;
787	window_vt_y += mb_h;
788	}	748	}
789		749
790	szHint.width_inc = fwidth;	750	szHint.width_inc = fwidth;
791	szHint.height_inc = fheight;	751	szHint.height_inc = fheight;
792	szHint.min_width = szHint.base_width + szHint.width_inc;	752	szHint.min_width = szHint.base_width + szHint.width_inc;
…		…
812	{	772	{
813	min_it (height, max_height);	773	min_it (height, max_height);
814	szHint.height = szHint.base_height + height;	774	szHint.height = szHint.base_height + height;
815	}	775	}
816		776
817	if (scrollbar_visible () && (options & Opt_scrollBar_right))	777	if (scrollBar.state && OPTION (Opt_scrollBar_right))
818	window_sb_x = szHint.width - sb_w;	778	window_sb_x = szHint.width - sb_w;
819		779
820	if (recalc_x)	780	if (recalc_x)
821	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	781	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
822	if (recalc_y)	782	if (recalc_y)
…		…
836	* Called after a window size change.	796	* Called after a window size change.
837	*/	797	*/
838	void	798	void
839	rxvt_term::tt_winch ()	799	rxvt_term::tt_winch ()
840	{	800	{
841	if (pty.pty < 0)	801	if (pty->pty < 0)
842	return;	802	return;
843		803
844	struct winsize ws;	804	struct winsize ws;
845		805
846	ws.ws_col = ncol;	806	ws.ws_col = ncol;
847	ws.ws_row = nrow;	807	ws.ws_row = nrow;
848	ws.ws_xpixel = width;	808	ws.ws_xpixel = width;
849	ws.ws_ypixel = height;	809	ws.ws_ypixel = height;
850	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	810	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
851		811
852	#if 0	812	#if 0
853	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	813	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
854	if (cmd_pid) /* force through to the command */	814	if (cmd_pid) /* force through to the command */
855	kill (-cmd_pid, SIGWINCH);	815	kill (-cmd_pid, SIGWINCH);
…		…
891	prop.height += lineSpace;	851	prop.height += lineSpace;
892	fs->set_prop (prop);	852	fs->set_prop (prop);
893		853
894	fwidth = prop.width;	854	fwidth = prop.width;
895	fheight = prop.height;	855	fheight = prop.height;
896	fbase = (*fs)[1]->ascent;	856	fbase = prop.ascent;
897		857
898	for (int style = 1; style < 4; style++)	858	for (int style = 1; style < 4; style++)
899	{	859	{
900	#if ENABLE_STYLES	860	#if ENABLE_STYLES
901	const char *res = rs[Rs_font + style];	861	const char *res = rs[Rs_font + style];
…		…
935	return true;	895	return true;
936	}	896	}
937		897
938	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	898	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939	{	899	{
940	// TODO: SMART_WINDOW_TITLE
941	XChangeProperty (display->display, parent[0],	900	XChangeProperty (display->display, parent[0],
942	prop, XA_STRING, 8, PropModeReplace,	901	prop, XA_STRING, 8, PropModeReplace,
943	(const unsigned char *)str, len >= 0 ? len : strlen (str));	902	(const unsigned char *)str, len >= 0 ? len : strlen (str));
944	}	903	}
945		904
946	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	905	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947	{	906	{
948	// TODO: SMART_WINDOW_TITLE
949	wchar_t *ws = rxvt_mbstowcs (str, len);	907	wchar_t *ws = rxvt_mbstowcs (str, len);
950	char *s = rxvt_wcstoutf8 (ws);	908	char *s = rxvt_wcstoutf8 (ws);
951		909
952	XChangeProperty (display->display, parent[0],	910	XChangeProperty (display->display, parent[0],
953	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	911	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
…		…
994	i = atoi (color);	952	i = atoi (color);
995		953
996	if (i >= 8 && i <= 15)	954	if (i >= 8 && i <= 15)
997	{ /* bright colors */	955	{ /* bright colors */
998	i -= 8;	956	i -= 8;
999	# ifndef NO_BRIGHTCOLOR
1000	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	957	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001	SET_PIXCOLOR (idx);	958	SET_PIXCOLOR (idx);
1002	goto done;	959	goto done;
1003	# endif
1004	}	960	}
1005		961
1006	if (i >= 0 && i <= 7)	962	if (i >= 0 && i <= 7)
1007	{ /* normal colors */	963	{ /* normal colors */
1008	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	964	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1181		1137
1182	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1138	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1183		1139
1184	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1140	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1185	{	1141	{
1186	if (scrollbar_visible ())	1142	if (scrollBar.state)
1187	{	1143	{
1188	XMoveResizeWindow (disp, scrollBar.win,	1144	XMoveResizeWindow (disp, scrollBar.win,
1189	window_sb_x, 0,	1145	window_sb_x, 0,
1190	scrollbar_TotalWidth (), szHint.height);	1146	scrollbar_TotalWidth (), szHint.height);
1191	resize_scrollbar ();	1147	resize_scrollbar ();
1192	}	1148	}
1193		1149
1194	if (menubar_visible ())
1195	XMoveResizeWindow (disp, menuBar.win,
1196	window_vt_x, 0,
1197	TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199	XMoveResizeWindow (disp, vt,	1150	XMoveResizeWindow (disp, vt,
1200	window_vt_x, window_vt_y,	1151	window_vt_x, window_vt_y,
1201	TermWin_TotalWidth (), TermWin_TotalHeight ());	1152	width, height);
1202		1153
1203	scr_clear ();	1154	scr_clear ();
1204	#ifdef XPM_BACKGROUND	1155	#ifdef XPM_BACKGROUND
1205	resize_pixmap ();	1156	resize_pixmap ();
1206	#endif	1157	#endif
…		…
1386	XRectangle rect, status_rect, needed_rect;	1337	XRectangle rect, status_rect, needed_rect;
1387	unsigned long fg, bg;	1338	unsigned long fg, bg;
1388	const char *p;	1339	const char *p;
1389	char **s;	1340	char **s;
1390	XIMStyles *xim_styles;	1341	XIMStyles *xim_styles;
		1342
		1343	set_environ (envv);
1391		1344
1392	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1345	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393	return false;	1346	return false;
1394		1347
1395	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1348	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1561	int i;	1514	int i;
1562	const char *p;	1515	const char *p;
1563	char **s;	1516	char **s;
1564	char buf[IMBUFSIZ];	1517	char buf[IMBUFSIZ];
1565		1518
1566	SET_R (this);	1519	make_current ();
1567		1520
1568	im_destroy ();	1521	im_destroy ();
1569		1522
1570	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1523	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571	if (Input_Context)	1524	if (Input_Context)

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.151 by root, Wed Dec 21 19:50:16 2005 UTC vs. Revision 1.188 by root, Wed Jan 18 08:33:34 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.151 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.188 by root, Wed Jan 18 08:33:34 2006 UTC