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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.149 by root, Sun Dec 18 00:59:42 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"
		37
		38	#include <limits>
35		39
36	#include <csignal>	40	#include <csignal>
37	#include <cstring>	41	#include <cstring>
38		42
39	#ifdef TTY_GID_SUPPORT	43	#ifdef TTY_GID_SUPPORT
…		…
42		46
43	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
44	# include <termios.h>	48	# include <termios.h>
45	#endif	49	#endif
46		50
47	#ifdef KEYSYM_RESOURCE
48	# include "keyboard.h"
49	#endif
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];	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;
		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);
64	}	80	}
65		81
66	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
67	class rxvt_composite_vec rxvt_composite;	83	class rxvt_composite_vec rxvt_composite;
68		84
…		…
133	rootwin_ev (this, &rxvt_term::rootwin_cb),	149	rootwin_ev (this, &rxvt_term::rootwin_cb),
134	#endif	150	#endif
135	#ifdef HAVE_SCROLLBARS	151	#ifdef HAVE_SCROLLBARS
136	scrollbar_ev (this, &rxvt_term::x_cb),	152	scrollbar_ev (this, &rxvt_term::x_cb),
137	#endif	153	#endif
138	#ifdef MENUBAR
139	menubar_ev (this, &rxvt_term::x_cb),
140	#endif
141	#ifdef CURSOR_BLINK	154	#ifdef CURSOR_BLINK
142	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143	#endif	156	#endif
144	#ifdef TEXT_BLINK	157	#ifdef TEXT_BLINK
145	text_blink_ev (this, &rxvt_term::text_blink_cb),	158	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
157	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
158	#endif	171	#endif
159	#ifdef USE_XIM	172	#ifdef USE_XIM
160	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
161	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
162	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
163	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
164	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
165	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
166	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
167	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
168	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
171		188
172	termlist.push_back (this);	189	termlist.push_back (this);
173		190
174	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
175	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
176
177	if (!keyboard)
178	rxvt_fatal ("out of memory, aborting.\n");
179	#endif	193	#endif
180	}	194	}
181		195
182	// 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.
183	// for use before an emergency exit	197	// for use before an emergency exit
184	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
185	{	199	{
186	if (cmd_pid)	200	if (cmd_pid)
187	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
188		202
189	#ifdef UTMP_SUPPORT	203	delete pty; pty = 0;
190	privileged_utmp (RESTORE);
191	#endif
192
193	pty.put ();
194	}	204	}
195		205
196	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
197	{	207	{
198	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
…		…
212		222
213	selection_clear ();	223	selection_clear ();
214		224
215	#ifdef USE_XIM	225	#ifdef USE_XIM
216	im_destroy ();	226	im_destroy ();
217	#endif
218	#ifdef MENUBAR
219	if (menubarGC) XFreeGC (disp, menubarGC);
220	#endif	227	#endif
221	#ifdef XTERM_SCROLLBAR	228	#ifdef XTERM_SCROLLBAR
222	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	229	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
223	if (ShadowGC) XFreeGC (disp, ShadowGC);	230	if (ShadowGC) XFreeGC (disp, ShadowGC);
224	#endif	231	#endif
…		…
235	if (upArrow) XFreePixmap (disp, upArrow);	242	if (upArrow) XFreePixmap (disp, upArrow);
236	if (downArrow) XFreePixmap (disp, downArrow);	243	if (downArrow) XFreePixmap (disp, downArrow);
237	if (upArrowHi) XFreePixmap (disp, upArrowHi);	244	if (upArrowHi) XFreePixmap (disp, upArrowHi);
238	if (downArrowHi) XFreePixmap (disp, downArrowHi);	245	if (downArrowHi) XFreePixmap (disp, downArrowHi);
239	#endif	246	#endif
240	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	247	#ifdef RXVT_SCROLLBAR
241	if (topShadowGC) XFreeGC (disp, topShadowGC);	248	if (topShadowGC) XFreeGC (disp, topShadowGC);
242	if (botShadowGC) XFreeGC (disp, botShadowGC);	249	if (botShadowGC) XFreeGC (disp, botShadowGC);
243	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	250	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
244	#endif	251	#endif
245	if (gc) XFreeGC (disp, gc);	252	if (gc) XFreeGC (disp, gc);
246		253
247	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
248	delete menuBar.drawable;
249	//if (menuBar.win)
250	// XDestroyWindow (disp, menuBar.win);
251	#endif
252	delete drawable;	254	delete drawable;
253	// destroy all windows	255	// destroy all windows
254	if (parent[0])	256	if (parent[0])
255	XDestroyWindow (disp, parent[0]);	257	XDestroyWindow (disp, parent[0]);
256	}	258	}
257		259
258	// TODO: free pixcolours, colours should become part of rxvt_display	260	// TODO: free pixcolours, colours should become part of rxvt_display
259
260	delete pix_colors_focused;	261	delete pix_colors_focused;
261	#if OFF_FOCUS_FADING	262	#if OFF_FOCUS_FADING
262	delete pix_colors_unfocused;	263	delete pix_colors_unfocused;
263	#endif	264	#endif
264		265
…		…
286	#ifdef KEYSYM_RESOURCE	287	#ifdef KEYSYM_RESOURCE
287	delete keyboard;	288	delete keyboard;
288	#endif	289	#endif
289	}	290	}
290		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
291	void	304	void
292	rxvt_term::destroy ()	305	rxvt_term::destroy ()
293	{	306	{
294	if (destroy_ev.active)	307	if (destroy_ev.active)
295	return;	308	return;
296		309
		310	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
		311	return;
		312
297	#if ENABLE_OVERLAY	313	#if ENABLE_OVERLAY
298	scr_overlay_off ();	314	scr_overlay_off ();
299	#endif	315	#endif
300		316
301	if (display)	317	if (display)
…		…
303	#if USE_XIM	319	#if USE_XIM
304	im_ev.stop (display);	320	im_ev.stop (display);
305	#endif	321	#endif
306	#if HAVE_SCROLLBARS	322	#if HAVE_SCROLLBARS
307	scrollbar_ev.stop (display);	323	scrollbar_ev.stop (display);
308	#endif
309	#if MENUBAR
310	menubar_ev.stop (display);
311	#endif	324	#endif
312	#if TRANSPARENT	325	#if TRANSPARENT
313	rootwin_ev.stop (display);	326	rootwin_ev.stop (display);
314	#endif	327	#endif
315	incr_ev.stop ();	328	incr_ev.stop ();
…		…
339	}	352	}
340		353
341	void	354	void
342	rxvt_term::destroy_cb (time_watcher &w)	355	rxvt_term::destroy_cb (time_watcher &w)
343	{	356	{
344	SET_R (this);	357	make_current ();
345		358
346	delete this;	359	delete this;
347	}	360	}
348		361
349	/----------------------------------------------------------------------/	362	/----------------------------------------------------------------------/
…		…
440	/----------------------------------------------------------------------/	453	/----------------------------------------------------------------------/
441	bool	454	bool
442	rxvt_term::init (int argc, const char const argv)	455	rxvt_term::init (int argc, const char const argv)
443	{	456	{
444	SET_R (this);	457	SET_R (this);
445
446	set_locale ("");	458	set_locale ("");
		459	set_environ (envv); // few things in X do not call setlocale :(
447		460
448	if (!init_vars ())	461	if (!init_vars ())
449	return false;	462	return false;
450		463
451	init_secondary ();	464	init_secondary ();
…		…
454		467
455	#ifdef KEYSYM_RESOURCE	468	#ifdef KEYSYM_RESOURCE
456	keyboard->register_done ();	469	keyboard->register_done ();
457	#endif	470	#endif
458		471
459	#if MENUBAR_MAX
460	menubar_read (rs[Rs_menu]);
461	#endif
462	#ifdef HAVE_SCROLLBARS	472	#ifdef HAVE_SCROLLBARS
463	if (options & Opt_scrollBar)	473	if (OPTION (Opt_scrollBar))
464	scrollBar.setIdle (); /* set existence for size calculations */	474	scrollBar.setIdle (); /* set existence for size calculations */
465	#endif	475	#endif
466		476
		477	pty = rxvt_new_ptytty ();
		478
467	create_windows (argc, argv);	479	create_windows (argc, argv);
468		480
469	dDisp;	481	dDisp;
470		482
471	init_xlocale ();	483	init_xlocale ();
472		484
473	scr_reset (); /* initialize screen */	485	scr_reset (); // initialize screen
474		486
475	#if 0	487	#if 0
476	XSynchronize (disp, True);	488	XSynchronize (disp, True);
477	#endif	489	#endif
478		490
479	#ifdef HAVE_SCROLLBARS	491	#ifdef HAVE_SCROLLBARS
480	if (options & Opt_scrollBar)	492	if (OPTION (Opt_scrollBar))
481	resize_scrollbar (); /* create and map scrollbar */	493	resize_scrollbar (); /* create and map scrollbar */
482	#endif	494	#endif
483	#if (MENUBAR_MAX)
484	if (menubar_visible ())
485	XMapWindow (disp, menuBar.win);
486	#endif
487	#ifdef TRANSPARENT	495	#ifdef TRANSPARENT
488	if (options & Opt_transparent)	496	if (OPTION (Opt_transparent))
489	{	497	{
490	XSelectInput (disp, display->root, PropertyChangeMask);	498	XSelectInput (disp, display->root, PropertyChangeMask);
491	check_our_parents ();	499	check_our_parents ();
492	rootwin_ev.start (display, display->root);	500	rootwin_ev.start (display, display->root);
493	}	501	}
494	#endif	502	#endif
495		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
496	XMapWindow (disp, vt);	517	XMapWindow (disp, vt);
497	XMapWindow (disp, parent[0]);	518	XMapWindow (disp, parent[0]);
498		519
499	set_colorfgbg ();
500
501	init_command (cmd_argv);
502
503	free (cmd_argv);
504
505	pty_ev.start (pty.pty, EVENT_READ);
506
507	check_ev.start ();
508
509	return true;	520	return true;
510	}	521	}
511		522
512	static struct sig_handlers	523	static struct sig_handlers
513	{	524	{
514	sig_watcher sw_chld, sw_term, sw_int;	525	sig_watcher sw_term, sw_int;
515		526
516	void sig_chld (sig_watcher &w)
517	{
518	// we are being called for every SIGCHLD, find the corresponding term
519	int pid;
520
521	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523	if (pid == (*t)->cmd_pid)
524	{
525	(*t)->destroy ();
526	break;
527	}
528	}
529
530	/*	527	/*
531	* Catch a fatal signal and tidy up before quitting	528	* Catch a fatal signal and tidy up before quitting
532	*/	529	*/
533	void	530	void
534	sig_term (sig_watcher &w)	531	sig_term (sig_watcher &w)
…		…
540	signal (w.signum, SIG_DFL);	537	signal (w.signum, SIG_DFL);
541	kill (getpid (), w.signum);	538	kill (getpid (), w.signum);
542	}	539	}
543		540
544	sig_handlers ()	541	sig_handlers ()
545	: sw_chld (this, &sig_handlers::sig_chld),
546	sw_term (this, &sig_handlers::sig_term),	542	: sw_term (this, &sig_handlers::sig_term),
547	sw_int (this, &sig_handlers::sig_term)	543	sw_int (this, &sig_handlers::sig_term)
548	{	544	{
549	}	545	}
550	} sig_handlers;	546	} sig_handlers;
551		547
		548	char **rxvt_environ; // startup environment
		549
552	void	550	void
553	rxvt_init ()	551	rxvt_init ()
554	{	552	{
555	/*	553	uid_t uid = getuid ();
556	* Save and then give up any super-user privileges	554	gid_t gid = getgid ();
557	* If we need privileges in any area then we must specifically request it.	555
558	* We should only need to be root in these cases:	556	// before doing anything else, check for setuid/setgid operation,
559	* 1. write utmp entries on some systems	557	// start the helper process and drop privileges
560	* 2. chown tty on some systems	558	if (uid != geteuid ()
561	*/	559	\|\| gid != getegid ())
562	rxvt_privileges (SAVE);	560	{
563	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;
564		585
565	signal (SIGHUP, SIG_IGN);	586	signal (SIGHUP, SIG_IGN);
566	signal (SIGPIPE, SIG_IGN);	587	signal (SIGPIPE, SIG_IGN);
567		588
568	sig_handlers.sw_chld.start (SIGCHLD);
569	sig_handlers.sw_term.start (SIGTERM);	589	sig_handlers.sw_term.start (SIGTERM);
570	sig_handlers.sw_int.start (SIGINT);	590	sig_handlers.sw_int.start (SIGINT);
571		591
572	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	592	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
573	/* signal (SIGURG, SIG_DFL); */	593	/* signal (SIGURG, SIG_DFL); */
574		594
575	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	595	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576	// TODO: handle this with exceptions and tolerate the memory loss	596	// TODO: handle this with exceptions and tolerate the memory loss
577	XSetIOErrorHandler (rxvt_xioerror_handler);	597	XSetIOErrorHandler (rxvt_xioerror_handler);
		598
		599	XrmInitialize ();
578	}	600	}
579		601
580	/* ------------------------------------------------------------------------- *	602	/* ------------------------------------------------------------------------- *
581	* MEMORY ALLOCATION WRAPPERS *	603	* MEMORY ALLOCATION WRAPPERS *
582	* ------------------------------------------------------------------------- */	604	* ------------------------------------------------------------------------- */
…		…
600	rxvt_fatal ("memory allocation failure. aborting.\n");	622	rxvt_fatal ("memory allocation failure. aborting.\n");
601		623
602	return p;	624	return p;
603	}	625	}
604		626
605	void *	627	void *
606	rxvt_realloc (void *ptr, size_t size)	628	rxvt_realloc (void *ptr, size_t size)
607	{	629	{
608	void *p = realloc (ptr, size);	630	void *p = realloc (ptr, size);
609		631
610	if (!p)	632	if (!p)
611	rxvt_fatal ("memory allocation failure. aborting.\n");	633	rxvt_fatal ("memory allocation failure. aborting.\n");
612		634
613	return p;	635	return p;
614	}	636	}
615
616	/* ------------------------------------------------------------------------- *
617	* PRIVILEGED OPERATIONS *
618	* ------------------------------------------------------------------------- */
619	/* take care of suid/sgid super-user (root) privileges */
620	void
621	rxvt_privileges (rxvt_privaction action)
622	{
623	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
624	static uid_t euid;
625	static gid_t egid;
626	#endif
627
628	#if ! defined(__CYGWIN32__)
629	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630	/* setreuid () is the poor man's setuid (), seteuid () */
631	# define seteuid(a) setreuid(-1, (a))
632	# define setegid(a) setregid(-1, (a))
633	# define HAVE_SETEUID
634	# endif
635	# ifdef HAVE_SETEUID
636	switch (action)
637	{
638	case IGNORE:
639	/*
640	* change effective uid/gid - not real uid/gid - so we can switch
641	* back to root later, as required
642	*/
643	seteuid (getuid ());
644	setegid (getgid ());
645	break;
646	case SAVE:
647	euid = geteuid ();
648	egid = getegid ();
649	break;
650	case RESTORE:
651	seteuid (euid);
652	setegid (egid);
653	break;
654	}
655	# else
656	switch (action)
657	{
658	case IGNORE:
659	setuid (getuid ());
660	setgid (getgid ());
661	/* FALLTHROUGH */
662	case SAVE:
663	/* FALLTHROUGH */
664	case RESTORE:
665	break;
666	}
667	# endif
668	#endif
669	}
670
671	#ifdef UTMP_SUPPORT
672	void
673	rxvt_term::privileged_utmp (rxvt_privaction action)
674	{
675	if ((options & Opt_utmpInhibit)
676	\|\| !pty.name \|\| !*pty.name)
677	return;
678
679	rxvt_privileges (RESTORE);
680
681	if (action == SAVE)
682	makeutent (pty.name, rs[Rs_display_name]);
683	else
684	cleanutent ();
685
686	rxvt_privileges (IGNORE);
687	}
688	#endif
689		637
690	/----------------------------------------------------------------------/	638	/----------------------------------------------------------------------/
691	/*	639	/*
692	* window size/position calculcations for XSizeHint and other storage.	640	* window size/position calculcations for XSizeHint and other storage.
693	* if width/height are non-zero then override calculated width/height	641	* if width/height are non-zero then override calculated width/height
694	*/	642	*/
695	void	643	void
696	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	644	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697	{	645	{
698	short recalc_x, recalc_y;	646	short recalc_x, recalc_y;
699	int x, y, sb_w, mb_h, flags;	647	int x, y, sb_w, flags;
700	unsigned int w, h;	648	unsigned int w, h;
701	unsigned int max_width, max_height;	649	unsigned int max_width, max_height;
702	dDisp;	650	dDisp;
703		651
704	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",
…		…
718	if (rs[Rs_geometry])	666	if (rs[Rs_geometry])
719	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	667	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720		668
721	if (flags & WidthValue)	669	if (flags & WidthValue)
722	{	670	{
723	ncol = BOUND_POSITIVE_INT16 (w);	671	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724	szHint.flags \|= USSize;	672	szHint.flags \|= USSize;
725	}	673	}
726		674
727	if (flags & HeightValue)	675	if (flags & HeightValue)
728	{	676	{
729	nrow = BOUND_POSITIVE_INT16 (h);	677	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730	szHint.flags \|= USSize;	678	szHint.flags \|= USSize;
731	}	679	}
732		680
733	if (flags & XValue)	681	if (flags & XValue)
734	{	682	{
…		…
765	max_width = MAX_COLS * fwidth;	713	max_width = MAX_COLS * fwidth;
766	max_height = MAX_ROWS * fheight;	714	max_height = MAX_ROWS * fheight;
767		715
768	szHint.base_width = szHint.base_height = 2 * int_bwidth;	716	szHint.base_width = szHint.base_height = 2 * int_bwidth;
769		717
770	sb_w = mb_h = 0;	718	sb_w = 0;
771	window_vt_x = window_vt_y = int_bwidth;	719	window_vt_x = window_vt_y = int_bwidth;
772		720
773	if (scrollbar_visible ())	721	if (scrollBar.state)
774	{	722	{
775	sb_w = scrollbar_TotalWidth ();	723	sb_w = scrollbar_TotalWidth ();
776	szHint.base_width += sb_w;	724	szHint.base_width += sb_w;
777	if (!(options & Opt_scrollBar_right))	725	if (!OPTION (Opt_scrollBar_right))
778	window_vt_x += sb_w;	726	window_vt_x += sb_w;
779	}
780
781	if (menubar_visible ())
782	{
783	mb_h = menuBar_TotalHeight ();
784	szHint.base_height += mb_h;
785	window_vt_y += mb_h;
786	}	727	}
787		728
788	szHint.width_inc = fwidth;	729	szHint.width_inc = fwidth;
789	szHint.height_inc = fheight;	730	szHint.height_inc = fheight;
790	szHint.min_width = szHint.base_width + szHint.width_inc;	731	szHint.min_width = szHint.base_width + szHint.width_inc;
…		…
795	szHint.width = newwidth;	736	szHint.width = newwidth;
796	width = newwidth - szHint.base_width;	737	width = newwidth - szHint.base_width;
797	}	738	}
798	else	739	else
799	{	740	{
800	MIN_IT (width, max_width);	741	min_it (width, max_width);
801	szHint.width = szHint.base_width + width;	742	szHint.width = szHint.base_width + width;
802	}	743	}
803		744
804	if (newheight && newheight - szHint.base_height < max_height)	745	if (newheight && newheight - szHint.base_height < max_height)
805	{	746	{
806	szHint.height = newheight;	747	szHint.height = newheight;
807	height = newheight - szHint.base_height;	748	height = newheight - szHint.base_height;
808	}	749	}
809	else	750	else
810	{	751	{
811	MIN_IT (height, max_height);	752	min_it (height, max_height);
812	szHint.height = szHint.base_height + height;	753	szHint.height = szHint.base_height + height;
813	}	754	}
814		755
815	if (scrollbar_visible () && (options & Opt_scrollBar_right))	756	if (scrollBar.state && OPTION (Opt_scrollBar_right))
816	window_sb_x = szHint.width - sb_w;	757	window_sb_x = szHint.width - sb_w;
817		758
818	if (recalc_x)	759	if (recalc_x)
819	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	760	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
820	if (recalc_y)	761	if (recalc_y)
…		…
834	* Called after a window size change.	775	* Called after a window size change.
835	*/	776	*/
836	void	777	void
837	rxvt_term::tt_winch ()	778	rxvt_term::tt_winch ()
838	{	779	{
839	if (pty.pty < 0)	780	if (pty->pty < 0)
840	return;	781	return;
841		782
842	struct winsize ws;	783	struct winsize ws;
843		784
844	ws.ws_col = ncol;	785	ws.ws_col = ncol;
845	ws.ws_row = nrow;	786	ws.ws_row = nrow;
846	ws.ws_xpixel = width;	787	ws.ws_xpixel = width;
847	ws.ws_ypixel = height;	788	ws.ws_ypixel = height;
848	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	789	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
849		790
850	#if 0	791	#if 0
851	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	792	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852	if (cmd_pid) /* force through to the command */	793	if (cmd_pid) /* force through to the command */
853	kill (-cmd_pid, SIGWINCH);	794	kill (-cmd_pid, SIGWINCH);
…		…
889	prop.height += lineSpace;	830	prop.height += lineSpace;
890	fs->set_prop (prop);	831	fs->set_prop (prop);
891		832
892	fwidth = prop.width;	833	fwidth = prop.width;
893	fheight = prop.height;	834	fheight = prop.height;
894	fweight = prop.weight;	835	fbase = prop.ascent;
895	fslant = prop.slant;
896	fbase = (*fs)[1]->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.149 by root, Sun Dec 18 00:59:42 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.149 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.193 by root, Sat Jan 21 14:25:05 2006 UTC