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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC vs.
Revision 1.200 by root, Wed Jan 25 00:42:20 2006 UTC

…		…
48	# include <termios.h>	48	# include <termios.h>
49	#endif	49	#endif
50		50
51	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
52		52
		53	// used to tell global functions which terminal instance is "active"
		54	rxvt_t rxvt_current_term;
		55
53	static char curlocale[128], savelocale[128];	56	static char curlocale[128], savelocale[128];
54		57
55	bool	58	bool
56	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
57	{	60	{
58	if (!locale \|\| !strncmp (locale, curlocale, 128))	61	if (!locale \|\| !strncmp (locale, curlocale, 128))
59	return false;	62	return false;
60		63
61	strncpy (curlocale, locale, 128);	64	strncpy (curlocale, locale, 128);
62	setlocale (LC_CTYPE, curlocale);	65	setlocale (LC_CTYPE, curlocale);
63	return true;	66	return true;
64	}	67	}
65		68
66	bool	69	void
67	rxvt_push_locale (const char *locale)	70	rxvt_push_locale (const char *locale) NOTHROW
68	{	71	{
69	strcpy (savelocale, curlocale);	72	strcpy (savelocale, curlocale);
70	rxvt_set_locale (locale);	73	rxvt_set_locale (locale);
71	}	74	}
72		75
73	void	76	void
74	rxvt_pop_locale ()	77	rxvt_pop_locale () NOTHROW
75	{	78	{
76	rxvt_set_locale (savelocale);	79	rxvt_set_locale (savelocale);
77	}	80	}
78		81
79	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
…		…
146	rootwin_ev (this, &rxvt_term::rootwin_cb),	149	rootwin_ev (this, &rxvt_term::rootwin_cb),
147	#endif	150	#endif
148	#ifdef HAVE_SCROLLBARS	151	#ifdef HAVE_SCROLLBARS
149	scrollbar_ev (this, &rxvt_term::x_cb),	152	scrollbar_ev (this, &rxvt_term::x_cb),
150	#endif	153	#endif
151	#ifdef MENUBAR
152	menubar_ev (this, &rxvt_term::x_cb),
153	#endif
154	#ifdef CURSOR_BLINK	154	#ifdef CURSOR_BLINK
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156	#endif	156	#endif
157	#ifdef TEXT_BLINK	157	#ifdef TEXT_BLINK
158	text_blink_ev (this, &rxvt_term::text_blink_cb),	158	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
170	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
171	#endif	171	#endif
172	#ifdef USE_XIM	172	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
174	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
175	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
176	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
177	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
178	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
179	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
180	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
181	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
184		188
185	termlist.push_back (this);	189	termlist.push_back (this);
186		190
187	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
188	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
189
190	if (!keyboard)
191	rxvt_fatal ("out of memory, aborting.\n");
192	#endif	193	#endif
193	}	194	}
194		195
195	// 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.
196	// for use before an emergency exit	197	// for use before an emergency exit
197	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
198	{	199	{
199	if (cmd_pid)	200	if (cmd_pid)
200	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
201		202
202	#ifdef UTMP_SUPPORT	203	delete pty; pty = 0;
203	privileged_utmp (RESTORE);
204	#endif
205
206	pty.put ();
207	}	204	}
208		205
209	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
210	{	207	{
211	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212
213	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
214		209
215	emergency_cleanup ();	210	emergency_cleanup ();
216		211
217	#if ENABLE_STYLES	212	#if ENABLE_STYLES
…		…
227		222
228	selection_clear ();	223	selection_clear ();
229		224
230	#ifdef USE_XIM	225	#ifdef USE_XIM
231	im_destroy ();	226	im_destroy ();
232	#endif
233	#ifdef MENUBAR
234	if (menubarGC) XFreeGC (disp, menubarGC);
235	#endif	227	#endif
236	#ifdef XTERM_SCROLLBAR	228	#ifdef XTERM_SCROLLBAR
237	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	229	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238	if (ShadowGC) XFreeGC (disp, ShadowGC);	230	if (ShadowGC) XFreeGC (disp, ShadowGC);
239	#endif	231	#endif
…		…
250	if (upArrow) XFreePixmap (disp, upArrow);	242	if (upArrow) XFreePixmap (disp, upArrow);
251	if (downArrow) XFreePixmap (disp, downArrow);	243	if (downArrow) XFreePixmap (disp, downArrow);
252	if (upArrowHi) XFreePixmap (disp, upArrowHi);	244	if (upArrowHi) XFreePixmap (disp, upArrowHi);
253	if (downArrowHi) XFreePixmap (disp, downArrowHi);	245	if (downArrowHi) XFreePixmap (disp, downArrowHi);
254	#endif	246	#endif
255	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	247	#ifdef RXVT_SCROLLBAR
256	if (topShadowGC) XFreeGC (disp, topShadowGC);	248	if (topShadowGC) XFreeGC (disp, topShadowGC);
257	if (botShadowGC) XFreeGC (disp, botShadowGC);	249	if (botShadowGC) XFreeGC (disp, botShadowGC);
258	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	250	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259	#endif	251	#endif
260	if (gc) XFreeGC (disp, gc);	252	if (gc) XFreeGC (disp, gc);
261		253
262	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
263	delete menuBar.drawable;
264	//if (menuBar.win)
265	// XDestroyWindow (disp, menuBar.win);
266	#endif
267	delete drawable;	254	delete drawable;
268	// destroy all windows	255	// destroy all windows
269	if (parent[0])	256	if (parent[0])
270	XDestroyWindow (disp, parent[0]);	257	XDestroyWindow (disp, parent[0]);
271	}	258	}
272		259
273	// TODO: free pixcolours, colours should become part of rxvt_display	260	// TODO: free pixcolours, colours should become part of rxvt_display
274
275	delete pix_colors_focused;	261	delete pix_colors_focused;
276	#if OFF_FOCUS_FADING	262	#if OFF_FOCUS_FADING
277	delete pix_colors_unfocused;	263	delete pix_colors_unfocused;
278	#endif	264	#endif
279		265
…		…
301	#ifdef KEYSYM_RESOURCE	287	#ifdef KEYSYM_RESOURCE
302	delete keyboard;	288	delete keyboard;
303	#endif	289	#endif
304	}	290	}
305		291
		292	// child has exited, usually destroys
306	void	293	void
307	rxvt_term::child_exit ()	294	rxvt_term::child_cb (child_watcher &w, int status)
308	{	295	{
		296	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		297
309	cmd_pid = 0;	298	cmd_pid = 0;
310		299
311	if (!OPTION (Opt_hold))	300	if (!OPTION (Opt_hold))
312	destroy ();	301	destroy ();
313	}	302	}
…		…
316	rxvt_term::destroy ()	305	rxvt_term::destroy ()
317	{	306	{
318	if (destroy_ev.active)	307	if (destroy_ev.active)
319	return;	308	return;
320		309
		310	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		311
321	#if ENABLE_OVERLAY	312	#if ENABLE_OVERLAY
322	scr_overlay_off ();	313	scr_overlay_off ();
323	#endif	314	#endif
324		315
325	if (display)	316	if (display)
…		…
327	#if USE_XIM	318	#if USE_XIM
328	im_ev.stop (display);	319	im_ev.stop (display);
329	#endif	320	#endif
330	#if HAVE_SCROLLBARS	321	#if HAVE_SCROLLBARS
331	scrollbar_ev.stop (display);	322	scrollbar_ev.stop (display);
332	#endif
333	#if MENUBAR
334	menubar_ev.stop (display);
335	#endif	323	#endif
336	#if TRANSPARENT	324	#if TRANSPARENT
337	rootwin_ev.stop (display);	325	rootwin_ev.stop (display);
338	#endif	326	#endif
339	incr_ev.stop ();	327	incr_ev.stop ();
…		…
363	}	351	}
364		352
365	void	353	void
366	rxvt_term::destroy_cb (time_watcher &w)	354	rxvt_term::destroy_cb (time_watcher &w)
367	{	355	{
368	SET_R (this);	356	make_current ();
369		357
370	delete this;	358	delete this;
371	}	359	}
372		360
373	/----------------------------------------------------------------------/	361	/----------------------------------------------------------------------/
…		…
461	_exit (EXIT_FAILURE);	449	_exit (EXIT_FAILURE);
462	}	450	}
463		451
464	/----------------------------------------------------------------------/	452	/----------------------------------------------------------------------/
465	bool	453	bool
466	rxvt_term::init (int argc, const char const argv)	454	rxvt_term::init (int argc, const char const argv, stringvec *envv)
467	{	455	{
		456	this->envv = envv;
		457
468	SET_R (this);	458	SET_R (this);
469
470	set_locale ("");	459	set_locale ("");
		460	set_environ (envv); // few things in X do not call setlocale :(
471		461
472	if (!init_vars ())	462	if (!init_vars ())
473	return false;	463	return false;
474		464
475	init_secondary ();	465	init_secondary ();
…		…
478		468
479	#ifdef KEYSYM_RESOURCE	469	#ifdef KEYSYM_RESOURCE
480	keyboard->register_done ();	470	keyboard->register_done ();
481	#endif	471	#endif
482		472
483	#if MENUBAR_MAX
484	menubar_read (rs[Rs_menu]);
485	#endif
486	#ifdef HAVE_SCROLLBARS	473	#ifdef HAVE_SCROLLBARS
487	if (OPTION (Opt_scrollBar))	474	if (OPTION (Opt_scrollBar))
488	scrollBar.setIdle (); /* set existence for size calculations */	475	scrollBar.setIdle (); /* set existence for size calculations */
489	#endif	476	#endif
490		477
491	#if ENABLE_PERL	478	pty = ptytty::create ();
492	if (!rs[Rs_perl_ext_1])
493	rs[Rs_perl_ext_1] = "default";
494
495	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
496	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
497	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498	{
499	rxvt_perl.init ();
500	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
501	}
502	#endif
503		479
504	create_windows (argc, argv);	480	create_windows (argc, argv);
505		481
506	dDisp;	482	dDisp;
507		483
508	init_xlocale ();	484	init_xlocale ();
509		485
510	scr_reset (); /* initialize screen */	486	scr_reset (); // initialize screen
511		487
512	#if 0	488	#if 0
513	XSynchronize (disp, True);	489	XSynchronize (disp, True);
514	#endif	490	#endif
515		491
516	#ifdef HAVE_SCROLLBARS	492	#ifdef HAVE_SCROLLBARS
517	if (OPTION (Opt_scrollBar))	493	if (OPTION (Opt_scrollBar))
518	resize_scrollbar (); /* create and map scrollbar */	494	resize_scrollbar (); /* create and map scrollbar */
519	#endif	495	#endif
520	#if (MENUBAR_MAX)
521	if (menubar_visible ())
522	XMapWindow (disp, menuBar.win);
523	#endif
524	#ifdef TRANSPARENT	496	#ifdef TRANSPARENT
525	if (OPTION (Opt_transparent))	497	if (OPTION (Opt_transparent))
526	{	498	{
527	XSelectInput (disp, display->root, PropertyChangeMask);	499	XSelectInput (disp, display->root, PropertyChangeMask);
528	check_our_parents ();	500	check_our_parents ();
529	rootwin_ev.start (display, display->root);	501	rootwin_ev.start (display, display->root);
530	}	502	}
531	#endif	503	#endif
532		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
533	XMapWindow (disp, vt);	518	XMapWindow (disp, vt);
534	XMapWindow (disp, parent[0]);	519	XMapWindow (disp, parent[0]);
535		520
536	set_colorfgbg ();
537
538	init_command (cmd_argv);
539
540	free (cmd_argv);
541
542	if (pty.pty >= 0)
543	pty_ev.start (pty.pty, EVENT_READ);
544
545	check_ev.start ();
546
547	HOOK_INVOKE ((this, HOOK_START, DT_END));
548
549	return true;	521	return true;
550	}	522	}
551		523
552	static struct sig_handlers	524	static struct sig_handlers
553	{	525	{
554	sig_watcher sw_chld, sw_term, sw_int;	526	sig_watcher sw_term, sw_int;
555		527
556	void sig_chld (sig_watcher &w)
557	{
558	// we are being called for every SIGCHLD, find the corresponding term
559	int pid;
560
561	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
562	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
563	if (pid == (*t)->cmd_pid)
564	{
565	(*t)->child_exit ();
566	break;
567	}
568	}
569
570	/*	528	/*
571	* Catch a fatal signal and tidy up before quitting	529	* Catch a fatal signal and tidy up before quitting
572	*/	530	*/
573	void	531	void
574	sig_term (sig_watcher &w)	532	sig_term (sig_watcher &w)
575	{	533	{
576	#ifdef DEBUG_CMD
577	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
578	#endif
579	rxvt_emergency_cleanup ();	534	rxvt_emergency_cleanup ();
580	signal (w.signum, SIG_DFL);	535	signal (w.signum, SIG_DFL);
581	kill (getpid (), w.signum);	536	kill (getpid (), w.signum);
582	}	537	}
583		538
584	sig_handlers ()	539	sig_handlers ()
585	: sw_chld (this, &sig_handlers::sig_chld),
586	sw_term (this, &sig_handlers::sig_term),	540	: sw_term (this, &sig_handlers::sig_term),
587	sw_int (this, &sig_handlers::sig_term)	541	sw_int (this, &sig_handlers::sig_term)
588	{	542	{
589	}	543	}
590	} sig_handlers;	544	} sig_handlers;
591		545
		546	char **rxvt_environ; // startup environment
		547
592	void	548	void
593	rxvt_init ()	549	rxvt_init ()
594	{	550	{
595	/*	551	ptytty::init ();
596	* Save and then give up any super-user privileges	552
597	* If we need privileges in any area then we must specifically request it.	553	rxvt_environ = environ;
598	* We should only need to be root in these cases:
599	* 1. write utmp entries on some systems
600	* 2. chown tty on some systems
601	*/
602	rxvt_privileges (SAVE);
603	rxvt_privileges (IGNORE);
604		554
605	signal (SIGHUP, SIG_IGN);	555	signal (SIGHUP, SIG_IGN);
606	signal (SIGPIPE, SIG_IGN);	556	signal (SIGPIPE, SIG_IGN);
607		557
608	sig_handlers.sw_chld.start (SIGCHLD);
609	sig_handlers.sw_term.start (SIGTERM);	558	sig_handlers.sw_term.start (SIGTERM);
610	sig_handlers.sw_int.start (SIGINT);	559	sig_handlers.sw_int.start (SIGINT);
611		560
612	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	561	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
613	/* signal (SIGURG, SIG_DFL); */	562	/* signal (SIGURG, SIG_DFL); */
614		563
615	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	564	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
616	// TODO: handle this with exceptions and tolerate the memory loss	565	// TODO: handle this with exceptions and tolerate the memory loss
617	XSetIOErrorHandler (rxvt_xioerror_handler);	566	XSetIOErrorHandler (rxvt_xioerror_handler);
		567
		568	XrmInitialize ();
618	}	569	}
619		570
620	/* ------------------------------------------------------------------------- *	571	/* ------------------------------------------------------------------------- *
621	* MEMORY ALLOCATION WRAPPERS *	572	* MEMORY ALLOCATION WRAPPERS *
622	* ------------------------------------------------------------------------- */	573	* ------------------------------------------------------------------------- */
…		…
640	rxvt_fatal ("memory allocation failure. aborting.\n");	591	rxvt_fatal ("memory allocation failure. aborting.\n");
641		592
642	return p;	593	return p;
643	}	594	}
644		595
645	void *	596	void *
646	rxvt_realloc (void *ptr, size_t size)	597	rxvt_realloc (void *ptr, size_t size)
647	{	598	{
648	void *p = realloc (ptr, size);	599	void *p = realloc (ptr, size);
649		600
650	if (!p)	601	if (!p)
651	rxvt_fatal ("memory allocation failure. aborting.\n");	602	rxvt_fatal ("memory allocation failure. aborting.\n");
652		603
653	return p;	604	return p;
654	}	605	}
655
656	/* ------------------------------------------------------------------------- *
657	* PRIVILEGED OPERATIONS *
658	* ------------------------------------------------------------------------- */
659	/* take care of suid/sgid super-user (root) privileges */
660	void
661	rxvt_privileges (rxvt_privaction action)
662	{
663	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
664	static uid_t euid;
665	static gid_t egid;
666	#endif
667
668	#if ! defined(__CYGWIN32__)
669	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
670	/* setreuid () is the poor man's setuid (), seteuid () */
671	# define seteuid(a) setreuid(-1, (a))
672	# define setegid(a) setregid(-1, (a))
673	# define HAVE_SETEUID
674	# endif
675	# ifdef HAVE_SETEUID
676	switch (action)
677	{
678	case IGNORE:
679	/*
680	* change effective uid/gid - not real uid/gid - so we can switch
681	* back to root later, as required
682	*/
683	seteuid (getuid ());
684	setegid (getgid ());
685	break;
686	case SAVE:
687	euid = geteuid ();
688	egid = getegid ();
689	break;
690	case RESTORE:
691	seteuid (euid);
692	setegid (egid);
693	break;
694	}
695	# else
696	switch (action)
697	{
698	case IGNORE:
699	setuid (getuid ());
700	setgid (getgid ());
701	/* FALLTHROUGH */
702	case SAVE:
703	/* FALLTHROUGH */
704	case RESTORE:
705	break;
706	}
707	# endif
708	#endif
709	}
710
711	#ifdef UTMP_SUPPORT
712	void
713	rxvt_term::privileged_utmp (rxvt_privaction action)
714	{
715	if (OPTION (Opt_utmpInhibit)
716	\|\| !pty.name \|\| !*pty.name)
717	return;
718
719	rxvt_privileges (RESTORE);
720
721	if (action == SAVE)
722	makeutent (pty.name, rs[Rs_display_name]);
723	else
724	cleanutent ();
725
726	rxvt_privileges (IGNORE);
727	}
728	#endif
729		606
730	/----------------------------------------------------------------------/	607	/----------------------------------------------------------------------/
731	/*	608	/*
732	* window size/position calculcations for XSizeHint and other storage.	609	* window size/position calculcations for XSizeHint and other storage.
733	* if width/height are non-zero then override calculated width/height	610	* if width/height are non-zero then override calculated width/height
734	*/	611	*/
735	void	612	void
736	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	613	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
737	{	614	{
738	short recalc_x, recalc_y;	615	short recalc_x, recalc_y;
739	int x, y, sb_w, mb_h, flags;	616	int x, y, sb_w, flags;
740	unsigned int w, h;	617	unsigned int w, h;
741	unsigned int max_width, max_height;	618	unsigned int max_width, max_height;
742	dDisp;	619	dDisp;
743
744	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
745	ncol, nrow, szHint.width, szHint.height));
746		620
747	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	621	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
748	szHint.win_gravity = NorthWestGravity;	622	szHint.win_gravity = NorthWestGravity;
749	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	623	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
750		624
…		…
805	max_width = MAX_COLS * fwidth;	679	max_width = MAX_COLS * fwidth;
806	max_height = MAX_ROWS * fheight;	680	max_height = MAX_ROWS * fheight;
807		681
808	szHint.base_width = szHint.base_height = 2 * int_bwidth;	682	szHint.base_width = szHint.base_height = 2 * int_bwidth;
809		683
810	sb_w = mb_h = 0;	684	sb_w = 0;
811	window_vt_x = window_vt_y = int_bwidth;	685	window_vt_x = window_vt_y = int_bwidth;
812		686
813	if (scrollbar_visible ())	687	if (scrollBar.state)
814	{	688	{
815	sb_w = scrollbar_TotalWidth ();	689	sb_w = scrollbar_TotalWidth ();
816	szHint.base_width += sb_w;	690	szHint.base_width += sb_w;
817	if (!OPTION (Opt_scrollBar_right))	691	if (!OPTION (Opt_scrollBar_right))
818	window_vt_x += sb_w;	692	window_vt_x += sb_w;
819	}	693	}
820		694
821	if (menubar_visible ())
822	{
823	mb_h = menuBar_TotalHeight ();
824	szHint.base_height += mb_h;
825	window_vt_y += mb_h;
826	}
827
828	szHint.width_inc = fwidth;	695	szHint.width_inc = fwidth;
829	szHint.height_inc = fheight;	696	szHint.height_inc = fheight;
830	szHint.min_width = szHint.base_width + szHint.width_inc;	697	szHint.min_width = szHint.base_width + szHint.width_inc;
831	szHint.min_height = szHint.base_height + szHint.height_inc;	698	szHint.min_height = szHint.base_height + szHint.height_inc;
832		699
…		…
850	{	717	{
851	min_it (height, max_height);	718	min_it (height, max_height);
852	szHint.height = szHint.base_height + height;	719	szHint.height = szHint.base_height + height;
853	}	720	}
854		721
855	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	722	if (scrollBar.state && OPTION (Opt_scrollBar_right))
856	window_sb_x = szHint.width - sb_w;	723	window_sb_x = szHint.width - sb_w;
857		724
858	if (recalc_x)	725	if (recalc_x)
859	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	726	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
860	if (recalc_y)	727	if (recalc_y)
861	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	728	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
862		729
863	ncol = width / fwidth;	730	ncol = width / fwidth;
864	nrow = height / fheight;	731	nrow = height / fheight;
865	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
866	ncol, nrow, szHint.width,
867	szHint.height));
868	return;
869	}	732	}
870		733
871	/----------------------------------------------------------------------/	734	/----------------------------------------------------------------------/
872	/*	735	/*
873	* Tell the teletype handler what size the window is.	736	* Tell the teletype handler what size the window is.
874	* Called after a window size change.	737	* Called after a window size change.
875	*/	738	*/
876	void	739	void
877	rxvt_term::tt_winch ()	740	rxvt_term::tt_winch ()
878	{	741	{
879	if (pty.pty < 0)	742	if (pty->pty < 0)
880	return;	743	return;
881		744
882	struct winsize ws;	745	struct winsize ws;
883		746
884	ws.ws_col = ncol;	747	ws.ws_col = ncol;
885	ws.ws_row = nrow;	748	ws.ws_row = nrow;
886	ws.ws_xpixel = width;	749	ws.ws_xpixel = width;
887	ws.ws_ypixel = height;	750	ws.ws_ypixel = height;
888	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	751	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
889		752
890	#if 0	753	#if 0
891	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	754	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
892	if (cmd_pid) /* force through to the command */	755	if (cmd_pid) /* force through to the command */
893	kill (-cmd_pid, SIGWINCH);	756	kill (-cmd_pid, SIGWINCH);
…		…
1157	* -------------------------------------------------------------------- */	1020	* -------------------------------------------------------------------- */
1158	void	1021	void
1159	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)
1160	{	1023	{
1161	int fix_screen;	1024	int fix_screen;
1162	int old_width = szHint.width, old_height = szHint.height;	1025	int old_width = szHint.width;
		1026	int old_height = szHint.height;
1163	dDisp;	1027	dDisp;
1164		1028
1165	window_calc (newwidth, newheight);	1029	window_calc (newwidth, newheight);
1166	XSetWMNormalHints (disp, parent[0], &szHint);	1030	XSetWMNormalHints (disp, parent[0], &szHint);
1167		1031
…		…
1189	{	1053	{
1190	x -= x1;	1054	x -= x1;
1191	y -= y1;	1055	y -= y1;
1192	}	1056	}
1193		1057
1194	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1058	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1195	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1059	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1196	dx = old_width - szHint.width;	1060	dx = old_width - szHint.width;
1197	dy = old_height - szHint.height;	1061	dy = old_height - szHint.height;
1198		1062
1199	/* Check position of the center of the window */	1063	/* Check position of the center of the window */
1200	if (x < x1) /* left half */	1064	if (x < x1) /* left half */
1201	dx = 0;	1065	dx = 0;
…		…
1215		1079
1216	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1080	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1217		1081
1218	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1082	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1219	{	1083	{
1220	if (scrollbar_visible ())	1084	if (scrollBar.state)
1221	{	1085	{
1222	XMoveResizeWindow (disp, scrollBar.win,	1086	XMoveResizeWindow (disp, scrollBar.win,
1223	window_sb_x, 0,	1087	window_sb_x, 0,
1224	scrollbar_TotalWidth (), szHint.height);	1088	scrollbar_TotalWidth (), szHint.height);
1225	resize_scrollbar ();	1089	resize_scrollbar ();
1226	}	1090	}
1227		1091
1228	if (menubar_visible ())
1229	XMoveResizeWindow (disp, menuBar.win,
1230	window_vt_x, 0,
1231	width, menuBar_TotalHeight ());
1232
1233	XMoveResizeWindow (disp, vt,	1092	XMoveResizeWindow (disp, vt,
1234	window_vt_x, window_vt_y,	1093	window_vt_x, window_vt_y,
1235	width, height);	1094	width, height);
1236		1095
1237	scr_clear ();	1096	scr_clear ();
…		…
1239	resize_pixmap ();	1098	resize_pixmap ();
1240	#endif	1099	#endif
1241	}	1100	}
1242		1101
1243	if (fix_screen \|\| old_height == 0)	1102	if (fix_screen \|\| old_height == 0)
1244	{
1245	int curr_screen = -1;
1246	int old_ncol = prev_ncol;
1247
1248	/* scr_reset only works on the primary screen */
1249	if (old_height) /* this is not the first time through */
1250	{
1251	unsigned int ocol = ncol;
1252	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1253	curr_screen = scr_change_screen (PRIMARY);
1254	ncol = ocol;
1255	}
1256
1257	scr_reset ();	1103	scr_reset ();
1258
1259	if (curr_screen >= 0) /* this is not the first time through */
1260	{
1261	scr_change_screen (curr_screen);
1262	selection_check (old_ncol != ncol ? 4 : 0);
1263	}
1264	}
1265
1266	old_width = szHint.width;
1267	old_height = szHint.height;
1268		1104
1269	#ifdef XPM_BACKGROUND	1105	#ifdef XPM_BACKGROUND
1270	if (pixmap)	1106	if (pixmap)
1271	scr_touch (false);	1107	scr_touch (false);
1272	#endif	1108	#endif
…		…
1404	input_method = 0;	1240	input_method = 0;
1405	}	1241	}
1406		1242
1407	Input_Context = 0;	1243	Input_Context = 0;
1408	}	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	static void
		1306	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1307	{
		1308	((rxvt_term *)client_data)->make_current ();
		1309	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1310	DT_INT, call_data->position,
		1311	DT_INT, call_data->direction,
		1312	DT_INT, call_data->style,
		1313	DT_END));
		1314	}
		1315
		1316	#endif
1409		1317
1410	/*	1318	/*
1411	* Try to open a XIM with the current modifiers, then see if we can	1319	* Try to open a XIM with the current modifiers, then see if we can
1412	* open a suitable preedit type	1320	* open a suitable preedit type
1413	*/	1321	*/
…		…
1420	XRectangle rect, status_rect, needed_rect;	1328	XRectangle rect, status_rect, needed_rect;
1421	unsigned long fg, bg;	1329	unsigned long fg, bg;
1422	const char *p;	1330	const char *p;
1423	char **s;	1331	char **s;
1424	XIMStyles *xim_styles;	1332	XIMStyles *xim_styles;
		1333	#ifdef ENABLE_XIM_ONTHESPOT
		1334	XIMCallback xcb[4];
		1335	#endif
		1336
		1337	set_environ (envv);
1425		1338
1426	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1339	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1427	return false;	1340	return false;
1428		1341
1429	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1430	input_method = display->get_xim (locale, modifiers);	1342	input_method = display->get_xim (locale, modifiers);
1431	if (input_method == NULL)	1343	if (input_method == NULL)
1432	return false;	1344	return false;
1433		1345
1434	xim = input_method->xim;	1346	xim = input_method->xim;
…		…
1454	s = rxvt_splitcommastring (p);	1366	s = rxvt_splitcommastring (p);
1455		1367
1456	for (i = found = 0; !found && s[i]; i++)	1368	for (i = found = 0; !found && s[i]; i++)
1457	{	1369	{
1458	if (!strcmp (s[i], "OverTheSpot"))	1370	if (!strcmp (s[i], "OverTheSpot"))
1459	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1371	input_style = XIMPreeditPosition \| XIMStatusNothing;
1460	else if (!strcmp (s[i], "OffTheSpot"))	1372	else if (!strcmp (s[i], "OffTheSpot"))
1461	input_style = (XIMPreeditArea \| XIMStatusArea);	1373	input_style = XIMPreeditArea \| XIMStatusArea;
1462	else if (!strcmp (s[i], "Root"))	1374	else if (!strcmp (s[i], "Root"))
1463	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1375	input_style = XIMPreeditNothing \| XIMStatusNothing;
1464	else if (!strcmp (s[i], "None"))	1376	else if (!strcmp (s[i], "None"))
1465	input_style = (XIMPreeditNone \| XIMStatusNone);	1377	input_style = XIMPreeditNone \| XIMStatusNone;
		1378	#ifdef ENABLE_XIM_ONTHESPOT
		1379	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1380	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1381	#endif
		1382	else
		1383	input_style = XIMPreeditNothing \| XIMStatusNothing;
1466		1384
1467	for (j = 0; j < xim_styles->count_styles; j++)	1385	for (j = 0; j < xim_styles->count_styles; j++)
1468	if (input_style == xim_styles->supported_styles[j])	1386	if (input_style == xim_styles->supported_styles[j])
1469	{	1387	{
1470	rxvt_freecommastring (s);	1388	rxvt_freecommastring (s);
…		…
1559	XNBackground, bg,	1477	XNBackground, bg,
1560	XNArea, &status_rect,	1478	XNArea, &status_rect,
1561	XNFontSet, fs,	1479	XNFontSet, fs,
1562	NULL);	1480	NULL);
1563	}	1481	}
		1482	else if (input_style & XIMPreeditCallbacks)
		1483	{
		1484	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1485	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1486	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1487	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1488
		1489	preedit_attr = XVaCreateNestedList (0,
		1490	XNPreeditStartCallback, &xcb[0],
		1491	XNPreeditDoneCallback , &xcb[1],
		1492	XNPreeditDrawCallback , &xcb[2],
		1493	XNPreeditCaretCallback, &xcb[3],
		1494	NULL);
		1495	}
1564		1496
1565	Input_Context = XCreateIC (xim,	1497	Input_Context = XCreateIC (xim,
1566	XNInputStyle, input_style,	1498	XNInputStyle, input_style,
1567	XNClientWindow, vt,	1499	XNClientWindow, vt,
1568	XNFocusWindow, parent[0],	1500	XNFocusWindow, parent[0],
…		…
1580	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1512	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1581	im_destroy ();	1513	im_destroy ();
1582	return false;	1514	return false;
1583	}	1515	}
1584		1516
		1517	#if 0
		1518	// unfortunately, only the focus window is used by XIM, hard to fix
		1519	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1520	vt_select_input ();
		1521	#endif
		1522
1585	if (input_style & XIMPreeditArea)	1523	if (input_style & XIMPreeditArea)
1586	IMSetStatusPosition ();	1524	IMSetStatusPosition ();
1587		1525
1588	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1589	return true;	1526	return true;
1590	}	1527	}
1591		1528
1592	void	1529	void
1593	rxvt_term::im_cb ()	1530	rxvt_term::im_cb ()
…		…
1595	int i;	1532	int i;
1596	const char *p;	1533	const char *p;
1597	char **s;	1534	char **s;
1598	char buf[IMBUFSIZ];	1535	char buf[IMBUFSIZ];
1599		1536
1600	SET_R (this);	1537	make_current ();
1601		1538
1602	im_destroy ();	1539	im_destroy ();
1603		1540
1604	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1605	if (Input_Context)	1541	if (Input_Context)
1606	return;	1542	return;
1607		1543
1608	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1544	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1609	if (rs[Rs_imLocale])	1545	if (rs[Rs_imLocale])
…		…
1682	XFree (preedit_attr);	1618	XFree (preedit_attr);
1683	XFree (status_attr);	1619	XFree (status_attr);
1684	}	1620	}
1685	#endif /* USE_XIM */	1621	#endif /* USE_XIM */
1686		1622
1687	/----------------------------------------------------------------------/
1688	rxvt_t rxvt_current_term;
1689
1690	/----------------------- end-of-file (C source) -----------------------/	1623	/----------------------- 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.165 by root, Sun Jan 8 00:20:12 2006 UTC vs. Revision 1.200 by root, Wed Jan 25 00:42:20 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC vs.
Revision 1.200 by root, Wed Jan 25 00:42:20 2006 UTC