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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.184 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.199 by root, Tue Jan 24 19:40:12 2006 UTC

…		…
46		46
47	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	48	# include <termios.h>
49	#endif	49	#endif
50		50
51	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)	51	vector<rxvt_term *> rxvt_term::termlist;
52	static uid_t saved_euid;	52
53	static gid_t saved_egid;	53	// used to tell global functions which terminal instance is "active"
54	#endif	54	rxvt_t rxvt_current_term;
		55
		56	static char curlocale[128], savelocale[128];
55		57
56	bool	58	bool
57	rxvt_tainted ()
58	{
59	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60	return getuid () != saved_euid \|\| getgid () != saved_egid;
61	#else
62	return false;
63	#endif
64	}
65
66	vector<rxvt_term *> rxvt_term::termlist;
67
68	static char curlocale[128], savelocale[128];
69
70	bool
71	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
72	{	60	{
73	if (!locale \|\| !strncmp (locale, curlocale, 128))	61	if (!locale \|\| !strncmp (locale, curlocale, 128))
74	return false;	62	return false;
75		63
76	strncpy (curlocale, locale, 128);	64	strncpy (curlocale, locale, 128);
77	setlocale (LC_CTYPE, curlocale);	65	setlocale (LC_CTYPE, curlocale);
78	return true;	66	return true;
79	}	67	}
80		68
81	void	69	void
82	rxvt_push_locale (const char *locale)	70	rxvt_push_locale (const char *locale) NOTHROW
83	{	71	{
84	strcpy (savelocale, curlocale);	72	strcpy (savelocale, curlocale);
85	rxvt_set_locale (locale);	73	rxvt_set_locale (locale);
86	}	74	}
87		75
88	void	76	void
89	rxvt_pop_locale ()	77	rxvt_pop_locale () NOTHROW
90	{	78	{
91	rxvt_set_locale (savelocale);	79	rxvt_set_locale (savelocale);
92	}	80	}
93		81
94	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
…		…
182	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
183	#endif	171	#endif
184	#ifdef USE_XIM	172	#ifdef USE_XIM
185	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
186	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
187	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
188	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
189	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
190	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
191	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
192	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
193	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
196		188
197	termlist.push_back (this);	189	termlist.push_back (this);
198		190
199	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
200	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
201
202	if (!keyboard)
203	rxvt_fatal ("out of memory, aborting.\n");
204	#endif	193	#endif
205	}	194	}
206		195
207	// clean up the most important stuff, do not call x or free mem etc.	196	// clean up the most important stuff, do not call x or free mem etc.
208	// for use before an emergency exit	197	// for use before an emergency exit
209	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
210	{	199	{
211	if (cmd_pid)	200	if (cmd_pid)
212	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
213		202
214	#ifdef UTMP_SUPPORT
215	privileged_utmp (RESTORE);
216	#endif
217
218	delete pty; pty = 0;	203	delete pty; pty = 0;
219	}	204	}
220		205
221	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
222	{	207	{
223	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
226		209
227	emergency_cleanup ();	210	emergency_cleanup ();
228		211
229	#if ENABLE_STYLES	212	#if ENABLE_STYLES
…		…
304	#ifdef KEYSYM_RESOURCE	287	#ifdef KEYSYM_RESOURCE
305	delete keyboard;	288	delete keyboard;
306	#endif	289	#endif
307	}	290	}
308		291
		292	// child has exited, usually destroys
309	void	293	void
310	rxvt_term::child_exit ()	294	rxvt_term::child_cb (child_watcher &w, int status)
311	{	295	{
		296	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		297
312	cmd_pid = 0;	298	cmd_pid = 0;
313		299
314	if (!OPTION (Opt_hold))	300	if (!OPTION (Opt_hold))
315	destroy ();	301	destroy ();
316	}	302	}
317		303
318	void	304	void
319	rxvt_term::destroy ()	305	rxvt_term::destroy ()
320	{	306	{
321	if (destroy_ev.active)	307	if (destroy_ev.active)
		308	return;
		309
		310	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
322	return;	311	return;
323		312
324	#if ENABLE_OVERLAY	313	#if ENABLE_OVERLAY
325	scr_overlay_off ();	314	scr_overlay_off ();
326	#endif	315	#endif
…		…
461	_exit (EXIT_FAILURE);	450	_exit (EXIT_FAILURE);
462	}	451	}
463		452
464	/----------------------------------------------------------------------/	453	/----------------------------------------------------------------------/
465	bool	454	bool
466	rxvt_term::init (int argc, const char const argv)	455	rxvt_term::init (int argc, const char const argv, stringvec *envv)
467	{	456	{
		457	this->envv = envv;
		458
468	SET_R (this);	459	SET_R (this);
469	set_locale ("");	460	set_locale ("");
470	set_environ (envv); // few things in X do not call setlocale :(	461	set_environ (envv); // few things in X do not call setlocale :(
471		462
472	if (!init_vars ())	463	if (!init_vars ())
…		…
483	#ifdef HAVE_SCROLLBARS	474	#ifdef HAVE_SCROLLBARS
484	if (OPTION (Opt_scrollBar))	475	if (OPTION (Opt_scrollBar))
485	scrollBar.setIdle (); /* set existence for size calculations */	476	scrollBar.setIdle (); /* set existence for size calculations */
486	#endif	477	#endif
487		478
488	#if ENABLE_PERL	479	pty = ptytty::create ();
489	if (!rs[Rs_perl_ext_1])
490	rs[Rs_perl_ext_1] = "default";
491
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	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497	// ignore some perl-related arguments if some bozo installed us set[ug]id
498	if (rxvt_tainted ())
499	{
500	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502	{
503	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504	rs[Rs_perl_lib] = 0;
505	rs[Rs_perl_eval] = 0;
506	}
507	}
508	#endif
509	rxvt_perl.init (this);
510	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511	}
512	#endif
513
514	pty = rxvt_new_ptytty ();
515		480
516	create_windows (argc, argv);	481	create_windows (argc, argv);
517		482
518	dDisp;	483	dDisp;
519		484
…		…
536	check_our_parents ();	501	check_our_parents ();
537	rootwin_ev.start (display, display->root);	502	rootwin_ev.start (display, display->root);
538	}	503	}
539	#endif	504	#endif
540		505
		506	set_colorfgbg ();
		507
		508	init_command (cmd_argv);
		509
		510	free (cmd_argv);
		511
		512	if (pty->pty >= 0)
		513	pty_ev.start (pty->pty, EVENT_READ);
		514
		515	check_ev.start ();
		516
		517	HOOK_INVOKE ((this, HOOK_START, DT_END));
		518
541	XMapWindow (disp, vt);	519	XMapWindow (disp, vt);
542	XMapWindow (disp, parent[0]);	520	XMapWindow (disp, parent[0]);
543		521
544	set_colorfgbg ();
545
546	init_command (cmd_argv);
547
548	free (cmd_argv);
549
550	if (pty->pty >= 0)
551	pty_ev.start (pty->pty, EVENT_READ);
552
553	check_ev.start ();
554
555	HOOK_INVOKE ((this, HOOK_START, DT_END));
556
557	return true;	522	return true;
558	}	523	}
559		524
560	static struct sig_handlers	525	static struct sig_handlers
561	{	526	{
562	sig_watcher sw_chld, sw_term, sw_int;	527	sig_watcher sw_term, sw_int;
563		528
564	void sig_chld (sig_watcher &w)
565	{
566	// we are being called for every SIGCHLD, find the corresponding term
567	int pid;
568
569	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
570	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
571	if (pid == (*t)->cmd_pid)
572	{
573	(*t)->child_exit ();
574	break;
575	}
576	}
577
578	/*	529	/*
579	* Catch a fatal signal and tidy up before quitting	530	* Catch a fatal signal and tidy up before quitting
580	*/	531	*/
581	void	532	void
582	sig_term (sig_watcher &w)	533	sig_term (sig_watcher &w)
583	{	534	{
584	#ifdef DEBUG_CMD
585	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
586	#endif
587	rxvt_emergency_cleanup ();	535	rxvt_emergency_cleanup ();
588	signal (w.signum, SIG_DFL);	536	signal (w.signum, SIG_DFL);
589	kill (getpid (), w.signum);	537	kill (getpid (), w.signum);
590	}	538	}
591		539
592	sig_handlers ()	540	sig_handlers ()
593	: sw_chld (this, &sig_handlers::sig_chld),
594	sw_term (this, &sig_handlers::sig_term),	541	: sw_term (this, &sig_handlers::sig_term),
595	sw_int (this, &sig_handlers::sig_term)	542	sw_int (this, &sig_handlers::sig_term)
596	{	543	{
597	}	544	}
598	} sig_handlers;	545	} sig_handlers;
599		546
600	char **rxvt_environ; // startup environment	547	char **rxvt_environ; // startup environment
601		548
602	void	549	void
603	rxvt_init ()	550	rxvt_init ()
604	{	551	{
		552	ptytty::init ();
		553
605	rxvt_environ = environ;	554	rxvt_environ = environ;
606
607	/*
608	* Save and then give up any super-user privileges
609	* If we need privileges in any area then we must specifically request it.
610	* We should only need to be root in these cases:
611	* 1. write utmp entries on some systems
612	* 2. chown tty on some systems
613	*/
614	rxvt_privileges (SAVE);
615	rxvt_privileges (IGNORE);
616		555
617	signal (SIGHUP, SIG_IGN);	556	signal (SIGHUP, SIG_IGN);
618	signal (SIGPIPE, SIG_IGN);	557	signal (SIGPIPE, SIG_IGN);
619		558
620	sig_handlers.sw_chld.start (SIGCHLD);
621	sig_handlers.sw_term.start (SIGTERM);	559	sig_handlers.sw_term.start (SIGTERM);
622	sig_handlers.sw_int.start (SIGINT);	560	sig_handlers.sw_int.start (SIGINT);
623		561
624	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	562	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
625	/* signal (SIGURG, SIG_DFL); */	563	/* signal (SIGURG, SIG_DFL); */
…		…
654	rxvt_fatal ("memory allocation failure. aborting.\n");	592	rxvt_fatal ("memory allocation failure. aborting.\n");
655		593
656	return p;	594	return p;
657	}	595	}
658		596
659	void *	597	void *
660	rxvt_realloc (void *ptr, size_t size)	598	rxvt_realloc (void *ptr, size_t size)
661	{	599	{
662	void *p = realloc (ptr, size);	600	void *p = realloc (ptr, size);
663		601
664	if (!p)	602	if (!p)
665	rxvt_fatal ("memory allocation failure. aborting.\n");	603	rxvt_fatal ("memory allocation failure. aborting.\n");
666		604
667	return p;	605	return p;
668	}	606	}
669
670	/* ------------------------------------------------------------------------- *
671	* PRIVILEGED OPERATIONS *
672	* ------------------------------------------------------------------------- */
673	/* take care of suid/sgid super-user (root) privileges */
674	void
675	rxvt_privileges (rxvt_privaction action)
676	{
677	#if ! defined(__CYGWIN32__)
678	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
679	/* setreuid () is the poor man's setuid (), seteuid () */
680	# define seteuid(a) setreuid(-1, (a))
681	# define setegid(a) setregid(-1, (a))
682	# define HAVE_SETEUID
683	# endif
684	# ifdef HAVE_SETEUID
685	switch (action)
686	{
687	case IGNORE:
688	/*
689	* change effective uid/gid - not real uid/gid - so we can switch
690	* back to root later, as required
691	*/
692	setegid (getgid ());
693	seteuid (getuid ());
694	break;
695	case SAVE:
696	saved_egid = getegid ();
697	saved_euid = geteuid ();
698	break;
699	case RESTORE:
700	setegid (saved_egid);
701	seteuid (saved_euid);
702	break;
703	}
704	# else
705	switch (action)
706	{
707	case IGNORE:
708	setgid (getgid ());
709	setuid (getuid ());
710	/* FALLTHROUGH */
711	case SAVE:
712	/* FALLTHROUGH */
713	case RESTORE:
714	break;
715	}
716	# endif
717	#endif
718	}
719
720	#ifdef UTMP_SUPPORT
721	void
722	rxvt_term::privileged_utmp (rxvt_privaction action)
723	{
724	if (OPTION (Opt_utmpInhibit))
725	return;
726
727	rxvt_privileges (RESTORE);
728
729	if (action == SAVE)
730	pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
731	else
732	pty->logout ();
733
734	rxvt_privileges (IGNORE);
735	}
736	#endif
737		607
738	/----------------------------------------------------------------------/	608	/----------------------------------------------------------------------/
739	/*	609	/*
740	* window size/position calculcations for XSizeHint and other storage.	610	* window size/position calculcations for XSizeHint and other storage.
741	* if width/height are non-zero then override calculated width/height	611	* if width/height are non-zero then override calculated width/height
…		…
746	short recalc_x, recalc_y;	616	short recalc_x, recalc_y;
747	int x, y, sb_w, flags;	617	int x, y, sb_w, flags;
748	unsigned int w, h;	618	unsigned int w, h;
749	unsigned int max_width, max_height;	619	unsigned int max_width, max_height;
750	dDisp;	620	dDisp;
751
752	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
753	ncol, nrow, szHint.width, szHint.height));
754		621
755	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	622	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
756	szHint.win_gravity = NorthWestGravity;	623	szHint.win_gravity = NorthWestGravity;
757	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	624	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
758		625
…		…
861	if (recalc_y)	728	if (recalc_y)
862	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	729	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
863		730
864	ncol = width / fwidth;	731	ncol = width / fwidth;
865	nrow = height / fheight;	732	nrow = height / fheight;
866	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
867	ncol, nrow, szHint.width,
868	szHint.height));
869	return;
870	}	733	}
871		734
872	/----------------------------------------------------------------------/	735	/----------------------------------------------------------------------/
873	/*	736	/*
874	* Tell the teletype handler what size the window is.	737	* Tell the teletype handler what size the window is.
…		…
1158	* -------------------------------------------------------------------- */	1021	* -------------------------------------------------------------------- */
1159	void	1022	void
1160	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1023	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1161	{	1024	{
1162	int fix_screen;	1025	int fix_screen;
1163	int old_width = szHint.width, old_height = szHint.height;	1026	int old_width = szHint.width;
		1027	int old_height = szHint.height;
1164	dDisp;	1028	dDisp;
1165		1029
1166	window_calc (newwidth, newheight);	1030	window_calc (newwidth, newheight);
1167	XSetWMNormalHints (disp, parent[0], &szHint);	1031	XSetWMNormalHints (disp, parent[0], &szHint);
1168		1032
…		…
1190	{	1054	{
1191	x -= x1;	1055	x -= x1;
1192	y -= y1;	1056	y -= y1;
1193	}	1057	}
1194		1058
1195	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1059	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1196	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1060	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1197	dx = old_width - szHint.width;	1061	dx = old_width - szHint.width;
1198	dy = old_height - szHint.height;	1062	dy = old_height - szHint.height;
1199		1063
1200	/* Check position of the center of the window */	1064	/* Check position of the center of the window */
1201	if (x < x1) /* left half */	1065	if (x < x1) /* left half */
1202	dx = 0;	1066	dx = 0;
…		…
1235	resize_pixmap ();	1099	resize_pixmap ();
1236	#endif	1100	#endif
1237	}	1101	}
1238		1102
1239	if (fix_screen \|\| old_height == 0)	1103	if (fix_screen \|\| old_height == 0)
1240	{
1241	int curr_screen = -1;
1242	int old_ncol = prev_ncol;
1243
1244	/* scr_reset only works on the primary screen */
1245	if (old_height) /* this is not the first time through */
1246	{
1247	unsigned int ocol = ncol;
1248	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1249	curr_screen = scr_change_screen (PRIMARY);
1250	ncol = ocol;
1251	}
1252
1253	scr_reset ();	1104	scr_reset ();
1254
1255	if (curr_screen >= 0) /* this is not the first time through */
1256	{
1257	scr_change_screen (curr_screen);
1258	selection_check (old_ncol != ncol ? 4 : 0);
1259	}
1260	}
1261
1262	old_width = szHint.width;
1263	old_height = szHint.height;
1264		1105
1265	#ifdef XPM_BACKGROUND	1106	#ifdef XPM_BACKGROUND
1266	if (pixmap)	1107	if (pixmap)
1267	scr_touch (false);	1108	scr_touch (false);
1268	#endif	1109	#endif
…		…
1422	set_environ (envv);	1263	set_environ (envv);
1423		1264
1424	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1265	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1425	return false;	1266	return false;
1426		1267
1427	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1428	input_method = display->get_xim (locale, modifiers);	1268	input_method = display->get_xim (locale, modifiers);
1429	if (input_method == NULL)	1269	if (input_method == NULL)
1430	return false;	1270	return false;
1431		1271
1432	xim = input_method->xim;	1272	xim = input_method->xim;
…		…
1578	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1418	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1579	im_destroy ();	1419	im_destroy ();
1580	return false;	1420	return false;
1581	}	1421	}
1582		1422
		1423	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1424	vt_select_input ();
		1425
1583	if (input_style & XIMPreeditArea)	1426	if (input_style & XIMPreeditArea)
1584	IMSetStatusPosition ();	1427	IMSetStatusPosition ();
1585		1428
1586	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1587	return true;	1429	return true;
1588	}	1430	}
1589		1431
1590	void	1432	void
1591	rxvt_term::im_cb ()	1433	rxvt_term::im_cb ()
…		…
1597		1439
1598	make_current ();	1440	make_current ();
1599		1441
1600	im_destroy ();	1442	im_destroy ();
1601		1443
1602	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1603	if (Input_Context)	1444	if (Input_Context)
1604	return;	1445	return;
1605		1446
1606	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1447	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1607	if (rs[Rs_imLocale])	1448	if (rs[Rs_imLocale])
…		…
1680	XFree (preedit_attr);	1521	XFree (preedit_attr);
1681	XFree (status_attr);	1522	XFree (status_attr);
1682	}	1523	}
1683	#endif /* USE_XIM */	1524	#endif /* USE_XIM */
1684		1525
1685	/----------------------------------------------------------------------/
1686	rxvt_t rxvt_current_term;
1687
1688	/----------------------- end-of-file (C source) -----------------------/	1526	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.184 by root, Tue Jan 17 12:22:59 2006 UTC vs. Revision 1.199 by root, Tue Jan 24 19:40:12 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.184 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.199 by root, Tue Jan 24 19:40:12 2006 UTC