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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.161 by root, Wed Jan 4 20:43:38 2006 UTC vs.
Revision 1.203 by root, Wed Jan 25 02:42:06 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
		518	#if ENABLE_XEMBED
		519	if (rs[Rs_embed])
		520	{
		521	long info[2] = { 0, XEMBED_MAPPED };
		522
		523	XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		524	32, PropModeReplace, (unsigned char *)&info, 2);
		525	}
		526	#endif
		527
530	XMapWindow (disp, vt);	528	XMapWindow (disp, vt);
531	XMapWindow (disp, parent[0]);	529	XMapWindow (disp, parent[0]);
532		530
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;	531	return true;
546	}	532	}
547		533
548	static struct sig_handlers	534	static struct sig_handlers
549	{	535	{
550	sig_watcher sw_chld, sw_term, sw_int;	536	sig_watcher sw_term, sw_int;
551		537
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	/*	538	/*
567	* Catch a fatal signal and tidy up before quitting	539	* Catch a fatal signal and tidy up before quitting
568	*/	540	*/
569	void	541	void
570	sig_term (sig_watcher &w)	542	sig_term (sig_watcher &w)
571	{	543	{
572	#ifdef DEBUG_CMD
573	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
574	#endif
575	rxvt_emergency_cleanup ();	544	rxvt_emergency_cleanup ();
576	signal (w.signum, SIG_DFL);	545	signal (w.signum, SIG_DFL);
577	kill (getpid (), w.signum);	546	kill (getpid (), w.signum);
578	}	547	}
579		548
580	sig_handlers ()	549	sig_handlers ()
581	: sw_chld (this, &sig_handlers::sig_chld),
582	sw_term (this, &sig_handlers::sig_term),	550	: sw_term (this, &sig_handlers::sig_term),
583	sw_int (this, &sig_handlers::sig_term)	551	sw_int (this, &sig_handlers::sig_term)
584	{	552	{
585	}	553	}
586	} sig_handlers;	554	} sig_handlers;
587		555
		556	char **rxvt_environ; // startup environment
		557
588	void	558	void
589	rxvt_init ()	559	rxvt_init ()
590	{	560	{
591	/*	561	ptytty::init ();
592	* Save and then give up any super-user privileges	562
593	* If we need privileges in any area then we must specifically request it.	563	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		564
601	signal (SIGHUP, SIG_IGN);	565	signal (SIGHUP, SIG_IGN);
602	signal (SIGPIPE, SIG_IGN);	566	signal (SIGPIPE, SIG_IGN);
603		567
604	sig_handlers.sw_chld.start (SIGCHLD);
605	sig_handlers.sw_term.start (SIGTERM);	568	sig_handlers.sw_term.start (SIGTERM);
606	sig_handlers.sw_int.start (SIGINT);	569	sig_handlers.sw_int.start (SIGINT);
607		570
608	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	571	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
609	/* signal (SIGURG, SIG_DFL); */	572	/* signal (SIGURG, SIG_DFL); */
610		573
611	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	574	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
612	// TODO: handle this with exceptions and tolerate the memory loss	575	// TODO: handle this with exceptions and tolerate the memory loss
613	XSetIOErrorHandler (rxvt_xioerror_handler);	576	XSetIOErrorHandler (rxvt_xioerror_handler);
		577
		578	XrmInitialize ();
614	}	579	}
615		580
616	/* ------------------------------------------------------------------------- *	581	/* ------------------------------------------------------------------------- *
617	* MEMORY ALLOCATION WRAPPERS *	582	* MEMORY ALLOCATION WRAPPERS *
618	* ------------------------------------------------------------------------- */	583	* ------------------------------------------------------------------------- */
…		…
636	rxvt_fatal ("memory allocation failure. aborting.\n");	601	rxvt_fatal ("memory allocation failure. aborting.\n");
637		602
638	return p;	603	return p;
639	}	604	}
640		605
641	void *	606	void *
642	rxvt_realloc (void *ptr, size_t size)	607	rxvt_realloc (void *ptr, size_t size)
643	{	608	{
644	void *p = realloc (ptr, size);	609	void *p = realloc (ptr, size);
645		610
646	if (!p)	611	if (!p)
647	rxvt_fatal ("memory allocation failure. aborting.\n");	612	rxvt_fatal ("memory allocation failure. aborting.\n");
648		613
649	return p;	614	return p;
650	}	615	}
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		616
726	/----------------------------------------------------------------------/	617	/----------------------------------------------------------------------/
727	/*	618	/*
728	* window size/position calculcations for XSizeHint and other storage.	619	* window size/position calculcations for XSizeHint and other storage.
729	* if width/height are non-zero then override calculated width/height	620	* if width/height are non-zero then override calculated width/height
730	*/	621	*/
731	void	622	void
732	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	623	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
733	{	624	{
734	short recalc_x, recalc_y;	625	short recalc_x, recalc_y;
735	int x, y, sb_w, mb_h, flags;	626	int x, y, sb_w, flags;
736	unsigned int w, h;	627	unsigned int w, h;
737	unsigned int max_width, max_height;	628	unsigned int max_width, max_height;
738	dDisp;	629	dDisp;
739
740	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
741	ncol, nrow, szHint.width, szHint.height));
742		630
743	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	631	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
744	szHint.win_gravity = NorthWestGravity;	632	szHint.win_gravity = NorthWestGravity;
745	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	633	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
746		634
…		…
801	max_width = MAX_COLS * fwidth;	689	max_width = MAX_COLS * fwidth;
802	max_height = MAX_ROWS * fheight;	690	max_height = MAX_ROWS * fheight;
803		691
804	szHint.base_width = szHint.base_height = 2 * int_bwidth;	692	szHint.base_width = szHint.base_height = 2 * int_bwidth;
805		693
806	sb_w = mb_h = 0;	694	sb_w = 0;
807	window_vt_x = window_vt_y = int_bwidth;	695	window_vt_x = window_vt_y = int_bwidth;
808		696
809	if (scrollbar_visible ())	697	if (scrollBar.state)
810	{	698	{
811	sb_w = scrollbar_TotalWidth ();	699	sb_w = scrollbar_TotalWidth ();
812	szHint.base_width += sb_w;	700	szHint.base_width += sb_w;
813	if (!OPTION (Opt_scrollBar_right))	701	if (!OPTION (Opt_scrollBar_right))
814	window_vt_x += sb_w;	702	window_vt_x += sb_w;
815	}	703	}
816		704
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;	705	szHint.width_inc = fwidth;
825	szHint.height_inc = fheight;	706	szHint.height_inc = fheight;
826	szHint.min_width = szHint.base_width + szHint.width_inc;	707	szHint.min_width = szHint.base_width + szHint.width_inc;
827	szHint.min_height = szHint.base_height + szHint.height_inc;	708	szHint.min_height = szHint.base_height + szHint.height_inc;
828		709
…		…
846	{	727	{
847	min_it (height, max_height);	728	min_it (height, max_height);
848	szHint.height = szHint.base_height + height;	729	szHint.height = szHint.base_height + height;
849	}	730	}
850		731
851	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	732	if (scrollBar.state && OPTION (Opt_scrollBar_right))
852	window_sb_x = szHint.width - sb_w;	733	window_sb_x = szHint.width - sb_w;
853		734
854	if (recalc_x)	735	if (recalc_x)
855	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	736	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
856	if (recalc_y)	737	if (recalc_y)
857	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	738	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
858		739
859	ncol = width / fwidth;	740	ncol = width / fwidth;
860	nrow = height / fheight;	741	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	}	742	}
866		743
867	/----------------------------------------------------------------------/	744	/----------------------------------------------------------------------/
868	/*	745	/*
869	* Tell the teletype handler what size the window is.	746	* Tell the teletype handler what size the window is.
870	* Called after a window size change.	747	* Called after a window size change.
871	*/	748	*/
872	void	749	void
873	rxvt_term::tt_winch ()	750	rxvt_term::tt_winch ()
874	{	751	{
875	if (pty.pty < 0)	752	if (pty->pty < 0)
876	return;	753	return;
877		754
878	struct winsize ws;	755	struct winsize ws;
879		756
880	ws.ws_col = ncol;	757	ws.ws_col = ncol;
881	ws.ws_row = nrow;	758	ws.ws_row = nrow;
882	ws.ws_xpixel = width;	759	ws.ws_xpixel = width;
883	ws.ws_ypixel = height;	760	ws.ws_ypixel = height;
884	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	761	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
885		762
886	#if 0	763	#if 0
887	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	764	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
888	if (cmd_pid) /* force through to the command */	765	if (cmd_pid) /* force through to the command */
889	kill (-cmd_pid, SIGWINCH);	766	kill (-cmd_pid, SIGWINCH);
…		…
1153	* -------------------------------------------------------------------- */	1030	* -------------------------------------------------------------------- */
1154	void	1031	void
1155	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1032	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1156	{	1033	{
1157	int fix_screen;	1034	int fix_screen;
1158	int old_width = szHint.width, old_height = szHint.height;	1035	int old_width = szHint.width;
		1036	int old_height = szHint.height;
1159	dDisp;	1037	dDisp;
1160		1038
1161	window_calc (newwidth, newheight);	1039	window_calc (newwidth, newheight);
1162	XSetWMNormalHints (disp, parent[0], &szHint);	1040	XSetWMNormalHints (disp, parent[0], &szHint);
1163		1041
…		…
1185	{	1063	{
1186	x -= x1;	1064	x -= x1;
1187	y -= y1;	1065	y -= y1;
1188	}	1066	}
1189		1067
1190	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1068	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1191	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1069	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1192	dx = old_width - szHint.width;	1070	dx = old_width - szHint.width;
1193	dy = old_height - szHint.height;	1071	dy = old_height - szHint.height;
1194		1072
1195	/* Check position of the center of the window */	1073	/* Check position of the center of the window */
1196	if (x < x1) /* left half */	1074	if (x < x1) /* left half */
1197	dx = 0;	1075	dx = 0;
…		…
1211		1089
1212	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1090	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1213		1091
1214	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1092	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1215	{	1093	{
1216	if (scrollbar_visible ())	1094	if (scrollBar.state)
1217	{	1095	{
1218	XMoveResizeWindow (disp, scrollBar.win,	1096	XMoveResizeWindow (disp, scrollBar.win,
1219	window_sb_x, 0,	1097	window_sb_x, 0,
1220	scrollbar_TotalWidth (), szHint.height);	1098	scrollbar_TotalWidth (), szHint.height);
1221	resize_scrollbar ();	1099	resize_scrollbar ();
1222	}	1100	}
1223		1101
1224	if (menubar_visible ())
1225	XMoveResizeWindow (disp, menuBar.win,
1226	window_vt_x, 0,
1227	width, menuBar_TotalHeight ());
1228
1229	XMoveResizeWindow (disp, vt,	1102	XMoveResizeWindow (disp, vt,
1230	window_vt_x, window_vt_y,	1103	window_vt_x, window_vt_y,
1231	width, height);	1104	width, height);
1232		1105
1233	scr_clear ();	1106	scr_clear ();
…		…
1235	resize_pixmap ();	1108	resize_pixmap ();
1236	#endif	1109	#endif
1237	}	1110	}
1238		1111
1239	if (fix_screen \|\| old_height == 0)	1112	if (fix_screen \|\| old_height == 0)
1240	{
1241	int curr_screen = -1;
1242	int old_ncol = prev_ncol;
1243
1244	/* scr_reset only works on the primary screen */
1245	if (old_height) /* this is not the first time through */
1246	{
1247	unsigned int ocol = ncol;
1248	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1249	curr_screen = scr_change_screen (PRIMARY);
1250	ncol = ocol;
1251	}
1252
1253	scr_reset ();	1113	scr_reset ();
1254
1255	if (curr_screen >= 0) /* this is not the first time through */
1256	{
1257	scr_change_screen (curr_screen);
1258	selection_check (old_ncol != ncol ? 4 : 0);
1259	}
1260	}
1261
1262	old_width = szHint.width;
1263	old_height = szHint.height;
1264		1114
1265	#ifdef XPM_BACKGROUND	1115	#ifdef XPM_BACKGROUND
1266	if (pixmap)	1116	if (pixmap)
1267	scr_touch (false);	1117	scr_touch (false);
1268	#endif	1118	#endif
…		…
1371	XPoint nspot;	1221	XPoint nspot;
1372	XVaNestedList preedit_attr;	1222	XVaNestedList preedit_attr;
1373		1223
1374	if (!Input_Context	1224	if (!Input_Context
1375	\|\| !focus	1225	\|\| !focus
1376	\|\| !(input_style & XIMPreeditPosition))	1226	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1377	return;	1227	return;
1378		1228
1379	im_set_position (nspot);	1229	im_set_position (nspot);
1380		1230
1381	if (nspot.x == spot.x && nspot.y == spot.y)	1231	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1400	input_method = 0;	1250	input_method = 0;
1401	}	1251	}
1402		1252
1403	Input_Context = 0;	1253	Input_Context = 0;
1404	}	1254	}
		1255
		1256	#ifdef ENABLE_XIM_ONTHESPOT
		1257
		1258	static void
		1259	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1260	{
		1261	((rxvt_term *)client_data)->make_current ();
		1262	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1263	}
		1264
		1265	static void
		1266	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1267	{
		1268	((rxvt_term *)client_data)->make_current ();
		1269	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1270	}
		1271
		1272	static void
		1273	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1274	{
		1275	rxvt_term term = (rxvt_term )client_data;
		1276	XIMText *text = call_data->text;
		1277
		1278	term->make_current ();
		1279
		1280	if (text)
		1281	{
		1282	void *str;
		1283
		1284	if (!text->encoding_is_wchar && text->string.multi_byte)
		1285	{
		1286	// of course, X makes it ugly again
		1287	if (term->rs[Rs_imLocale])
		1288	SET_LOCALE (term->rs[Rs_imLocale]);
		1289
		1290	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1291	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1292
		1293	if (term->rs[Rs_imLocale])
		1294	SET_LOCALE (term->locale);
		1295	}
		1296	else
		1297	str = (void *)text->string.wide_char;
		1298
		1299	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1300	DT_INT, call_data->caret,
		1301	DT_INT, call_data->chg_first,
		1302	DT_INT, call_data->chg_length,
		1303	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1304	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1305	DT_END));
		1306	}
		1307	else
		1308	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1309	DT_INT, call_data->caret,
		1310	DT_INT, call_data->chg_first,
		1311	DT_INT, call_data->chg_length,
		1312	DT_END));
		1313	}
		1314
		1315	#if 0
		1316	static void
		1317	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1318	{
		1319	((rxvt_term *)client_data)->make_current ();
		1320	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1321	DT_INT, call_data->position,
		1322	DT_INT, call_data->direction,
		1323	DT_INT, call_data->style,
		1324	DT_END));
		1325	}
		1326	#endif
		1327
		1328	#endif
1405		1329
1406	/*	1330	/*
1407	* Try to open a XIM with the current modifiers, then see if we can	1331	* Try to open a XIM with the current modifiers, then see if we can
1408	* open a suitable preedit type	1332	* open a suitable preedit type
1409	*/	1333	*/
…		…
1416	XRectangle rect, status_rect, needed_rect;	1340	XRectangle rect, status_rect, needed_rect;
1417	unsigned long fg, bg;	1341	unsigned long fg, bg;
1418	const char *p;	1342	const char *p;
1419	char **s;	1343	char **s;
1420	XIMStyles *xim_styles;	1344	XIMStyles *xim_styles;
		1345	#ifdef ENABLE_XIM_ONTHESPOT
		1346	XIMCallback xcb[4];
		1347	#endif
		1348
		1349	set_environ (envv);
1421		1350
1422	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1351	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423	return false;	1352	return false;
1424		1353
1425	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1426	input_method = display->get_xim (locale, modifiers);	1354	input_method = display->get_xim (locale, modifiers);
1427	if (input_method == NULL)	1355	if (input_method == NULL)
1428	return false;	1356	return false;
1429		1357
1430	xim = input_method->xim;	1358	xim = input_method->xim;
…		…
1450	s = rxvt_splitcommastring (p);	1378	s = rxvt_splitcommastring (p);
1451		1379
1452	for (i = found = 0; !found && s[i]; i++)	1380	for (i = found = 0; !found && s[i]; i++)
1453	{	1381	{
1454	if (!strcmp (s[i], "OverTheSpot"))	1382	if (!strcmp (s[i], "OverTheSpot"))
1455	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1383	input_style = XIMPreeditPosition \| XIMStatusNothing;
1456	else if (!strcmp (s[i], "OffTheSpot"))	1384	else if (!strcmp (s[i], "OffTheSpot"))
1457	input_style = (XIMPreeditArea \| XIMStatusArea);	1385	input_style = XIMPreeditArea \| XIMStatusArea;
1458	else if (!strcmp (s[i], "Root"))	1386	else if (!strcmp (s[i], "Root"))
1459	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1387	input_style = XIMPreeditNothing \| XIMStatusNothing;
1460	else if (!strcmp (s[i], "None"))	1388	else if (!strcmp (s[i], "None"))
1461	input_style = (XIMPreeditNone \| XIMStatusNone);	1389	input_style = XIMPreeditNone \| XIMStatusNone;
		1390	#ifdef ENABLE_XIM_ONTHESPOT
		1391	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1392	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1393	#endif
		1394	else
		1395	input_style = XIMPreeditNothing \| XIMStatusNothing;
1462		1396
1463	for (j = 0; j < xim_styles->count_styles; j++)	1397	for (j = 0; j < xim_styles->count_styles; j++)
1464	if (input_style == xim_styles->supported_styles[j])	1398	if (input_style == xim_styles->supported_styles[j])
1465	{	1399	{
1466	rxvt_freecommastring (s);	1400	rxvt_freecommastring (s);
…		…
1555	XNBackground, bg,	1489	XNBackground, bg,
1556	XNArea, &status_rect,	1490	XNArea, &status_rect,
1557	XNFontSet, fs,	1491	XNFontSet, fs,
1558	NULL);	1492	NULL);
1559	}	1493	}
		1494	else if (input_style & XIMPreeditCallbacks)
		1495	{
		1496	im_set_position (spot);
		1497
		1498	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1499	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1500	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1501	#if 0
		1502	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1503	#endif
		1504
		1505	preedit_attr = XVaCreateNestedList (0,
		1506	XNSpotLocation, &spot,
		1507	XNPreeditStartCallback, &xcb[0],
		1508	XNPreeditDoneCallback , &xcb[1],
		1509	XNPreeditDrawCallback , &xcb[2],
		1510	#if 0
		1511	XNPreeditCaretCallback, &xcb[3],
		1512	#endif
		1513	NULL);
		1514	}
1560		1515
1561	Input_Context = XCreateIC (xim,	1516	Input_Context = XCreateIC (xim,
1562	XNInputStyle, input_style,	1517	XNInputStyle, input_style,
1563	XNClientWindow, vt,	1518	XNClientWindow, vt,
1564	XNFocusWindow, parent[0],	1519	XNFocusWindow, parent[0],
…		…
1576	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1531	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1577	im_destroy ();	1532	im_destroy ();
1578	return false;	1533	return false;
1579	}	1534	}
1580		1535
		1536	#if 0
		1537	// unfortunately, only the focus window is used by XIM, hard to fix
		1538	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1539	vt_select_input ();
		1540	#endif
		1541
1581	if (input_style & XIMPreeditArea)	1542	if (input_style & XIMPreeditArea)
1582	IMSetStatusPosition ();	1543	IMSetStatusPosition ();
1583		1544
1584	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1585	return true;	1545	return true;
1586	}	1546	}
1587		1547
1588	void	1548	void
1589	rxvt_term::im_cb ()	1549	rxvt_term::im_cb ()
…		…
1591	int i;	1551	int i;
1592	const char *p;	1552	const char *p;
1593	char **s;	1553	char **s;
1594	char buf[IMBUFSIZ];	1554	char buf[IMBUFSIZ];
1595		1555
1596	SET_R (this);	1556	make_current ();
1597		1557
1598	im_destroy ();	1558	im_destroy ();
1599		1559
1600	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1601	if (Input_Context)	1560	if (Input_Context)
1602	return;	1561	return;
1603		1562
1604	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1563	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1605	if (rs[Rs_imLocale])	1564	if (rs[Rs_imLocale])
…		…
1678	XFree (preedit_attr);	1637	XFree (preedit_attr);
1679	XFree (status_attr);	1638	XFree (status_attr);
1680	}	1639	}
1681	#endif /* USE_XIM */	1640	#endif /* USE_XIM */
1682		1641
1683	/----------------------------------------------------------------------/
1684	rxvt_t rxvt_current_term;
1685
1686	/----------------------- end-of-file (C source) -----------------------/	1642	/----------------------- 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.161 by root, Wed Jan 4 20:43:38 2006 UTC vs. Revision 1.203 by root, Wed Jan 25 02:42:06 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.161 by root, Wed Jan 4 20:43:38 2006 UTC vs.
Revision 1.203 by root, Wed Jan 25 02:42:06 2006 UTC