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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.152 by root, Thu Dec 22 16:44:10 2005 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.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "keyboard.h"
		36	#include "rxvtperl.h"
35		37
36	#include <limits>	38	#include <limits>
37		39
38	#include <csignal>	40	#include <csignal>
39	#include <cstring>	41	#include <cstring>
…		…
44		46
45	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
46	# include <termios.h>	48	# include <termios.h>
47	#endif	49	#endif
48		50
49	#ifdef KEYSYM_RESOURCE
50	# include "keyboard.h"
51	#endif
52
53	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
54		52
		53	// used to tell global functions which terminal instance is "active"
		54	rxvt_t rxvt_current_term;
		55
55	static char curlocale[128];	56	static char curlocale[128], savelocale[128];
56		57
57	bool	58	bool
58	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
59	{	60	{
60	if (!locale \|\| !strncmp (locale, curlocale, 128))	61	if (!locale \|\| !strncmp (locale, curlocale, 128))
61	return false;	62	return false;
62		63
63	strncpy (curlocale, locale, 128);	64	strncpy (curlocale, locale, 128);
64	setlocale (LC_CTYPE, curlocale);	65	setlocale (LC_CTYPE, curlocale);
65	return true;	66	return true;
		67	}
		68
		69	void
		70	rxvt_push_locale (const char *locale) NOTHROW
		71	{
		72	strcpy (savelocale, curlocale);
		73	rxvt_set_locale (locale);
		74	}
		75
		76	void
		77	rxvt_pop_locale () NOTHROW
		78	{
		79	rxvt_set_locale (savelocale);
66	}	80	}
67		81
68	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
69	class rxvt_composite_vec rxvt_composite;	83	class rxvt_composite_vec rxvt_composite;
70		84
…		…
135	rootwin_ev (this, &rxvt_term::rootwin_cb),	149	rootwin_ev (this, &rxvt_term::rootwin_cb),
136	#endif	150	#endif
137	#ifdef HAVE_SCROLLBARS	151	#ifdef HAVE_SCROLLBARS
138	scrollbar_ev (this, &rxvt_term::x_cb),	152	scrollbar_ev (this, &rxvt_term::x_cb),
139	#endif	153	#endif
140	#ifdef MENUBAR
141	menubar_ev (this, &rxvt_term::x_cb),
142	#endif
143	#ifdef CURSOR_BLINK	154	#ifdef CURSOR_BLINK
144	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
145	#endif	156	#endif
146	#ifdef TEXT_BLINK	157	#ifdef TEXT_BLINK
147	text_blink_ev (this, &rxvt_term::text_blink_cb),	158	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
159	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
160	#endif	171	#endif
161	#ifdef USE_XIM	172	#ifdef USE_XIM
162	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
163	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
164	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
165	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
166	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
167	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
168	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
169	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
170	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
173		188
174	termlist.push_back (this);	189	termlist.push_back (this);
175		190
176	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
177	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
178
179	if (!keyboard)
180	rxvt_fatal ("out of memory, aborting.\n");
181	#endif	193	#endif
182	}	194	}
183		195
184	// 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.
185	// for use before an emergency exit	197	// for use before an emergency exit
186	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
187	{	199	{
188	if (cmd_pid)	200	if (cmd_pid)
189	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
190		202
191	#ifdef UTMP_SUPPORT	203	delete pty; pty = 0;
192	privileged_utmp (RESTORE);
193	#endif
194
195	pty.put ();
196	}	204	}
197		205
198	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
199	{	207	{
200	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
…		…
214		222
215	selection_clear ();	223	selection_clear ();
216		224
217	#ifdef USE_XIM	225	#ifdef USE_XIM
218	im_destroy ();	226	im_destroy ();
219	#endif
220	#ifdef MENUBAR
221	if (menubarGC) XFreeGC (disp, menubarGC);
222	#endif	227	#endif
223	#ifdef XTERM_SCROLLBAR	228	#ifdef XTERM_SCROLLBAR
224	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	229	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
225	if (ShadowGC) XFreeGC (disp, ShadowGC);	230	if (ShadowGC) XFreeGC (disp, ShadowGC);
226	#endif	231	#endif
…		…
237	if (upArrow) XFreePixmap (disp, upArrow);	242	if (upArrow) XFreePixmap (disp, upArrow);
238	if (downArrow) XFreePixmap (disp, downArrow);	243	if (downArrow) XFreePixmap (disp, downArrow);
239	if (upArrowHi) XFreePixmap (disp, upArrowHi);	244	if (upArrowHi) XFreePixmap (disp, upArrowHi);
240	if (downArrowHi) XFreePixmap (disp, downArrowHi);	245	if (downArrowHi) XFreePixmap (disp, downArrowHi);
241	#endif	246	#endif
242	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	247	#ifdef RXVT_SCROLLBAR
243	if (topShadowGC) XFreeGC (disp, topShadowGC);	248	if (topShadowGC) XFreeGC (disp, topShadowGC);
244	if (botShadowGC) XFreeGC (disp, botShadowGC);	249	if (botShadowGC) XFreeGC (disp, botShadowGC);
245	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	250	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
246	#endif	251	#endif
247	if (gc) XFreeGC (disp, gc);	252	if (gc) XFreeGC (disp, gc);
248		253
249	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
250	delete menuBar.drawable;
251	//if (menuBar.win)
252	// XDestroyWindow (disp, menuBar.win);
253	#endif
254	delete drawable;	254	delete drawable;
255	// destroy all windows	255	// destroy all windows
256	if (parent[0])	256	if (parent[0])
257	XDestroyWindow (disp, parent[0]);	257	XDestroyWindow (disp, parent[0]);
258	}	258	}
259		259
260	// TODO: free pixcolours, colours should become part of rxvt_display	260	// TODO: free pixcolours, colours should become part of rxvt_display
261
262	delete pix_colors_focused;	261	delete pix_colors_focused;
263	#if OFF_FOCUS_FADING	262	#if OFF_FOCUS_FADING
264	delete pix_colors_unfocused;	263	delete pix_colors_unfocused;
265	#endif	264	#endif
266		265
…		…
288	#ifdef KEYSYM_RESOURCE	287	#ifdef KEYSYM_RESOURCE
289	delete keyboard;	288	delete keyboard;
290	#endif	289	#endif
291	}	290	}
292		291
		292	// child has exited, usually destroys
293	void	293	void
294	rxvt_term::child_exit ()	294	rxvt_term::child_cb (child_watcher &w, int status)
295	{	295	{
		296	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		297
296	cmd_pid = 0;	298	cmd_pid = 0;
297		299
298	if (!(options & Opt_hold))	300	if (!OPTION (Opt_hold))
299	destroy ();	301	destroy ();
300	}	302	}
301		303
302	void	304	void
303	rxvt_term::destroy ()	305	rxvt_term::destroy ()
304	{	306	{
305	if (destroy_ev.active)	307	if (destroy_ev.active)
306	return;	308	return;
307		309
		310	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		311
308	#if ENABLE_OVERLAY	312	#if ENABLE_OVERLAY
309	scr_overlay_off ();	313	scr_overlay_off ();
310	#endif	314	#endif
311		315
312	if (display)	316	if (display)
…		…
314	#if USE_XIM	318	#if USE_XIM
315	im_ev.stop (display);	319	im_ev.stop (display);
316	#endif	320	#endif
317	#if HAVE_SCROLLBARS	321	#if HAVE_SCROLLBARS
318	scrollbar_ev.stop (display);	322	scrollbar_ev.stop (display);
319	#endif
320	#if MENUBAR
321	menubar_ev.stop (display);
322	#endif	323	#endif
323	#if TRANSPARENT	324	#if TRANSPARENT
324	rootwin_ev.stop (display);	325	rootwin_ev.stop (display);
325	#endif	326	#endif
326	incr_ev.stop ();	327	incr_ev.stop ();
…		…
350	}	351	}
351		352
352	void	353	void
353	rxvt_term::destroy_cb (time_watcher &w)	354	rxvt_term::destroy_cb (time_watcher &w)
354	{	355	{
355	SET_R (this);	356	make_current ();
356		357
357	delete this;	358	delete this;
358	}	359	}
359		360
360	/----------------------------------------------------------------------/	361	/----------------------------------------------------------------------/
…		…
448	_exit (EXIT_FAILURE);	449	_exit (EXIT_FAILURE);
449	}	450	}
450		451
451	/----------------------------------------------------------------------/	452	/----------------------------------------------------------------------/
452	bool	453	bool
453	rxvt_term::init (int argc, const char const argv)	454	rxvt_term::init (int argc, const char const argv, stringvec *envv)
454	{	455	{
		456	this->envv = envv;
		457
455	SET_R (this);	458	SET_R (this);
456
457	set_locale ("");	459	set_locale ("");
		460	set_environ (envv); // few things in X do not call setlocale :(
458		461
459	if (!init_vars ())	462	if (!init_vars ())
460	return false;	463	return false;
461		464
462	init_secondary ();	465	init_secondary ();
…		…
465		468
466	#ifdef KEYSYM_RESOURCE	469	#ifdef KEYSYM_RESOURCE
467	keyboard->register_done ();	470	keyboard->register_done ();
468	#endif	471	#endif
469		472
470	#if MENUBAR_MAX
471	menubar_read (rs[Rs_menu]);
472	#endif
473	#ifdef HAVE_SCROLLBARS	473	#ifdef HAVE_SCROLLBARS
474	if (options & Opt_scrollBar)	474	if (OPTION (Opt_scrollBar))
475	scrollBar.setIdle (); /* set existence for size calculations */	475	scrollBar.setIdle (); /* set existence for size calculations */
476	#endif	476	#endif
477		477
		478	pty = ptytty::create ();
		479
478	create_windows (argc, argv);	480	create_windows (argc, argv);
479		481
480	dDisp;	482	dDisp;
481		483
482	init_xlocale ();	484	init_xlocale ();
483		485
484	scr_reset (); /* initialize screen */	486	scr_reset (); // initialize screen
485		487
486	#if 0	488	#if 0
487	XSynchronize (disp, True);	489	XSynchronize (disp, True);
488	#endif	490	#endif
489		491
490	#ifdef HAVE_SCROLLBARS	492	#ifdef HAVE_SCROLLBARS
491	if (options & Opt_scrollBar)	493	if (OPTION (Opt_scrollBar))
492	resize_scrollbar (); /* create and map scrollbar */	494	resize_scrollbar (); /* create and map scrollbar */
493	#endif	495	#endif
494	#if (MENUBAR_MAX)
495	if (menubar_visible ())
496	XMapWindow (disp, menuBar.win);
497	#endif
498	#ifdef TRANSPARENT	496	#ifdef TRANSPARENT
499	if (options & Opt_transparent)	497	if (OPTION (Opt_transparent))
500	{	498	{
501	XSelectInput (disp, display->root, PropertyChangeMask);	499	XSelectInput (disp, display->root, PropertyChangeMask);
502	check_our_parents ();	500	check_our_parents ();
503	rootwin_ev.start (display, display->root);	501	rootwin_ev.start (display, display->root);
504	}	502	}
505	#endif	503	#endif
506		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
507	XMapWindow (disp, vt);	528	XMapWindow (disp, vt);
508	XMapWindow (disp, parent[0]);	529	XMapWindow (disp, parent[0]);
509		530
510	set_colorfgbg ();
511
512	init_command (cmd_argv);
513
514	free (cmd_argv);
515
516	pty_ev.start (pty.pty, EVENT_READ);
517
518	check_ev.start ();
519
520	return true;	531	return true;
521	}	532	}
522		533
523	static struct sig_handlers	534	static struct sig_handlers
524	{	535	{
525	sig_watcher sw_chld, sw_term, sw_int;	536	sig_watcher sw_term, sw_int;
526		537
527	void sig_chld (sig_watcher &w)
528	{
529	// we are being called for every SIGCHLD, find the corresponding term
530	int pid;
531
532	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
533	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
534	if (pid == (*t)->cmd_pid)
535	{
536	(*t)->child_exit ();
537	break;
538	}
539	}
540
541	/*	538	/*
542	* Catch a fatal signal and tidy up before quitting	539	* Catch a fatal signal and tidy up before quitting
543	*/	540	*/
544	void	541	void
545	sig_term (sig_watcher &w)	542	sig_term (sig_watcher &w)
546	{	543	{
547	#ifdef DEBUG_CMD
548	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
549	#endif
550	rxvt_emergency_cleanup ();	544	rxvt_emergency_cleanup ();
551	signal (w.signum, SIG_DFL);	545	signal (w.signum, SIG_DFL);
552	kill (getpid (), w.signum);	546	kill (getpid (), w.signum);
553	}	547	}
554		548
555	sig_handlers ()	549	sig_handlers ()
556	: sw_chld (this, &sig_handlers::sig_chld),
557	sw_term (this, &sig_handlers::sig_term),	550	: sw_term (this, &sig_handlers::sig_term),
558	sw_int (this, &sig_handlers::sig_term)	551	sw_int (this, &sig_handlers::sig_term)
559	{	552	{
560	}	553	}
561	} sig_handlers;	554	} sig_handlers;
562		555
		556	char **rxvt_environ; // startup environment
		557
563	void	558	void
564	rxvt_init ()	559	rxvt_init ()
565	{	560	{
566	/*	561	ptytty::init ();
567	* Save and then give up any super-user privileges	562
568	* If we need privileges in any area then we must specifically request it.	563	rxvt_environ = environ;
569	* We should only need to be root in these cases:
570	* 1. write utmp entries on some systems
571	* 2. chown tty on some systems
572	*/
573	rxvt_privileges (SAVE);
574	rxvt_privileges (IGNORE);
575		564
576	signal (SIGHUP, SIG_IGN);	565	signal (SIGHUP, SIG_IGN);
577	signal (SIGPIPE, SIG_IGN);	566	signal (SIGPIPE, SIG_IGN);
578		567
579	sig_handlers.sw_chld.start (SIGCHLD);
580	sig_handlers.sw_term.start (SIGTERM);	568	sig_handlers.sw_term.start (SIGTERM);
581	sig_handlers.sw_int.start (SIGINT);	569	sig_handlers.sw_int.start (SIGINT);
582		570
583	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	571	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
584	/* signal (SIGURG, SIG_DFL); */	572	/* signal (SIGURG, SIG_DFL); */
585		573
586	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	574	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587	// TODO: handle this with exceptions and tolerate the memory loss	575	// TODO: handle this with exceptions and tolerate the memory loss
588	XSetIOErrorHandler (rxvt_xioerror_handler);	576	XSetIOErrorHandler (rxvt_xioerror_handler);
		577
		578	XrmInitialize ();
589	}	579	}
590		580
591	/* ------------------------------------------------------------------------- *	581	/* ------------------------------------------------------------------------- *
592	* MEMORY ALLOCATION WRAPPERS *	582	* MEMORY ALLOCATION WRAPPERS *
593	* ------------------------------------------------------------------------- */	583	* ------------------------------------------------------------------------- */
…		…
611	rxvt_fatal ("memory allocation failure. aborting.\n");	601	rxvt_fatal ("memory allocation failure. aborting.\n");
612		602
613	return p;	603	return p;
614	}	604	}
615		605
616	void *	606	void *
617	rxvt_realloc (void *ptr, size_t size)	607	rxvt_realloc (void *ptr, size_t size)
618	{	608	{
619	void *p = realloc (ptr, size);	609	void *p = realloc (ptr, size);
620		610
621	if (!p)	611	if (!p)
622	rxvt_fatal ("memory allocation failure. aborting.\n");	612	rxvt_fatal ("memory allocation failure. aborting.\n");
623		613
624	return p;	614	return p;
625	}	615	}
626
627	/* ------------------------------------------------------------------------- *
628	* PRIVILEGED OPERATIONS *
629	* ------------------------------------------------------------------------- */
630	/* take care of suid/sgid super-user (root) privileges */
631	void
632	rxvt_privileges (rxvt_privaction action)
633	{
634	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
635	static uid_t euid;
636	static gid_t egid;
637	#endif
638
639	#if ! defined(__CYGWIN32__)
640	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
641	/* setreuid () is the poor man's setuid (), seteuid () */
642	# define seteuid(a) setreuid(-1, (a))
643	# define setegid(a) setregid(-1, (a))
644	# define HAVE_SETEUID
645	# endif
646	# ifdef HAVE_SETEUID
647	switch (action)
648	{
649	case IGNORE:
650	/*
651	* change effective uid/gid - not real uid/gid - so we can switch
652	* back to root later, as required
653	*/
654	seteuid (getuid ());
655	setegid (getgid ());
656	break;
657	case SAVE:
658	euid = geteuid ();
659	egid = getegid ();
660	break;
661	case RESTORE:
662	seteuid (euid);
663	setegid (egid);
664	break;
665	}
666	# else
667	switch (action)
668	{
669	case IGNORE:
670	setuid (getuid ());
671	setgid (getgid ());
672	/* FALLTHROUGH */
673	case SAVE:
674	/* FALLTHROUGH */
675	case RESTORE:
676	break;
677	}
678	# endif
679	#endif
680	}
681
682	#ifdef UTMP_SUPPORT
683	void
684	rxvt_term::privileged_utmp (rxvt_privaction action)
685	{
686	if ((options & Opt_utmpInhibit)
687	\|\| !pty.name \|\| !*pty.name)
688	return;
689
690	rxvt_privileges (RESTORE);
691
692	if (action == SAVE)
693	makeutent (pty.name, rs[Rs_display_name]);
694	else
695	cleanutent ();
696
697	rxvt_privileges (IGNORE);
698	}
699	#endif
700		616
701	/----------------------------------------------------------------------/	617	/----------------------------------------------------------------------/
702	/*	618	/*
703	* window size/position calculcations for XSizeHint and other storage.	619	* window size/position calculcations for XSizeHint and other storage.
704	* if width/height are non-zero then override calculated width/height	620	* if width/height are non-zero then override calculated width/height
705	*/	621	*/
706	void	622	void
707	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	623	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
708	{	624	{
709	short recalc_x, recalc_y;	625	short recalc_x, recalc_y;
710	int x, y, sb_w, mb_h, flags;	626	int x, y, sb_w, flags;
711	unsigned int w, h;	627	unsigned int w, h;
712	unsigned int max_width, max_height;	628	unsigned int max_width, max_height;
713	dDisp;	629	dDisp;
714
715	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
716	ncol, nrow, szHint.width, szHint.height));
717		630
718	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	631	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
719	szHint.win_gravity = NorthWestGravity;	632	szHint.win_gravity = NorthWestGravity;
720	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	633	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
721		634
…		…
776	max_width = MAX_COLS * fwidth;	689	max_width = MAX_COLS * fwidth;
777	max_height = MAX_ROWS * fheight;	690	max_height = MAX_ROWS * fheight;
778		691
779	szHint.base_width = szHint.base_height = 2 * int_bwidth;	692	szHint.base_width = szHint.base_height = 2 * int_bwidth;
780		693
781	sb_w = mb_h = 0;	694	sb_w = 0;
782	window_vt_x = window_vt_y = int_bwidth;	695	window_vt_x = window_vt_y = int_bwidth;
783		696
784	if (scrollbar_visible ())	697	if (scrollBar.state)
785	{	698	{
786	sb_w = scrollbar_TotalWidth ();	699	sb_w = scrollbar_TotalWidth ();
787	szHint.base_width += sb_w;	700	szHint.base_width += sb_w;
788	if (!(options & Opt_scrollBar_right))	701	if (!OPTION (Opt_scrollBar_right))
789	window_vt_x += sb_w;	702	window_vt_x += sb_w;
790	}
791
792	if (menubar_visible ())
793	{
794	mb_h = menuBar_TotalHeight ();
795	szHint.base_height += mb_h;
796	window_vt_y += mb_h;
797	}	703	}
798		704
799	szHint.width_inc = fwidth;	705	szHint.width_inc = fwidth;
800	szHint.height_inc = fheight;	706	szHint.height_inc = fheight;
801	szHint.min_width = szHint.base_width + szHint.width_inc;	707	szHint.min_width = szHint.base_width + szHint.width_inc;
…		…
821	{	727	{
822	min_it (height, max_height);	728	min_it (height, max_height);
823	szHint.height = szHint.base_height + height;	729	szHint.height = szHint.base_height + height;
824	}	730	}
825		731
826	if (scrollbar_visible () && (options & Opt_scrollBar_right))	732	if (scrollBar.state && OPTION (Opt_scrollBar_right))
827	window_sb_x = szHint.width - sb_w;	733	window_sb_x = szHint.width - sb_w;
828		734
829	if (recalc_x)	735	if (recalc_x)
830	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	736	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
831	if (recalc_y)	737	if (recalc_y)
832	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	738	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
833		739
834	ncol = width / fwidth;	740	ncol = width / fwidth;
835	nrow = height / fheight;	741	nrow = height / fheight;
836	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
837	ncol, nrow, szHint.width,
838	szHint.height));
839	return;
840	}	742	}
841		743
842	/----------------------------------------------------------------------/	744	/----------------------------------------------------------------------/
843	/*	745	/*
844	* Tell the teletype handler what size the window is.	746	* Tell the teletype handler what size the window is.
845	* Called after a window size change.	747	* Called after a window size change.
846	*/	748	*/
847	void	749	void
848	rxvt_term::tt_winch ()	750	rxvt_term::tt_winch ()
849	{	751	{
850	if (pty.pty < 0)	752	if (pty->pty < 0)
851	return;	753	return;
852		754
853	struct winsize ws;	755	struct winsize ws;
854		756
855	ws.ws_col = ncol;	757	ws.ws_col = ncol;
856	ws.ws_row = nrow;	758	ws.ws_row = nrow;
857	ws.ws_xpixel = width;	759	ws.ws_xpixel = width;
858	ws.ws_ypixel = height;	760	ws.ws_ypixel = height;
859	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	761	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
860		762
861	#if 0	763	#if 0
862	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	764	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
863	if (cmd_pid) /* force through to the command */	765	if (cmd_pid) /* force through to the command */
864	kill (-cmd_pid, SIGWINCH);	766	kill (-cmd_pid, SIGWINCH);
…		…
900	prop.height += lineSpace;	802	prop.height += lineSpace;
901	fs->set_prop (prop);	803	fs->set_prop (prop);
902		804
903	fwidth = prop.width;	805	fwidth = prop.width;
904	fheight = prop.height;	806	fheight = prop.height;
905	fbase = (*fs)[1]->ascent;	807	fbase = prop.ascent;
906		808
907	for (int style = 1; style < 4; style++)	809	for (int style = 1; style < 4; style++)
908	{	810	{
909	#if ENABLE_STYLES	811	#if ENABLE_STYLES
910	const char *res = rs[Rs_font + style];	812	const char *res = rs[Rs_font + style];
…		…
944	return true;	846	return true;
945	}	847	}
946		848
947	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	849	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
948	{	850	{
949	// TODO: SMART_WINDOW_TITLE
950	XChangeProperty (display->display, parent[0],	851	XChangeProperty (display->display, parent[0],
951	prop, XA_STRING, 8, PropModeReplace,	852	prop, XA_STRING, 8, PropModeReplace,
952	(const unsigned char *)str, len >= 0 ? len : strlen (str));	853	(const unsigned char *)str, len >= 0 ? len : strlen (str));
953	}	854	}
954		855
955	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	856	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
956	{	857	{
957	// TODO: SMART_WINDOW_TITLE
958	wchar_t *ws = rxvt_mbstowcs (str, len);	858	wchar_t *ws = rxvt_mbstowcs (str, len);
959	char *s = rxvt_wcstoutf8 (ws);	859	char *s = rxvt_wcstoutf8 (ws);
960		860
961	XChangeProperty (display->display, parent[0],	861	XChangeProperty (display->display, parent[0],
962	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	862	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
…		…
1003	i = atoi (color);	903	i = atoi (color);
1004		904
1005	if (i >= 8 && i <= 15)	905	if (i >= 8 && i <= 15)
1006	{ /* bright colors */	906	{ /* bright colors */
1007	i -= 8;	907	i -= 8;
1008	# ifndef NO_BRIGHTCOLOR
1009	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	908	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1010	SET_PIXCOLOR (idx);	909	SET_PIXCOLOR (idx);
1011	goto done;	910	goto done;
1012	# endif
1013	}	911	}
1014		912
1015	if (i >= 0 && i <= 7)	913	if (i >= 0 && i <= 7)
1016	{ /* normal colors */	914	{ /* normal colors */
1017	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	915	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1132	* -------------------------------------------------------------------- */	1030	* -------------------------------------------------------------------- */
1133	void	1031	void
1134	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)
1135	{	1033	{
1136	int fix_screen;	1034	int fix_screen;
1137	int old_width = szHint.width, old_height = szHint.height;	1035	int old_width = szHint.width;
		1036	int old_height = szHint.height;
1138	dDisp;	1037	dDisp;
1139		1038
1140	window_calc (newwidth, newheight);	1039	window_calc (newwidth, newheight);
1141	XSetWMNormalHints (disp, parent[0], &szHint);	1040	XSetWMNormalHints (disp, parent[0], &szHint);
1142		1041
…		…
1164	{	1063	{
1165	x -= x1;	1064	x -= x1;
1166	y -= y1;	1065	y -= y1;
1167	}	1066	}
1168		1067
1169	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1068	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1170	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1069	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1171	dx = old_width - szHint.width;	1070	dx = old_width - szHint.width;
1172	dy = old_height - szHint.height;	1071	dy = old_height - szHint.height;
1173		1072
1174	/* Check position of the center of the window */	1073	/* Check position of the center of the window */
1175	if (x < x1) /* left half */	1074	if (x < x1) /* left half */
1176	dx = 0;	1075	dx = 0;
…		…
1190		1089
1191	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1090	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1192		1091
1193	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1092	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1194	{	1093	{
1195	if (scrollbar_visible ())	1094	if (scrollBar.state)
1196	{	1095	{
1197	XMoveResizeWindow (disp, scrollBar.win,	1096	XMoveResizeWindow (disp, scrollBar.win,
1198	window_sb_x, 0,	1097	window_sb_x, 0,
1199	scrollbar_TotalWidth (), szHint.height);	1098	scrollbar_TotalWidth (), szHint.height);
1200	resize_scrollbar ();	1099	resize_scrollbar ();
1201	}	1100	}
1202		1101
1203	if (menubar_visible ())
1204	XMoveResizeWindow (disp, menuBar.win,
1205	window_vt_x, 0,
1206	TermWin_TotalWidth (), menuBar_TotalHeight ());
1207
1208	XMoveResizeWindow (disp, vt,	1102	XMoveResizeWindow (disp, vt,
1209	window_vt_x, window_vt_y,	1103	window_vt_x, window_vt_y,
1210	TermWin_TotalWidth (), TermWin_TotalHeight ());	1104	width, height);
1211		1105
1212	scr_clear ();	1106	scr_clear ();
1213	#ifdef XPM_BACKGROUND	1107	#ifdef XPM_BACKGROUND
1214	resize_pixmap ();	1108	resize_pixmap ();
1215	#endif	1109	#endif
1216	}	1110	}
1217		1111
1218	if (fix_screen \|\| old_height == 0)	1112	if (fix_screen \|\| old_height == 0)
1219	{
1220	int curr_screen = -1;
1221	int old_ncol = prev_ncol;
1222
1223	/* scr_reset only works on the primary screen */
1224	if (old_height) /* this is not the first time through */
1225	{
1226	unsigned int ocol = ncol;
1227	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1228	curr_screen = scr_change_screen (PRIMARY);
1229	ncol = ocol;
1230	}
1231
1232	scr_reset ();	1113	scr_reset ();
1233
1234	if (curr_screen >= 0) /* this is not the first time through */
1235	{
1236	scr_change_screen (curr_screen);
1237	selection_check (old_ncol != ncol ? 4 : 0);
1238	}
1239	}
1240
1241	old_width = szHint.width;
1242	old_height = szHint.height;
1243		1114
1244	#ifdef XPM_BACKGROUND	1115	#ifdef XPM_BACKGROUND
1245	if (pixmap)	1116	if (pixmap)
1246	scr_touch (false);	1117	scr_touch (false);
1247	#endif	1118	#endif
…		…
1350	XPoint nspot;	1221	XPoint nspot;
1351	XVaNestedList preedit_attr;	1222	XVaNestedList preedit_attr;
1352		1223
1353	if (!Input_Context	1224	if (!Input_Context
1354	\|\| !focus	1225	\|\| !focus
1355	\|\| !(input_style & XIMPreeditPosition))	1226	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1356	return;	1227	return;
1357		1228
1358	im_set_position (nspot);	1229	im_set_position (nspot);
1359		1230
1360	if (nspot.x == spot.x && nspot.y == spot.y)	1231	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1379	input_method = 0;	1250	input_method = 0;
1380	}	1251	}
1381		1252
1382	Input_Context = 0;	1253	Input_Context = 0;
1383	}	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
1384		1329
1385	/*	1330	/*
1386	* 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
1387	* open a suitable preedit type	1332	* open a suitable preedit type
1388	*/	1333	*/
…		…
1395	XRectangle rect, status_rect, needed_rect;	1340	XRectangle rect, status_rect, needed_rect;
1396	unsigned long fg, bg;	1341	unsigned long fg, bg;
1397	const char *p;	1342	const char *p;
1398	char **s;	1343	char **s;
1399	XIMStyles *xim_styles;	1344	XIMStyles *xim_styles;
		1345	#ifdef ENABLE_XIM_ONTHESPOT
		1346	XIMCallback xcb[4];
		1347	#endif
		1348
		1349	set_environ (envv);
1400		1350
1401	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1351	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1402	return false;	1352	return false;
1403		1353
1404	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1405	input_method = display->get_xim (locale, modifiers);	1354	input_method = display->get_xim (locale, modifiers);
1406	if (input_method == NULL)	1355	if (input_method == NULL)
1407	return false;	1356	return false;
1408		1357
1409	xim = input_method->xim;	1358	xim = input_method->xim;
…		…
1429	s = rxvt_splitcommastring (p);	1378	s = rxvt_splitcommastring (p);
1430		1379
1431	for (i = found = 0; !found && s[i]; i++)	1380	for (i = found = 0; !found && s[i]; i++)
1432	{	1381	{
1433	if (!strcmp (s[i], "OverTheSpot"))	1382	if (!strcmp (s[i], "OverTheSpot"))
1434	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1383	input_style = XIMPreeditPosition \| XIMStatusNothing;
1435	else if (!strcmp (s[i], "OffTheSpot"))	1384	else if (!strcmp (s[i], "OffTheSpot"))
1436	input_style = (XIMPreeditArea \| XIMStatusArea);	1385	input_style = XIMPreeditArea \| XIMStatusArea;
1437	else if (!strcmp (s[i], "Root"))	1386	else if (!strcmp (s[i], "Root"))
1438	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1387	input_style = XIMPreeditNothing \| XIMStatusNothing;
1439	else if (!strcmp (s[i], "None"))	1388	else if (!strcmp (s[i], "None"))
1440	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;
1441		1396
1442	for (j = 0; j < xim_styles->count_styles; j++)	1397	for (j = 0; j < xim_styles->count_styles; j++)
1443	if (input_style == xim_styles->supported_styles[j])	1398	if (input_style == xim_styles->supported_styles[j])
1444	{	1399	{
1445	rxvt_freecommastring (s);	1400	rxvt_freecommastring (s);
…		…
1534	XNBackground, bg,	1489	XNBackground, bg,
1535	XNArea, &status_rect,	1490	XNArea, &status_rect,
1536	XNFontSet, fs,	1491	XNFontSet, fs,
1537	NULL);	1492	NULL);
1538	}	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	}
1539		1515
1540	Input_Context = XCreateIC (xim,	1516	Input_Context = XCreateIC (xim,
1541	XNInputStyle, input_style,	1517	XNInputStyle, input_style,
1542	XNClientWindow, vt,	1518	XNClientWindow, vt,
1543	XNFocusWindow, parent[0],	1519	XNFocusWindow, parent[0],
…		…
1555	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1531	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1556	im_destroy ();	1532	im_destroy ();
1557	return false;	1533	return false;
1558	}	1534	}
1559		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
1560	if (input_style & XIMPreeditArea)	1542	if (input_style & XIMPreeditArea)
1561	IMSetStatusPosition ();	1543	IMSetStatusPosition ();
1562		1544
1563	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1564	return true;	1545	return true;
1565	}	1546	}
1566		1547
1567	void	1548	void
1568	rxvt_term::im_cb ()	1549	rxvt_term::im_cb ()
…		…
1570	int i;	1551	int i;
1571	const char *p;	1552	const char *p;
1572	char **s;	1553	char **s;
1573	char buf[IMBUFSIZ];	1554	char buf[IMBUFSIZ];
1574		1555
1575	SET_R (this);	1556	make_current ();
1576		1557
1577	im_destroy ();	1558	im_destroy ();
1578		1559
1579	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1580	if (Input_Context)	1560	if (Input_Context)
1581	return;	1561	return;
1582		1562
1583	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1563	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1584	if (rs[Rs_imLocale])	1564	if (rs[Rs_imLocale])
…		…
1657	XFree (preedit_attr);	1637	XFree (preedit_attr);
1658	XFree (status_attr);	1638	XFree (status_attr);
1659	}	1639	}
1660	#endif /* USE_XIM */	1640	#endif /* USE_XIM */
1661		1641
1662	/----------------------------------------------------------------------/
1663	rxvt_t rxvt_current_term;
1664
1665	/----------------------- 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.152 by root, Thu Dec 22 16:44:10 2005 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.152 by root, Thu Dec 22 16:44:10 2005 UTC vs.
Revision 1.203 by root, Wed Jan 25 02:42:06 2006 UTC