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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.151 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.193 by root, Sat Jan 21 14:25:05 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
		294	rxvt_term::child_cb (child_watcher &w, int status)
		295	{
		296	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		297
		298	cmd_pid = 0;
		299
		300	if (!OPTION (Opt_hold))
		301	destroy ();
		302	}
		303
293	void	304	void
294	rxvt_term::destroy ()	305	rxvt_term::destroy ()
295	{	306	{
296	if (destroy_ev.active)	307	if (destroy_ev.active)
297	return;	308	return;
298		309
		310	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
		311	return;
		312
299	#if ENABLE_OVERLAY	313	#if ENABLE_OVERLAY
300	scr_overlay_off ();	314	scr_overlay_off ();
301	#endif	315	#endif
302		316
303	if (display)	317	if (display)
…		…
305	#if USE_XIM	319	#if USE_XIM
306	im_ev.stop (display);	320	im_ev.stop (display);
307	#endif	321	#endif
308	#if HAVE_SCROLLBARS	322	#if HAVE_SCROLLBARS
309	scrollbar_ev.stop (display);	323	scrollbar_ev.stop (display);
310	#endif
311	#if MENUBAR
312	menubar_ev.stop (display);
313	#endif	324	#endif
314	#if TRANSPARENT	325	#if TRANSPARENT
315	rootwin_ev.stop (display);	326	rootwin_ev.stop (display);
316	#endif	327	#endif
317	incr_ev.stop ();	328	incr_ev.stop ();
…		…
341	}	352	}
342		353
343	void	354	void
344	rxvt_term::destroy_cb (time_watcher &w)	355	rxvt_term::destroy_cb (time_watcher &w)
345	{	356	{
346	SET_R (this);	357	make_current ();
347		358
348	delete this;	359	delete this;
349	}	360	}
350		361
351	/----------------------------------------------------------------------/	362	/----------------------------------------------------------------------/
…		…
442	/----------------------------------------------------------------------/	453	/----------------------------------------------------------------------/
443	bool	454	bool
444	rxvt_term::init (int argc, const char const argv)	455	rxvt_term::init (int argc, const char const argv)
445	{	456	{
446	SET_R (this);	457	SET_R (this);
447
448	set_locale ("");	458	set_locale ("");
		459	set_environ (envv); // few things in X do not call setlocale :(
449		460
450	if (!init_vars ())	461	if (!init_vars ())
451	return false;	462	return false;
452		463
453	init_secondary ();	464	init_secondary ();
…		…
456		467
457	#ifdef KEYSYM_RESOURCE	468	#ifdef KEYSYM_RESOURCE
458	keyboard->register_done ();	469	keyboard->register_done ();
459	#endif	470	#endif
460		471
461	#if MENUBAR_MAX
462	menubar_read (rs[Rs_menu]);
463	#endif
464	#ifdef HAVE_SCROLLBARS	472	#ifdef HAVE_SCROLLBARS
465	if (options & Opt_scrollBar)	473	if (OPTION (Opt_scrollBar))
466	scrollBar.setIdle (); /* set existence for size calculations */	474	scrollBar.setIdle (); /* set existence for size calculations */
467	#endif	475	#endif
468		476
		477	pty = rxvt_new_ptytty ();
		478
469	create_windows (argc, argv);	479	create_windows (argc, argv);
470		480
471	dDisp;	481	dDisp;
472		482
473	init_xlocale ();	483	init_xlocale ();
474		484
475	scr_reset (); /* initialize screen */	485	scr_reset (); // initialize screen
476		486
477	#if 0	487	#if 0
478	XSynchronize (disp, True);	488	XSynchronize (disp, True);
479	#endif	489	#endif
480		490
481	#ifdef HAVE_SCROLLBARS	491	#ifdef HAVE_SCROLLBARS
482	if (options & Opt_scrollBar)	492	if (OPTION (Opt_scrollBar))
483	resize_scrollbar (); /* create and map scrollbar */	493	resize_scrollbar (); /* create and map scrollbar */
484	#endif	494	#endif
485	#if (MENUBAR_MAX)
486	if (menubar_visible ())
487	XMapWindow (disp, menuBar.win);
488	#endif
489	#ifdef TRANSPARENT	495	#ifdef TRANSPARENT
490	if (options & Opt_transparent)	496	if (OPTION (Opt_transparent))
491	{	497	{
492	XSelectInput (disp, display->root, PropertyChangeMask);	498	XSelectInput (disp, display->root, PropertyChangeMask);
493	check_our_parents ();	499	check_our_parents ();
494	rootwin_ev.start (display, display->root);	500	rootwin_ev.start (display, display->root);
495	}	501	}
496	#endif	502	#endif
497		503
		504	set_colorfgbg ();
		505
		506	init_command (cmd_argv);
		507
		508	free (cmd_argv);
		509
		510	if (pty->pty >= 0)
		511	pty_ev.start (pty->pty, EVENT_READ);
		512
		513	check_ev.start ();
		514
		515	HOOK_INVOKE ((this, HOOK_START, DT_END));
		516
498	XMapWindow (disp, vt);	517	XMapWindow (disp, vt);
499	XMapWindow (disp, parent[0]);	518	XMapWindow (disp, parent[0]);
500		519
501	set_colorfgbg ();
502
503	init_command (cmd_argv);
504
505	free (cmd_argv);
506
507	pty_ev.start (pty.pty, EVENT_READ);
508
509	check_ev.start ();
510
511	return true;	520	return true;
512	}	521	}
513		522
514	static struct sig_handlers	523	static struct sig_handlers
515	{	524	{
516	sig_watcher sw_chld, sw_term, sw_int;	525	sig_watcher sw_term, sw_int;
517		526
518	void sig_chld (sig_watcher &w)
519	{
520	// we are being called for every SIGCHLD, find the corresponding term
521	int pid;
522
523	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
524	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
525	if (pid == (*t)->cmd_pid)
526	{
527	(*t)->destroy ();
528	break;
529	}
530	}
531
532	/*	527	/*
533	* Catch a fatal signal and tidy up before quitting	528	* Catch a fatal signal and tidy up before quitting
534	*/	529	*/
535	void	530	void
536	sig_term (sig_watcher &w)	531	sig_term (sig_watcher &w)
…		…
542	signal (w.signum, SIG_DFL);	537	signal (w.signum, SIG_DFL);
543	kill (getpid (), w.signum);	538	kill (getpid (), w.signum);
544	}	539	}
545		540
546	sig_handlers ()	541	sig_handlers ()
547	: sw_chld (this, &sig_handlers::sig_chld),
548	sw_term (this, &sig_handlers::sig_term),	542	: sw_term (this, &sig_handlers::sig_term),
549	sw_int (this, &sig_handlers::sig_term)	543	sw_int (this, &sig_handlers::sig_term)
550	{	544	{
551	}	545	}
552	} sig_handlers;	546	} sig_handlers;
553		547
		548	char **rxvt_environ; // startup environment
		549
554	void	550	void
555	rxvt_init ()	551	rxvt_init ()
556	{	552	{
557	/*	553	uid_t uid = getuid ();
558	* Save and then give up any super-user privileges	554	gid_t gid = getgid ();
559	* If we need privileges in any area then we must specifically request it.	555
560	* We should only need to be root in these cases:	556	// before doing anything else, check for setuid/setgid operation,
561	* 1. write utmp entries on some systems	557	// start the helper process and drop privileges
562	* 2. chown tty on some systems	558	if (uid != geteuid ()
563	*/	559	\|\| gid != getegid ())
564	rxvt_privileges (SAVE);	560	{
565	rxvt_privileges (IGNORE);	561	#if PTYTTY_HELPER
		562	rxvt_ptytty_server ();
		563	#else
		564	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
		565	#endif
		566
		567	// drop privileges
		568	#if HAVE_SETRESUID
		569	setresgid (gid, gid, gid);
		570	setresuid (uid, uid, uid);
		571	#elif HAVE_SETREUID
		572	setregid (gid, gid);
		573	setreuid (uid, uid);
		574	#elif HAVE_SETUID
		575	setgid (gid);
		576	setuid (uid);
		577	#endif
		578
		579	if (uid != geteuid ()
		580	\|\| gid != getegid ())
		581	rxvt_fatal ("unable to drop privileges, aborting.\n");
		582	}
		583
		584	rxvt_environ = environ;
566		585
567	signal (SIGHUP, SIG_IGN);	586	signal (SIGHUP, SIG_IGN);
568	signal (SIGPIPE, SIG_IGN);	587	signal (SIGPIPE, SIG_IGN);
569		588
570	sig_handlers.sw_chld.start (SIGCHLD);
571	sig_handlers.sw_term.start (SIGTERM);	589	sig_handlers.sw_term.start (SIGTERM);
572	sig_handlers.sw_int.start (SIGINT);	590	sig_handlers.sw_int.start (SIGINT);
573		591
574	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	592	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
575	/* signal (SIGURG, SIG_DFL); */	593	/* signal (SIGURG, SIG_DFL); */
576		594
577	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	595	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
578	// TODO: handle this with exceptions and tolerate the memory loss	596	// TODO: handle this with exceptions and tolerate the memory loss
579	XSetIOErrorHandler (rxvt_xioerror_handler);	597	XSetIOErrorHandler (rxvt_xioerror_handler);
		598
		599	XrmInitialize ();
580	}	600	}
581		601
582	/* ------------------------------------------------------------------------- *	602	/* ------------------------------------------------------------------------- *
583	* MEMORY ALLOCATION WRAPPERS *	603	* MEMORY ALLOCATION WRAPPERS *
584	* ------------------------------------------------------------------------- */	604	* ------------------------------------------------------------------------- */
…		…
602	rxvt_fatal ("memory allocation failure. aborting.\n");	622	rxvt_fatal ("memory allocation failure. aborting.\n");
603		623
604	return p;	624	return p;
605	}	625	}
606		626
607	void *	627	void *
608	rxvt_realloc (void *ptr, size_t size)	628	rxvt_realloc (void *ptr, size_t size)
609	{	629	{
610	void *p = realloc (ptr, size);	630	void *p = realloc (ptr, size);
611		631
612	if (!p)	632	if (!p)
613	rxvt_fatal ("memory allocation failure. aborting.\n");	633	rxvt_fatal ("memory allocation failure. aborting.\n");
614		634
615	return p;	635	return p;
616	}	636	}
617
618	/* ------------------------------------------------------------------------- *
619	* PRIVILEGED OPERATIONS *
620	* ------------------------------------------------------------------------- */
621	/* take care of suid/sgid super-user (root) privileges */
622	void
623	rxvt_privileges (rxvt_privaction action)
624	{
625	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
626	static uid_t euid;
627	static gid_t egid;
628	#endif
629
630	#if ! defined(__CYGWIN32__)
631	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
632	/* setreuid () is the poor man's setuid (), seteuid () */
633	# define seteuid(a) setreuid(-1, (a))
634	# define setegid(a) setregid(-1, (a))
635	# define HAVE_SETEUID
636	# endif
637	# ifdef HAVE_SETEUID
638	switch (action)
639	{
640	case IGNORE:
641	/*
642	* change effective uid/gid - not real uid/gid - so we can switch
643	* back to root later, as required
644	*/
645	seteuid (getuid ());
646	setegid (getgid ());
647	break;
648	case SAVE:
649	euid = geteuid ();
650	egid = getegid ();
651	break;
652	case RESTORE:
653	seteuid (euid);
654	setegid (egid);
655	break;
656	}
657	# else
658	switch (action)
659	{
660	case IGNORE:
661	setuid (getuid ());
662	setgid (getgid ());
663	/* FALLTHROUGH */
664	case SAVE:
665	/* FALLTHROUGH */
666	case RESTORE:
667	break;
668	}
669	# endif
670	#endif
671	}
672
673	#ifdef UTMP_SUPPORT
674	void
675	rxvt_term::privileged_utmp (rxvt_privaction action)
676	{
677	if ((options & Opt_utmpInhibit)
678	\|\| !pty.name \|\| !*pty.name)
679	return;
680
681	rxvt_privileges (RESTORE);
682
683	if (action == SAVE)
684	makeutent (pty.name, rs[Rs_display_name]);
685	else
686	cleanutent ();
687
688	rxvt_privileges (IGNORE);
689	}
690	#endif
691		637
692	/----------------------------------------------------------------------/	638	/----------------------------------------------------------------------/
693	/*	639	/*
694	* window size/position calculcations for XSizeHint and other storage.	640	* window size/position calculcations for XSizeHint and other storage.
695	* if width/height are non-zero then override calculated width/height	641	* if width/height are non-zero then override calculated width/height
696	*/	642	*/
697	void	643	void
698	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	644	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
699	{	645	{
700	short recalc_x, recalc_y;	646	short recalc_x, recalc_y;
701	int x, y, sb_w, mb_h, flags;	647	int x, y, sb_w, flags;
702	unsigned int w, h;	648	unsigned int w, h;
703	unsigned int max_width, max_height;	649	unsigned int max_width, max_height;
704	dDisp;	650	dDisp;
705		651
706	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	652	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
…		…
767	max_width = MAX_COLS * fwidth;	713	max_width = MAX_COLS * fwidth;
768	max_height = MAX_ROWS * fheight;	714	max_height = MAX_ROWS * fheight;
769		715
770	szHint.base_width = szHint.base_height = 2 * int_bwidth;	716	szHint.base_width = szHint.base_height = 2 * int_bwidth;
771		717
772	sb_w = mb_h = 0;	718	sb_w = 0;
773	window_vt_x = window_vt_y = int_bwidth;	719	window_vt_x = window_vt_y = int_bwidth;
774		720
775	if (scrollbar_visible ())	721	if (scrollBar.state)
776	{	722	{
777	sb_w = scrollbar_TotalWidth ();	723	sb_w = scrollbar_TotalWidth ();
778	szHint.base_width += sb_w;	724	szHint.base_width += sb_w;
779	if (!(options & Opt_scrollBar_right))	725	if (!OPTION (Opt_scrollBar_right))
780	window_vt_x += sb_w;	726	window_vt_x += sb_w;
781	}
782
783	if (menubar_visible ())
784	{
785	mb_h = menuBar_TotalHeight ();
786	szHint.base_height += mb_h;
787	window_vt_y += mb_h;
788	}	727	}
789		728
790	szHint.width_inc = fwidth;	729	szHint.width_inc = fwidth;
791	szHint.height_inc = fheight;	730	szHint.height_inc = fheight;
792	szHint.min_width = szHint.base_width + szHint.width_inc;	731	szHint.min_width = szHint.base_width + szHint.width_inc;
…		…
812	{	751	{
813	min_it (height, max_height);	752	min_it (height, max_height);
814	szHint.height = szHint.base_height + height;	753	szHint.height = szHint.base_height + height;
815	}	754	}
816		755
817	if (scrollbar_visible () && (options & Opt_scrollBar_right))	756	if (scrollBar.state && OPTION (Opt_scrollBar_right))
818	window_sb_x = szHint.width - sb_w;	757	window_sb_x = szHint.width - sb_w;
819		758
820	if (recalc_x)	759	if (recalc_x)
821	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	760	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
822	if (recalc_y)	761	if (recalc_y)
…		…
836	* Called after a window size change.	775	* Called after a window size change.
837	*/	776	*/
838	void	777	void
839	rxvt_term::tt_winch ()	778	rxvt_term::tt_winch ()
840	{	779	{
841	if (pty.pty < 0)	780	if (pty->pty < 0)
842	return;	781	return;
843		782
844	struct winsize ws;	783	struct winsize ws;
845		784
846	ws.ws_col = ncol;	785	ws.ws_col = ncol;
847	ws.ws_row = nrow;	786	ws.ws_row = nrow;
848	ws.ws_xpixel = width;	787	ws.ws_xpixel = width;
849	ws.ws_ypixel = height;	788	ws.ws_ypixel = height;
850	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	789	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
851		790
852	#if 0	791	#if 0
853	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	792	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
854	if (cmd_pid) /* force through to the command */	793	if (cmd_pid) /* force through to the command */
855	kill (-cmd_pid, SIGWINCH);	794	kill (-cmd_pid, SIGWINCH);
…		…
891	prop.height += lineSpace;	830	prop.height += lineSpace;
892	fs->set_prop (prop);	831	fs->set_prop (prop);
893		832
894	fwidth = prop.width;	833	fwidth = prop.width;
895	fheight = prop.height;	834	fheight = prop.height;
896	fbase = (*fs)[1]->ascent;	835	fbase = prop.ascent;
897		836
898	for (int style = 1; style < 4; style++)	837	for (int style = 1; style < 4; style++)
899	{	838	{
900	#if ENABLE_STYLES	839	#if ENABLE_STYLES
901	const char *res = rs[Rs_font + style];	840	const char *res = rs[Rs_font + style];
…		…
935	return true;	874	return true;
936	}	875	}
937		876
938	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	877	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939	{	878	{
940	// TODO: SMART_WINDOW_TITLE
941	XChangeProperty (display->display, parent[0],	879	XChangeProperty (display->display, parent[0],
942	prop, XA_STRING, 8, PropModeReplace,	880	prop, XA_STRING, 8, PropModeReplace,
943	(const unsigned char *)str, len >= 0 ? len : strlen (str));	881	(const unsigned char *)str, len >= 0 ? len : strlen (str));
944	}	882	}
945		883
946	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	884	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947	{	885	{
948	// TODO: SMART_WINDOW_TITLE
949	wchar_t *ws = rxvt_mbstowcs (str, len);	886	wchar_t *ws = rxvt_mbstowcs (str, len);
950	char *s = rxvt_wcstoutf8 (ws);	887	char *s = rxvt_wcstoutf8 (ws);
951		888
952	XChangeProperty (display->display, parent[0],	889	XChangeProperty (display->display, parent[0],
953	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	890	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
…		…
994	i = atoi (color);	931	i = atoi (color);
995		932
996	if (i >= 8 && i <= 15)	933	if (i >= 8 && i <= 15)
997	{ /* bright colors */	934	{ /* bright colors */
998	i -= 8;	935	i -= 8;
999	# ifndef NO_BRIGHTCOLOR
1000	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	936	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001	SET_PIXCOLOR (idx);	937	SET_PIXCOLOR (idx);
1002	goto done;	938	goto done;
1003	# endif
1004	}	939	}
1005		940
1006	if (i >= 0 && i <= 7)	941	if (i >= 0 && i <= 7)
1007	{ /* normal colors */	942	{ /* normal colors */
1008	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	943	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1181		1116
1182	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1117	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1183		1118
1184	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1119	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1185	{	1120	{
1186	if (scrollbar_visible ())	1121	if (scrollBar.state)
1187	{	1122	{
1188	XMoveResizeWindow (disp, scrollBar.win,	1123	XMoveResizeWindow (disp, scrollBar.win,
1189	window_sb_x, 0,	1124	window_sb_x, 0,
1190	scrollbar_TotalWidth (), szHint.height);	1125	scrollbar_TotalWidth (), szHint.height);
1191	resize_scrollbar ();	1126	resize_scrollbar ();
1192	}	1127	}
1193		1128
1194	if (menubar_visible ())
1195	XMoveResizeWindow (disp, menuBar.win,
1196	window_vt_x, 0,
1197	TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199	XMoveResizeWindow (disp, vt,	1129	XMoveResizeWindow (disp, vt,
1200	window_vt_x, window_vt_y,	1130	window_vt_x, window_vt_y,
1201	TermWin_TotalWidth (), TermWin_TotalHeight ());	1131	width, height);
1202		1132
1203	scr_clear ();	1133	scr_clear ();
1204	#ifdef XPM_BACKGROUND	1134	#ifdef XPM_BACKGROUND
1205	resize_pixmap ();	1135	resize_pixmap ();
1206	#endif	1136	#endif
…		…
1386	XRectangle rect, status_rect, needed_rect;	1316	XRectangle rect, status_rect, needed_rect;
1387	unsigned long fg, bg;	1317	unsigned long fg, bg;
1388	const char *p;	1318	const char *p;
1389	char **s;	1319	char **s;
1390	XIMStyles *xim_styles;	1320	XIMStyles *xim_styles;
		1321
		1322	set_environ (envv);
1391		1323
1392	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1324	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393	return false;	1325	return false;
1394		1326
1395	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1327	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1561	int i;	1493	int i;
1562	const char *p;	1494	const char *p;
1563	char **s;	1495	char **s;
1564	char buf[IMBUFSIZ];	1496	char buf[IMBUFSIZ];
1565		1497
1566	SET_R (this);	1498	make_current ();
1567		1499
1568	im_destroy ();	1500	im_destroy ();
1569		1501
1570	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1502	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571	if (Input_Context)	1503	if (Input_Context)
…		…
1648	XFree (preedit_attr);	1580	XFree (preedit_attr);
1649	XFree (status_attr);	1581	XFree (status_attr);
1650	}	1582	}
1651	#endif /* USE_XIM */	1583	#endif /* USE_XIM */
1652		1584
1653	/----------------------------------------------------------------------/
1654	rxvt_t rxvt_current_term;
1655
1656	/----------------------- end-of-file (C source) -----------------------/	1585	/----------------------- 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.151 by root, Wed Dec 21 19:50:16 2005 UTC vs. Revision 1.193 by root, Sat Jan 21 14:25:05 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.151 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.193 by root, Sat Jan 21 14:25:05 2006 UTC