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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.177 by root, Mon Jan 16 06:37:52 2006 UTC vs.
Revision 1.202 by root, Wed Jan 25 01:08:38 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	}
93
94	void
95	rxvt_term::make_current () const
96	{
97	SET_R (this);
98	rxvt_set_locale (locale);
99	set_environ (envv);
100	}	80	}
101		81
102	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
103	class rxvt_composite_vec rxvt_composite;	83	class rxvt_composite_vec rxvt_composite;
104		84
…		…
169	rootwin_ev (this, &rxvt_term::rootwin_cb),	149	rootwin_ev (this, &rxvt_term::rootwin_cb),
170	#endif	150	#endif
171	#ifdef HAVE_SCROLLBARS	151	#ifdef HAVE_SCROLLBARS
172	scrollbar_ev (this, &rxvt_term::x_cb),	152	scrollbar_ev (this, &rxvt_term::x_cb),
173	#endif	153	#endif
174	#ifdef MENUBAR
175	menubar_ev (this, &rxvt_term::x_cb),
176	#endif
177	#ifdef CURSOR_BLINK	154	#ifdef CURSOR_BLINK
178	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
179	#endif	156	#endif
180	#ifdef TEXT_BLINK	157	#ifdef TEXT_BLINK
181	text_blink_ev (this, &rxvt_term::text_blink_cb),	158	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
193	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
194	#endif	171	#endif
195	#ifdef USE_XIM	172	#ifdef USE_XIM
196	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
197	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
198	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
199	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
200	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
201	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
202	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
203	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
204	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
207		188
208	termlist.push_back (this);	189	termlist.push_back (this);
209		190
210	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
211	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
212
213	if (!keyboard)
214	rxvt_fatal ("out of memory, aborting.\n");
215	#endif	193	#endif
216	}	194	}
217		195
218	// 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.
219	// for use before an emergency exit	197	// for use before an emergency exit
220	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
221	{	199	{
222	if (cmd_pid)	200	if (cmd_pid)
223	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
224		202
225	#ifdef UTMP_SUPPORT	203	delete pty; pty = 0;
226	privileged_utmp (RESTORE);
227	#endif
228
229	pty.put ();
230	}	204	}
231		205
232	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
233	{	207	{
234	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
235
236	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
237		209
238	emergency_cleanup ();	210	emergency_cleanup ();
239		211
240	#if ENABLE_STYLES	212	#if ENABLE_STYLES
…		…
250		222
251	selection_clear ();	223	selection_clear ();
252		224
253	#ifdef USE_XIM	225	#ifdef USE_XIM
254	im_destroy ();	226	im_destroy ();
255	#endif
256	#ifdef MENUBAR
257	if (menubarGC) XFreeGC (disp, menubarGC);
258	#endif	227	#endif
259	#ifdef XTERM_SCROLLBAR	228	#ifdef XTERM_SCROLLBAR
260	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	229	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
261	if (ShadowGC) XFreeGC (disp, ShadowGC);	230	if (ShadowGC) XFreeGC (disp, ShadowGC);
262	#endif	231	#endif
…		…
273	if (upArrow) XFreePixmap (disp, upArrow);	242	if (upArrow) XFreePixmap (disp, upArrow);
274	if (downArrow) XFreePixmap (disp, downArrow);	243	if (downArrow) XFreePixmap (disp, downArrow);
275	if (upArrowHi) XFreePixmap (disp, upArrowHi);	244	if (upArrowHi) XFreePixmap (disp, upArrowHi);
276	if (downArrowHi) XFreePixmap (disp, downArrowHi);	245	if (downArrowHi) XFreePixmap (disp, downArrowHi);
277	#endif	246	#endif
278	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	247	#ifdef RXVT_SCROLLBAR
279	if (topShadowGC) XFreeGC (disp, topShadowGC);	248	if (topShadowGC) XFreeGC (disp, topShadowGC);
280	if (botShadowGC) XFreeGC (disp, botShadowGC);	249	if (botShadowGC) XFreeGC (disp, botShadowGC);
281	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	250	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
282	#endif	251	#endif
283	if (gc) XFreeGC (disp, gc);	252	if (gc) XFreeGC (disp, gc);
284		253
285	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
286	delete menuBar.drawable;
287	//if (menuBar.win)
288	// XDestroyWindow (disp, menuBar.win);
289	#endif
290	delete drawable;	254	delete drawable;
291	// destroy all windows	255	// destroy all windows
292	if (parent[0])	256	if (parent[0])
293	XDestroyWindow (disp, parent[0]);	257	XDestroyWindow (disp, parent[0]);
294	}	258	}
…		…
323	#ifdef KEYSYM_RESOURCE	287	#ifdef KEYSYM_RESOURCE
324	delete keyboard;	288	delete keyboard;
325	#endif	289	#endif
326	}	290	}
327		291
		292	// child has exited, usually destroys
328	void	293	void
329	rxvt_term::child_exit ()	294	rxvt_term::child_cb (child_watcher &w, int status)
330	{	295	{
		296	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		297
331	cmd_pid = 0;	298	cmd_pid = 0;
332		299
333	if (!OPTION (Opt_hold))	300	if (!OPTION (Opt_hold))
334	destroy ();	301	destroy ();
335	}	302	}
…		…
338	rxvt_term::destroy ()	305	rxvt_term::destroy ()
339	{	306	{
340	if (destroy_ev.active)	307	if (destroy_ev.active)
341	return;	308	return;
342		309
		310	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		311
343	#if ENABLE_OVERLAY	312	#if ENABLE_OVERLAY
344	scr_overlay_off ();	313	scr_overlay_off ();
345	#endif	314	#endif
346		315
347	if (display)	316	if (display)
…		…
349	#if USE_XIM	318	#if USE_XIM
350	im_ev.stop (display);	319	im_ev.stop (display);
351	#endif	320	#endif
352	#if HAVE_SCROLLBARS	321	#if HAVE_SCROLLBARS
353	scrollbar_ev.stop (display);	322	scrollbar_ev.stop (display);
354	#endif
355	#if MENUBAR
356	menubar_ev.stop (display);
357	#endif	323	#endif
358	#if TRANSPARENT	324	#if TRANSPARENT
359	rootwin_ev.stop (display);	325	rootwin_ev.stop (display);
360	#endif	326	#endif
361	incr_ev.stop ();	327	incr_ev.stop ();
…		…
483	_exit (EXIT_FAILURE);	449	_exit (EXIT_FAILURE);
484	}	450	}
485		451
486	/----------------------------------------------------------------------/	452	/----------------------------------------------------------------------/
487	bool	453	bool
488	rxvt_term::init (int argc, const char const argv)	454	rxvt_term::init (int argc, const char const argv, stringvec *envv)
489	{	455	{
		456	this->envv = envv;
		457
490	SET_R (this);	458	SET_R (this);
491	set_locale ("");	459	set_locale ("");
492	set_environ (envv); // few things in X do not call setlocale :(	460	set_environ (envv); // few things in X do not call setlocale :(
493		461
494	if (!init_vars ())	462	if (!init_vars ())
…		…
500		468
501	#ifdef KEYSYM_RESOURCE	469	#ifdef KEYSYM_RESOURCE
502	keyboard->register_done ();	470	keyboard->register_done ();
503	#endif	471	#endif
504		472
505	#if MENUBAR_MAX
506	menubar_read (rs[Rs_menu]);
507	#endif
508	#ifdef HAVE_SCROLLBARS	473	#ifdef HAVE_SCROLLBARS
509	if (OPTION (Opt_scrollBar))	474	if (OPTION (Opt_scrollBar))
510	scrollBar.setIdle (); /* set existence for size calculations */	475	scrollBar.setIdle (); /* set existence for size calculations */
511	#endif	476	#endif
512		477
513	#if ENABLE_PERL	478	pty = ptytty::create ();
514	if (!rs[Rs_perl_ext_1])
515	rs[Rs_perl_ext_1] = "default";
516
517	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
518	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
519	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
520	{
521	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
522	// ignore some perl-related arguments if some bozo installed us set[ug]id
523	if (rxvt_tainted ())
524	{
525	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
526	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
527	{
528	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
529	rs[Rs_perl_lib] = 0;
530	rs[Rs_perl_eval] = 0;
531	}
532	}
533	#endif
534	rxvt_perl.init ();
535	setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
536	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
537	}
538	#endif
539		479
540	create_windows (argc, argv);	480	create_windows (argc, argv);
541		481
542	dDisp;	482	dDisp;
543		483
…		…
551		491
552	#ifdef HAVE_SCROLLBARS	492	#ifdef HAVE_SCROLLBARS
553	if (OPTION (Opt_scrollBar))	493	if (OPTION (Opt_scrollBar))
554	resize_scrollbar (); /* create and map scrollbar */	494	resize_scrollbar (); /* create and map scrollbar */
555	#endif	495	#endif
556	#if (MENUBAR_MAX)
557	if (menubar_visible ())
558	XMapWindow (disp, menuBar.win);
559	#endif
560	#ifdef TRANSPARENT	496	#ifdef TRANSPARENT
561	if (OPTION (Opt_transparent))	497	if (OPTION (Opt_transparent))
562	{	498	{
563	XSelectInput (disp, display->root, PropertyChangeMask);	499	XSelectInput (disp, display->root, PropertyChangeMask);
564	check_our_parents ();	500	check_our_parents ();
565	rootwin_ev.start (display, display->root);	501	rootwin_ev.start (display, display->root);
566	}	502	}
567	#endif	503	#endif
568		504
		505	set_colorfgbg ();
		506
		507	init_command (cmd_argv);
		508
		509	free (cmd_argv);
		510
		511	if (pty->pty >= 0)
		512	pty_ev.start (pty->pty, EVENT_READ);
		513
		514	check_ev.start ();
		515
		516	HOOK_INVOKE ((this, HOOK_START, DT_END));
		517
569	XMapWindow (disp, vt);	518	XMapWindow (disp, vt);
570	XMapWindow (disp, parent[0]);	519	XMapWindow (disp, parent[0]);
571		520
572	set_colorfgbg ();
573
574	init_command (cmd_argv);
575
576	free (cmd_argv);
577
578	if (pty.pty >= 0)
579	pty_ev.start (pty.pty, EVENT_READ);
580
581	check_ev.start ();
582
583	HOOK_INVOKE ((this, HOOK_START, DT_END));
584
585	return true;	521	return true;
586	}	522	}
587		523
588	static struct sig_handlers	524	static struct sig_handlers
589	{	525	{
590	sig_watcher sw_chld, sw_term, sw_int;	526	sig_watcher sw_term, sw_int;
591		527
592	void sig_chld (sig_watcher &w)
593	{
594	// we are being called for every SIGCHLD, find the corresponding term
595	int pid;
596
597	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
598	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
599	if (pid == (*t)->cmd_pid)
600	{
601	(*t)->child_exit ();
602	break;
603	}
604	}
605
606	/*	528	/*
607	* Catch a fatal signal and tidy up before quitting	529	* Catch a fatal signal and tidy up before quitting
608	*/	530	*/
609	void	531	void
610	sig_term (sig_watcher &w)	532	sig_term (sig_watcher &w)
611	{	533	{
612	#ifdef DEBUG_CMD
613	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
614	#endif
615	rxvt_emergency_cleanup ();	534	rxvt_emergency_cleanup ();
616	signal (w.signum, SIG_DFL);	535	signal (w.signum, SIG_DFL);
617	kill (getpid (), w.signum);	536	kill (getpid (), w.signum);
618	}	537	}
619		538
620	sig_handlers ()	539	sig_handlers ()
621	: sw_chld (this, &sig_handlers::sig_chld),
622	sw_term (this, &sig_handlers::sig_term),	540	: sw_term (this, &sig_handlers::sig_term),
623	sw_int (this, &sig_handlers::sig_term)	541	sw_int (this, &sig_handlers::sig_term)
624	{	542	{
625	}	543	}
626	} sig_handlers;	544	} sig_handlers;
627		545
628	char **rxvt_environ; // startup environment	546	char **rxvt_environ; // startup environment
629		547
630	void	548	void
631	rxvt_init ()	549	rxvt_init ()
632	{	550	{
		551	ptytty::init ();
		552
633	rxvt_environ = environ;	553	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		554
645	signal (SIGHUP, SIG_IGN);	555	signal (SIGHUP, SIG_IGN);
646	signal (SIGPIPE, SIG_IGN);	556	signal (SIGPIPE, SIG_IGN);
647		557
648	sig_handlers.sw_chld.start (SIGCHLD);
649	sig_handlers.sw_term.start (SIGTERM);	558	sig_handlers.sw_term.start (SIGTERM);
650	sig_handlers.sw_int.start (SIGINT);	559	sig_handlers.sw_int.start (SIGINT);
651		560
652	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	561	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
653	/* signal (SIGURG, SIG_DFL); */	562	/* signal (SIGURG, SIG_DFL); */
…		…
682	rxvt_fatal ("memory allocation failure. aborting.\n");	591	rxvt_fatal ("memory allocation failure. aborting.\n");
683		592
684	return p;	593	return p;
685	}	594	}
686		595
687	void *	596	void *
688	rxvt_realloc (void *ptr, size_t size)	597	rxvt_realloc (void *ptr, size_t size)
689	{	598	{
690	void *p = realloc (ptr, size);	599	void *p = realloc (ptr, size);
691		600
692	if (!p)	601	if (!p)
693	rxvt_fatal ("memory allocation failure. aborting.\n");	602	rxvt_fatal ("memory allocation failure. aborting.\n");
694		603
695	return p;	604	return p;
696	}	605	}
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	}
747
748	#ifdef UTMP_SUPPORT
749	void
750	rxvt_term::privileged_utmp (rxvt_privaction action)
751	{
752	if (OPTION (Opt_utmpInhibit)
753	\|\| !pty.name \|\| !*pty.name)
754	return;
755
756	rxvt_privileges (RESTORE);
757
758	if (action == SAVE)
759	makeutent (pty.name, rs[Rs_display_name]);
760	else
761	cleanutent ();
762
763	rxvt_privileges (IGNORE);
764	}
765	#endif
766		606
767	/----------------------------------------------------------------------/	607	/----------------------------------------------------------------------/
768	/*	608	/*
769	* window size/position calculcations for XSizeHint and other storage.	609	* window size/position calculcations for XSizeHint and other storage.
770	* if width/height are non-zero then override calculated width/height	610	* if width/height are non-zero then override calculated width/height
771	*/	611	*/
772	void	612	void
773	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	613	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
774	{	614	{
775	short recalc_x, recalc_y;	615	short recalc_x, recalc_y;
776	int x, y, sb_w, mb_h, flags;	616	int x, y, sb_w, flags;
777	unsigned int w, h;	617	unsigned int w, h;
778	unsigned int max_width, max_height;	618	unsigned int max_width, max_height;
779	dDisp;	619	dDisp;
780
781	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
782	ncol, nrow, szHint.width, szHint.height));
783		620
784	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	621	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
785	szHint.win_gravity = NorthWestGravity;	622	szHint.win_gravity = NorthWestGravity;
786	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	623	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
787		624
…		…
842	max_width = MAX_COLS * fwidth;	679	max_width = MAX_COLS * fwidth;
843	max_height = MAX_ROWS * fheight;	680	max_height = MAX_ROWS * fheight;
844		681
845	szHint.base_width = szHint.base_height = 2 * int_bwidth;	682	szHint.base_width = szHint.base_height = 2 * int_bwidth;
846		683
847	sb_w = mb_h = 0;	684	sb_w = 0;
848	window_vt_x = window_vt_y = int_bwidth;	685	window_vt_x = window_vt_y = int_bwidth;
849		686
850	if (scrollbar_visible ())	687	if (scrollBar.state)
851	{	688	{
852	sb_w = scrollbar_TotalWidth ();	689	sb_w = scrollbar_TotalWidth ();
853	szHint.base_width += sb_w;	690	szHint.base_width += sb_w;
854	if (!OPTION (Opt_scrollBar_right))	691	if (!OPTION (Opt_scrollBar_right))
855	window_vt_x += sb_w;	692	window_vt_x += sb_w;
856	}	693	}
857		694
858	if (menubar_visible ())
859	{
860	mb_h = menuBar_TotalHeight ();
861	szHint.base_height += mb_h;
862	window_vt_y += mb_h;
863	}
864
865	szHint.width_inc = fwidth;	695	szHint.width_inc = fwidth;
866	szHint.height_inc = fheight;	696	szHint.height_inc = fheight;
867	szHint.min_width = szHint.base_width + szHint.width_inc;	697	szHint.min_width = szHint.base_width + szHint.width_inc;
868	szHint.min_height = szHint.base_height + szHint.height_inc;	698	szHint.min_height = szHint.base_height + szHint.height_inc;
869		699
…		…
887	{	717	{
888	min_it (height, max_height);	718	min_it (height, max_height);
889	szHint.height = szHint.base_height + height;	719	szHint.height = szHint.base_height + height;
890	}	720	}
891		721
892	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	722	if (scrollBar.state && OPTION (Opt_scrollBar_right))
893	window_sb_x = szHint.width - sb_w;	723	window_sb_x = szHint.width - sb_w;
894		724
895	if (recalc_x)	725	if (recalc_x)
896	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	726	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
897	if (recalc_y)	727	if (recalc_y)
898	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	728	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
899		729
900	ncol = width / fwidth;	730	ncol = width / fwidth;
901	nrow = height / fheight;	731	nrow = height / fheight;
902	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
903	ncol, nrow, szHint.width,
904	szHint.height));
905	return;
906	}	732	}
907		733
908	/----------------------------------------------------------------------/	734	/----------------------------------------------------------------------/
909	/*	735	/*
910	* Tell the teletype handler what size the window is.	736	* Tell the teletype handler what size the window is.
911	* Called after a window size change.	737	* Called after a window size change.
912	*/	738	*/
913	void	739	void
914	rxvt_term::tt_winch ()	740	rxvt_term::tt_winch ()
915	{	741	{
916	if (pty.pty < 0)	742	if (pty->pty < 0)
917	return;	743	return;
918		744
919	struct winsize ws;	745	struct winsize ws;
920		746
921	ws.ws_col = ncol;	747	ws.ws_col = ncol;
922	ws.ws_row = nrow;	748	ws.ws_row = nrow;
923	ws.ws_xpixel = width;	749	ws.ws_xpixel = width;
924	ws.ws_ypixel = height;	750	ws.ws_ypixel = height;
925	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	751	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
926		752
927	#if 0	753	#if 0
928	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	754	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
929	if (cmd_pid) /* force through to the command */	755	if (cmd_pid) /* force through to the command */
930	kill (-cmd_pid, SIGWINCH);	756	kill (-cmd_pid, SIGWINCH);
…		…
1194	* -------------------------------------------------------------------- */	1020	* -------------------------------------------------------------------- */
1195	void	1021	void
1196	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1022	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1197	{	1023	{
1198	int fix_screen;	1024	int fix_screen;
1199	int old_width = szHint.width, old_height = szHint.height;	1025	int old_width = szHint.width;
		1026	int old_height = szHint.height;
1200	dDisp;	1027	dDisp;
1201		1028
1202	window_calc (newwidth, newheight);	1029	window_calc (newwidth, newheight);
1203	XSetWMNormalHints (disp, parent[0], &szHint);	1030	XSetWMNormalHints (disp, parent[0], &szHint);
1204		1031
…		…
1226	{	1053	{
1227	x -= x1;	1054	x -= x1;
1228	y -= y1;	1055	y -= y1;
1229	}	1056	}
1230		1057
1231	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1058	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1232	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1059	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1233	dx = old_width - szHint.width;	1060	dx = old_width - szHint.width;
1234	dy = old_height - szHint.height;	1061	dy = old_height - szHint.height;
1235		1062
1236	/* Check position of the center of the window */	1063	/* Check position of the center of the window */
1237	if (x < x1) /* left half */	1064	if (x < x1) /* left half */
1238	dx = 0;	1065	dx = 0;
…		…
1252		1079
1253	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1080	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1254		1081
1255	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1082	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1256	{	1083	{
1257	if (scrollbar_visible ())	1084	if (scrollBar.state)
1258	{	1085	{
1259	XMoveResizeWindow (disp, scrollBar.win,	1086	XMoveResizeWindow (disp, scrollBar.win,
1260	window_sb_x, 0,	1087	window_sb_x, 0,
1261	scrollbar_TotalWidth (), szHint.height);	1088	scrollbar_TotalWidth (), szHint.height);
1262	resize_scrollbar ();	1089	resize_scrollbar ();
1263	}	1090	}
1264		1091
1265	if (menubar_visible ())
1266	XMoveResizeWindow (disp, menuBar.win,
1267	window_vt_x, 0,
1268	width, menuBar_TotalHeight ());
1269
1270	XMoveResizeWindow (disp, vt,	1092	XMoveResizeWindow (disp, vt,
1271	window_vt_x, window_vt_y,	1093	window_vt_x, window_vt_y,
1272	width, height);	1094	width, height);
1273		1095
1274	scr_clear ();	1096	scr_clear ();
…		…
1276	resize_pixmap ();	1098	resize_pixmap ();
1277	#endif	1099	#endif
1278	}	1100	}
1279		1101
1280	if (fix_screen \|\| old_height == 0)	1102	if (fix_screen \|\| old_height == 0)
1281	{
1282	int curr_screen = -1;
1283	int old_ncol = prev_ncol;
1284
1285	/* scr_reset only works on the primary screen */
1286	if (old_height) /* this is not the first time through */
1287	{
1288	unsigned int ocol = ncol;
1289	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1290	curr_screen = scr_change_screen (PRIMARY);
1291	ncol = ocol;
1292	}
1293
1294	scr_reset ();	1103	scr_reset ();
1295
1296	if (curr_screen >= 0) /* this is not the first time through */
1297	{
1298	scr_change_screen (curr_screen);
1299	selection_check (old_ncol != ncol ? 4 : 0);
1300	}
1301	}
1302
1303	old_width = szHint.width;
1304	old_height = szHint.height;
1305		1104
1306	#ifdef XPM_BACKGROUND	1105	#ifdef XPM_BACKGROUND
1307	if (pixmap)	1106	if (pixmap)
1308	scr_touch (false);	1107	scr_touch (false);
1309	#endif	1108	#endif
…		…
1412	XPoint nspot;	1211	XPoint nspot;
1413	XVaNestedList preedit_attr;	1212	XVaNestedList preedit_attr;
1414		1213
1415	if (!Input_Context	1214	if (!Input_Context
1416	\|\| !focus	1215	\|\| !focus
1417	\|\| !(input_style & XIMPreeditPosition))	1216	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1418	return;	1217	return;
1419		1218
1420	im_set_position (nspot);	1219	im_set_position (nspot);
1421		1220
1422	if (nspot.x == spot.x && nspot.y == spot.y)	1221	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1441	input_method = 0;	1240	input_method = 0;
1442	}	1241	}
1443		1242
1444	Input_Context = 0;	1243	Input_Context = 0;
1445	}	1244	}
		1245
		1246	#ifdef ENABLE_XIM_ONTHESPOT
		1247
		1248	static void
		1249	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1250	{
		1251	((rxvt_term *)client_data)->make_current ();
		1252	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1253	}
		1254
		1255	static void
		1256	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1257	{
		1258	((rxvt_term *)client_data)->make_current ();
		1259	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1260	}
		1261
		1262	static void
		1263	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1264	{
		1265	rxvt_term term = (rxvt_term )client_data;
		1266	XIMText *text = call_data->text;
		1267
		1268	term->make_current ();
		1269
		1270	if (text)
		1271	{
		1272	void *str;
		1273
		1274	if (!text->encoding_is_wchar && text->string.multi_byte)
		1275	{
		1276	// of course, X makes it ugly again
		1277	if (term->rs[Rs_imLocale])
		1278	SET_LOCALE (term->rs[Rs_imLocale]);
		1279
		1280	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1281	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1282
		1283	if (term->rs[Rs_imLocale])
		1284	SET_LOCALE (term->locale);
		1285	}
		1286	else
		1287	str = (void *)text->string.wide_char;
		1288
		1289	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1290	DT_INT, call_data->caret,
		1291	DT_INT, call_data->chg_first,
		1292	DT_INT, call_data->chg_length,
		1293	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1294	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1295	DT_END));
		1296	}
		1297	else
		1298	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1299	DT_INT, call_data->caret,
		1300	DT_INT, call_data->chg_first,
		1301	DT_INT, call_data->chg_length,
		1302	DT_END));
		1303	}
		1304
		1305	#if 0
		1306	static void
		1307	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1308	{
		1309	((rxvt_term *)client_data)->make_current ();
		1310	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1311	DT_INT, call_data->position,
		1312	DT_INT, call_data->direction,
		1313	DT_INT, call_data->style,
		1314	DT_END));
		1315	}
		1316	#endif
		1317
		1318	#endif
1446		1319
1447	/*	1320	/*
1448	* Try to open a XIM with the current modifiers, then see if we can	1321	* Try to open a XIM with the current modifiers, then see if we can
1449	* open a suitable preedit type	1322	* open a suitable preedit type
1450	*/	1323	*/
…		…
1457	XRectangle rect, status_rect, needed_rect;	1330	XRectangle rect, status_rect, needed_rect;
1458	unsigned long fg, bg;	1331	unsigned long fg, bg;
1459	const char *p;	1332	const char *p;
1460	char **s;	1333	char **s;
1461	XIMStyles *xim_styles;	1334	XIMStyles *xim_styles;
		1335	#ifdef ENABLE_XIM_ONTHESPOT
		1336	XIMCallback xcb[4];
		1337	#endif
1462		1338
1463	set_environ (envv);	1339	set_environ (envv);
1464		1340
1465	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1341	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1466	return false;	1342	return false;
1467		1343
1468	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1469	input_method = display->get_xim (locale, modifiers);	1344	input_method = display->get_xim (locale, modifiers);
1470	if (input_method == NULL)	1345	if (input_method == NULL)
1471	return false;	1346	return false;
1472		1347
1473	xim = input_method->xim;	1348	xim = input_method->xim;
…		…
1493	s = rxvt_splitcommastring (p);	1368	s = rxvt_splitcommastring (p);
1494		1369
1495	for (i = found = 0; !found && s[i]; i++)	1370	for (i = found = 0; !found && s[i]; i++)
1496	{	1371	{
1497	if (!strcmp (s[i], "OverTheSpot"))	1372	if (!strcmp (s[i], "OverTheSpot"))
1498	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1373	input_style = XIMPreeditPosition \| XIMStatusNothing;
1499	else if (!strcmp (s[i], "OffTheSpot"))	1374	else if (!strcmp (s[i], "OffTheSpot"))
1500	input_style = (XIMPreeditArea \| XIMStatusArea);	1375	input_style = XIMPreeditArea \| XIMStatusArea;
1501	else if (!strcmp (s[i], "Root"))	1376	else if (!strcmp (s[i], "Root"))
1502	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1377	input_style = XIMPreeditNothing \| XIMStatusNothing;
1503	else if (!strcmp (s[i], "None"))	1378	else if (!strcmp (s[i], "None"))
1504	input_style = (XIMPreeditNone \| XIMStatusNone);	1379	input_style = XIMPreeditNone \| XIMStatusNone;
		1380	#ifdef ENABLE_XIM_ONTHESPOT
		1381	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1382	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1383	#endif
		1384	else
		1385	input_style = XIMPreeditNothing \| XIMStatusNothing;
1505		1386
1506	for (j = 0; j < xim_styles->count_styles; j++)	1387	for (j = 0; j < xim_styles->count_styles; j++)
1507	if (input_style == xim_styles->supported_styles[j])	1388	if (input_style == xim_styles->supported_styles[j])
1508	{	1389	{
1509	rxvt_freecommastring (s);	1390	rxvt_freecommastring (s);
…		…
1598	XNBackground, bg,	1479	XNBackground, bg,
1599	XNArea, &status_rect,	1480	XNArea, &status_rect,
1600	XNFontSet, fs,	1481	XNFontSet, fs,
1601	NULL);	1482	NULL);
1602	}	1483	}
		1484	else if (input_style & XIMPreeditCallbacks)
		1485	{
		1486	im_set_position (spot);
		1487
		1488	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1489	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1490	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1491	#if 0
		1492	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1493	#endif
		1494
		1495	preedit_attr = XVaCreateNestedList (0,
		1496	XNSpotLocation, &spot,
		1497	XNPreeditStartCallback, &xcb[0],
		1498	XNPreeditDoneCallback , &xcb[1],
		1499	XNPreeditDrawCallback , &xcb[2],
		1500	#if 0
		1501	XNPreeditCaretCallback, &xcb[3],
		1502	#endif
		1503	NULL);
		1504	}
1603		1505
1604	Input_Context = XCreateIC (xim,	1506	Input_Context = XCreateIC (xim,
1605	XNInputStyle, input_style,	1507	XNInputStyle, input_style,
1606	XNClientWindow, vt,	1508	XNClientWindow, vt,
1607	XNFocusWindow, parent[0],	1509	XNFocusWindow, parent[0],
…		…
1619	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1521	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1620	im_destroy ();	1522	im_destroy ();
1621	return false;	1523	return false;
1622	}	1524	}
1623		1525
		1526	#if 0
		1527	// unfortunately, only the focus window is used by XIM, hard to fix
		1528	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1529	vt_select_input ();
		1530	#endif
		1531
1624	if (input_style & XIMPreeditArea)	1532	if (input_style & XIMPreeditArea)
1625	IMSetStatusPosition ();	1533	IMSetStatusPosition ();
1626		1534
1627	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1628	return true;	1535	return true;
1629	}	1536	}
1630		1537
1631	void	1538	void
1632	rxvt_term::im_cb ()	1539	rxvt_term::im_cb ()
…		…
1638		1545
1639	make_current ();	1546	make_current ();
1640		1547
1641	im_destroy ();	1548	im_destroy ();
1642		1549
1643	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1644	if (Input_Context)	1550	if (Input_Context)
1645	return;	1551	return;
1646		1552
1647	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1553	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1648	if (rs[Rs_imLocale])	1554	if (rs[Rs_imLocale])
…		…
1721	XFree (preedit_attr);	1627	XFree (preedit_attr);
1722	XFree (status_attr);	1628	XFree (status_attr);
1723	}	1629	}
1724	#endif /* USE_XIM */	1630	#endif /* USE_XIM */
1725		1631
1726	/----------------------------------------------------------------------/
1727	rxvt_t rxvt_current_term;
1728
1729	/----------------------- end-of-file (C source) -----------------------/	1632	/----------------------- 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.177 by root, Mon Jan 16 06:37:52 2006 UTC vs. Revision 1.202 by root, Wed Jan 25 01:08:38 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.177 by root, Mon Jan 16 06:37:52 2006 UTC vs.
Revision 1.202 by root, Wed Jan 25 01:08:38 2006 UTC