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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC vs.
Revision 1.204 by root, Wed Jan 25 02:53:13 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__)
52	static uid_t saved_euid;
53	static gid_t saved_egid;
54	#endif
55
56	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
57		52
		53	// used to tell global functions which terminal instance is "active"
		54	rxvt_t rxvt_current_term;
		55
58	static char curlocale[128], savelocale[128];	56	static char curlocale[128], savelocale[128];
59		57
60	bool	58	bool
61	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
62	{	60	{
63	if (!locale \|\| !strncmp (locale, curlocale, 128))	61	if (!locale \|\| !strncmp (locale, curlocale, 128))
64	return false;	62	return false;
65		63
66	strncpy (curlocale, locale, 128);	64	strncpy (curlocale, locale, 128);
67	setlocale (LC_CTYPE, curlocale);	65	setlocale (LC_CTYPE, curlocale);
68	return true;	66	return true;
69	}	67	}
70		68
71	bool	69	void
72	rxvt_push_locale (const char *locale)	70	rxvt_push_locale (const char *locale) NOTHROW
73	{	71	{
74	strcpy (savelocale, curlocale);	72	strcpy (savelocale, curlocale);
75	rxvt_set_locale (locale);	73	rxvt_set_locale (locale);
76	}	74	}
77		75
78	void	76	void
79	rxvt_pop_locale ()	77	rxvt_pop_locale () NOTHROW
80	{	78	{
81	rxvt_set_locale (savelocale);	79	rxvt_set_locale (savelocale);
82	}	80	}
83		81
84	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
…		…
151	rootwin_ev (this, &rxvt_term::rootwin_cb),	149	rootwin_ev (this, &rxvt_term::rootwin_cb),
152	#endif	150	#endif
153	#ifdef HAVE_SCROLLBARS	151	#ifdef HAVE_SCROLLBARS
154	scrollbar_ev (this, &rxvt_term::x_cb),	152	scrollbar_ev (this, &rxvt_term::x_cb),
155	#endif	153	#endif
156	#ifdef MENUBAR
157	menubar_ev (this, &rxvt_term::x_cb),
158	#endif
159	#ifdef CURSOR_BLINK	154	#ifdef CURSOR_BLINK
160	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
161	#endif	156	#endif
162	#ifdef TEXT_BLINK	157	#ifdef TEXT_BLINK
163	text_blink_ev (this, &rxvt_term::text_blink_cb),	158	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
175	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
176	#endif	171	#endif
177	#ifdef USE_XIM	172	#ifdef USE_XIM
178	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
179	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
180	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
181	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
182	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
183	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
184	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
185	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
186	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
189		188
190	termlist.push_back (this);	189	termlist.push_back (this);
191		190
192	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
193	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
194
195	if (!keyboard)
196	rxvt_fatal ("out of memory, aborting.\n");
197	#endif	193	#endif
198	}	194	}
199		195
200	// 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.
201	// for use before an emergency exit	197	// for use before an emergency exit
202	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
203	{	199	{
204	if (cmd_pid)	200	if (cmd_pid)
205	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
206		202
207	#ifdef UTMP_SUPPORT	203	delete pty; pty = 0;
208	privileged_utmp (RESTORE);
209	#endif
210
211	pty.put ();
212	}	204	}
213		205
214	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
215	{	207	{
216	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
217
218	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
219		209
220	emergency_cleanup ();	210	emergency_cleanup ();
221		211
222	#if ENABLE_STYLES	212	#if ENABLE_STYLES
…		…
232		222
233	selection_clear ();	223	selection_clear ();
234		224
235	#ifdef USE_XIM	225	#ifdef USE_XIM
236	im_destroy ();	226	im_destroy ();
237	#endif
238	#ifdef MENUBAR
239	if (menubarGC) XFreeGC (disp, menubarGC);
240	#endif	227	#endif
241	#ifdef XTERM_SCROLLBAR	228	#ifdef XTERM_SCROLLBAR
242	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	229	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
243	if (ShadowGC) XFreeGC (disp, ShadowGC);	230	if (ShadowGC) XFreeGC (disp, ShadowGC);
244	#endif	231	#endif
…		…
255	if (upArrow) XFreePixmap (disp, upArrow);	242	if (upArrow) XFreePixmap (disp, upArrow);
256	if (downArrow) XFreePixmap (disp, downArrow);	243	if (downArrow) XFreePixmap (disp, downArrow);
257	if (upArrowHi) XFreePixmap (disp, upArrowHi);	244	if (upArrowHi) XFreePixmap (disp, upArrowHi);
258	if (downArrowHi) XFreePixmap (disp, downArrowHi);	245	if (downArrowHi) XFreePixmap (disp, downArrowHi);
259	#endif	246	#endif
260	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	247	#ifdef RXVT_SCROLLBAR
261	if (topShadowGC) XFreeGC (disp, topShadowGC);	248	if (topShadowGC) XFreeGC (disp, topShadowGC);
262	if (botShadowGC) XFreeGC (disp, botShadowGC);	249	if (botShadowGC) XFreeGC (disp, botShadowGC);
263	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	250	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
264	#endif	251	#endif
265	if (gc) XFreeGC (disp, gc);	252	if (gc) XFreeGC (disp, gc);
266		253
267	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
268	delete menuBar.drawable;
269	//if (menuBar.win)
270	// XDestroyWindow (disp, menuBar.win);
271	#endif
272	delete drawable;	254	delete drawable;
273	// destroy all windows	255	// destroy all windows
274	if (parent[0])	256	if (parent[0])
275	XDestroyWindow (disp, parent[0]);	257	XDestroyWindow (disp, parent[0]);
276	}	258	}
277		259
278	// TODO: free pixcolours, colours should become part of rxvt_display	260	// TODO: free pixcolours, colours should become part of rxvt_display
279
280	delete pix_colors_focused;	261	delete pix_colors_focused;
281	#if OFF_FOCUS_FADING	262	#if OFF_FOCUS_FADING
282	delete pix_colors_unfocused;	263	delete pix_colors_unfocused;
283	#endif	264	#endif
284	#if USE_XGETDEFAULT
285	XrmDestroyDatabase (xrmdatabase);
286	#endif
287		265
288	displays.put (display);	266	displays.put (display);
289		267
290	scr_release ();	268	scr_release ();
291		269
…		…
293	for (int i = 0; i < allocated.size (); i++)	271	for (int i = 0; i < allocated.size (); i++)
294	free (allocated [i]);	272	free (allocated [i]);
295		273
296	free (selection.text);	274	free (selection.text);
297	// TODO: manage env vars in child only(!)	275	// TODO: manage env vars in child only(!)
298	free (env_windowid);
299	free (env_display);	276	free (env_display);
300	free (env_term);	277	free (env_term);
301	free (env_colorfgbg);
302	free (locale);	278	free (locale);
303	free (v_buffer);	279	free (v_buffer);
304	free (incr_buf);	280	free (incr_buf);
305		281
306	delete envv;	282	delete envv;
…		…
309	#ifdef KEYSYM_RESOURCE	285	#ifdef KEYSYM_RESOURCE
310	delete keyboard;	286	delete keyboard;
311	#endif	287	#endif
312	}	288	}
313		289
		290	// child has exited, usually destroys
314	void	291	void
315	rxvt_term::child_exit ()	292	rxvt_term::child_cb (child_watcher &w, int status)
316	{	293	{
		294	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		295
317	cmd_pid = 0;	296	cmd_pid = 0;
318		297
319	if (!OPTION (Opt_hold))	298	if (!OPTION (Opt_hold))
320	destroy ();	299	destroy ();
321	}	300	}
…		…
324	rxvt_term::destroy ()	303	rxvt_term::destroy ()
325	{	304	{
326	if (destroy_ev.active)	305	if (destroy_ev.active)
327	return;	306	return;
328		307
		308	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		309
329	#if ENABLE_OVERLAY	310	#if ENABLE_OVERLAY
330	scr_overlay_off ();	311	scr_overlay_off ();
331	#endif	312	#endif
332		313
333	if (display)	314	if (display)
…		…
335	#if USE_XIM	316	#if USE_XIM
336	im_ev.stop (display);	317	im_ev.stop (display);
337	#endif	318	#endif
338	#if HAVE_SCROLLBARS	319	#if HAVE_SCROLLBARS
339	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
340	#endif
341	#if MENUBAR
342	menubar_ev.stop (display);
343	#endif	321	#endif
344	#if TRANSPARENT	322	#if TRANSPARENT
345	rootwin_ev.stop (display);	323	rootwin_ev.stop (display);
346	#endif	324	#endif
347	incr_ev.stop ();	325	incr_ev.stop ();
…		…
371	}	349	}
372		350
373	void	351	void
374	rxvt_term::destroy_cb (time_watcher &w)	352	rxvt_term::destroy_cb (time_watcher &w)
375	{	353	{
376	SET_R (this);	354	make_current ();
377		355
378	delete this;	356	delete this;
379	}	357	}
380		358
381	/----------------------------------------------------------------------/	359	/----------------------------------------------------------------------/
…		…
469	_exit (EXIT_FAILURE);	447	_exit (EXIT_FAILURE);
470	}	448	}
471		449
472	/----------------------------------------------------------------------/	450	/----------------------------------------------------------------------/
473	bool	451	bool
474	rxvt_term::init (int argc, const char const argv)	452	rxvt_term::init (int argc, const char const argv, stringvec *envv)
475	{	453	{
		454	this->envv = envv;
		455
476	SET_R (this);	456	SET_R (this);
477
478	set_locale ("");	457	set_locale ("");
		458	set_environ (envv); // few things in X do not call setlocale :(
479		459
480	if (!init_vars ())	460	if (!init_vars ())
481	return false;	461	return false;
482		462
483	init_secondary ();	463	init_secondary ();
…		…
486		466
487	#ifdef KEYSYM_RESOURCE	467	#ifdef KEYSYM_RESOURCE
488	keyboard->register_done ();	468	keyboard->register_done ();
489	#endif	469	#endif
490		470
491	#if MENUBAR_MAX
492	menubar_read (rs[Rs_menu]);
493	#endif
494	#ifdef HAVE_SCROLLBARS	471	#ifdef HAVE_SCROLLBARS
495	if (OPTION (Opt_scrollBar))	472	if (OPTION (Opt_scrollBar))
496	scrollBar.setIdle (); /* set existence for size calculations */	473	scrollBar.setIdle (); /* set existence for size calculations */
497	#endif	474	#endif
498		475
499	#if ENABLE_PERL	476	pty = ptytty::create ();
500	if (!rs[Rs_perl_ext_1])
501	rs[Rs_perl_ext_1] = "default";
502
503	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
504	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
505	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
506	{
507	bool tainted = false;
508
509	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
510	// ignore some perl-related arguments if some bozo installed us set[ug]id
511	if (getuid () != saved_euid \|\| getgid () != saved_egid)
512	{
513	tainted = true;
514
515	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
516	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
517	{
518	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
519	rs[Rs_perl_lib] = 0;
520	rs[Rs_perl_eval] = "our $tainted = 1";
521	}
522	}
523	#endif
524	rxvt_perl.init (tainted);
525	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
526	}
527	#endif
528		477
529	create_windows (argc, argv);	478	create_windows (argc, argv);
530		479
531	dDisp;	480	dDisp;
532		481
533	init_xlocale ();	482	init_xlocale ();
534		483
535	scr_reset (); /* initialize screen */	484	scr_reset (); // initialize screen
536		485
537	#if 0	486	#if 0
538	XSynchronize (disp, True);	487	XSynchronize (disp, True);
539	#endif	488	#endif
540		489
541	#ifdef HAVE_SCROLLBARS	490	#ifdef HAVE_SCROLLBARS
542	if (OPTION (Opt_scrollBar))	491	if (OPTION (Opt_scrollBar))
543	resize_scrollbar (); /* create and map scrollbar */	492	resize_scrollbar (); /* create and map scrollbar */
544	#endif	493	#endif
545	#if (MENUBAR_MAX)
546	if (menubar_visible ())
547	XMapWindow (disp, menuBar.win);
548	#endif
549	#ifdef TRANSPARENT	494	#ifdef TRANSPARENT
550	if (OPTION (Opt_transparent))	495	if (OPTION (Opt_transparent))
551	{	496	{
552	XSelectInput (disp, display->root, PropertyChangeMask);	497	XSelectInput (disp, display->root, PropertyChangeMask);
553	check_our_parents ();	498	check_our_parents ();
554	rootwin_ev.start (display, display->root);	499	rootwin_ev.start (display, display->root);
555	}	500	}
556	#endif	501	#endif
557		502
		503	set_colorfgbg ();
		504
		505	init_command (cmd_argv);
		506
		507	free (cmd_argv);
		508
		509	if (pty->pty >= 0)
		510	pty_ev.start (pty->pty, EVENT_READ);
		511
		512	check_ev.start ();
		513
		514	HOOK_INVOKE ((this, HOOK_START, DT_END));
		515
		516	#if ENABLE_XEMBED
		517	if (rs[Rs_embed])
		518	{
		519	long info[2] = { 0, XEMBED_MAPPED };
		520
		521	XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		522	32, PropModeReplace, (unsigned char *)&info, 2);
		523	}
		524	#endif
		525
558	XMapWindow (disp, vt);	526	XMapWindow (disp, vt);
559	XMapWindow (disp, parent[0]);	527	XMapWindow (disp, parent[0]);
560		528
561	set_colorfgbg ();
562
563	init_command (cmd_argv);
564
565	free (cmd_argv);
566
567	if (pty.pty >= 0)
568	pty_ev.start (pty.pty, EVENT_READ);
569
570	check_ev.start ();
571
572	HOOK_INVOKE ((this, HOOK_START, DT_END));
573
574	return true;	529	return true;
575	}	530	}
576		531
577	static struct sig_handlers	532	static struct sig_handlers
578	{	533	{
579	sig_watcher sw_chld, sw_term, sw_int;	534	sig_watcher sw_term, sw_int;
580		535
581	void sig_chld (sig_watcher &w)
582	{
583	// we are being called for every SIGCHLD, find the corresponding term
584	int pid;
585
586	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
587	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
588	if (pid == (*t)->cmd_pid)
589	{
590	(*t)->child_exit ();
591	break;
592	}
593	}
594
595	/*	536	/*
596	* Catch a fatal signal and tidy up before quitting	537	* Catch a fatal signal and tidy up before quitting
597	*/	538	*/
598	void	539	void
599	sig_term (sig_watcher &w)	540	sig_term (sig_watcher &w)
600	{	541	{
601	#ifdef DEBUG_CMD
602	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
603	#endif
604	rxvt_emergency_cleanup ();	542	rxvt_emergency_cleanup ();
605	signal (w.signum, SIG_DFL);	543	signal (w.signum, SIG_DFL);
606	kill (getpid (), w.signum);	544	kill (getpid (), w.signum);
607	}	545	}
608		546
609	sig_handlers ()	547	sig_handlers ()
610	: sw_chld (this, &sig_handlers::sig_chld),
611	sw_term (this, &sig_handlers::sig_term),	548	: sw_term (this, &sig_handlers::sig_term),
612	sw_int (this, &sig_handlers::sig_term)	549	sw_int (this, &sig_handlers::sig_term)
613	{	550	{
614	}	551	}
615	} sig_handlers;	552	} sig_handlers;
616		553
		554	char **rxvt_environ; // startup environment
		555
617	void	556	void
618	rxvt_init ()	557	rxvt_init ()
619	{	558	{
620	/*	559	ptytty::init ();
621	* Save and then give up any super-user privileges	560
622	* If we need privileges in any area then we must specifically request it.	561	rxvt_environ = environ;
623	* We should only need to be root in these cases:
624	* 1. write utmp entries on some systems
625	* 2. chown tty on some systems
626	*/
627	rxvt_privileges (SAVE);
628	rxvt_privileges (IGNORE);
629		562
630	signal (SIGHUP, SIG_IGN);	563	signal (SIGHUP, SIG_IGN);
631	signal (SIGPIPE, SIG_IGN);	564	signal (SIGPIPE, SIG_IGN);
632		565
633	sig_handlers.sw_chld.start (SIGCHLD);
634	sig_handlers.sw_term.start (SIGTERM);	566	sig_handlers.sw_term.start (SIGTERM);
635	sig_handlers.sw_int.start (SIGINT);	567	sig_handlers.sw_int.start (SIGINT);
636		568
637	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	569	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
638	/* signal (SIGURG, SIG_DFL); */	570	/* signal (SIGURG, SIG_DFL); */
639		571
640	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	572	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
641	// TODO: handle this with exceptions and tolerate the memory loss	573	// TODO: handle this with exceptions and tolerate the memory loss
642	XSetIOErrorHandler (rxvt_xioerror_handler);	574	XSetIOErrorHandler (rxvt_xioerror_handler);
643		575
644	#ifdef USE_XGETDEFAULT
645	XrmInitialize ();	576	XrmInitialize ();
646	#endif
647	}	577	}
648		578
649	/* ------------------------------------------------------------------------- *	579	/* ------------------------------------------------------------------------- *
650	* MEMORY ALLOCATION WRAPPERS *	580	* MEMORY ALLOCATION WRAPPERS *
651	* ------------------------------------------------------------------------- */	581	* ------------------------------------------------------------------------- */
…		…
669	rxvt_fatal ("memory allocation failure. aborting.\n");	599	rxvt_fatal ("memory allocation failure. aborting.\n");
670		600
671	return p;	601	return p;
672	}	602	}
673		603
674	void *	604	void *
675	rxvt_realloc (void *ptr, size_t size)	605	rxvt_realloc (void *ptr, size_t size)
676	{	606	{
677	void *p = realloc (ptr, size);	607	void *p = realloc (ptr, size);
678		608
679	if (!p)	609	if (!p)
680	rxvt_fatal ("memory allocation failure. aborting.\n");	610	rxvt_fatal ("memory allocation failure. aborting.\n");
681		611
682	return p;	612	return p;
683	}	613	}
684
685	/* ------------------------------------------------------------------------- *
686	* PRIVILEGED OPERATIONS *
687	* ------------------------------------------------------------------------- */
688	/* take care of suid/sgid super-user (root) privileges */
689	void
690	rxvt_privileges (rxvt_privaction action)
691	{
692	#if ! defined(__CYGWIN32__)
693	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
694	/* setreuid () is the poor man's setuid (), seteuid () */
695	# define seteuid(a) setreuid(-1, (a))
696	# define setegid(a) setregid(-1, (a))
697	# define HAVE_SETEUID
698	# endif
699	# ifdef HAVE_SETEUID
700	switch (action)
701	{
702	case IGNORE:
703	/*
704	* change effective uid/gid - not real uid/gid - so we can switch
705	* back to root later, as required
706	*/
707	seteuid (getuid ());
708	setegid (getgid ());
709	break;
710	case SAVE:
711	saved_euid = geteuid ();
712	saved_egid = getegid ();
713	break;
714	case RESTORE:
715	seteuid (saved_euid);
716	setegid (saved_egid);
717	break;
718	}
719	# else
720	switch (action)
721	{
722	case IGNORE:
723	setuid (getuid ());
724	setgid (getgid ());
725	/* FALLTHROUGH */
726	case SAVE:
727	/* FALLTHROUGH */
728	case RESTORE:
729	break;
730	}
731	# endif
732	#endif
733	}
734
735	#ifdef UTMP_SUPPORT
736	void
737	rxvt_term::privileged_utmp (rxvt_privaction action)
738	{
739	if (OPTION (Opt_utmpInhibit)
740	\|\| !pty.name \|\| !*pty.name)
741	return;
742
743	rxvt_privileges (RESTORE);
744
745	if (action == SAVE)
746	makeutent (pty.name, rs[Rs_display_name]);
747	else
748	cleanutent ();
749
750	rxvt_privileges (IGNORE);
751	}
752	#endif
753		614
754	/----------------------------------------------------------------------/	615	/----------------------------------------------------------------------/
755	/*	616	/*
756	* window size/position calculcations for XSizeHint and other storage.	617	* window size/position calculcations for XSizeHint and other storage.
757	* if width/height are non-zero then override calculated width/height	618	* if width/height are non-zero then override calculated width/height
758	*/	619	*/
759	void	620	void
760	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	621	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
761	{	622	{
762	short recalc_x, recalc_y;	623	short recalc_x, recalc_y;
763	int x, y, sb_w, mb_h, flags;	624	int x, y, sb_w, flags;
764	unsigned int w, h;	625	unsigned int w, h;
765	unsigned int max_width, max_height;	626	unsigned int max_width, max_height;
766	dDisp;	627	dDisp;
767
768	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
769	ncol, nrow, szHint.width, szHint.height));
770		628
771	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	629	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
772	szHint.win_gravity = NorthWestGravity;	630	szHint.win_gravity = NorthWestGravity;
773	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	631	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
774		632
…		…
829	max_width = MAX_COLS * fwidth;	687	max_width = MAX_COLS * fwidth;
830	max_height = MAX_ROWS * fheight;	688	max_height = MAX_ROWS * fheight;
831		689
832	szHint.base_width = szHint.base_height = 2 * int_bwidth;	690	szHint.base_width = szHint.base_height = 2 * int_bwidth;
833		691
834	sb_w = mb_h = 0;	692	sb_w = 0;
835	window_vt_x = window_vt_y = int_bwidth;	693	window_vt_x = window_vt_y = int_bwidth;
836		694
837	if (scrollbar_visible ())	695	if (scrollBar.state)
838	{	696	{
839	sb_w = scrollbar_TotalWidth ();	697	sb_w = scrollbar_TotalWidth ();
840	szHint.base_width += sb_w;	698	szHint.base_width += sb_w;
841	if (!OPTION (Opt_scrollBar_right))	699	if (!OPTION (Opt_scrollBar_right))
842	window_vt_x += sb_w;	700	window_vt_x += sb_w;
843	}	701	}
844		702
845	if (menubar_visible ())
846	{
847	mb_h = menuBar_TotalHeight ();
848	szHint.base_height += mb_h;
849	window_vt_y += mb_h;
850	}
851
852	szHint.width_inc = fwidth;	703	szHint.width_inc = fwidth;
853	szHint.height_inc = fheight;	704	szHint.height_inc = fheight;
854	szHint.min_width = szHint.base_width + szHint.width_inc;	705	szHint.min_width = szHint.base_width + szHint.width_inc;
855	szHint.min_height = szHint.base_height + szHint.height_inc;	706	szHint.min_height = szHint.base_height + szHint.height_inc;
856		707
…		…
874	{	725	{
875	min_it (height, max_height);	726	min_it (height, max_height);
876	szHint.height = szHint.base_height + height;	727	szHint.height = szHint.base_height + height;
877	}	728	}
878		729
879	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	730	if (scrollBar.state && OPTION (Opt_scrollBar_right))
880	window_sb_x = szHint.width - sb_w;	731	window_sb_x = szHint.width - sb_w;
881		732
882	if (recalc_x)	733	if (recalc_x)
883	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	734	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
884	if (recalc_y)	735	if (recalc_y)
885	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	736	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
886		737
887	ncol = width / fwidth;	738	ncol = width / fwidth;
888	nrow = height / fheight;	739	nrow = height / fheight;
889	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
890	ncol, nrow, szHint.width,
891	szHint.height));
892	return;
893	}	740	}
894		741
895	/----------------------------------------------------------------------/	742	/----------------------------------------------------------------------/
896	/*	743	/*
897	* Tell the teletype handler what size the window is.	744	* Tell the teletype handler what size the window is.
898	* Called after a window size change.	745	* Called after a window size change.
899	*/	746	*/
900	void	747	void
901	rxvt_term::tt_winch ()	748	rxvt_term::tt_winch ()
902	{	749	{
903	if (pty.pty < 0)	750	if (pty->pty < 0)
904	return;	751	return;
905		752
906	struct winsize ws;	753	struct winsize ws;
907		754
908	ws.ws_col = ncol;	755	ws.ws_col = ncol;
909	ws.ws_row = nrow;	756	ws.ws_row = nrow;
910	ws.ws_xpixel = width;	757	ws.ws_xpixel = width;
911	ws.ws_ypixel = height;	758	ws.ws_ypixel = height;
912	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	759	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
913		760
914	#if 0	761	#if 0
915	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	762	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
916	if (cmd_pid) /* force through to the command */	763	if (cmd_pid) /* force through to the command */
917	kill (-cmd_pid, SIGWINCH);	764	kill (-cmd_pid, SIGWINCH);
…		…
1137	{	984	{
1138	unsigned int i;	985	unsigned int i;
1139	const char *xpmb = "\0";	986	const char *xpmb = "\0";
1140	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	987	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1141		988
1142	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1143	strcpy (fstr, "default");	989	strcpy (fstr, "default");
1144	strcpy (bstr, "default");	990	strcpy (bstr, "default");
1145	for (i = Color_Black; i <= Color_White; i++)	991	for (i = Color_Black; i <= Color_White; i++)
1146	if (pix_colors[Color_fg] == pix_colors[i])	992	if (pix_colors[Color_fg] == pix_colors[i])
1147	{	993	{
…		…
1181	* -------------------------------------------------------------------- */	1027	* -------------------------------------------------------------------- */
1182	void	1028	void
1183	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1029	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1184	{	1030	{
1185	int fix_screen;	1031	int fix_screen;
1186	int old_width = szHint.width, old_height = szHint.height;	1032	int old_width = szHint.width;
		1033	int old_height = szHint.height;
1187	dDisp;	1034	dDisp;
1188		1035
1189	window_calc (newwidth, newheight);	1036	window_calc (newwidth, newheight);
1190	XSetWMNormalHints (disp, parent[0], &szHint);	1037	XSetWMNormalHints (disp, parent[0], &szHint);
1191		1038
…		…
1213	{	1060	{
1214	x -= x1;	1061	x -= x1;
1215	y -= y1;	1062	y -= y1;
1216	}	1063	}
1217		1064
1218	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1065	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1219	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1066	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1220	dx = old_width - szHint.width;	1067	dx = old_width - szHint.width;
1221	dy = old_height - szHint.height;	1068	dy = old_height - szHint.height;
1222		1069
1223	/* Check position of the center of the window */	1070	/* Check position of the center of the window */
1224	if (x < x1) /* left half */	1071	if (x < x1) /* left half */
1225	dx = 0;	1072	dx = 0;
…		…
1239		1086
1240	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1087	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1241		1088
1242	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1089	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1243	{	1090	{
1244	if (scrollbar_visible ())	1091	if (scrollBar.state)
1245	{	1092	{
1246	XMoveResizeWindow (disp, scrollBar.win,	1093	XMoveResizeWindow (disp, scrollBar.win,
1247	window_sb_x, 0,	1094	window_sb_x, 0,
1248	scrollbar_TotalWidth (), szHint.height);	1095	scrollbar_TotalWidth (), szHint.height);
1249	resize_scrollbar ();	1096	resize_scrollbar ();
1250	}	1097	}
1251		1098
1252	if (menubar_visible ())
1253	XMoveResizeWindow (disp, menuBar.win,
1254	window_vt_x, 0,
1255	width, menuBar_TotalHeight ());
1256
1257	XMoveResizeWindow (disp, vt,	1099	XMoveResizeWindow (disp, vt,
1258	window_vt_x, window_vt_y,	1100	window_vt_x, window_vt_y,
1259	width, height);	1101	width, height);
1260		1102
1261	scr_clear ();	1103	scr_clear ();
…		…
1263	resize_pixmap ();	1105	resize_pixmap ();
1264	#endif	1106	#endif
1265	}	1107	}
1266		1108
1267	if (fix_screen \|\| old_height == 0)	1109	if (fix_screen \|\| old_height == 0)
1268	{
1269	int curr_screen = -1;
1270	int old_ncol = prev_ncol;
1271
1272	/* scr_reset only works on the primary screen */
1273	if (old_height) /* this is not the first time through */
1274	{
1275	unsigned int ocol = ncol;
1276	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1277	curr_screen = scr_change_screen (PRIMARY);
1278	ncol = ocol;
1279	}
1280
1281	scr_reset ();	1110	scr_reset ();
1282
1283	if (curr_screen >= 0) /* this is not the first time through */
1284	{
1285	scr_change_screen (curr_screen);
1286	selection_check (old_ncol != ncol ? 4 : 0);
1287	}
1288	}
1289
1290	old_width = szHint.width;
1291	old_height = szHint.height;
1292		1111
1293	#ifdef XPM_BACKGROUND	1112	#ifdef XPM_BACKGROUND
1294	if (pixmap)	1113	if (pixmap)
1295	scr_touch (false);	1114	scr_touch (false);
1296	#endif	1115	#endif
…		…
1399	XPoint nspot;	1218	XPoint nspot;
1400	XVaNestedList preedit_attr;	1219	XVaNestedList preedit_attr;
1401		1220
1402	if (!Input_Context	1221	if (!Input_Context
1403	\|\| !focus	1222	\|\| !focus
1404	\|\| !(input_style & XIMPreeditPosition))	1223	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1405	return;	1224	return;
1406		1225
1407	im_set_position (nspot);	1226	im_set_position (nspot);
1408		1227
1409	if (nspot.x == spot.x && nspot.y == spot.y)	1228	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1428	input_method = 0;	1247	input_method = 0;
1429	}	1248	}
1430		1249
1431	Input_Context = 0;	1250	Input_Context = 0;
1432	}	1251	}
		1252
		1253	#ifdef ENABLE_XIM_ONTHESPOT
		1254
		1255	static void
		1256	xim_preedit_start (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_START, DT_END));
		1260	}
		1261
		1262	static void
		1263	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1264	{
		1265	((rxvt_term *)client_data)->make_current ();
		1266	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1267	}
		1268
		1269	static void
		1270	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1271	{
		1272	rxvt_term term = (rxvt_term )client_data;
		1273	XIMText *text = call_data->text;
		1274
		1275	term->make_current ();
		1276
		1277	if (text)
		1278	{
		1279	void *str;
		1280
		1281	if (!text->encoding_is_wchar && text->string.multi_byte)
		1282	{
		1283	// of course, X makes it ugly again
		1284	if (term->rs[Rs_imLocale])
		1285	SET_LOCALE (term->rs[Rs_imLocale]);
		1286
		1287	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1288	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1289
		1290	if (term->rs[Rs_imLocale])
		1291	SET_LOCALE (term->locale);
		1292	}
		1293	else
		1294	str = (void *)text->string.wide_char;
		1295
		1296	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1297	DT_INT, call_data->caret,
		1298	DT_INT, call_data->chg_first,
		1299	DT_INT, call_data->chg_length,
		1300	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1301	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1302	DT_END));
		1303	}
		1304	else
		1305	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1306	DT_INT, call_data->caret,
		1307	DT_INT, call_data->chg_first,
		1308	DT_INT, call_data->chg_length,
		1309	DT_END));
		1310	}
		1311
		1312	#if 0
		1313	static void
		1314	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1315	{
		1316	((rxvt_term *)client_data)->make_current ();
		1317	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1318	DT_INT, call_data->position,
		1319	DT_INT, call_data->direction,
		1320	DT_INT, call_data->style,
		1321	DT_END));
		1322	}
		1323	#endif
		1324
		1325	#endif
1433		1326
1434	/*	1327	/*
1435	* Try to open a XIM with the current modifiers, then see if we can	1328	* Try to open a XIM with the current modifiers, then see if we can
1436	* open a suitable preedit type	1329	* open a suitable preedit type
1437	*/	1330	*/
…		…
1444	XRectangle rect, status_rect, needed_rect;	1337	XRectangle rect, status_rect, needed_rect;
1445	unsigned long fg, bg;	1338	unsigned long fg, bg;
1446	const char *p;	1339	const char *p;
1447	char **s;	1340	char **s;
1448	XIMStyles *xim_styles;	1341	XIMStyles *xim_styles;
		1342	#ifdef ENABLE_XIM_ONTHESPOT
		1343	XIMCallback xcb[4];
		1344	#endif
		1345
		1346	set_environ (envv);
1449		1347
1450	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1348	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1451	return false;	1349	return false;
1452		1350
1453	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1454	input_method = display->get_xim (locale, modifiers);	1351	input_method = display->get_xim (locale, modifiers);
1455	if (input_method == NULL)	1352	if (input_method == NULL)
1456	return false;	1353	return false;
1457		1354
1458	xim = input_method->xim;	1355	xim = input_method->xim;
…		…
1478	s = rxvt_splitcommastring (p);	1375	s = rxvt_splitcommastring (p);
1479		1376
1480	for (i = found = 0; !found && s[i]; i++)	1377	for (i = found = 0; !found && s[i]; i++)
1481	{	1378	{
1482	if (!strcmp (s[i], "OverTheSpot"))	1379	if (!strcmp (s[i], "OverTheSpot"))
1483	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1380	input_style = XIMPreeditPosition \| XIMStatusNothing;
1484	else if (!strcmp (s[i], "OffTheSpot"))	1381	else if (!strcmp (s[i], "OffTheSpot"))
1485	input_style = (XIMPreeditArea \| XIMStatusArea);	1382	input_style = XIMPreeditArea \| XIMStatusArea;
1486	else if (!strcmp (s[i], "Root"))	1383	else if (!strcmp (s[i], "Root"))
1487	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1384	input_style = XIMPreeditNothing \| XIMStatusNothing;
1488	else if (!strcmp (s[i], "None"))	1385	else if (!strcmp (s[i], "None"))
1489	input_style = (XIMPreeditNone \| XIMStatusNone);	1386	input_style = XIMPreeditNone \| XIMStatusNone;
		1387	#ifdef ENABLE_XIM_ONTHESPOT
		1388	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1389	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1390	#endif
		1391	else
		1392	input_style = XIMPreeditNothing \| XIMStatusNothing;
1490		1393
1491	for (j = 0; j < xim_styles->count_styles; j++)	1394	for (j = 0; j < xim_styles->count_styles; j++)
1492	if (input_style == xim_styles->supported_styles[j])	1395	if (input_style == xim_styles->supported_styles[j])
1493	{	1396	{
1494	rxvt_freecommastring (s);	1397	rxvt_freecommastring (s);
…		…
1583	XNBackground, bg,	1486	XNBackground, bg,
1584	XNArea, &status_rect,	1487	XNArea, &status_rect,
1585	XNFontSet, fs,	1488	XNFontSet, fs,
1586	NULL);	1489	NULL);
1587	}	1490	}
		1491	else if (input_style & XIMPreeditCallbacks)
		1492	{
		1493	im_set_position (spot);
		1494
		1495	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1496	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1497	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1498	#if 0
		1499	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1500	#endif
		1501
		1502	preedit_attr = XVaCreateNestedList (0,
		1503	XNSpotLocation, &spot,
		1504	XNPreeditStartCallback, &xcb[0],
		1505	XNPreeditDoneCallback , &xcb[1],
		1506	XNPreeditDrawCallback , &xcb[2],
		1507	#if 0
		1508	XNPreeditCaretCallback, &xcb[3],
		1509	#endif
		1510	NULL);
		1511	}
1588		1512
1589	Input_Context = XCreateIC (xim,	1513	Input_Context = XCreateIC (xim,
1590	XNInputStyle, input_style,	1514	XNInputStyle, input_style,
1591	XNClientWindow, vt,	1515	XNClientWindow, vt,
1592	XNFocusWindow, parent[0],	1516	XNFocusWindow, parent[0],
…		…
1604	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1528	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1605	im_destroy ();	1529	im_destroy ();
1606	return false;	1530	return false;
1607	}	1531	}
1608		1532
		1533	#if 0
		1534	// unfortunately, only the focus window is used by XIM, hard to fix
		1535	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1536	vt_select_input ();
		1537	#endif
		1538
1609	if (input_style & XIMPreeditArea)	1539	if (input_style & XIMPreeditArea)
1610	IMSetStatusPosition ();	1540	IMSetStatusPosition ();
1611		1541
1612	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1613	return true;	1542	return true;
1614	}	1543	}
1615		1544
1616	void	1545	void
1617	rxvt_term::im_cb ()	1546	rxvt_term::im_cb ()
…		…
1619	int i;	1548	int i;
1620	const char *p;	1549	const char *p;
1621	char **s;	1550	char **s;
1622	char buf[IMBUFSIZ];	1551	char buf[IMBUFSIZ];
1623		1552
1624	SET_R (this);	1553	make_current ();
1625		1554
1626	im_destroy ();	1555	im_destroy ();
1627		1556
1628	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1629	if (Input_Context)	1557	if (Input_Context)
1630	return;	1558	return;
1631		1559
1632	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1560	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1633	if (rs[Rs_imLocale])	1561	if (rs[Rs_imLocale])
…		…
1706	XFree (preedit_attr);	1634	XFree (preedit_attr);
1707	XFree (status_attr);	1635	XFree (status_attr);
1708	}	1636	}
1709	#endif /* USE_XIM */	1637	#endif /* USE_XIM */
1710		1638
1711	/----------------------------------------------------------------------/
1712	rxvt_t rxvt_current_term;
1713
1714	/----------------------- end-of-file (C source) -----------------------/	1639	/----------------------- 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.167 by root, Sun Jan 8 08:43:11 2006 UTC vs. Revision 1.204 by root, Wed Jan 25 02:53:13 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC vs.
Revision 1.204 by root, Wed Jan 25 02:53:13 2006 UTC