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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.141 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.187 by root, Tue Jan 17 16:22:41 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	static char curlocale[128];	53	static char curlocale[128], savelocale[128];
54		54
55	bool	55	bool
56	rxvt_set_locale (const char *locale)	56	rxvt_set_locale (const char *locale)
57	{	57	{
58	if (!locale \|\| !strncmp (locale, curlocale, 128))	58	if (!locale \|\| !strncmp (locale, curlocale, 128))
59	return false;	59	return false;
60		60
61	strncpy (curlocale, locale, 128);	61	strncpy (curlocale, locale, 128);
62	setlocale (LC_CTYPE, curlocale);	62	setlocale (LC_CTYPE, curlocale);
63	return true;	63	return true;
		64	}
		65
		66	void
		67	rxvt_push_locale (const char *locale)
		68	{
		69	strcpy (savelocale, curlocale);
		70	rxvt_set_locale (locale);
		71	}
		72
		73	void
		74	rxvt_pop_locale ()
		75	{
		76	rxvt_set_locale (savelocale);
64	}	77	}
65		78
66	#if ENABLE_COMBINING	79	#if ENABLE_COMBINING
67	class rxvt_composite_vec rxvt_composite;	80	class rxvt_composite_vec rxvt_composite;
68		81
…		…
133	rootwin_ev (this, &rxvt_term::rootwin_cb),	146	rootwin_ev (this, &rxvt_term::rootwin_cb),
134	#endif	147	#endif
135	#ifdef HAVE_SCROLLBARS	148	#ifdef HAVE_SCROLLBARS
136	scrollbar_ev (this, &rxvt_term::x_cb),	149	scrollbar_ev (this, &rxvt_term::x_cb),
137	#endif	150	#endif
138	#ifdef MENUBAR
139	menubar_ev (this, &rxvt_term::x_cb),
140	#endif
141	#ifdef CURSOR_BLINK	151	#ifdef CURSOR_BLINK
142	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	152	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143	#endif	153	#endif
144	#ifdef TEXT_BLINK	154	#ifdef TEXT_BLINK
145	text_blink_ev (this, &rxvt_term::text_blink_cb),	155	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
157	pointer_ev (this, &rxvt_term::pointer_cb),	167	pointer_ev (this, &rxvt_term::pointer_cb),
158	#endif	168	#endif
159	#ifdef USE_XIM	169	#ifdef USE_XIM
160	im_ev (this, &rxvt_term::im_cb),	170	im_ev (this, &rxvt_term::im_cb),
161	#endif	171	#endif
162	sw_term (this, &rxvt_term::sig_term),
163	sw_int (this, &rxvt_term::sig_term),
164	sw_chld (this, &rxvt_term::sig_chld),
165	termwin_ev (this, &rxvt_term::x_cb),	172	termwin_ev (this, &rxvt_term::x_cb),
166	vt_ev (this, &rxvt_term::x_cb),	173	vt_ev (this, &rxvt_term::x_cb),
167	check_ev (this, &rxvt_term::check_cb),	174	check_ev (this, &rxvt_term::check_cb),
168	flush_ev (this, &rxvt_term::flush_cb),	175	flush_ev (this, &rxvt_term::flush_cb),
169	destroy_ev (this, &rxvt_term::destroy_cb),	176	destroy_ev (this, &rxvt_term::destroy_cb),
…		…
187	void rxvt_term::emergency_cleanup ()	194	void rxvt_term::emergency_cleanup ()
188	{	195	{
189	if (cmd_pid)	196	if (cmd_pid)
190	kill (-cmd_pid, SIGHUP);	197	kill (-cmd_pid, SIGHUP);
191		198
192	#ifdef UTMP_SUPPORT	199	delete pty; pty = 0;
193	privileged_utmp (RESTORE);
194	#endif
195
196	pty.put ();
197	}	200	}
198		201
199	rxvt_term::~rxvt_term ()	202	rxvt_term::~rxvt_term ()
200	{	203	{
		204	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		205
201	termlist.erase (find (termlist.begin (), termlist.end(), this));	206	termlist.erase (find (termlist.begin (), termlist.end(), this));
202		207
203	emergency_cleanup ();	208	emergency_cleanup ();
204		209
205	#if ENABLE_STYLES	210	#if ENABLE_STYLES
206	for (int i = RS_styleCount; --i; )	211	for (int i = RS_styleCount; --i; )
207	if (TermWin.fontset[i] != TermWin.fontset[0])	212	if (fontset[i] != fontset[0])
208	delete TermWin.fontset[i];	213	delete fontset[i];
209	#endif	214	#endif
210	delete TermWin.fontset[0];	215	delete fontset[0];
211		216
212	if (display)	217	if (display)
213	{	218	{
214	dDisp;	219	dDisp;
215		220
216	selection_clear ();	221	selection_clear ();
217		222
218	#ifdef USE_XIM	223	#ifdef USE_XIM
219	im_destroy ();	224	im_destroy ();
220	#endif
221	#ifdef MENUBAR
222	if (menubarGC) XFreeGC (disp, menubarGC);
223	#endif	225	#endif
224	#ifdef XTERM_SCROLLBAR	226	#ifdef XTERM_SCROLLBAR
225	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	227	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
226	if (ShadowGC) XFreeGC (disp, ShadowGC);	228	if (ShadowGC) XFreeGC (disp, ShadowGC);
227	#endif	229	#endif
…		…
238	if (upArrow) XFreePixmap (disp, upArrow);	240	if (upArrow) XFreePixmap (disp, upArrow);
239	if (downArrow) XFreePixmap (disp, downArrow);	241	if (downArrow) XFreePixmap (disp, downArrow);
240	if (upArrowHi) XFreePixmap (disp, upArrowHi);	242	if (upArrowHi) XFreePixmap (disp, upArrowHi);
241	if (downArrowHi) XFreePixmap (disp, downArrowHi);	243	if (downArrowHi) XFreePixmap (disp, downArrowHi);
242	#endif	244	#endif
243	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	245	#ifdef RXVT_SCROLLBAR
244	if (topShadowGC) XFreeGC (disp, topShadowGC);	246	if (topShadowGC) XFreeGC (disp, topShadowGC);
245	if (botShadowGC) XFreeGC (disp, botShadowGC);	247	if (botShadowGC) XFreeGC (disp, botShadowGC);
246	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	248	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247	#endif	249	#endif
248	if (TermWin.gc) XFreeGC (disp, TermWin.gc);	250	if (gc) XFreeGC (disp, gc);
249		251
250	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251	delete menuBar.drawable;	252	delete drawable;
252	//if (menuBar.win)
253	// XDestroyWindow (disp, menuBar.win);
254	#endif
255	delete TermWin.drawable;
256	// destroy all windows	253	// destroy all windows
257	if (TermWin.parent[0]	254	if (parent[0])
258	#if ENABLE_XEMBED
259	&& !rs[Rs_embed]
260	#endif
261	)
262	XDestroyWindow (disp, TermWin.parent[0]);	255	XDestroyWindow (disp, parent[0]);
263	}	256	}
264		257
265	// TODO: free pixcolours, colours should become part of rxvt_display	258	// TODO: free pixcolours, colours should become part of rxvt_display
266
267	delete pix_colors_focused;	259	delete pix_colors_focused;
268	#ifdef OFF_FOCUS_FADING	260	#if OFF_FOCUS_FADING
269	delete pix_colors_unfocused;	261	delete pix_colors_unfocused;
270	#endif	262	#endif
271		263
272	displays.put (display);	264	displays.put (display);
273		265
…		…
294	delete keyboard;	286	delete keyboard;
295	#endif	287	#endif
296	}	288	}
297		289
298	void	290	void
		291	rxvt_term::child_exit ()
		292	{
		293	cmd_pid = 0;
		294
		295	if (!OPTION (Opt_hold))
		296	destroy ();
		297	}
		298
		299	void
299	rxvt_term::destroy ()	300	rxvt_term::destroy ()
300	{	301	{
301	if (destroy_ev.active)	302	if (destroy_ev.active)
302	return;	303	return;
303		304
…		…
310	#if USE_XIM	311	#if USE_XIM
311	im_ev.stop (display);	312	im_ev.stop (display);
312	#endif	313	#endif
313	#if HAVE_SCROLLBARS	314	#if HAVE_SCROLLBARS
314	scrollbar_ev.stop (display);	315	scrollbar_ev.stop (display);
315	#endif
316	#if MENUBAR
317	menubar_ev.stop (display);
318	#endif	316	#endif
319	#if TRANSPARENT	317	#if TRANSPARENT
320	rootwin_ev.stop (display);	318	rootwin_ev.stop (display);
321	#endif	319	#endif
322	incr_ev.stop ();	320	incr_ev.stop ();
…		…
346	}	344	}
347		345
348	void	346	void
349	rxvt_term::destroy_cb (time_watcher &w)	347	rxvt_term::destroy_cb (time_watcher &w)
350	{	348	{
351	SET_R (this);	349	make_current ();
352		350
353	delete this;	351	delete this;
354	}	352	}
355		353
356	/----------------------------------------------------------------------/	354	/----------------------------------------------------------------------/
…		…
421	{	419	{
422	if (GET_R->allowedxerror == -1)	420	if (GET_R->allowedxerror == -1)
423	GET_R->allowedxerror = event->error_code;	421	GET_R->allowedxerror = event->error_code;
424	else	422	else
425	{	423	{
426	//TODO: GET_R is most likely not the terminal which caused the error	424	// GET_R is most likely not the terminal which caused the error,
427	//TODO: maybe just output the error and continue?	425	// so just output the error and continue
428	#if ENABLE_FRILLS	426	#if ENABLE_FRILLS
429	print_x_error (display, event);	427	print_x_error (display, event);
430	#else	428	#else
431	old_xerror_handler (display, event);	429	old_xerror_handler (display, event);
432	#endif	430	#endif
…		…
442	DisplayString (display));	440	DisplayString (display));
443	rxvt_emergency_cleanup ();	441	rxvt_emergency_cleanup ();
444	_exit (EXIT_FAILURE);	442	_exit (EXIT_FAILURE);
445	}	443	}
446		444
447	/*
448	* Catch a fatal signal and tidy up before quitting
449	*/
450	void
451	rxvt_term::sig_term (sig_watcher &w)
452	{
453	#ifdef DEBUG_CMD
454	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
455	#endif
456	rxvt_emergency_cleanup ();
457	signal (w.signum, SIG_DFL);
458	kill (getpid (), w.signum);
459	}
460
461	/----------------------------------------------------------------------/	445	/----------------------------------------------------------------------/
462	/* rxvt_init () */
463	bool	446	bool
464	rxvt_term::init (int argc, const char const argv)	447	rxvt_term::init (int argc, const char const argv)
465	{	448	{
466	SET_R (this);	449	SET_R (this);
467
468	set_locale ("");	450	set_locale ("");
		451	set_environ (envv); // few things in X do not call setlocale :(
469		452
470	if (!init_vars ())	453	if (!init_vars ())
471	return false;	454	return false;
472		455
473	init_secondary ();	456	init_secondary ();
…		…
476		459
477	#ifdef KEYSYM_RESOURCE	460	#ifdef KEYSYM_RESOURCE
478	keyboard->register_done ();	461	keyboard->register_done ();
479	#endif	462	#endif
480		463
481	#if MENUBAR_MAX
482	menubar_read (rs[Rs_menu]);
483	#endif
484	#ifdef HAVE_SCROLLBARS	464	#ifdef HAVE_SCROLLBARS
485	if (options & Opt_scrollBar)	465	if (OPTION (Opt_scrollBar))
486	scrollBar.setIdle (); /* set existence for size calculations */	466	scrollBar.setIdle (); /* set existence for size calculations */
487	#endif	467	#endif
488		468
		469	#if ENABLE_PERL
		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	}
		480	#endif
		481
		482	pty = rxvt_new_ptytty ();
		483
489	create_windows (argc, argv);	484	create_windows (argc, argv);
490		485
491	dDisp;	486	dDisp;
492		487
493	init_xlocale ();	488	init_xlocale ();
494		489
495	scr_reset (); /* initialize screen */	490	scr_reset (); // initialize screen
496		491
497	#if 0	492	#if 0
498	XSynchronize (disp, True);	493	XSynchronize (disp, True);
499	#endif	494	#endif
500		495
501	#ifdef HAVE_SCROLLBARS	496	#ifdef HAVE_SCROLLBARS
502	if (options & Opt_scrollBar)	497	if (OPTION (Opt_scrollBar))
503	resize_scrollbar (); /* create and map scrollbar */	498	resize_scrollbar (); /* create and map scrollbar */
504	#endif	499	#endif
505	#if (MENUBAR_MAX)
506	if (menubar_visible ())
507	XMapWindow (disp, menuBar.win);
508	#endif
509	#ifdef TRANSPARENT	500	#ifdef TRANSPARENT
510	if (options & Opt_transparent)	501	if (OPTION (Opt_transparent))
511	{	502	{
512	XSelectInput (disp, display->root, PropertyChangeMask);	503	XSelectInput (disp, display->root, PropertyChangeMask);
513	check_our_parents ();	504	check_our_parents ();
514	rootwin_ev.start (display, display->root);	505	rootwin_ev.start (display, display->root);
515	}	506	}
516	#endif	507	#endif
517		508
518	XMapWindow (disp, TermWin.vt);	509	XMapWindow (disp, vt);
519	XMapWindow (disp, TermWin.parent[0]);	510	XMapWindow (disp, parent[0]);
520		511
521	set_colorfgbg ();	512	set_colorfgbg ();
522		513
523	init_command (cmd_argv);	514	init_command (cmd_argv);
524		515
525	free (cmd_argv);	516	free (cmd_argv);
526		517
		518	if (pty->pty >= 0)
527	pty_ev.start (pty.pty, EVENT_READ);	519	pty_ev.start (pty->pty, EVENT_READ);
528		520
529	check_ev.start ();	521	check_ev.start ();
530		522
		523	HOOK_INVOKE ((this, HOOK_START, DT_END));
		524
531	return true;	525	return true;
532	}	526	}
533		527
		528	static struct sig_handlers
		529	{
		530	sig_watcher sw_chld, sw_term, sw_int;
		531
		532	void sig_chld (sig_watcher &w)
		533	{
		534	// we are being called for every SIGCHLD, find the corresponding term
		535	int pid;
		536
		537	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
		538	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
		539	if (pid == (*t)->cmd_pid)
		540	{
		541	(*t)->child_exit ();
		542	break;
		543	}
		544	}
		545
		546	/*
		547	* Catch a fatal signal and tidy up before quitting
		548	*/
		549	void
		550	sig_term (sig_watcher &w)
		551	{
		552	#ifdef DEBUG_CMD
		553	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
		554	#endif
		555	rxvt_emergency_cleanup ();
		556	signal (w.signum, SIG_DFL);
		557	kill (getpid (), w.signum);
		558	}
		559
		560	sig_handlers ()
		561	: sw_chld (this, &sig_handlers::sig_chld),
		562	sw_term (this, &sig_handlers::sig_term),
		563	sw_int (this, &sig_handlers::sig_term)
		564	{
		565	}
		566	} sig_handlers;
		567
		568	char **rxvt_environ; // startup environment
		569
534	void	570	void
535	rxvt_init ()	571	rxvt_init ()
536	{	572	{
537	/*	573	uid_t uid = getuid ();
538	* Save and then give up any super-user privileges	574	gid_t gid = getgid ();
539	* If we need privileges in any area then we must specifically request it.	575
540	* We should only need to be root in these cases:	576	// before doing anything else, check for setuid/setgid operation,
541	* 1. write utmp entries on some systems	577	// start the helper process and drop privileges
542	* 2. chown tty on some systems	578	if (uid != geteuid ()
543	*/	579	\|\| 1 //D
544	rxvt_privileges (SAVE);	580	\|\| gid != getegid ())
545	rxvt_privileges (IGNORE);	581	{
		582	#if PTYTTY_HELPER
		583	rxvt_ptytty_server ();
		584	#else
		585	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
		586	#endif
		587
		588	// drop privileges
		589	#if HAVE_SETRESUID
		590	setresgid (gid, gid, gid);
		591	setresuid (uid, uid, uid);
		592	#elif HAVE_SETREUID
		593	setregid (gid, gid);
		594	setreuid (uid, uid);
		595	#elif HAVE_SETUID
		596	setgid (gid);
		597	setuid (uid);
		598	#endif
		599
		600	if (uid != geteuid ()
		601	\|\| gid != getegid ())
		602	rxvt_fatal ("unable to drop privileges, aborting.\n");
		603	}
		604
		605	rxvt_environ = environ;
546		606
547	signal (SIGHUP, SIG_IGN);	607	signal (SIGHUP, SIG_IGN);
548	signal (SIGPIPE, SIG_IGN);	608	signal (SIGPIPE, SIG_IGN);
		609
		610	sig_handlers.sw_chld.start (SIGCHLD);
		611	sig_handlers.sw_term.start (SIGTERM);
		612	sig_handlers.sw_int.start (SIGINT);
549		613
550	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	614	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
551	/* signal (SIGURG, SIG_DFL); */	615	/* signal (SIGURG, SIG_DFL); */
552		616
553	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	617	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
554	// TODO: handle this with exceptions and tolerate the memory loss	618	// TODO: handle this with exceptions and tolerate the memory loss
555	XSetIOErrorHandler (rxvt_xioerror_handler);	619	XSetIOErrorHandler (rxvt_xioerror_handler);
556	}
557		620
558	/* ------------------------------------------------------------------------- *	621	XrmInitialize ();
559	* SIGNAL HANDLING & EXIT HANDLER *
560	* ------------------------------------------------------------------------- */
561	/*
562	* Catch a SIGCHLD signal and exit if the direct child has died
563	*/
564
565	void
566	rxvt_term::sig_chld (sig_watcher &w)
567	{
568	// we are being called for every SIGCHLD, not just ours
569	int pid;
570
571	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
572	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
573	if (pid == (*t)->cmd_pid)
574	{
575	(*t)->destroy ();
576	break;
577	}
578	}	622	}
579		623
580	/* ------------------------------------------------------------------------- *	624	/* ------------------------------------------------------------------------- *
581	* MEMORY ALLOCATION WRAPPERS *	625	* MEMORY ALLOCATION WRAPPERS *
582	* ------------------------------------------------------------------------- */	626	* ------------------------------------------------------------------------- */
…		…
589	rxvt_fatal ("memory allocation failure. aborting.\n");	633	rxvt_fatal ("memory allocation failure. aborting.\n");
590		634
591	return p;	635	return p;
592	}	636	}
593		637
594	void *	638	void *
595	rxvt_calloc (size_t number, size_t size)	639	rxvt_calloc (size_t number, size_t size)
596	{	640	{
597	void *p = calloc (number, size);	641	void *p = calloc (number, size);
598		642
599	if (!p)	643	if (!p)
…		…
610	if (!p)	654	if (!p)
611	rxvt_fatal ("memory allocation failure. aborting.\n");	655	rxvt_fatal ("memory allocation failure. aborting.\n");
612		656
613	return p;	657	return p;
614	}	658	}
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		659
690	/----------------------------------------------------------------------/	660	/----------------------------------------------------------------------/
691	/*	661	/*
692	* window size/position calculcations for XSizeHint and other storage.	662	* window size/position calculcations for XSizeHint and other storage.
693	* if width/height are non-zero then override calculated width/height	663	* if width/height are non-zero then override calculated width/height
694	*/	664	*/
695	void	665	void
696	rxvt_term::window_calc (unsigned int width, unsigned int height)	666	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697	{	667	{
698	short recalc_x, recalc_y;	668	short recalc_x, recalc_y;
699	int x, y, sb_w, mb_h, flags;	669	int x, y, sb_w, flags;
700	unsigned int w, h;	670	unsigned int w, h;
701	unsigned int max_width, max_height;	671	unsigned int max_width, max_height;
702	dDisp;	672	dDisp;
703		673
704	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	674	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705	TermWin.ncol, TermWin.nrow, szHint.width,	675	ncol, nrow, szHint.width, szHint.height));
706	szHint.height));	676
707	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	677	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
708	szHint.win_gravity = NorthWestGravity;	678	szHint.win_gravity = NorthWestGravity;
709	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	679	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710		680
711	recalc_x = recalc_y = 0;	681	recalc_x = recalc_y = 0;
712	flags = 0;	682	flags = 0;
		683
713	if (!parsed_geometry)	684	if (!parsed_geometry)
714	{	685	{
715	parsed_geometry = 1;	686	parsed_geometry = 1;
		687
716	if (rs[Rs_geometry])	688	if (rs[Rs_geometry])
717	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	689	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718		690
719	if (flags & WidthValue)	691	if (flags & WidthValue)
720	{	692	{
721	TermWin.ncol = BOUND_POSITIVE_INT16 (w);	693	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
722	szHint.flags \|= USSize;	694	szHint.flags \|= USSize;
723	}	695	}
724		696
725	if (flags & HeightValue)	697	if (flags & HeightValue)
726	{	698	{
727	TermWin.nrow = BOUND_POSITIVE_INT16 (h);	699	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
728	szHint.flags \|= USSize;	700	szHint.flags \|= USSize;
729	}	701	}
730		702
731	if (flags & XValue)	703	if (flags & XValue)
732	{	704	{
733	szHint.x = x;	705	szHint.x = x;
734	szHint.flags \|= USPosition;	706	szHint.flags \|= USPosition;
		707
735	if (flags & XNegative)	708	if (flags & XNegative)
736	{	709	{
737	recalc_x = 1;	710	recalc_x = 1;
738	szHint.win_gravity = NorthEastGravity;	711	szHint.win_gravity = NorthEastGravity;
739	}	712	}
…		…
741		714
742	if (flags & YValue)	715	if (flags & YValue)
743	{	716	{
744	szHint.y = y;	717	szHint.y = y;
745	szHint.flags \|= USPosition;	718	szHint.flags \|= USPosition;
		719
746	if (flags & YNegative)	720	if (flags & YNegative)
747	{	721	{
748	recalc_y = 1;	722	recalc_y = 1;
		723
749	if (szHint.win_gravity == NorthEastGravity)	724	if (szHint.win_gravity == NorthEastGravity)
750	szHint.win_gravity = SouthEastGravity;	725	szHint.win_gravity = SouthEastGravity;
751	else	726	else
752	szHint.win_gravity = SouthWestGravity;	727	szHint.win_gravity = SouthWestGravity;
753	}	728	}
754	}	729	}
755	}	730	}
756		731
757	/* TODO: BOUNDS */	732	/* TODO: BOUNDS */
758	TermWin.width = TermWin.ncol * TermWin.fwidth;	733	width = ncol * fwidth;
759	TermWin.height = TermWin.nrow * TermWin.fheight;	734	height = nrow * fheight;
760	max_width = MAX_COLS * TermWin.fwidth;	735	max_width = MAX_COLS * fwidth;
761	max_height = MAX_ROWS * TermWin.fheight;	736	max_height = MAX_ROWS * fheight;
762		737
763	szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;	738	szHint.base_width = szHint.base_height = 2 * int_bwidth;
764		739
765	sb_w = mb_h = 0;	740	sb_w = 0;
766	window_vt_x = window_vt_y = TermWin.int_bwidth;	741	window_vt_x = window_vt_y = int_bwidth;
767		742
768	if (scrollbar_visible ())	743	if (scrollBar.state)
769	{	744	{
770	sb_w = scrollbar_TotalWidth ();	745	sb_w = scrollbar_TotalWidth ();
771	szHint.base_width += sb_w;	746	szHint.base_width += sb_w;
772	if (!(options & Opt_scrollBar_right))	747	if (!OPTION (Opt_scrollBar_right))
773	window_vt_x += sb_w;	748	window_vt_x += sb_w;
774	}	749	}
775		750
776	if (menubar_visible ())
777	{
778	mb_h = menuBar_TotalHeight ();
779	szHint.base_height += mb_h;
780	window_vt_y += mb_h;
781	}
782
783	szHint.width_inc = TermWin.fwidth;	751	szHint.width_inc = fwidth;
784	szHint.height_inc = TermWin.fheight;	752	szHint.height_inc = fheight;
785	szHint.min_width = szHint.base_width + szHint.width_inc;	753	szHint.min_width = szHint.base_width + szHint.width_inc;
786	szHint.min_height = szHint.base_height + szHint.height_inc;	754	szHint.min_height = szHint.base_height + szHint.height_inc;
787		755
788	if (width && width - szHint.base_width < max_width)	756	if (newwidth && newwidth - szHint.base_width < max_width)
789	{	757	{
790	szHint.width = width;	758	szHint.width = newwidth;
791	TermWin.width = width - szHint.base_width;	759	width = newwidth - szHint.base_width;
792	}	760	}
793	else	761	else
794	{	762	{
795	MIN_IT (TermWin.width, max_width);	763	min_it (width, max_width);
796	szHint.width = szHint.base_width + TermWin.width;	764	szHint.width = szHint.base_width + width;
797	}	765	}
798		766
799	if (height && height - szHint.base_height < max_height)	767	if (newheight && newheight - szHint.base_height < max_height)
800	{	768	{
801	szHint.height = height;	769	szHint.height = newheight;
802	TermWin.height = height - szHint.base_height;	770	height = newheight - szHint.base_height;
803	}	771	}
804	else	772	else
805	{	773	{
806	MIN_IT (TermWin.height, max_height);	774	min_it (height, max_height);
807	szHint.height = szHint.base_height + TermWin.height;	775	szHint.height = szHint.base_height + height;
808	}	776	}
809		777
810	if (scrollbar_visible () && (options & Opt_scrollBar_right))	778	if (scrollBar.state && OPTION (Opt_scrollBar_right))
811	window_sb_x = szHint.width - sb_w;	779	window_sb_x = szHint.width - sb_w;
812		780
813	if (recalc_x)	781	if (recalc_x)
814	szHint.x += (DisplayWidth (disp, display->screen)	782	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
815	- szHint.width - 2 * TermWin.ext_bwidth);
816	if (recalc_y)	783	if (recalc_y)
817	szHint.y += (DisplayHeight (disp, display->screen)	784	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
818	- szHint.height - 2 * TermWin.ext_bwidth);
819		785
820	TermWin.ncol = TermWin.width / TermWin.fwidth;	786	ncol = width / fwidth;
821	TermWin.nrow = TermWin.height / TermWin.fheight;	787	nrow = height / fheight;
822	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	788	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
823	TermWin.ncol, TermWin.nrow, szHint.width,	789	ncol, nrow, szHint.width,
824	szHint.height));	790	szHint.height));
825	return;	791	return;
826	}	792	}
827		793
828	/----------------------------------------------------------------------/	794	/----------------------------------------------------------------------/
…		…
831	* Called after a window size change.	797	* Called after a window size change.
832	*/	798	*/
833	void	799	void
834	rxvt_term::tt_winch ()	800	rxvt_term::tt_winch ()
835	{	801	{
836	if (pty.pty < 0)	802	if (pty->pty < 0)
837	return;	803	return;
838		804
839	struct winsize ws;	805	struct winsize ws;
840		806
841	ws.ws_col = TermWin.ncol;	807	ws.ws_col = ncol;
842	ws.ws_row = TermWin.nrow;	808	ws.ws_row = nrow;
843	ws.ws_xpixel = TermWin.width;	809	ws.ws_xpixel = width;
844	ws.ws_ypixel = TermWin.height;	810	ws.ws_ypixel = height;
845	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	811	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
846		812
847	#if 0	813	#if 0
848	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	814	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
849	if (cmd_pid) /* force through to the command */	815	if (cmd_pid) /* force through to the command */
850	kill (-cmd_pid, SIGWINCH);	816	kill (-cmd_pid, SIGWINCH);
851	#endif	817	#endif
852	}	818	}
853		819
854	/----------------------------------------------------------------------/	820	/----------------------------------------------------------------------/
855	/* set_fonts () - load and set the various fonts	821	/* set_fonts () - load and set the various fonts
856	/*	822	*
857	* init = 1 - initialize	823	* init = 1 - initialize
858	*	824	*
859	* fontname == FONT_UP - switch to bigger font	825	* fontname == FONT_UP - switch to bigger font
860	* fontname == FONT_DN - switch to smaller font	826	* fontname == FONT_DN - switch to smaller font
861	*/	827	*/
…		…
873	return false;	839	return false;
874	}	840	}
875		841
876	#if ENABLE_STYLES	842	#if ENABLE_STYLES
877	for (int i = RS_styleCount; --i; )	843	for (int i = RS_styleCount; --i; )
878	if (TermWin.fontset[i] != TermWin.fontset[0])	844	if (fontset[i] != fontset[0])
879	delete TermWin.fontset[i];	845	delete fontset[i];
880	#endif	846	#endif
881		847
882	delete TermWin.fontset[0];	848	delete fontset[0];
883	TermWin.fontset[0] = fs;	849	fontset[0] = fs;
884		850
885	prop = (*fs)[1]->properties ();	851	prop = (*fs)[1]->properties ();
886	prop.height += TermWin.lineSpace;	852	prop.height += lineSpace;
887	fs->set_prop (prop);	853	fs->set_prop (prop);
888		854
889	TermWin.fwidth = prop.width;	855	fwidth = prop.width;
890	TermWin.fheight = prop.height;	856	fheight = prop.height;
891	TermWin.fweight = prop.weight;	857	fbase = prop.ascent;
892	TermWin.fslant = prop.slant;
893	TermWin.fbase = (*fs)[1]->ascent;
894		858
895	for (int style = 1; style < 4; style++)	859	for (int style = 1; style < 4; style++)
896	{	860	{
897	#if ENABLE_STYLES	861	#if ENABLE_STYLES
898	const char *res = rs[Rs_font + style];	862	const char *res = rs[Rs_font + style];
899		863
900	if (res && !*res)	864	if (res && !*res)
901	TermWin.fontset[style] = TermWin.fontset[0];	865	fontset[style] = fontset[0];
902	else	866	else
903	{	867	{
904	TermWin.fontset[style] = fs = new rxvt_fontset (this);	868	fontset[style] = fs = new rxvt_fontset (this);
905	rxvt_fontprop prop2 = prop;	869	rxvt_fontprop prop2 = prop;
906		870
907	if (res)	871	if (res)
908	prop2.weight = prop2.slant = rxvt_fontprop::unset;	872	prop2.weight = prop2.slant = rxvt_fontprop::unset;
909	else	873	else
910	{	874	{
911	res = TermWin.fontset[0]->fontdesc;	875	res = fontset[0]->fontdesc;
912		876
913	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	877	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
914	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	878	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
915	}	879	}
916		880
917	fs->populate (res);	881	fs->populate (res);
918	fs->set_prop (prop2);	882	fs->set_prop (prop2);
919	}	883	}
920	#else	884	#else
921	TermWin.fontset[style] = TermWin.fontset[0];	885	fontset[style] = fontset[0];
922	#endif	886	#endif
923	}	887	}
924		888
925	if (TermWin.parent[0])	889	if (parent[0])
926	{	890	{
927	resize_all_windows (0, 0, 0);	891	resize_all_windows (0, 0, 0);
928	scr_remap_chars ();	892	scr_remap_chars ();
929	scr_touch (true);	893	scr_touch (true);
930	}	894	}
…		…
932	return true;	896	return true;
933	}	897	}
934		898
935	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	899	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
936	{	900	{
937	// TODO: SMART_WINDOW_TITLE
938	XChangeProperty (display->display, TermWin.parent[0],	901	XChangeProperty (display->display, parent[0],
939	prop, XA_STRING, 8, PropModeReplace,	902	prop, XA_STRING, 8, PropModeReplace,
940	(const unsigned char *)str, len >= 0 ? len : strlen (str));	903	(const unsigned char *)str, len >= 0 ? len : strlen (str));
941	}	904	}
942		905
943	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	906	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944	{	907	{
945	// TODO: SMART_WINDOW_TITLE
946	wchar_t *ws = rxvt_mbstowcs (str, len);	908	wchar_t *ws = rxvt_mbstowcs (str, len);
947	char *s = rxvt_wcstoutf8 (ws);	909	char *s = rxvt_wcstoutf8 (ws);
948		910
949	XChangeProperty (display->display, TermWin.parent[0],	911	XChangeProperty (display->display, parent[0],
950	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	912	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951	(const unsigned char *)s, strlen (s));	913	(const unsigned char *)s, strlen (s));
952		914
953	free (s);	915	free (s);
954	free (ws);	916	free (ws);
…		…
959	/* xterm sequences - title, iconName, color (exptl) */	921	/* xterm sequences - title, iconName, color (exptl) */
960	void	922	void
961	rxvt_term::set_title (const char *str)	923	rxvt_term::set_title (const char *str)
962	{	924	{
963	set_string_property (XA_WM_NAME, str);	925	set_string_property (XA_WM_NAME, str);
964	#if ENABLE_FRILLS	926	#if ENABLE_EWMH
965	set_utf8_property (xa[XA_NET_WM_NAME], str);	927	set_utf8_property (xa[XA_NET_WM_NAME], str);
966	#endif	928	#endif
967	}	929	}
968		930
969	void	931	void
970	rxvt_term::set_icon_name (const char *str)	932	rxvt_term::set_icon_name (const char *str)
971	{	933	{
972	set_string_property (XA_WM_ICON_NAME, str);	934	set_string_property (XA_WM_ICON_NAME, str);
973	#if ENABLE_FRILLS	935	#if ENABLE_EWMH
974	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	936	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
975	#endif	937	#endif
976	}	938	}
977		939
978	#ifdef XTERM_COLOR_CHANGE	940	#ifdef XTERM_COLOR_CHANGE
…		…
991	i = atoi (color);	953	i = atoi (color);
992		954
993	if (i >= 8 && i <= 15)	955	if (i >= 8 && i <= 15)
994	{ /* bright colors */	956	{ /* bright colors */
995	i -= 8;	957	i -= 8;
996	# ifndef NO_BRIGHTCOLOR
997	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	958	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
998	SET_PIXCOLOR (idx);	959	SET_PIXCOLOR (idx);
999	goto Done;	960	goto done;
1000	# endif
1001	}	961	}
1002		962
1003	if (i >= 0 && i <= 7)	963	if (i >= 0 && i <= 7)
1004	{ /* normal colors */	964	{ /* normal colors */
1005	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	965	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1006	SET_PIXCOLOR (idx);	966	SET_PIXCOLOR (idx);
1007	goto Done;	967	goto done;
1008	}	968	}
1009	}	969	}
1010		970
1011	if (!rXParseAllocColor (&xcol, color))	971	if (!rXParseAllocColor (&xcol, color))
1012	return;	972	return;
…		…
1032	pix_colors_focused[idx] = xcol;	992	pix_colors_focused[idx] = xcol;
1033	SET_PIXCOLOR (idx);	993	SET_PIXCOLOR (idx);
1034		994
1035	/* XSetWindowAttributes attr; */	995	/* XSetWindowAttributes attr; */
1036	/* Cursor cursor; */	996	/* Cursor cursor; */
1037	Done:	997	done:
		998
1038	#ifdef OFF_FOCUS_FADING	999	#if OFF_FOCUS_FADING
1039	if (rs[Rs_fade])	1000	if (rs[Rs_fade])
1040	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));	1001	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1041	#endif	1002	#endif
1042		1003
1043	/TODO: handle Color_BD, scrollbar background, etc. /	1004	/TODO: handle Color_BD, scrollbar background, etc. /
1044		1005
1045	recolour_cursor ();	1006	recolour_cursor ();
…		…
1116		1077
1117	/* -------------------------------------------------------------------- *	1078	/* -------------------------------------------------------------------- *
1118	* - WINDOW RESIZING - *	1079	* - WINDOW RESIZING - *
1119	* -------------------------------------------------------------------- */	1080	* -------------------------------------------------------------------- */
1120	void	1081	void
1121	rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)	1082	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1122	{	1083	{
1123	int fix_screen;	1084	int fix_screen;
1124	#ifdef SMART_RESIZE
1125	int old_width = szHint.width, old_height = szHint.height;	1085	int old_width = szHint.width, old_height = szHint.height;
1126	#endif
1127	dDisp;	1086	dDisp;
1128		1087
1129	window_calc (width, height);	1088	window_calc (newwidth, newheight);
1130	XSetWMNormalHints (disp, TermWin.parent[0], &szHint);	1089	XSetWMNormalHints (disp, parent[0], &szHint);
1131		1090
1132	if (!ignoreparent)	1091	if (!ignoreparent)
1133	{	1092	{
1134	#ifdef SMART_RESIZE	1093	#ifdef SMART_RESIZE
1135	/*	1094	/*
…		…
1139	int x, y, x1, y1;	1098	int x, y, x1, y1;
1140	int dx, dy;	1099	int dx, dy;
1141	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1100	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1142	Window unused_cr;	1101	Window unused_cr;
1143		1102
1144	XTranslateCoordinates (disp, TermWin.parent[0], display->root,	1103	XTranslateCoordinates (disp, parent[0], display->root,
1145	0, 0, &x, &y, &unused_cr);	1104	0, 0, &x, &y, &unused_cr);
1146	XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,	1105	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1147	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1106	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1148	/*	1107	/*
1149	* if display->root isn't the parent window, a WM will probably have offset	1108	* if display->root isn't the parent window, a WM will probably have offset
1150	* our position for handles and decorations. Counter it	1109	* our position for handles and decorations. Counter it
1151	*/	1110	*/
…		…
1168	if (y < y1) /* top half */	1127	if (y < y1) /* top half */
1169	dy = 0;	1128	dy = 0;
1170	else if (y == y1) /* exact center */	1129	else if (y == y1) /* exact center */
1171	dy /= 2;	1130	dy /= 2;
1172		1131
1173	XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,	1132	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1174	szHint.width, szHint.height);	1133	szHint.width, szHint.height);
1175	#else	1134	#else
1176	XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);	1135	XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1177	#endif	1136	#endif
1178	}	1137	}
1179		1138
1180	fix_screen = TermWin.ncol != prev_ncol \|\| TermWin.nrow != prev_nrow;	1139	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1181		1140
1182	if (fix_screen \|\| width != old_width \|\| height != old_height)	1141	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1183	{	1142	{
1184	if (scrollbar_visible ())	1143	if (scrollBar.state)
1185	{	1144	{
1186	XMoveResizeWindow (disp, scrollBar.win,	1145	XMoveResizeWindow (disp, scrollBar.win,
1187	window_sb_x, 0,	1146	window_sb_x, 0,
1188	scrollbar_TotalWidth (), szHint.height);	1147	scrollbar_TotalWidth (), szHint.height);
1189	resize_scrollbar ();	1148	resize_scrollbar ();
1190	}	1149	}
1191		1150
1192	if (menubar_visible ())
1193	XMoveResizeWindow (disp, menuBar.win,
1194	window_vt_x, 0,
1195	TermWin_TotalWidth (), menuBar_TotalHeight ());
1196
1197	XMoveResizeWindow (disp, TermWin.vt,	1151	XMoveResizeWindow (disp, vt,
1198	window_vt_x, window_vt_y,	1152	window_vt_x, window_vt_y,
1199	TermWin_TotalWidth (), TermWin_TotalHeight ());	1153	width, height);
1200		1154
1201	scr_clear ();	1155	scr_clear ();
1202	#ifdef XPM_BACKGROUND	1156	#ifdef XPM_BACKGROUND
1203	resize_pixmap ();	1157	resize_pixmap ();
1204	#endif	1158	#endif
…		…
1210	int old_ncol = prev_ncol;	1164	int old_ncol = prev_ncol;
1211		1165
1212	/* scr_reset only works on the primary screen */	1166	/* scr_reset only works on the primary screen */
1213	if (old_height) /* this is not the first time through */	1167	if (old_height) /* this is not the first time through */
1214	{	1168	{
1215	unsigned int ncol = TermWin.ncol;	1169	unsigned int ocol = ncol;
1216	TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this	1170	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1217	curr_screen = scr_change_screen (PRIMARY);	1171	curr_screen = scr_change_screen (PRIMARY);
1218	TermWin.ncol = ncol;	1172	ncol = ocol;
1219	}	1173	}
1220		1174
1221	scr_reset ();	1175	scr_reset ();
1222		1176
1223	if (curr_screen >= 0) /* this is not the first time through */	1177	if (curr_screen >= 0) /* this is not the first time through */
1224	{	1178	{
1225	scr_change_screen (curr_screen);	1179	scr_change_screen (curr_screen);
1226	selection_check (old_ncol != TermWin.ncol ? 4 : 0);	1180	selection_check (old_ncol != ncol ? 4 : 0);
1227	}	1181	}
1228	}	1182	}
1229		1183
1230	old_width = szHint.width;	1184	old_width = szHint.width;
1231	old_height = szHint.height;	1185	old_height = szHint.height;
1232		1186
1233	#ifdef XPM_BACKGROUND	1187	#ifdef XPM_BACKGROUND
1234	if (TermWin.pixmap)	1188	if (pixmap)
1235	scr_touch (false);	1189	scr_touch (false);
1236	#endif	1190	#endif
1237		1191
1238	#ifdef USE_XIM	1192	#ifdef USE_XIM
1239	IMSetStatusPosition ();	1193	IMSetStatusPosition ();
…		…
1243	/*	1197	/*
1244	* Set the width/height of the vt window in characters. Units are pixels.	1198	* Set the width/height of the vt window in characters. Units are pixels.
1245	* good for toggling 80/132 columns	1199	* good for toggling 80/132 columns
1246	*/	1200	*/
1247	void	1201	void
1248	rxvt_term::set_widthheight (unsigned int width, unsigned int height)	1202	rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1249	{	1203	{
1250	XWindowAttributes wattr;	1204	XWindowAttributes wattr;
1251		1205
1252	if (width == 0 \|\| height == 0)	1206	if (newwidth == 0 \|\| newheight == 0)
1253	{	1207	{
1254	XGetWindowAttributes (display->display, display->root, &wattr);	1208	XGetWindowAttributes (display->display, display->root, &wattr);
		1209
1255	if (width == 0)	1210	if (newwidth == 0)
1256	width = wattr.width - szHint.base_width;	1211	newwidth = wattr.width - szHint.base_width;
1257	if (height == 0)	1212	if (newheight == 0)
1258	height = wattr.height - szHint.base_height;	1213	newheight = wattr.height - szHint.base_height;
1259	}
1260
1261	if (width != TermWin.width \|\| height != TermWin.height)
1262	{	1214	}
		1215
		1216	if (newwidth != width \|\| newheight != height)
		1217	{
1263	width += szHint.base_width;	1218	newwidth += szHint.base_width;
1264	height += szHint.base_height;	1219	newheight += szHint.base_height;
1265	resize_all_windows (width, height, 0);	1220	resize_all_windows (newwidth, newheight, 0);
1266	}	1221	}
1267	}	1222	}
1268		1223
1269	/* -------------------------------------------------------------------- *	1224	/* -------------------------------------------------------------------- *
1270	* - X INPUT METHOD ROUTINES - *	1225	* - X INPUT METHOD ROUTINES - *
…		…
1280		1235
1281	void	1236	void
1282	rxvt_term::im_set_size (XRectangle &size)	1237	rxvt_term::im_set_size (XRectangle &size)
1283	{	1238	{
1284	// the int_bwidth terms make no sense to me	1239	// the int_bwidth terms make no sense to me
1285	size.x = TermWin.int_bwidth;	1240	size.x = int_bwidth;
1286	size.y = TermWin.int_bwidth;	1241	size.y = int_bwidth;
1287	size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;	1242	size.width = Width2Pixel (ncol) + int_bwidth;
1288	size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;	1243	size.height = Height2Pixel (nrow) + int_bwidth;
1289	}	1244	}
1290		1245
1291	void	1246	void
1292	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,	1247	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1293	XRectangle &status_rect,	1248	XRectangle &status_rect,
1294	const XRectangle &needed_rect)	1249	const XRectangle &needed_rect)
1295	{	1250	{
1296	preedit_rect.x = needed_rect.width;	1251	preedit_rect.x = needed_rect.width;
1297	preedit_rect.y = 0;	1252	preedit_rect.y = 0;
1298	preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;	1253	preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1299	preedit_rect.height = TermWin.fheight;	1254	preedit_rect.height = fheight;
1300		1255
1301	status_rect.x = 0;	1256	status_rect.x = 0;
1302	status_rect.y = 0;	1257	status_rect.y = 0;
1303	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;	1258	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1304	status_rect.height = TermWin.fheight;	1259	status_rect.height = fheight;
1305	}	1260	}
1306		1261
1307	/* Checking whether input method is running. */	1262	/* Checking whether input method is running. */
1308	bool	1263	bool
1309	rxvt_term::IMisRunning ()	1264	rxvt_term::IMisRunning ()
…		…
1337	{	1292	{
1338	XPoint nspot;	1293	XPoint nspot;
1339	XVaNestedList preedit_attr;	1294	XVaNestedList preedit_attr;
1340		1295
1341	if (!Input_Context	1296	if (!Input_Context
1342	\|\| !TermWin.focus	1297	\|\| !focus
1343	\|\| !(input_style & XIMPreeditPosition))	1298	\|\| !(input_style & XIMPreeditPosition))
1344	return;	1299	return;
1345		1300
1346	im_set_position (nspot);	1301	im_set_position (nspot);
1347		1302
…		…
1383	XRectangle rect, status_rect, needed_rect;	1338	XRectangle rect, status_rect, needed_rect;
1384	unsigned long fg, bg;	1339	unsigned long fg, bg;
1385	const char *p;	1340	const char *p;
1386	char **s;	1341	char **s;
1387	XIMStyles *xim_styles;	1342	XIMStyles *xim_styles;
		1343
		1344	set_environ (envv);
1388		1345
1389	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1346	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1390	return false;	1347	return false;
1391		1348
1392	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1349	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1467	"----R---%d------*,"	1424	"----R---%d------*,"
1468	"----R---%d------*,"	1425	"----R---%d------*,"
1469	"----R---%d------*,"	1426	"----R---%d------*,"
1470	"----R---%d------*,"	1427	"----R---%d------*,"
1471	"*",	1428	"*",
1472	TermWin.fheight,	1429	fheight,
1473	TermWin.fheight + 1, TermWin.fheight - 1,	1430	fheight + 1, fheight - 1,
1474	TermWin.fheight - 2, TermWin.fheight + 2);	1431	fheight - 2, fheight + 2);
1475		1432
1476	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1433	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1477	&missing_charset_list, &missing_charset_count, &def_string);	1434	&missing_charset_list, &missing_charset_count, &def_string);
1478		1435
1479	if (missing_charset_list)	1436	if (missing_charset_list)
…		…
1525	NULL);	1482	NULL);
1526	}	1483	}
1527		1484
1528	Input_Context = XCreateIC (xim,	1485	Input_Context = XCreateIC (xim,
1529	XNInputStyle, input_style,	1486	XNInputStyle, input_style,
1530	XNClientWindow, TermWin.vt,	1487	XNClientWindow, vt,
1531	XNFocusWindow, TermWin.parent[0],	1488	XNFocusWindow, parent[0],
1532	preedit_attr ? XNPreeditAttributes : NULL,	1489	preedit_attr ? XNPreeditAttributes : NULL,
1533	preedit_attr,	1490	preedit_attr,
1534	status_attr ? XNStatusAttributes : NULL,	1491	status_attr ? XNStatusAttributes : NULL,
1535	status_attr, NULL);	1492	status_attr, NULL);
1536		1493
…		…
1553	}	1510	}
1554		1511
1555	void	1512	void
1556	rxvt_term::im_cb ()	1513	rxvt_term::im_cb ()
1557	{	1514	{
1558	int i, found, had_im;	1515	int i;
1559	const char *p;	1516	const char *p;
1560	char **s;	1517	char **s;
1561	char buf[IMBUFSIZ];	1518	char buf[IMBUFSIZ];
1562		1519
1563	SET_R (this);	1520	make_current ();
1564		1521
1565	im_destroy ();	1522	im_destroy ();
1566		1523
1567	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1524	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1568	if (Input_Context)	1525	if (Input_Context)
…		…
1620	{	1577	{
1621	XRectangle preedit_rect, status_rect, *needed_rect;	1578	XRectangle preedit_rect, status_rect, *needed_rect;
1622	XVaNestedList preedit_attr, status_attr;	1579	XVaNestedList preedit_attr, status_attr;
1623		1580
1624	if (!Input_Context	1581	if (!Input_Context
1625	\|\| !TermWin.focus	1582	\|\| !focus
1626	\|\| !(input_style & XIMPreeditArea)	1583	\|\| !(input_style & XIMPreeditArea)
1627	\|\| !IMisRunning ())	1584	\|\| !IMisRunning ())
1628	return;	1585	return;
1629		1586
1630	/* Getting the necessary width of preedit area */	1587	/* Getting the necessary width of preedit area */

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.141 by root, Sat Feb 19 01:07:58 2005 UTC vs. Revision 1.187 by root, Tue Jan 17 16:22:41 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.141 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.187 by root, Tue Jan 17 16:22:41 2006 UTC