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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.186 by root, Tue Jan 17 15:41:33 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
…		…
214	delete pty; pty = 0;	203	delete pty; pty = 0;
215	}	204	}
216		205
217	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
218	{	207	{
219	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
220
221	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
222		209
223	emergency_cleanup ();	210	emergency_cleanup ();
224		211
225	#if ENABLE_STYLES	212	#if ENABLE_STYLES
…		…
300	#ifdef KEYSYM_RESOURCE	287	#ifdef KEYSYM_RESOURCE
301	delete keyboard;	288	delete keyboard;
302	#endif	289	#endif
303	}	290	}
304		291
		292	// child has exited, usually destroys
305	void	293	void
306	rxvt_term::child_exit ()	294	rxvt_term::child_cb (child_watcher &w, int status)
307	{	295	{
		296	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		297
308	cmd_pid = 0;	298	cmd_pid = 0;
309		299
310	if (!OPTION (Opt_hold))	300	if (!OPTION (Opt_hold))
311	destroy ();	301	destroy ();
312	}	302	}
313		303
314	void	304	void
315	rxvt_term::destroy ()	305	rxvt_term::destroy ()
316	{	306	{
317	if (destroy_ev.active)	307	if (destroy_ev.active)
		308	return;
		309
		310	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
318	return;	311	return;
319		312
320	#if ENABLE_OVERLAY	313	#if ENABLE_OVERLAY
321	scr_overlay_off ();	314	scr_overlay_off ();
322	#endif	315	#endif
…		…
457	_exit (EXIT_FAILURE);	450	_exit (EXIT_FAILURE);
458	}	451	}
459		452
460	/----------------------------------------------------------------------/	453	/----------------------------------------------------------------------/
461	bool	454	bool
462	rxvt_term::init (int argc, const char const argv)	455	rxvt_term::init (int argc, const char const argv, stringvec *envv)
463	{	456	{
		457	this->envv = envv;
		458
464	SET_R (this);	459	SET_R (this);
465	set_locale ("");	460	set_locale ("");
466	set_environ (envv); // few things in X do not call setlocale :(	461	set_environ (envv); // few things in X do not call setlocale :(
467		462
468	if (!init_vars ())	463	if (!init_vars ())
…		…
479	#ifdef HAVE_SCROLLBARS	474	#ifdef HAVE_SCROLLBARS
480	if (OPTION (Opt_scrollBar))	475	if (OPTION (Opt_scrollBar))
481	scrollBar.setIdle (); /* set existence for size calculations */	476	scrollBar.setIdle (); /* set existence for size calculations */
482	#endif	477	#endif
483		478
484	#if ENABLE_PERL	479	pty = ptytty::create ();
485	if (!rs[Rs_perl_ext_1])
486	rs[Rs_perl_ext_1] = "default";
487
488	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
489	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
490	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
491	{
492	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
493	// ignore some perl-related arguments if some bozo installed us set[ug]id
494	if (rxvt_tainted ())
495	{
496	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
497	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498	{
499	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
500	rs[Rs_perl_lib] = 0;
501	rs[Rs_perl_eval] = 0;
502	}
503	}
504	#endif
505	rxvt_perl.init (this);
506	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
507	}
508	#endif
509
510	pty = rxvt_new_ptytty ();
511		480
512	create_windows (argc, argv);	481	create_windows (argc, argv);
513		482
514	dDisp;	483	dDisp;
515		484
…		…
532	check_our_parents ();	501	check_our_parents ();
533	rootwin_ev.start (display, display->root);	502	rootwin_ev.start (display, display->root);
534	}	503	}
535	#endif	504	#endif
536		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
537	XMapWindow (disp, vt);	519	XMapWindow (disp, vt);
538	XMapWindow (disp, parent[0]);	520	XMapWindow (disp, parent[0]);
539		521
540	set_colorfgbg ();
541
542	init_command (cmd_argv);
543
544	free (cmd_argv);
545
546	if (pty->pty >= 0)
547	pty_ev.start (pty->pty, EVENT_READ);
548
549	check_ev.start ();
550
551	HOOK_INVOKE ((this, HOOK_START, DT_END));
552
553	return true;	522	return true;
554	}	523	}
555		524
556	static struct sig_handlers	525	static struct sig_handlers
557	{	526	{
558	sig_watcher sw_chld, sw_term, sw_int;	527	sig_watcher sw_term, sw_int;
559		528
560	void sig_chld (sig_watcher &w)
561	{
562	// we are being called for every SIGCHLD, find the corresponding term
563	int pid;
564
565	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
566	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
567	if (pid == (*t)->cmd_pid)
568	{
569	(*t)->child_exit ();
570	break;
571	}
572	}
573
574	/*	529	/*
575	* Catch a fatal signal and tidy up before quitting	530	* Catch a fatal signal and tidy up before quitting
576	*/	531	*/
577	void	532	void
578	sig_term (sig_watcher &w)	533	sig_term (sig_watcher &w)
579	{	534	{
580	#ifdef DEBUG_CMD
581	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
582	#endif
583	rxvt_emergency_cleanup ();	535	rxvt_emergency_cleanup ();
584	signal (w.signum, SIG_DFL);	536	signal (w.signum, SIG_DFL);
585	kill (getpid (), w.signum);	537	kill (getpid (), w.signum);
586	}	538	}
587		539
588	sig_handlers ()	540	sig_handlers ()
589	: sw_chld (this, &sig_handlers::sig_chld),
590	sw_term (this, &sig_handlers::sig_term),	541	: sw_term (this, &sig_handlers::sig_term),
591	sw_int (this, &sig_handlers::sig_term)	542	sw_int (this, &sig_handlers::sig_term)
592	{	543	{
593	}	544	}
594	} sig_handlers;	545	} sig_handlers;
595		546
596	char **rxvt_environ; // startup environment	547	char **rxvt_environ; // startup environment
597		548
598	void	549	void
599	rxvt_init ()	550	rxvt_init ()
600	{	551	{
601	uid_t uid = getuid ();	552	ptytty::init ();
602	gid_t gid = getgid ();
603
604	// before doing anything else, check for setuid/setgid operation,
605	// start the helper process and drop privileges
606	if (uid != geteuid ()
607	\|\| 1 //D
608	\|\| gid != getegid ())
609	{
610	#if PTYTTY_HELPER
611	rxvt_ptytty_server ();
612	#else
613	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
614	#endif
615
616	// drop privileges
617	#if HAVE_SETRESUID
618	setresgid (gid, gid, gid);
619	setresuid (uid, uid, uid);
620	#elif HAVE_SETREUID
621	setregid (gid, gid);
622	setreuid (uid, uid);
623	#elif HAVE_SETUID
624	setgid (gid);
625	setuid (uid);
626	#endif
627
628	if (uid != geteuid ()
629	\|\| gid != getegid ())
630	rxvt_fatal ("unable to drop privileges, aborting.\n");
631	}
632		553
633	rxvt_environ = environ;	554	rxvt_environ = environ;
634
635	/*
636	* Save and then give up any super-user privileges
637	* If we need privileges in any area then we must specifically request it.
638	* We should only need to be root in these cases:
639	* 1. write utmp entries on some systems
640	* 2. chown tty on some systems
641	*/
642	rxvt_privileges (SAVE);
643	rxvt_privileges (IGNORE);
644		555
645	signal (SIGHUP, SIG_IGN);	556	signal (SIGHUP, SIG_IGN);
646	signal (SIGPIPE, SIG_IGN);	557	signal (SIGPIPE, SIG_IGN);
647		558
648	sig_handlers.sw_chld.start (SIGCHLD);
649	sig_handlers.sw_term.start (SIGTERM);	559	sig_handlers.sw_term.start (SIGTERM);
650	sig_handlers.sw_int.start (SIGINT);	560	sig_handlers.sw_int.start (SIGINT);
651		561
652	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	562	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
653	/* signal (SIGURG, SIG_DFL); */	563	/* signal (SIGURG, SIG_DFL); */
…		…
682	rxvt_fatal ("memory allocation failure. aborting.\n");	592	rxvt_fatal ("memory allocation failure. aborting.\n");
683		593
684	return p;	594	return p;
685	}	595	}
686		596
687	void *	597	void *
688	rxvt_realloc (void *ptr, size_t size)	598	rxvt_realloc (void *ptr, size_t size)
689	{	599	{
690	void *p = realloc (ptr, size);	600	void *p = realloc (ptr, size);
691		601
692	if (!p)	602	if (!p)
693	rxvt_fatal ("memory allocation failure. aborting.\n");	603	rxvt_fatal ("memory allocation failure. aborting.\n");
694		604
695	return p;	605	return p;
696	}
697
698	/* ------------------------------------------------------------------------- *
699	* PRIVILEGED OPERATIONS *
700	* ------------------------------------------------------------------------- */
701	/* take care of suid/sgid super-user (root) privileges */
702	void
703	rxvt_privileges (rxvt_privaction action)
704	{
705	#if ! defined(__CYGWIN32__)
706	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
707	/* setreuid () is the poor man's setuid (), seteuid () */
708	# define seteuid(a) setreuid(-1, (a))
709	# define setegid(a) setregid(-1, (a))
710	# define HAVE_SETEUID
711	# endif
712	# ifdef HAVE_SETEUID
713	switch (action)
714	{
715	case IGNORE:
716	/*
717	* change effective uid/gid - not real uid/gid - so we can switch
718	* back to root later, as required
719	*/
720	setegid (getgid ());
721	seteuid (getuid ());
722	break;
723	case SAVE:
724	saved_egid = getegid ();
725	saved_euid = geteuid ();
726	break;
727	case RESTORE:
728	setegid (saved_egid);
729	seteuid (saved_euid);
730	break;
731	}
732	# else
733	switch (action)
734	{
735	case IGNORE:
736	setgid (getgid ());
737	setuid (getuid ());
738	/* FALLTHROUGH */
739	case SAVE:
740	/* FALLTHROUGH */
741	case RESTORE:
742	break;
743	}
744	# endif
745	#endif
746	}	606	}
747		607
748	/----------------------------------------------------------------------/	608	/----------------------------------------------------------------------/
749	/*	609	/*
750	* window size/position calculcations for XSizeHint and other storage.	610	* window size/position calculcations for XSizeHint and other storage.
…		…
756	short recalc_x, recalc_y;	616	short recalc_x, recalc_y;
757	int x, y, sb_w, flags;	617	int x, y, sb_w, flags;
758	unsigned int w, h;	618	unsigned int w, h;
759	unsigned int max_width, max_height;	619	unsigned int max_width, max_height;
760	dDisp;	620	dDisp;
761
762	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
763	ncol, nrow, szHint.width, szHint.height));
764		621
765	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	622	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
766	szHint.win_gravity = NorthWestGravity;	623	szHint.win_gravity = NorthWestGravity;
767	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	624	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
768		625
…		…
871	if (recalc_y)	728	if (recalc_y)
872	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	729	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
873		730
874	ncol = width / fwidth;	731	ncol = width / fwidth;
875	nrow = height / fheight;	732	nrow = height / fheight;
876	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
877	ncol, nrow, szHint.width,
878	szHint.height));
879	return;
880	}	733	}
881		734
882	/----------------------------------------------------------------------/	735	/----------------------------------------------------------------------/
883	/*	736	/*
884	* Tell the teletype handler what size the window is.	737	* Tell the teletype handler what size the window is.
…		…
1168	* -------------------------------------------------------------------- */	1021	* -------------------------------------------------------------------- */
1169	void	1022	void
1170	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)
1171	{	1024	{
1172	int fix_screen;	1025	int fix_screen;
1173	int old_width = szHint.width, old_height = szHint.height;	1026	int old_width = szHint.width;
		1027	int old_height = szHint.height;
1174	dDisp;	1028	dDisp;
1175		1029
1176	window_calc (newwidth, newheight);	1030	window_calc (newwidth, newheight);
1177	XSetWMNormalHints (disp, parent[0], &szHint);	1031	XSetWMNormalHints (disp, parent[0], &szHint);
1178		1032
…		…
1200	{	1054	{
1201	x -= x1;	1055	x -= x1;
1202	y -= y1;	1056	y -= y1;
1203	}	1057	}
1204		1058
1205	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1059	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1206	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1060	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1207	dx = old_width - szHint.width;	1061	dx = old_width - szHint.width;
1208	dy = old_height - szHint.height;	1062	dy = old_height - szHint.height;
1209		1063
1210	/* Check position of the center of the window */	1064	/* Check position of the center of the window */
1211	if (x < x1) /* left half */	1065	if (x < x1) /* left half */
1212	dx = 0;	1066	dx = 0;
…		…
1245	resize_pixmap ();	1099	resize_pixmap ();
1246	#endif	1100	#endif
1247	}	1101	}
1248		1102
1249	if (fix_screen \|\| old_height == 0)	1103	if (fix_screen \|\| old_height == 0)
1250	{
1251	int curr_screen = -1;
1252	int old_ncol = prev_ncol;
1253
1254	/* scr_reset only works on the primary screen */
1255	if (old_height) /* this is not the first time through */
1256	{
1257	unsigned int ocol = ncol;
1258	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1259	curr_screen = scr_change_screen (PRIMARY);
1260	ncol = ocol;
1261	}
1262
1263	scr_reset ();	1104	scr_reset ();
1264
1265	if (curr_screen >= 0) /* this is not the first time through */
1266	{
1267	scr_change_screen (curr_screen);
1268	selection_check (old_ncol != ncol ? 4 : 0);
1269	}
1270	}
1271
1272	old_width = szHint.width;
1273	old_height = szHint.height;
1274		1105
1275	#ifdef XPM_BACKGROUND	1106	#ifdef XPM_BACKGROUND
1276	if (pixmap)	1107	if (pixmap)
1277	scr_touch (false);	1108	scr_touch (false);
1278	#endif	1109	#endif
…		…
1432	set_environ (envv);	1263	set_environ (envv);
1433		1264
1434	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1265	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1435	return false;	1266	return false;
1436		1267
1437	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1438	input_method = display->get_xim (locale, modifiers);	1268	input_method = display->get_xim (locale, modifiers);
1439	if (input_method == NULL)	1269	if (input_method == NULL)
1440	return false;	1270	return false;
1441		1271
1442	xim = input_method->xim;	1272	xim = input_method->xim;
…		…
1588	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1418	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1589	im_destroy ();	1419	im_destroy ();
1590	return false;	1420	return false;
1591	}	1421	}
1592		1422
		1423	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1424	vt_select_input ();
		1425
1593	if (input_style & XIMPreeditArea)	1426	if (input_style & XIMPreeditArea)
1594	IMSetStatusPosition ();	1427	IMSetStatusPosition ();
1595		1428
1596	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1597	return true;	1429	return true;
1598	}	1430	}
1599		1431
1600	void	1432	void
1601	rxvt_term::im_cb ()	1433	rxvt_term::im_cb ()
…		…
1607		1439
1608	make_current ();	1440	make_current ();
1609		1441
1610	im_destroy ();	1442	im_destroy ();
1611		1443
1612	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1613	if (Input_Context)	1444	if (Input_Context)
1614	return;	1445	return;
1615		1446
1616	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1447	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1617	if (rs[Rs_imLocale])	1448	if (rs[Rs_imLocale])
…		…
1690	XFree (preedit_attr);	1521	XFree (preedit_attr);
1691	XFree (status_attr);	1522	XFree (status_attr);
1692	}	1523	}
1693	#endif /* USE_XIM */	1524	#endif /* USE_XIM */
1694		1525
1695	/----------------------------------------------------------------------/
1696	rxvt_t rxvt_current_term;
1697
1698	/----------------------- 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.186 by root, Tue Jan 17 15:41:33 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.186 by root, Tue Jan 17 15:41:33 2006 UTC vs.
Revision 1.199 by root, Tue Jan 24 19:40:12 2006 UTC