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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.160 by root, Wed Jan 4 05:35:34 2006 UTC vs.
Revision 1.201 by root, Wed Jan 25 00:57:57 2006 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
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	PERL_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] && *rs[Rs_perl_ext_1])
493	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495	{
496	rxvt_perl.init ();
497	PERL_INVOKE ((this, HOOK_INIT, DT_END));
498	}
499	#endif
500		479
501	create_windows (argc, argv);	480	create_windows (argc, argv);
502		481
503	dDisp;	482	dDisp;
504		483
505	init_xlocale ();	484	init_xlocale ();
506		485
507	scr_reset (); /* initialize screen */	486	scr_reset (); // initialize screen
508		487
509	#if 0	488	#if 0
510	XSynchronize (disp, True);	489	XSynchronize (disp, True);
511	#endif	490	#endif
512		491
513	#ifdef HAVE_SCROLLBARS	492	#ifdef HAVE_SCROLLBARS
514	if (OPTION (Opt_scrollBar))	493	if (OPTION (Opt_scrollBar))
515	resize_scrollbar (); /* create and map scrollbar */	494	resize_scrollbar (); /* create and map scrollbar */
516	#endif	495	#endif
517	#if (MENUBAR_MAX)
518	if (menubar_visible ())
519	XMapWindow (disp, menuBar.win);
520	#endif
521	#ifdef TRANSPARENT	496	#ifdef TRANSPARENT
522	if (OPTION (Opt_transparent))	497	if (OPTION (Opt_transparent))
523	{	498	{
524	XSelectInput (disp, display->root, PropertyChangeMask);	499	XSelectInput (disp, display->root, PropertyChangeMask);
525	check_our_parents ();	500	check_our_parents ();
526	rootwin_ev.start (display, display->root);	501	rootwin_ev.start (display, display->root);
527	}	502	}
528	#endif	503	#endif
529		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
530	XMapWindow (disp, vt);	518	XMapWindow (disp, vt);
531	XMapWindow (disp, parent[0]);	519	XMapWindow (disp, parent[0]);
532		520
533	set_colorfgbg ();
534
535	init_command (cmd_argv);
536
537	free (cmd_argv);
538
539	pty_ev.start (pty.pty, EVENT_READ);
540
541	check_ev.start ();
542
543	PERL_INVOKE ((this, HOOK_START, DT_END));
544
545	return true;	521	return true;
546	}	522	}
547		523
548	static struct sig_handlers	524	static struct sig_handlers
549	{	525	{
550	sig_watcher sw_chld, sw_term, sw_int;	526	sig_watcher sw_term, sw_int;
551		527
552	void sig_chld (sig_watcher &w)
553	{
554	// we are being called for every SIGCHLD, find the corresponding term
555	int pid;
556
557	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
558	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
559	if (pid == (*t)->cmd_pid)
560	{
561	(*t)->child_exit ();
562	break;
563	}
564	}
565
566	/*	528	/*
567	* Catch a fatal signal and tidy up before quitting	529	* Catch a fatal signal and tidy up before quitting
568	*/	530	*/
569	void	531	void
570	sig_term (sig_watcher &w)	532	sig_term (sig_watcher &w)
571	{	533	{
572	#ifdef DEBUG_CMD
573	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
574	#endif
575	rxvt_emergency_cleanup ();	534	rxvt_emergency_cleanup ();
576	signal (w.signum, SIG_DFL);	535	signal (w.signum, SIG_DFL);
577	kill (getpid (), w.signum);	536	kill (getpid (), w.signum);
578	}	537	}
579		538
580	sig_handlers ()	539	sig_handlers ()
581	: sw_chld (this, &sig_handlers::sig_chld),
582	sw_term (this, &sig_handlers::sig_term),	540	: sw_term (this, &sig_handlers::sig_term),
583	sw_int (this, &sig_handlers::sig_term)	541	sw_int (this, &sig_handlers::sig_term)
584	{	542	{
585	}	543	}
586	} sig_handlers;	544	} sig_handlers;
587		545
		546	char **rxvt_environ; // startup environment
		547
588	void	548	void
589	rxvt_init ()	549	rxvt_init ()
590	{	550	{
591	/*	551	ptytty::init ();
592	* Save and then give up any super-user privileges	552
593	* If we need privileges in any area then we must specifically request it.	553	rxvt_environ = environ;
594	* We should only need to be root in these cases:
595	* 1. write utmp entries on some systems
596	* 2. chown tty on some systems
597	*/
598	rxvt_privileges (SAVE);
599	rxvt_privileges (IGNORE);
600		554
601	signal (SIGHUP, SIG_IGN);	555	signal (SIGHUP, SIG_IGN);
602	signal (SIGPIPE, SIG_IGN);	556	signal (SIGPIPE, SIG_IGN);
603		557
604	sig_handlers.sw_chld.start (SIGCHLD);
605	sig_handlers.sw_term.start (SIGTERM);	558	sig_handlers.sw_term.start (SIGTERM);
606	sig_handlers.sw_int.start (SIGINT);	559	sig_handlers.sw_int.start (SIGINT);
607		560
608	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	561	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
609	/* signal (SIGURG, SIG_DFL); */	562	/* signal (SIGURG, SIG_DFL); */
610		563
611	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	564	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
612	// TODO: handle this with exceptions and tolerate the memory loss	565	// TODO: handle this with exceptions and tolerate the memory loss
613	XSetIOErrorHandler (rxvt_xioerror_handler);	566	XSetIOErrorHandler (rxvt_xioerror_handler);
		567
		568	XrmInitialize ();
614	}	569	}
615		570
616	/* ------------------------------------------------------------------------- *	571	/* ------------------------------------------------------------------------- *
617	* MEMORY ALLOCATION WRAPPERS *	572	* MEMORY ALLOCATION WRAPPERS *
618	* ------------------------------------------------------------------------- */	573	* ------------------------------------------------------------------------- */
…		…
636	rxvt_fatal ("memory allocation failure. aborting.\n");	591	rxvt_fatal ("memory allocation failure. aborting.\n");
637		592
638	return p;	593	return p;
639	}	594	}
640		595
641	void *	596	void *
642	rxvt_realloc (void *ptr, size_t size)	597	rxvt_realloc (void *ptr, size_t size)
643	{	598	{
644	void *p = realloc (ptr, size);	599	void *p = realloc (ptr, size);
645		600
646	if (!p)	601	if (!p)
647	rxvt_fatal ("memory allocation failure. aborting.\n");	602	rxvt_fatal ("memory allocation failure. aborting.\n");
648		603
649	return p;	604	return p;
650	}	605	}
651
652	/* ------------------------------------------------------------------------- *
653	* PRIVILEGED OPERATIONS *
654	* ------------------------------------------------------------------------- */
655	/* take care of suid/sgid super-user (root) privileges */
656	void
657	rxvt_privileges (rxvt_privaction action)
658	{
659	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
660	static uid_t euid;
661	static gid_t egid;
662	#endif
663
664	#if ! defined(__CYGWIN32__)
665	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
666	/* setreuid () is the poor man's setuid (), seteuid () */
667	# define seteuid(a) setreuid(-1, (a))
668	# define setegid(a) setregid(-1, (a))
669	# define HAVE_SETEUID
670	# endif
671	# ifdef HAVE_SETEUID
672	switch (action)
673	{
674	case IGNORE:
675	/*
676	* change effective uid/gid - not real uid/gid - so we can switch
677	* back to root later, as required
678	*/
679	seteuid (getuid ());
680	setegid (getgid ());
681	break;
682	case SAVE:
683	euid = geteuid ();
684	egid = getegid ();
685	break;
686	case RESTORE:
687	seteuid (euid);
688	setegid (egid);
689	break;
690	}
691	# else
692	switch (action)
693	{
694	case IGNORE:
695	setuid (getuid ());
696	setgid (getgid ());
697	/* FALLTHROUGH */
698	case SAVE:
699	/* FALLTHROUGH */
700	case RESTORE:
701	break;
702	}
703	# endif
704	#endif
705	}
706
707	#ifdef UTMP_SUPPORT
708	void
709	rxvt_term::privileged_utmp (rxvt_privaction action)
710	{
711	if (OPTION (Opt_utmpInhibit)
712	\|\| !pty.name \|\| !*pty.name)
713	return;
714
715	rxvt_privileges (RESTORE);
716
717	if (action == SAVE)
718	makeutent (pty.name, rs[Rs_display_name]);
719	else
720	cleanutent ();
721
722	rxvt_privileges (IGNORE);
723	}
724	#endif
725		606
726	/----------------------------------------------------------------------/	607	/----------------------------------------------------------------------/
727	/*	608	/*
728	* window size/position calculcations for XSizeHint and other storage.	609	* window size/position calculcations for XSizeHint and other storage.
729	* if width/height are non-zero then override calculated width/height	610	* if width/height are non-zero then override calculated width/height
730	*/	611	*/
731	void	612	void
732	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	613	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
733	{	614	{
734	short recalc_x, recalc_y;	615	short recalc_x, recalc_y;
735	int x, y, sb_w, mb_h, flags;	616	int x, y, sb_w, flags;
736	unsigned int w, h;	617	unsigned int w, h;
737	unsigned int max_width, max_height;	618	unsigned int max_width, max_height;
738	dDisp;	619	dDisp;
739
740	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
741	ncol, nrow, szHint.width, szHint.height));
742		620
743	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	621	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
744	szHint.win_gravity = NorthWestGravity;	622	szHint.win_gravity = NorthWestGravity;
745	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	623	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
746		624
…		…
801	max_width = MAX_COLS * fwidth;	679	max_width = MAX_COLS * fwidth;
802	max_height = MAX_ROWS * fheight;	680	max_height = MAX_ROWS * fheight;
803		681
804	szHint.base_width = szHint.base_height = 2 * int_bwidth;	682	szHint.base_width = szHint.base_height = 2 * int_bwidth;
805		683
806	sb_w = mb_h = 0;	684	sb_w = 0;
807	window_vt_x = window_vt_y = int_bwidth;	685	window_vt_x = window_vt_y = int_bwidth;
808		686
809	if (scrollbar_visible ())	687	if (scrollBar.state)
810	{	688	{
811	sb_w = scrollbar_TotalWidth ();	689	sb_w = scrollbar_TotalWidth ();
812	szHint.base_width += sb_w;	690	szHint.base_width += sb_w;
813	if (!OPTION (Opt_scrollBar_right))	691	if (!OPTION (Opt_scrollBar_right))
814	window_vt_x += sb_w;	692	window_vt_x += sb_w;
815	}	693	}
816		694
817	if (menubar_visible ())
818	{
819	mb_h = menuBar_TotalHeight ();
820	szHint.base_height += mb_h;
821	window_vt_y += mb_h;
822	}
823
824	szHint.width_inc = fwidth;	695	szHint.width_inc = fwidth;
825	szHint.height_inc = fheight;	696	szHint.height_inc = fheight;
826	szHint.min_width = szHint.base_width + szHint.width_inc;	697	szHint.min_width = szHint.base_width + szHint.width_inc;
827	szHint.min_height = szHint.base_height + szHint.height_inc;	698	szHint.min_height = szHint.base_height + szHint.height_inc;
828		699
…		…
846	{	717	{
847	min_it (height, max_height);	718	min_it (height, max_height);
848	szHint.height = szHint.base_height + height;	719	szHint.height = szHint.base_height + height;
849	}	720	}
850		721
851	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	722	if (scrollBar.state && OPTION (Opt_scrollBar_right))
852	window_sb_x = szHint.width - sb_w;	723	window_sb_x = szHint.width - sb_w;
853		724
854	if (recalc_x)	725	if (recalc_x)
855	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	726	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
856	if (recalc_y)	727	if (recalc_y)
857	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	728	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
858		729
859	ncol = width / fwidth;	730	ncol = width / fwidth;
860	nrow = height / fheight;	731	nrow = height / fheight;
861	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
862	ncol, nrow, szHint.width,
863	szHint.height));
864	return;
865	}	732	}
866		733
867	/----------------------------------------------------------------------/	734	/----------------------------------------------------------------------/
868	/*	735	/*
869	* Tell the teletype handler what size the window is.	736	* Tell the teletype handler what size the window is.
870	* Called after a window size change.	737	* Called after a window size change.
871	*/	738	*/
872	void	739	void
873	rxvt_term::tt_winch ()	740	rxvt_term::tt_winch ()
874	{	741	{
875	if (pty.pty < 0)	742	if (pty->pty < 0)
876	return;	743	return;
877		744
878	struct winsize ws;	745	struct winsize ws;
879		746
880	ws.ws_col = ncol;	747	ws.ws_col = ncol;
881	ws.ws_row = nrow;	748	ws.ws_row = nrow;
882	ws.ws_xpixel = width;	749	ws.ws_xpixel = width;
883	ws.ws_ypixel = height;	750	ws.ws_ypixel = height;
884	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	751	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
885		752
886	#if 0	753	#if 0
887	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	754	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
888	if (cmd_pid) /* force through to the command */	755	if (cmd_pid) /* force through to the command */
889	kill (-cmd_pid, SIGWINCH);	756	kill (-cmd_pid, SIGWINCH);
…		…
1026	i = atoi (color);	893	i = atoi (color);
1027		894
1028	if (i >= 8 && i <= 15)	895	if (i >= 8 && i <= 15)
1029	{ /* bright colors */	896	{ /* bright colors */
1030	i -= 8;	897	i -= 8;
1031	# ifndef NO_BRIGHTCOLOR
1032	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	898	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1033	SET_PIXCOLOR (idx);	899	SET_PIXCOLOR (idx);
1034	goto done;	900	goto done;
1035	# endif
1036	}	901	}
1037		902
1038	if (i >= 0 && i <= 7)	903	if (i >= 0 && i <= 7)
1039	{ /* normal colors */	904	{ /* normal colors */
1040	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	905	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1155	* -------------------------------------------------------------------- */	1020	* -------------------------------------------------------------------- */
1156	void	1021	void
1157	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)
1158	{	1023	{
1159	int fix_screen;	1024	int fix_screen;
1160	int old_width = szHint.width, old_height = szHint.height;	1025	int old_width = szHint.width;
		1026	int old_height = szHint.height;
1161	dDisp;	1027	dDisp;
1162		1028
1163	window_calc (newwidth, newheight);	1029	window_calc (newwidth, newheight);
1164	XSetWMNormalHints (disp, parent[0], &szHint);	1030	XSetWMNormalHints (disp, parent[0], &szHint);
1165		1031
…		…
1187	{	1053	{
1188	x -= x1;	1054	x -= x1;
1189	y -= y1;	1055	y -= y1;
1190	}	1056	}
1191		1057
1192	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1058	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1193	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1059	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1194	dx = old_width - szHint.width;	1060	dx = old_width - szHint.width;
1195	dy = old_height - szHint.height;	1061	dy = old_height - szHint.height;
1196		1062
1197	/* Check position of the center of the window */	1063	/* Check position of the center of the window */
1198	if (x < x1) /* left half */	1064	if (x < x1) /* left half */
1199	dx = 0;	1065	dx = 0;
…		…
1213		1079
1214	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1080	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1215		1081
1216	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1082	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1217	{	1083	{
1218	if (scrollbar_visible ())	1084	if (scrollBar.state)
1219	{	1085	{
1220	XMoveResizeWindow (disp, scrollBar.win,	1086	XMoveResizeWindow (disp, scrollBar.win,
1221	window_sb_x, 0,	1087	window_sb_x, 0,
1222	scrollbar_TotalWidth (), szHint.height);	1088	scrollbar_TotalWidth (), szHint.height);
1223	resize_scrollbar ();	1089	resize_scrollbar ();
1224	}	1090	}
1225		1091
1226	if (menubar_visible ())
1227	XMoveResizeWindow (disp, menuBar.win,
1228	window_vt_x, 0,
1229	width, menuBar_TotalHeight ());
1230
1231	XMoveResizeWindow (disp, vt,	1092	XMoveResizeWindow (disp, vt,
1232	window_vt_x, window_vt_y,	1093	window_vt_x, window_vt_y,
1233	width, height);	1094	width, height);
1234		1095
1235	scr_clear ();	1096	scr_clear ();
…		…
1237	resize_pixmap ();	1098	resize_pixmap ();
1238	#endif	1099	#endif
1239	}	1100	}
1240		1101
1241	if (fix_screen \|\| old_height == 0)	1102	if (fix_screen \|\| old_height == 0)
1242	{
1243	int curr_screen = -1;
1244	int old_ncol = prev_ncol;
1245
1246	/* scr_reset only works on the primary screen */
1247	if (old_height) /* this is not the first time through */
1248	{
1249	unsigned int ocol = ncol;
1250	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1251	curr_screen = scr_change_screen (PRIMARY);
1252	ncol = ocol;
1253	}
1254
1255	scr_reset ();	1103	scr_reset ();
1256
1257	if (curr_screen >= 0) /* this is not the first time through */
1258	{
1259	scr_change_screen (curr_screen);
1260	selection_check (old_ncol != ncol ? 4 : 0);
1261	}
1262	}
1263
1264	old_width = szHint.width;
1265	old_height = szHint.height;
1266		1104
1267	#ifdef XPM_BACKGROUND	1105	#ifdef XPM_BACKGROUND
1268	if (pixmap)	1106	if (pixmap)
1269	scr_touch (false);	1107	scr_touch (false);
1270	#endif	1108	#endif
…		…
1402	input_method = 0;	1240	input_method = 0;
1403	}	1241	}
1404		1242
1405	Input_Context = 0;	1243	Input_Context = 0;
1406	}	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
1407		1319
1408	/*	1320	/*
1409	* 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
1410	* open a suitable preedit type	1322	* open a suitable preedit type
1411	*/	1323	*/
…		…
1418	XRectangle rect, status_rect, needed_rect;	1330	XRectangle rect, status_rect, needed_rect;
1419	unsigned long fg, bg;	1331	unsigned long fg, bg;
1420	const char *p;	1332	const char *p;
1421	char **s;	1333	char **s;
1422	XIMStyles *xim_styles;	1334	XIMStyles *xim_styles;
		1335	#ifdef ENABLE_XIM_ONTHESPOT
		1336	XIMCallback xcb[4];
		1337	#endif
		1338
		1339	set_environ (envv);
1423		1340
1424	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1341	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1425	return false;	1342	return false;
1426		1343
1427	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1428	input_method = display->get_xim (locale, modifiers);	1344	input_method = display->get_xim (locale, modifiers);
1429	if (input_method == NULL)	1345	if (input_method == NULL)
1430	return false;	1346	return false;
1431		1347
1432	xim = input_method->xim;	1348	xim = input_method->xim;
…		…
1452	s = rxvt_splitcommastring (p);	1368	s = rxvt_splitcommastring (p);
1453		1369
1454	for (i = found = 0; !found && s[i]; i++)	1370	for (i = found = 0; !found && s[i]; i++)
1455	{	1371	{
1456	if (!strcmp (s[i], "OverTheSpot"))	1372	if (!strcmp (s[i], "OverTheSpot"))
1457	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1373	input_style = XIMPreeditPosition \| XIMStatusNothing;
1458	else if (!strcmp (s[i], "OffTheSpot"))	1374	else if (!strcmp (s[i], "OffTheSpot"))
1459	input_style = (XIMPreeditArea \| XIMStatusArea);	1375	input_style = XIMPreeditArea \| XIMStatusArea;
1460	else if (!strcmp (s[i], "Root"))	1376	else if (!strcmp (s[i], "Root"))
1461	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1377	input_style = XIMPreeditNothing \| XIMStatusNothing;
1462	else if (!strcmp (s[i], "None"))	1378	else if (!strcmp (s[i], "None"))
1463	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;
1464		1386
1465	for (j = 0; j < xim_styles->count_styles; j++)	1387	for (j = 0; j < xim_styles->count_styles; j++)
1466	if (input_style == xim_styles->supported_styles[j])	1388	if (input_style == xim_styles->supported_styles[j])
1467	{	1389	{
1468	rxvt_freecommastring (s);	1390	rxvt_freecommastring (s);
…		…
1557	XNBackground, bg,	1479	XNBackground, bg,
1558	XNArea, &status_rect,	1480	XNArea, &status_rect,
1559	XNFontSet, fs,	1481	XNFontSet, fs,
1560	NULL);	1482	NULL);
1561	}	1483	}
		1484	else if (input_style & XIMPreeditCallbacks)
		1485	{
		1486	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1487	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1488	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1489	#if 0
		1490	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1491	#endif
		1492
		1493	preedit_attr = XVaCreateNestedList (0,
		1494	XNPreeditStartCallback, &xcb[0],
		1495	XNPreeditDoneCallback , &xcb[1],
		1496	XNPreeditDrawCallback , &xcb[2],
		1497	#if 0
		1498	XNPreeditCaretCallback, &xcb[3],
		1499	#endif
		1500	NULL);
		1501	}
1562		1502
1563	Input_Context = XCreateIC (xim,	1503	Input_Context = XCreateIC (xim,
1564	XNInputStyle, input_style,	1504	XNInputStyle, input_style,
1565	XNClientWindow, vt,	1505	XNClientWindow, vt,
1566	XNFocusWindow, parent[0],	1506	XNFocusWindow, parent[0],
…		…
1578	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1518	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1579	im_destroy ();	1519	im_destroy ();
1580	return false;	1520	return false;
1581	}	1521	}
1582		1522
		1523	#if 0
		1524	// unfortunately, only the focus window is used by XIM, hard to fix
		1525	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1526	vt_select_input ();
		1527	#endif
		1528
1583	if (input_style & XIMPreeditArea)	1529	if (input_style & XIMPreeditArea)
1584	IMSetStatusPosition ();	1530	IMSetStatusPosition ();
1585		1531
1586	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1587	return true;	1532	return true;
1588	}	1533	}
1589		1534
1590	void	1535	void
1591	rxvt_term::im_cb ()	1536	rxvt_term::im_cb ()
…		…
1593	int i;	1538	int i;
1594	const char *p;	1539	const char *p;
1595	char **s;	1540	char **s;
1596	char buf[IMBUFSIZ];	1541	char buf[IMBUFSIZ];
1597		1542
1598	SET_R (this);	1543	make_current ();
1599		1544
1600	im_destroy ();	1545	im_destroy ();
1601		1546
1602	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1603	if (Input_Context)	1547	if (Input_Context)
1604	return;	1548	return;
1605		1549
1606	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1550	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1607	if (rs[Rs_imLocale])	1551	if (rs[Rs_imLocale])
…		…
1680	XFree (preedit_attr);	1624	XFree (preedit_attr);
1681	XFree (status_attr);	1625	XFree (status_attr);
1682	}	1626	}
1683	#endif /* USE_XIM */	1627	#endif /* USE_XIM */
1684		1628
1685	/----------------------------------------------------------------------/
1686	rxvt_t rxvt_current_term;
1687
1688	/----------------------- end-of-file (C source) -----------------------/	1629	/----------------------- 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.160 by root, Wed Jan 4 05:35:34 2006 UTC vs. Revision 1.201 by root, Wed Jan 25 00:57:57 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.160 by root, Wed Jan 4 05:35:34 2006 UTC vs.
Revision 1.201 by root, Wed Jan 25 00:57:57 2006 UTC