[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.191 by root, Fri Jan 20 10:27:08 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),
…		…
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
164	termwin_ev (this, &rxvt_term::x_cb),	175	termwin_ev (this, &rxvt_term::x_cb),
165	vt_ev (this, &rxvt_term::x_cb),	176	vt_ev (this, &rxvt_term::x_cb),
		177	child_ev (this, &rxvt_term::child_cb),
166	check_ev (this, &rxvt_term::check_cb),	178	check_ev (this, &rxvt_term::check_cb),
167	flush_ev (this, &rxvt_term::flush_cb),	179	flush_ev (this, &rxvt_term::flush_cb),
168	destroy_ev (this, &rxvt_term::destroy_cb),	180	destroy_ev (this, &rxvt_term::destroy_cb),
169	pty_ev (this, &rxvt_term::pty_cb),	181	pty_ev (this, &rxvt_term::pty_cb),
170	incr_ev (this, &rxvt_term::incr_cb)	182	incr_ev (this, &rxvt_term::incr_cb)
…		…
173		185
174	termlist.push_back (this);	186	termlist.push_back (this);
175		187
176	#ifdef KEYSYM_RESOURCE	188	#ifdef KEYSYM_RESOURCE
177	keyboard = new keyboard_manager;	189	keyboard = new keyboard_manager;
178
179	if (!keyboard)
180	rxvt_fatal ("out of memory, aborting.\n");
181	#endif	190	#endif
182	}	191	}
183		192
184	// clean up the most important stuff, do not call x or free mem etc.	193	// clean up the most important stuff, do not call x or free mem etc.
185	// for use before an emergency exit	194	// for use before an emergency exit
186	void rxvt_term::emergency_cleanup ()	195	void rxvt_term::emergency_cleanup ()
187	{	196	{
188	if (cmd_pid)	197	if (cmd_pid)
189	kill (-cmd_pid, SIGHUP);	198	kill (-cmd_pid, SIGHUP);
190		199
191	#ifdef UTMP_SUPPORT	200	delete pty; pty = 0;
192	privileged_utmp (RESTORE);
193	#endif
194
195	pty.put ();
196	}	201	}
197		202
198	rxvt_term::~rxvt_term ()	203	rxvt_term::~rxvt_term ()
199	{	204	{
200	termlist.erase (find (termlist.begin (), termlist.end(), this));	205	termlist.erase (find (termlist.begin (), termlist.end(), this));
…		…
214		219
215	selection_clear ();	220	selection_clear ();
216		221
217	#ifdef USE_XIM	222	#ifdef USE_XIM
218	im_destroy ();	223	im_destroy ();
219	#endif
220	#ifdef MENUBAR
221	if (menubarGC) XFreeGC (disp, menubarGC);
222	#endif	224	#endif
223	#ifdef XTERM_SCROLLBAR	225	#ifdef XTERM_SCROLLBAR
224	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	226	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
225	if (ShadowGC) XFreeGC (disp, ShadowGC);	227	if (ShadowGC) XFreeGC (disp, ShadowGC);
226	#endif	228	#endif
…		…
237	if (upArrow) XFreePixmap (disp, upArrow);	239	if (upArrow) XFreePixmap (disp, upArrow);
238	if (downArrow) XFreePixmap (disp, downArrow);	240	if (downArrow) XFreePixmap (disp, downArrow);
239	if (upArrowHi) XFreePixmap (disp, upArrowHi);	241	if (upArrowHi) XFreePixmap (disp, upArrowHi);
240	if (downArrowHi) XFreePixmap (disp, downArrowHi);	242	if (downArrowHi) XFreePixmap (disp, downArrowHi);
241	#endif	243	#endif
242	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	244	#ifdef RXVT_SCROLLBAR
243	if (topShadowGC) XFreeGC (disp, topShadowGC);	245	if (topShadowGC) XFreeGC (disp, topShadowGC);
244	if (botShadowGC) XFreeGC (disp, botShadowGC);	246	if (botShadowGC) XFreeGC (disp, botShadowGC);
245	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	247	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
246	#endif	248	#endif
247	if (gc) XFreeGC (disp, gc);	249	if (gc) XFreeGC (disp, gc);
248		250
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;	251	delete drawable;
255	// destroy all windows	252	// destroy all windows
256	if (parent[0])	253	if (parent[0])
257	XDestroyWindow (disp, parent[0]);	254	XDestroyWindow (disp, parent[0]);
258	}	255	}
259		256
260	// TODO: free pixcolours, colours should become part of rxvt_display	257	// TODO: free pixcolours, colours should become part of rxvt_display
261
262	delete pix_colors_focused;	258	delete pix_colors_focused;
263	#if OFF_FOCUS_FADING	259	#if OFF_FOCUS_FADING
264	delete pix_colors_unfocused;	260	delete pix_colors_unfocused;
265	#endif	261	#endif
266		262
…		…
288	#ifdef KEYSYM_RESOURCE	284	#ifdef KEYSYM_RESOURCE
289	delete keyboard;	285	delete keyboard;
290	#endif	286	#endif
291	}	287	}
292		288
		289	// child has exited, usually destroys
		290	void
		291	rxvt_term::child_cb (child_watcher &w, int status)
		292	{
		293	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		294
		295	cmd_pid = 0;
		296
		297	if (!OPTION (Opt_hold))
		298	destroy ();
		299	}
		300
293	void	301	void
294	rxvt_term::destroy ()	302	rxvt_term::destroy ()
295	{	303	{
296	if (destroy_ev.active)	304	if (destroy_ev.active)
297	return;	305	return;
298		306
		307	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
		308	return;
		309
299	#if ENABLE_OVERLAY	310	#if ENABLE_OVERLAY
300	scr_overlay_off ();	311	scr_overlay_off ();
301	#endif	312	#endif
302		313
303	if (display)	314	if (display)
…		…
305	#if USE_XIM	316	#if USE_XIM
306	im_ev.stop (display);	317	im_ev.stop (display);
307	#endif	318	#endif
308	#if HAVE_SCROLLBARS	319	#if HAVE_SCROLLBARS
309	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
310	#endif
311	#if MENUBAR
312	menubar_ev.stop (display);
313	#endif	321	#endif
314	#if TRANSPARENT	322	#if TRANSPARENT
315	rootwin_ev.stop (display);	323	rootwin_ev.stop (display);
316	#endif	324	#endif
317	incr_ev.stop ();	325	incr_ev.stop ();
…		…
341	}	349	}
342		350
343	void	351	void
344	rxvt_term::destroy_cb (time_watcher &w)	352	rxvt_term::destroy_cb (time_watcher &w)
345	{	353	{
346	SET_R (this);	354	make_current ();
347		355
348	delete this;	356	delete this;
349	}	357	}
350		358
351	/----------------------------------------------------------------------/	359	/----------------------------------------------------------------------/
…		…
442	/----------------------------------------------------------------------/	450	/----------------------------------------------------------------------/
443	bool	451	bool
444	rxvt_term::init (int argc, const char const argv)	452	rxvt_term::init (int argc, const char const argv)
445	{	453	{
446	SET_R (this);	454	SET_R (this);
447
448	set_locale ("");	455	set_locale ("");
		456	set_environ (envv); // few things in X do not call setlocale :(
449		457
450	if (!init_vars ())	458	if (!init_vars ())
451	return false;	459	return false;
452		460
453	init_secondary ();	461	init_secondary ();
…		…
456		464
457	#ifdef KEYSYM_RESOURCE	465	#ifdef KEYSYM_RESOURCE
458	keyboard->register_done ();	466	keyboard->register_done ();
459	#endif	467	#endif
460		468
461	#if MENUBAR_MAX	469	#if ENABLE_PERL
462	menubar_read (rs[Rs_menu]);	470	if (!rs[Rs_perl_ext_1])
		471	rs[Rs_perl_ext_1] = "default";
		472
		473	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		474	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		475	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		476	{
		477	rxvt_perl.init (this);
		478	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		479	}
463	#endif	480	#endif
		481
464	#ifdef HAVE_SCROLLBARS	482	#ifdef HAVE_SCROLLBARS
465	if (options & Opt_scrollBar)	483	if (OPTION (Opt_scrollBar))
466	scrollBar.setIdle (); /* set existence for size calculations */	484	scrollBar.setIdle (); /* set existence for size calculations */
467	#endif	485	#endif
468		486
		487	pty = rxvt_new_ptytty ();
		488
469	create_windows (argc, argv);	489	create_windows (argc, argv);
470		490
471	dDisp;	491	dDisp;
472		492
473	init_xlocale ();	493	init_xlocale ();
474		494
475	scr_reset (); /* initialize screen */	495	scr_reset (); // initialize screen
476		496
477	#if 0	497	#if 0
478	XSynchronize (disp, True);	498	XSynchronize (disp, True);
479	#endif	499	#endif
480		500
481	#ifdef HAVE_SCROLLBARS	501	#ifdef HAVE_SCROLLBARS
482	if (options & Opt_scrollBar)	502	if (OPTION (Opt_scrollBar))
483	resize_scrollbar (); /* create and map scrollbar */	503	resize_scrollbar (); /* create and map scrollbar */
484	#endif	504	#endif
485	#if (MENUBAR_MAX)
486	if (menubar_visible ())
487	XMapWindow (disp, menuBar.win);
488	#endif
489	#ifdef TRANSPARENT	505	#ifdef TRANSPARENT
490	if (options & Opt_transparent)	506	if (OPTION (Opt_transparent))
491	{	507	{
492	XSelectInput (disp, display->root, PropertyChangeMask);	508	XSelectInput (disp, display->root, PropertyChangeMask);
493	check_our_parents ();	509	check_our_parents ();
494	rootwin_ev.start (display, display->root);	510	rootwin_ev.start (display, display->root);
495	}	511	}
496	#endif	512	#endif
497		513
		514	set_colorfgbg ();
		515
		516	init_command (cmd_argv);
		517
		518	free (cmd_argv);
		519
		520	if (pty->pty >= 0)
		521	pty_ev.start (pty->pty, EVENT_READ);
		522
		523	check_ev.start ();
		524
		525	HOOK_INVOKE ((this, HOOK_START, DT_END));
		526
498	XMapWindow (disp, vt);	527	XMapWindow (disp, vt);
499	XMapWindow (disp, parent[0]);	528	XMapWindow (disp, parent[0]);
500		529
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;	530	return true;
512	}	531	}
513		532
514	static struct sig_handlers	533	static struct sig_handlers
515	{	534	{
516	sig_watcher sw_chld, sw_term, sw_int;	535	sig_watcher sw_term, sw_int;
517		536
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	/*	537	/*
533	* Catch a fatal signal and tidy up before quitting	538	* Catch a fatal signal and tidy up before quitting
534	*/	539	*/
535	void	540	void
536	sig_term (sig_watcher &w)	541	sig_term (sig_watcher &w)
…		…
542	signal (w.signum, SIG_DFL);	547	signal (w.signum, SIG_DFL);
543	kill (getpid (), w.signum);	548	kill (getpid (), w.signum);
544	}	549	}
545		550
546	sig_handlers ()	551	sig_handlers ()
547	: sw_chld (this, &sig_handlers::sig_chld),
548	sw_term (this, &sig_handlers::sig_term),	552	: sw_term (this, &sig_handlers::sig_term),
549	sw_int (this, &sig_handlers::sig_term)	553	sw_int (this, &sig_handlers::sig_term)
550	{	554	{
551	}	555	}
552	} sig_handlers;	556	} sig_handlers;
553		557
		558	char **rxvt_environ; // startup environment
		559
554	void	560	void
555	rxvt_init ()	561	rxvt_init ()
556	{	562	{
557	/*	563	uid_t uid = getuid ();
558	* Save and then give up any super-user privileges	564	gid_t gid = getgid ();
559	* If we need privileges in any area then we must specifically request it.	565
560	* We should only need to be root in these cases:	566	// before doing anything else, check for setuid/setgid operation,
561	* 1. write utmp entries on some systems	567	// start the helper process and drop privileges
562	* 2. chown tty on some systems	568	if (uid != geteuid ()
563	*/	569	\|\| gid != getegid ())
564	rxvt_privileges (SAVE);	570	{
565	rxvt_privileges (IGNORE);	571	#if PTYTTY_HELPER
		572	rxvt_ptytty_server ();
		573	#else
		574	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
		575	#endif
		576
		577	// drop privileges
		578	#if HAVE_SETRESUID
		579	setresgid (gid, gid, gid);
		580	setresuid (uid, uid, uid);
		581	#elif HAVE_SETREUID
		582	setregid (gid, gid);
		583	setreuid (uid, uid);
		584	#elif HAVE_SETUID
		585	setgid (gid);
		586	setuid (uid);
		587	#endif
		588
		589	if (uid != geteuid ()
		590	\|\| gid != getegid ())
		591	rxvt_fatal ("unable to drop privileges, aborting.\n");
		592	}
		593
		594	rxvt_environ = environ;
566		595
567	signal (SIGHUP, SIG_IGN);	596	signal (SIGHUP, SIG_IGN);
568	signal (SIGPIPE, SIG_IGN);	597	signal (SIGPIPE, SIG_IGN);
569		598
570	sig_handlers.sw_chld.start (SIGCHLD);
571	sig_handlers.sw_term.start (SIGTERM);	599	sig_handlers.sw_term.start (SIGTERM);
572	sig_handlers.sw_int.start (SIGINT);	600	sig_handlers.sw_int.start (SIGINT);
573		601
574	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	602	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
575	/* signal (SIGURG, SIG_DFL); */	603	/* signal (SIGURG, SIG_DFL); */
576		604
577	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	605	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
578	// TODO: handle this with exceptions and tolerate the memory loss	606	// TODO: handle this with exceptions and tolerate the memory loss
579	XSetIOErrorHandler (rxvt_xioerror_handler);	607	XSetIOErrorHandler (rxvt_xioerror_handler);
		608
		609	XrmInitialize ();
580	}	610	}
581		611
582	/* ------------------------------------------------------------------------- *	612	/* ------------------------------------------------------------------------- *
583	* MEMORY ALLOCATION WRAPPERS *	613	* MEMORY ALLOCATION WRAPPERS *
584	* ------------------------------------------------------------------------- */	614	* ------------------------------------------------------------------------- */
…		…
602	rxvt_fatal ("memory allocation failure. aborting.\n");	632	rxvt_fatal ("memory allocation failure. aborting.\n");
603		633
604	return p;	634	return p;
605	}	635	}
606		636
607	void *	637	void *
608	rxvt_realloc (void *ptr, size_t size)	638	rxvt_realloc (void *ptr, size_t size)
609	{	639	{
610	void *p = realloc (ptr, size);	640	void *p = realloc (ptr, size);
611		641
612	if (!p)	642	if (!p)
613	rxvt_fatal ("memory allocation failure. aborting.\n");	643	rxvt_fatal ("memory allocation failure. aborting.\n");
614		644
615	return p;	645	return p;
616	}	646	}
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		647
692	/----------------------------------------------------------------------/	648	/----------------------------------------------------------------------/
693	/*	649	/*
694	* window size/position calculcations for XSizeHint and other storage.	650	* window size/position calculcations for XSizeHint and other storage.
695	* if width/height are non-zero then override calculated width/height	651	* if width/height are non-zero then override calculated width/height
696	*/	652	*/
697	void	653	void
698	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	654	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
699	{	655	{
700	short recalc_x, recalc_y;	656	short recalc_x, recalc_y;
701	int x, y, sb_w, mb_h, flags;	657	int x, y, sb_w, flags;
702	unsigned int w, h;	658	unsigned int w, h;
703	unsigned int max_width, max_height;	659	unsigned int max_width, max_height;
704	dDisp;	660	dDisp;
705		661
706	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	662	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
…		…
767	max_width = MAX_COLS * fwidth;	723	max_width = MAX_COLS * fwidth;
768	max_height = MAX_ROWS * fheight;	724	max_height = MAX_ROWS * fheight;
769		725
770	szHint.base_width = szHint.base_height = 2 * int_bwidth;	726	szHint.base_width = szHint.base_height = 2 * int_bwidth;
771		727
772	sb_w = mb_h = 0;	728	sb_w = 0;
773	window_vt_x = window_vt_y = int_bwidth;	729	window_vt_x = window_vt_y = int_bwidth;
774		730
775	if (scrollbar_visible ())	731	if (scrollBar.state)
776	{	732	{
777	sb_w = scrollbar_TotalWidth ();	733	sb_w = scrollbar_TotalWidth ();
778	szHint.base_width += sb_w;	734	szHint.base_width += sb_w;
779	if (!(options & Opt_scrollBar_right))	735	if (!OPTION (Opt_scrollBar_right))
780	window_vt_x += sb_w;	736	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	}	737	}
789		738
790	szHint.width_inc = fwidth;	739	szHint.width_inc = fwidth;
791	szHint.height_inc = fheight;	740	szHint.height_inc = fheight;
792	szHint.min_width = szHint.base_width + szHint.width_inc;	741	szHint.min_width = szHint.base_width + szHint.width_inc;
…		…
812	{	761	{
813	min_it (height, max_height);	762	min_it (height, max_height);
814	szHint.height = szHint.base_height + height;	763	szHint.height = szHint.base_height + height;
815	}	764	}
816		765
817	if (scrollbar_visible () && (options & Opt_scrollBar_right))	766	if (scrollBar.state && OPTION (Opt_scrollBar_right))
818	window_sb_x = szHint.width - sb_w;	767	window_sb_x = szHint.width - sb_w;
819		768
820	if (recalc_x)	769	if (recalc_x)
821	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	770	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
822	if (recalc_y)	771	if (recalc_y)
…		…
836	* Called after a window size change.	785	* Called after a window size change.
837	*/	786	*/
838	void	787	void
839	rxvt_term::tt_winch ()	788	rxvt_term::tt_winch ()
840	{	789	{
841	if (pty.pty < 0)	790	if (pty->pty < 0)
842	return;	791	return;
843		792
844	struct winsize ws;	793	struct winsize ws;
845		794
846	ws.ws_col = ncol;	795	ws.ws_col = ncol;
847	ws.ws_row = nrow;	796	ws.ws_row = nrow;
848	ws.ws_xpixel = width;	797	ws.ws_xpixel = width;
849	ws.ws_ypixel = height;	798	ws.ws_ypixel = height;
850	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	799	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
851		800
852	#if 0	801	#if 0
853	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	802	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
854	if (cmd_pid) /* force through to the command */	803	if (cmd_pid) /* force through to the command */
855	kill (-cmd_pid, SIGWINCH);	804	kill (-cmd_pid, SIGWINCH);
…		…
891	prop.height += lineSpace;	840	prop.height += lineSpace;
892	fs->set_prop (prop);	841	fs->set_prop (prop);
893		842
894	fwidth = prop.width;	843	fwidth = prop.width;
895	fheight = prop.height;	844	fheight = prop.height;
896	fbase = (*fs)[1]->ascent;	845	fbase = prop.ascent;
897		846
898	for (int style = 1; style < 4; style++)	847	for (int style = 1; style < 4; style++)
899	{	848	{
900	#if ENABLE_STYLES	849	#if ENABLE_STYLES
901	const char *res = rs[Rs_font + style];	850	const char *res = rs[Rs_font + style];
…		…
935	return true;	884	return true;
936	}	885	}
937		886
938	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	887	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939	{	888	{
940	// TODO: SMART_WINDOW_TITLE
941	XChangeProperty (display->display, parent[0],	889	XChangeProperty (display->display, parent[0],
942	prop, XA_STRING, 8, PropModeReplace,	890	prop, XA_STRING, 8, PropModeReplace,
943	(const unsigned char *)str, len >= 0 ? len : strlen (str));	891	(const unsigned char *)str, len >= 0 ? len : strlen (str));
944	}	892	}
945		893
946	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	894	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947	{	895	{
948	// TODO: SMART_WINDOW_TITLE
949	wchar_t *ws = rxvt_mbstowcs (str, len);	896	wchar_t *ws = rxvt_mbstowcs (str, len);
950	char *s = rxvt_wcstoutf8 (ws);	897	char *s = rxvt_wcstoutf8 (ws);
951		898
952	XChangeProperty (display->display, parent[0],	899	XChangeProperty (display->display, parent[0],
953	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	900	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
…		…
994	i = atoi (color);	941	i = atoi (color);
995		942
996	if (i >= 8 && i <= 15)	943	if (i >= 8 && i <= 15)
997	{ /* bright colors */	944	{ /* bright colors */
998	i -= 8;	945	i -= 8;
999	# ifndef NO_BRIGHTCOLOR
1000	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	946	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001	SET_PIXCOLOR (idx);	947	SET_PIXCOLOR (idx);
1002	goto done;	948	goto done;
1003	# endif
1004	}	949	}
1005		950
1006	if (i >= 0 && i <= 7)	951	if (i >= 0 && i <= 7)
1007	{ /* normal colors */	952	{ /* normal colors */
1008	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	953	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1181		1126
1182	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1127	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1183		1128
1184	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1129	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1185	{	1130	{
1186	if (scrollbar_visible ())	1131	if (scrollBar.state)
1187	{	1132	{
1188	XMoveResizeWindow (disp, scrollBar.win,	1133	XMoveResizeWindow (disp, scrollBar.win,
1189	window_sb_x, 0,	1134	window_sb_x, 0,
1190	scrollbar_TotalWidth (), szHint.height);	1135	scrollbar_TotalWidth (), szHint.height);
1191	resize_scrollbar ();	1136	resize_scrollbar ();
1192	}	1137	}
1193		1138
1194	if (menubar_visible ())
1195	XMoveResizeWindow (disp, menuBar.win,
1196	window_vt_x, 0,
1197	TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199	XMoveResizeWindow (disp, vt,	1139	XMoveResizeWindow (disp, vt,
1200	window_vt_x, window_vt_y,	1140	window_vt_x, window_vt_y,
1201	TermWin_TotalWidth (), TermWin_TotalHeight ());	1141	width, height);
1202		1142
1203	scr_clear ();	1143	scr_clear ();
1204	#ifdef XPM_BACKGROUND	1144	#ifdef XPM_BACKGROUND
1205	resize_pixmap ();	1145	resize_pixmap ();
1206	#endif	1146	#endif
…		…
1386	XRectangle rect, status_rect, needed_rect;	1326	XRectangle rect, status_rect, needed_rect;
1387	unsigned long fg, bg;	1327	unsigned long fg, bg;
1388	const char *p;	1328	const char *p;
1389	char **s;	1329	char **s;
1390	XIMStyles *xim_styles;	1330	XIMStyles *xim_styles;
		1331
		1332	set_environ (envv);
1391		1333
1392	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1334	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393	return false;	1335	return false;
1394		1336
1395	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1337	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1561	int i;	1503	int i;
1562	const char *p;	1504	const char *p;
1563	char **s;	1505	char **s;
1564	char buf[IMBUFSIZ];	1506	char buf[IMBUFSIZ];
1565		1507
1566	SET_R (this);	1508	make_current ();
1567		1509
1568	im_destroy ();	1510	im_destroy ();
1569		1511
1570	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1512	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571	if (Input_Context)	1513	if (Input_Context)
…		…
1648	XFree (preedit_attr);	1590	XFree (preedit_attr);
1649	XFree (status_attr);	1591	XFree (status_attr);
1650	}	1592	}
1651	#endif /* USE_XIM */	1593	#endif /* USE_XIM */
1652		1594
1653	/----------------------------------------------------------------------/
1654	rxvt_t rxvt_current_term;
1655
1656	/----------------------- end-of-file (C source) -----------------------/	1595	/----------------------- 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.191 by root, Fri Jan 20 10:27:08 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.191 by root, Fri Jan 20 10:27:08 2006 UTC