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

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