[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.192 by root, Fri Jan 20 12:16:28 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),
…		…
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
162	termwin_ev (this, &rxvt_term::x_cb),	175	termwin_ev (this, &rxvt_term::x_cb),
163	vt_ev (this, &rxvt_term::x_cb),	176	vt_ev (this, &rxvt_term::x_cb),
		177	child_ev (this, &rxvt_term::child_cb),
164	check_ev (this, &rxvt_term::check_cb),	178	check_ev (this, &rxvt_term::check_cb),
165	flush_ev (this, &rxvt_term::flush_cb),	179	flush_ev (this, &rxvt_term::flush_cb),
166	destroy_ev (this, &rxvt_term::destroy_cb),	180	destroy_ev (this, &rxvt_term::destroy_cb),
167	pty_ev (this, &rxvt_term::pty_cb),	181	pty_ev (this, &rxvt_term::pty_cb),
168	incr_ev (this, &rxvt_term::incr_cb)	182	incr_ev (this, &rxvt_term::incr_cb)
…		…
171		185
172	termlist.push_back (this);	186	termlist.push_back (this);
173		187
174	#ifdef KEYSYM_RESOURCE	188	#ifdef KEYSYM_RESOURCE
175	keyboard = new keyboard_manager;	189	keyboard = new keyboard_manager;
176
177	if (!keyboard)
178	rxvt_fatal ("out of memory, aborting.\n");
179	#endif	190	#endif
180	}	191	}
181		192
182	// 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.
183	// for use before an emergency exit	194	// for use before an emergency exit
184	void rxvt_term::emergency_cleanup ()	195	void rxvt_term::emergency_cleanup ()
185	{	196	{
186	if (cmd_pid)	197	if (cmd_pid)
187	kill (-cmd_pid, SIGHUP);	198	kill (-cmd_pid, SIGHUP);
188		199
189	#ifdef UTMP_SUPPORT	200	delete pty; pty = 0;
190	privileged_utmp (RESTORE);
191	#endif
192
193	pty.put ();
194	}	201	}
195		202
196	rxvt_term::~rxvt_term ()	203	rxvt_term::~rxvt_term ()
197	{	204	{
198	termlist.erase (find (termlist.begin (), termlist.end(), this));	205	termlist.erase (find (termlist.begin (), termlist.end(), this));
…		…
212		219
213	selection_clear ();	220	selection_clear ();
214		221
215	#ifdef USE_XIM	222	#ifdef USE_XIM
216	im_destroy ();	223	im_destroy ();
217	#endif
218	#ifdef MENUBAR
219	if (menubarGC) XFreeGC (disp, menubarGC);
220	#endif	224	#endif
221	#ifdef XTERM_SCROLLBAR	225	#ifdef XTERM_SCROLLBAR
222	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	226	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
223	if (ShadowGC) XFreeGC (disp, ShadowGC);	227	if (ShadowGC) XFreeGC (disp, ShadowGC);
224	#endif	228	#endif
…		…
235	if (upArrow) XFreePixmap (disp, upArrow);	239	if (upArrow) XFreePixmap (disp, upArrow);
236	if (downArrow) XFreePixmap (disp, downArrow);	240	if (downArrow) XFreePixmap (disp, downArrow);
237	if (upArrowHi) XFreePixmap (disp, upArrowHi);	241	if (upArrowHi) XFreePixmap (disp, upArrowHi);
238	if (downArrowHi) XFreePixmap (disp, downArrowHi);	242	if (downArrowHi) XFreePixmap (disp, downArrowHi);
239	#endif	243	#endif
240	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	244	#ifdef RXVT_SCROLLBAR
241	if (topShadowGC) XFreeGC (disp, topShadowGC);	245	if (topShadowGC) XFreeGC (disp, topShadowGC);
242	if (botShadowGC) XFreeGC (disp, botShadowGC);	246	if (botShadowGC) XFreeGC (disp, botShadowGC);
243	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	247	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
244	#endif	248	#endif
245	if (gc) XFreeGC (disp, gc);	249	if (gc) XFreeGC (disp, gc);
246		250
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;	251	delete drawable;
253	// destroy all windows	252	// destroy all windows
254	if (parent[0])	253	if (parent[0])
255	XDestroyWindow (disp, parent[0]);	254	XDestroyWindow (disp, parent[0]);
256	}	255	}
257		256
258	// TODO: free pixcolours, colours should become part of rxvt_display	257	// TODO: free pixcolours, colours should become part of rxvt_display
259
260	delete pix_colors_focused;	258	delete pix_colors_focused;
261	#if OFF_FOCUS_FADING	259	#if OFF_FOCUS_FADING
262	delete pix_colors_unfocused;	260	delete pix_colors_unfocused;
263	#endif	261	#endif
264		262
…		…
286	#ifdef KEYSYM_RESOURCE	284	#ifdef KEYSYM_RESOURCE
287	delete keyboard;	285	delete keyboard;
288	#endif	286	#endif
289	}	287	}
290		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
291	void	301	void
292	rxvt_term::destroy ()	302	rxvt_term::destroy ()
293	{	303	{
294	if (destroy_ev.active)	304	if (destroy_ev.active)
295	return;	305	return;
296		306
		307	if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
		308	return;
		309
297	#if ENABLE_OVERLAY	310	#if ENABLE_OVERLAY
298	scr_overlay_off ();	311	scr_overlay_off ();
299	#endif	312	#endif
300		313
301	if (display)	314	if (display)
…		…
303	#if USE_XIM	316	#if USE_XIM
304	im_ev.stop (display);	317	im_ev.stop (display);
305	#endif	318	#endif
306	#if HAVE_SCROLLBARS	319	#if HAVE_SCROLLBARS
307	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
308	#endif
309	#if MENUBAR
310	menubar_ev.stop (display);
311	#endif	321	#endif
312	#if TRANSPARENT	322	#if TRANSPARENT
313	rootwin_ev.stop (display);	323	rootwin_ev.stop (display);
314	#endif	324	#endif
315	incr_ev.stop ();	325	incr_ev.stop ();
…		…
339	}	349	}
340		350
341	void	351	void
342	rxvt_term::destroy_cb (time_watcher &w)	352	rxvt_term::destroy_cb (time_watcher &w)
343	{	353	{
344	SET_R (this);	354	make_current ();
345		355
346	delete this;	356	delete this;
347	}	357	}
348		358
349	/----------------------------------------------------------------------/	359	/----------------------------------------------------------------------/
…		…
440	/----------------------------------------------------------------------/	450	/----------------------------------------------------------------------/
441	bool	451	bool
442	rxvt_term::init (int argc, const char const argv)	452	rxvt_term::init (int argc, const char const argv)
443	{	453	{
444	SET_R (this);	454	SET_R (this);
445
446	set_locale ("");	455	set_locale ("");
		456	set_environ (envv); // few things in X do not call setlocale :(
447		457
448	if (!init_vars ())	458	if (!init_vars ())
449	return false;	459	return false;
450		460
451	init_secondary ();	461	init_secondary ();
…		…
454		464
455	#ifdef KEYSYM_RESOURCE	465	#ifdef KEYSYM_RESOURCE
456	keyboard->register_done ();	466	keyboard->register_done ();
457	#endif	467	#endif
458		468
459	#if MENUBAR_MAX
460	menubar_read (rs[Rs_menu]);
461	#endif
462	#ifdef HAVE_SCROLLBARS	469	#ifdef HAVE_SCROLLBARS
463	if (options & Opt_scrollBar)	470	if (OPTION (Opt_scrollBar))
464	scrollBar.setIdle (); /* set existence for size calculations */	471	scrollBar.setIdle (); /* set existence for size calculations */
465	#endif	472	#endif
466		473
		474	pty = rxvt_new_ptytty ();
		475
467	create_windows (argc, argv);	476	create_windows (argc, argv);
468		477
469	dDisp;	478	dDisp;
470		479
471	init_xlocale ();	480	init_xlocale ();
472		481
473	scr_reset (); /* initialize screen */	482	scr_reset (); // initialize screen
474		483
475	#if 0	484	#if 0
476	XSynchronize (disp, True);	485	XSynchronize (disp, True);
477	#endif	486	#endif
478		487
479	#ifdef HAVE_SCROLLBARS	488	#ifdef HAVE_SCROLLBARS
480	if (options & Opt_scrollBar)	489	if (OPTION (Opt_scrollBar))
481	resize_scrollbar (); /* create and map scrollbar */	490	resize_scrollbar (); /* create and map scrollbar */
482	#endif	491	#endif
483	#if (MENUBAR_MAX)
484	if (menubar_visible ())
485	XMapWindow (disp, menuBar.win);
486	#endif
487	#ifdef TRANSPARENT	492	#ifdef TRANSPARENT
488	if (options & Opt_transparent)	493	if (OPTION (Opt_transparent))
489	{	494	{
490	XSelectInput (disp, display->root, PropertyChangeMask);	495	XSelectInput (disp, display->root, PropertyChangeMask);
491	check_our_parents ();	496	check_our_parents ();
492	rootwin_ev.start (display, display->root);	497	rootwin_ev.start (display, display->root);
493	}	498	}
494	#endif	499	#endif
495		500
		501	set_colorfgbg ();
		502
		503	init_command (cmd_argv);
		504
		505	free (cmd_argv);
		506
		507	if (pty->pty >= 0)
		508	pty_ev.start (pty->pty, EVENT_READ);
		509
		510	check_ev.start ();
		511
		512	HOOK_INVOKE ((this, HOOK_START, DT_END));
		513
496	XMapWindow (disp, vt);	514	XMapWindow (disp, vt);
497	XMapWindow (disp, parent[0]);	515	XMapWindow (disp, parent[0]);
498		516
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;	517	return true;
510	}	518	}
511		519
512	static struct sig_handlers	520	static struct sig_handlers
513	{	521	{
514	sig_watcher sw_chld, sw_term, sw_int;	522	sig_watcher sw_term, sw_int;
515		523
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	/*	524	/*
531	* Catch a fatal signal and tidy up before quitting	525	* Catch a fatal signal and tidy up before quitting
532	*/	526	*/
533	void	527	void
534	sig_term (sig_watcher &w)	528	sig_term (sig_watcher &w)
…		…
540	signal (w.signum, SIG_DFL);	534	signal (w.signum, SIG_DFL);
541	kill (getpid (), w.signum);	535	kill (getpid (), w.signum);
542	}	536	}
543		537
544	sig_handlers ()	538	sig_handlers ()
545	: sw_chld (this, &sig_handlers::sig_chld),
546	sw_term (this, &sig_handlers::sig_term),	539	: sw_term (this, &sig_handlers::sig_term),
547	sw_int (this, &sig_handlers::sig_term)	540	sw_int (this, &sig_handlers::sig_term)
548	{	541	{
549	}	542	}
550	} sig_handlers;	543	} sig_handlers;
551		544
		545	char **rxvt_environ; // startup environment
		546
552	void	547	void
553	rxvt_init ()	548	rxvt_init ()
554	{	549	{
555	/*	550	uid_t uid = getuid ();
556	* Save and then give up any super-user privileges	551	gid_t gid = getgid ();
557	* If we need privileges in any area then we must specifically request it.	552
558	* We should only need to be root in these cases:	553	// before doing anything else, check for setuid/setgid operation,
559	* 1. write utmp entries on some systems	554	// start the helper process and drop privileges
560	* 2. chown tty on some systems	555	if (uid != geteuid ()
561	*/	556	\|\| gid != getegid ())
562	rxvt_privileges (SAVE);	557	{
563	rxvt_privileges (IGNORE);	558	#if PTYTTY_HELPER
		559	rxvt_ptytty_server ();
		560	#else
		561	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
		562	#endif
		563
		564	// drop privileges
		565	#if HAVE_SETRESUID
		566	setresgid (gid, gid, gid);
		567	setresuid (uid, uid, uid);
		568	#elif HAVE_SETREUID
		569	setregid (gid, gid);
		570	setreuid (uid, uid);
		571	#elif HAVE_SETUID
		572	setgid (gid);
		573	setuid (uid);
		574	#endif
		575
		576	if (uid != geteuid ()
		577	\|\| gid != getegid ())
		578	rxvt_fatal ("unable to drop privileges, aborting.\n");
		579	}
		580
		581	rxvt_environ = environ;
564		582
565	signal (SIGHUP, SIG_IGN);	583	signal (SIGHUP, SIG_IGN);
566	signal (SIGPIPE, SIG_IGN);	584	signal (SIGPIPE, SIG_IGN);
567		585
568	sig_handlers.sw_chld.start (SIGCHLD);
569	sig_handlers.sw_term.start (SIGTERM);	586	sig_handlers.sw_term.start (SIGTERM);
570	sig_handlers.sw_int.start (SIGINT);	587	sig_handlers.sw_int.start (SIGINT);
571		588
572	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	589	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
573	/* signal (SIGURG, SIG_DFL); */	590	/* signal (SIGURG, SIG_DFL); */
574		591
575	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	592	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576	// TODO: handle this with exceptions and tolerate the memory loss	593	// TODO: handle this with exceptions and tolerate the memory loss
577	XSetIOErrorHandler (rxvt_xioerror_handler);	594	XSetIOErrorHandler (rxvt_xioerror_handler);
		595
		596	XrmInitialize ();
578	}	597	}
579		598
580	/* ------------------------------------------------------------------------- *	599	/* ------------------------------------------------------------------------- *
581	* MEMORY ALLOCATION WRAPPERS *	600	* MEMORY ALLOCATION WRAPPERS *
582	* ------------------------------------------------------------------------- */	601	* ------------------------------------------------------------------------- */
…		…
600	rxvt_fatal ("memory allocation failure. aborting.\n");	619	rxvt_fatal ("memory allocation failure. aborting.\n");
601		620
602	return p;	621	return p;
603	}	622	}
604		623
605	void *	624	void *
606	rxvt_realloc (void *ptr, size_t size)	625	rxvt_realloc (void *ptr, size_t size)
607	{	626	{
608	void *p = realloc (ptr, size);	627	void *p = realloc (ptr, size);
609		628
610	if (!p)	629	if (!p)
611	rxvt_fatal ("memory allocation failure. aborting.\n");	630	rxvt_fatal ("memory allocation failure. aborting.\n");
612		631
613	return p;	632	return p;
614	}	633	}
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		634
690	/----------------------------------------------------------------------/	635	/----------------------------------------------------------------------/
691	/*	636	/*
692	* window size/position calculcations for XSizeHint and other storage.	637	* window size/position calculcations for XSizeHint and other storage.
693	* if width/height are non-zero then override calculated width/height	638	* if width/height are non-zero then override calculated width/height
694	*/	639	*/
695	void	640	void
696	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	641	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697	{	642	{
698	short recalc_x, recalc_y;	643	short recalc_x, recalc_y;
699	int x, y, sb_w, mb_h, flags;	644	int x, y, sb_w, flags;
700	unsigned int w, h;	645	unsigned int w, h;
701	unsigned int max_width, max_height;	646	unsigned int max_width, max_height;
702	dDisp;	647	dDisp;
703		648
704	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	649	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
…		…
718	if (rs[Rs_geometry])	663	if (rs[Rs_geometry])
719	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	664	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720		665
721	if (flags & WidthValue)	666	if (flags & WidthValue)
722	{	667	{
723	ncol = BOUND_POSITIVE_INT16 (w);	668	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724	szHint.flags \|= USSize;	669	szHint.flags \|= USSize;
725	}	670	}
726		671
727	if (flags & HeightValue)	672	if (flags & HeightValue)
728	{	673	{
729	nrow = BOUND_POSITIVE_INT16 (h);	674	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730	szHint.flags \|= USSize;	675	szHint.flags \|= USSize;
731	}	676	}
732		677
733	if (flags & XValue)	678	if (flags & XValue)
734	{	679	{
…		…
765	max_width = MAX_COLS * fwidth;	710	max_width = MAX_COLS * fwidth;
766	max_height = MAX_ROWS * fheight;	711	max_height = MAX_ROWS * fheight;
767		712
768	szHint.base_width = szHint.base_height = 2 * int_bwidth;	713	szHint.base_width = szHint.base_height = 2 * int_bwidth;
769		714
770	sb_w = mb_h = 0;	715	sb_w = 0;
771	window_vt_x = window_vt_y = int_bwidth;	716	window_vt_x = window_vt_y = int_bwidth;
772		717
773	if (scrollbar_visible ())	718	if (scrollBar.state)
774	{	719	{
775	sb_w = scrollbar_TotalWidth ();	720	sb_w = scrollbar_TotalWidth ();
776	szHint.base_width += sb_w;	721	szHint.base_width += sb_w;
777	if (!(options & Opt_scrollBar_right))	722	if (!OPTION (Opt_scrollBar_right))
778	window_vt_x += sb_w;	723	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	}	724	}
787		725
788	szHint.width_inc = fwidth;	726	szHint.width_inc = fwidth;
789	szHint.height_inc = fheight;	727	szHint.height_inc = fheight;
790	szHint.min_width = szHint.base_width + szHint.width_inc;	728	szHint.min_width = szHint.base_width + szHint.width_inc;
…		…
795	szHint.width = newwidth;	733	szHint.width = newwidth;
796	width = newwidth - szHint.base_width;	734	width = newwidth - szHint.base_width;
797	}	735	}
798	else	736	else
799	{	737	{
800	MIN_IT (width, max_width);	738	min_it (width, max_width);
801	szHint.width = szHint.base_width + width;	739	szHint.width = szHint.base_width + width;
802	}	740	}
803		741
804	if (newheight && newheight - szHint.base_height < max_height)	742	if (newheight && newheight - szHint.base_height < max_height)
805	{	743	{
806	szHint.height = newheight;	744	szHint.height = newheight;
807	height = newheight - szHint.base_height;	745	height = newheight - szHint.base_height;
808	}	746	}
809	else	747	else
810	{	748	{
811	MIN_IT (height, max_height);	749	min_it (height, max_height);
812	szHint.height = szHint.base_height + height;	750	szHint.height = szHint.base_height + height;
813	}	751	}
814		752
815	if (scrollbar_visible () && (options & Opt_scrollBar_right))	753	if (scrollBar.state && OPTION (Opt_scrollBar_right))
816	window_sb_x = szHint.width - sb_w;	754	window_sb_x = szHint.width - sb_w;
817		755
818	if (recalc_x)	756	if (recalc_x)
819	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	757	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
820	if (recalc_y)	758	if (recalc_y)
…		…
834	* Called after a window size change.	772	* Called after a window size change.
835	*/	773	*/
836	void	774	void
837	rxvt_term::tt_winch ()	775	rxvt_term::tt_winch ()
838	{	776	{
839	if (pty.pty < 0)	777	if (pty->pty < 0)
840	return;	778	return;
841		779
842	struct winsize ws;	780	struct winsize ws;
843		781
844	ws.ws_col = ncol;	782	ws.ws_col = ncol;
845	ws.ws_row = nrow;	783	ws.ws_row = nrow;
846	ws.ws_xpixel = width;	784	ws.ws_xpixel = width;
847	ws.ws_ypixel = height;	785	ws.ws_ypixel = height;
848	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	786	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
849		787
850	#if 0	788	#if 0
851	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	789	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852	if (cmd_pid) /* force through to the command */	790	if (cmd_pid) /* force through to the command */
853	kill (-cmd_pid, SIGWINCH);	791	kill (-cmd_pid, SIGWINCH);
…		…
889	prop.height += lineSpace;	827	prop.height += lineSpace;
890	fs->set_prop (prop);	828	fs->set_prop (prop);
891		829
892	fwidth = prop.width;	830	fwidth = prop.width;
893	fheight = prop.height;	831	fheight = prop.height;
894	fweight = prop.weight;	832	fbase = prop.ascent;
895	fslant = prop.slant;
896	fbase = (*fs)[1]->ascent;
897		833
898	for (int style = 1; style < 4; style++)	834	for (int style = 1; style < 4; style++)
899	{	835	{
900	#if ENABLE_STYLES	836	#if ENABLE_STYLES
901	const char *res = rs[Rs_font + style];	837	const char *res = rs[Rs_font + style];
…		…
935	return true;	871	return true;
936	}	872	}
937		873
938	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	874	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939	{	875	{
940	// TODO: SMART_WINDOW_TITLE
941	XChangeProperty (display->display, parent[0],	876	XChangeProperty (display->display, parent[0],
942	prop, XA_STRING, 8, PropModeReplace,	877	prop, XA_STRING, 8, PropModeReplace,
943	(const unsigned char *)str, len >= 0 ? len : strlen (str));	878	(const unsigned char *)str, len >= 0 ? len : strlen (str));
944	}	879	}
945		880
946	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	881	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947	{	882	{
948	// TODO: SMART_WINDOW_TITLE
949	wchar_t *ws = rxvt_mbstowcs (str, len);	883	wchar_t *ws = rxvt_mbstowcs (str, len);
950	char *s = rxvt_wcstoutf8 (ws);	884	char *s = rxvt_wcstoutf8 (ws);
951		885
952	XChangeProperty (display->display, parent[0],	886	XChangeProperty (display->display, parent[0],
953	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	887	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
…		…
994	i = atoi (color);	928	i = atoi (color);
995		929
996	if (i >= 8 && i <= 15)	930	if (i >= 8 && i <= 15)
997	{ /* bright colors */	931	{ /* bright colors */
998	i -= 8;	932	i -= 8;
999	# ifndef NO_BRIGHTCOLOR
1000	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	933	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001	SET_PIXCOLOR (idx);	934	SET_PIXCOLOR (idx);
1002	goto done;	935	goto done;
1003	# endif
1004	}	936	}
1005		937
1006	if (i >= 0 && i <= 7)	938	if (i >= 0 && i <= 7)
1007	{ /* normal colors */	939	{ /* normal colors */
1008	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	940	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1181		1113
1182	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1114	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1183		1115
1184	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1116	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1185	{	1117	{
1186	if (scrollbar_visible ())	1118	if (scrollBar.state)
1187	{	1119	{
1188	XMoveResizeWindow (disp, scrollBar.win,	1120	XMoveResizeWindow (disp, scrollBar.win,
1189	window_sb_x, 0,	1121	window_sb_x, 0,
1190	scrollbar_TotalWidth (), szHint.height);	1122	scrollbar_TotalWidth (), szHint.height);
1191	resize_scrollbar ();	1123	resize_scrollbar ();
1192	}	1124	}
1193		1125
1194	if (menubar_visible ())
1195	XMoveResizeWindow (disp, menuBar.win,
1196	window_vt_x, 0,
1197	TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199	XMoveResizeWindow (disp, vt,	1126	XMoveResizeWindow (disp, vt,
1200	window_vt_x, window_vt_y,	1127	window_vt_x, window_vt_y,
1201	TermWin_TotalWidth (), TermWin_TotalHeight ());	1128	width, height);
1202		1129
1203	scr_clear ();	1130	scr_clear ();
1204	#ifdef XPM_BACKGROUND	1131	#ifdef XPM_BACKGROUND
1205	resize_pixmap ();	1132	resize_pixmap ();
1206	#endif	1133	#endif
…		…
1386	XRectangle rect, status_rect, needed_rect;	1313	XRectangle rect, status_rect, needed_rect;
1387	unsigned long fg, bg;	1314	unsigned long fg, bg;
1388	const char *p;	1315	const char *p;
1389	char **s;	1316	char **s;
1390	XIMStyles *xim_styles;	1317	XIMStyles *xim_styles;
		1318
		1319	set_environ (envv);
1391		1320
1392	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1321	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393	return false;	1322	return false;
1394		1323
1395	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1324	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1561	int i;	1490	int i;
1562	const char *p;	1491	const char *p;
1563	char **s;	1492	char **s;
1564	char buf[IMBUFSIZ];	1493	char buf[IMBUFSIZ];
1565		1494
1566	SET_R (this);	1495	make_current ();
1567		1496
1568	im_destroy ();	1497	im_destroy ();
1569		1498
1570	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1499	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571	if (Input_Context)	1500	if (Input_Context)
…		…
1648	XFree (preedit_attr);	1577	XFree (preedit_attr);
1649	XFree (status_attr);	1578	XFree (status_attr);
1650	}	1579	}
1651	#endif /* USE_XIM */	1580	#endif /* USE_XIM */
1652		1581
1653	/----------------------------------------------------------------------/
1654	rxvt_t rxvt_current_term;
1655
1656	/----------------------- end-of-file (C source) -----------------------/	1582	/----------------------- 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.192 by root, Fri Jan 20 12:16:28 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.192 by root, Fri Jan 20 12:16:28 2006 UTC