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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.135 by root, Sun Feb 13 11:07:57 2005 UTC vs.
Revision 1.183 by root, Tue Jan 17 10:19:13 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 "main.intpro" /* PROTOS for internal routines */	35	#include "keyboard.h"
		36	#include "rxvtperl.h"
		37
		38	#include <limits>
36		39
37	#include <csignal>	40	#include <csignal>
38	#include <cstring>	41	#include <cstring>
39		42
40	#ifdef TTY_GID_SUPPORT	43	#ifdef TTY_GID_SUPPORT
…		…
43		46
44	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
45	# include <termios.h>	48	# include <termios.h>
46	#endif	49	#endif
47		50
48	#ifdef KEYSYM_RESOURCE	51	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
49	# include "keyboard.h"	52	static uid_t saved_euid;
		53	static gid_t saved_egid;
50	#endif	54	#endif
		55
		56	bool
		57	rxvt_tainted ()
		58	{
		59	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
		60	return getuid () != saved_euid \|\| getgid () != saved_egid;
		61	#else
		62	return false;
		63	#endif
		64	}
51		65
52	vector<rxvt_term *> rxvt_term::termlist;	66	vector<rxvt_term *> rxvt_term::termlist;
53		67
54	static char curlocale[128];	68	static char curlocale[128], savelocale[128];
55		69
56	bool	70	bool
57	rxvt_set_locale (const char *locale)	71	rxvt_set_locale (const char *locale)
58	{	72	{
59	if (!locale \|\| !strncmp (locale, curlocale, 128))	73	if (!locale \|\| !strncmp (locale, curlocale, 128))
60	return false;	74	return false;
61		75
62	strncpy (curlocale, locale, 128);	76	strncpy (curlocale, locale, 128);
63	setlocale (LC_CTYPE, curlocale);	77	setlocale (LC_CTYPE, curlocale);
64	return true;	78	return true;
		79	}
		80
		81	void
		82	rxvt_push_locale (const char *locale)
		83	{
		84	strcpy (savelocale, curlocale);
		85	rxvt_set_locale (locale);
		86	}
		87
		88	void
		89	rxvt_pop_locale ()
		90	{
		91	rxvt_set_locale (savelocale);
65	}	92	}
66		93
67	#if ENABLE_COMBINING	94	#if ENABLE_COMBINING
68	class rxvt_composite_vec rxvt_composite;	95	class rxvt_composite_vec rxvt_composite;
69		96
…		…
134	rootwin_ev (this, &rxvt_term::rootwin_cb),	161	rootwin_ev (this, &rxvt_term::rootwin_cb),
135	#endif	162	#endif
136	#ifdef HAVE_SCROLLBARS	163	#ifdef HAVE_SCROLLBARS
137	scrollbar_ev (this, &rxvt_term::x_cb),	164	scrollbar_ev (this, &rxvt_term::x_cb),
138	#endif	165	#endif
139	#ifdef MENUBAR
140	menubar_ev (this, &rxvt_term::x_cb),
141	#endif
142	#ifdef CURSOR_BLINK	166	#ifdef CURSOR_BLINK
143	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	167	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
144	#endif	168	#endif
145	#ifdef TEXT_BLINK	169	#ifdef TEXT_BLINK
146	text_blink_ev (this, &rxvt_term::text_blink_cb),	170	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
158	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev (this, &rxvt_term::pointer_cb),
159	#endif	183	#endif
160	#ifdef USE_XIM	184	#ifdef USE_XIM
161	im_ev (this, &rxvt_term::im_cb),	185	im_ev (this, &rxvt_term::im_cb),
162	#endif	186	#endif
163	sw_term (this, &rxvt_term::sig_term),
164	sw_int (this, &rxvt_term::sig_term),
165	sw_chld (this, &rxvt_term::sig_chld),
166	termwin_ev (this, &rxvt_term::x_cb),	187	termwin_ev (this, &rxvt_term::x_cb),
167	vt_ev (this, &rxvt_term::x_cb),	188	vt_ev (this, &rxvt_term::x_cb),
168	check_ev (this, &rxvt_term::check_cb),	189	check_ev (this, &rxvt_term::check_cb),
169	flush_ev (this, &rxvt_term::flush_cb),	190	flush_ev (this, &rxvt_term::flush_cb),
170	destroy_ev (this, &rxvt_term::destroy_cb),	191	destroy_ev (this, &rxvt_term::destroy_cb),
…		…
197	pty.put ();	218	pty.put ();
198	}	219	}
199		220
200	rxvt_term::~rxvt_term ()	221	rxvt_term::~rxvt_term ()
201	{	222	{
		223	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		224
202	termlist.erase (find (termlist.begin (), termlist.end(), this));	225	termlist.erase (find (termlist.begin (), termlist.end(), this));
203		226
204	emergency_cleanup ();	227	emergency_cleanup ();
205		228
206	#if ENABLE_STYLES	229	#if ENABLE_STYLES
207	for (int i = RS_styleCount; --i; )	230	for (int i = RS_styleCount; --i; )
208	if (TermWin.fontset[i] != TermWin.fontset[0])	231	if (fontset[i] != fontset[0])
209	delete TermWin.fontset[i];	232	delete fontset[i];
210	#endif	233	#endif
211	delete TermWin.fontset[0];	234	delete fontset[0];
212		235
213	if (display)	236	if (display)
214	{	237	{
215	dDisp;	238	dDisp;
216		239
217	selection_clear ();	240	selection_clear ();
218		241
219	#ifdef USE_XIM	242	#ifdef USE_XIM
220	im_destroy ();	243	im_destroy ();
221	#endif
222	#ifdef MENUBAR
223	if (menubarGC) XFreeGC (disp, menubarGC);
224	#endif	244	#endif
225	#ifdef XTERM_SCROLLBAR	245	#ifdef XTERM_SCROLLBAR
226	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	246	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
227	if (ShadowGC) XFreeGC (disp, ShadowGC);	247	if (ShadowGC) XFreeGC (disp, ShadowGC);
228	#endif	248	#endif
…		…
239	if (upArrow) XFreePixmap (disp, upArrow);	259	if (upArrow) XFreePixmap (disp, upArrow);
240	if (downArrow) XFreePixmap (disp, downArrow);	260	if (downArrow) XFreePixmap (disp, downArrow);
241	if (upArrowHi) XFreePixmap (disp, upArrowHi);	261	if (upArrowHi) XFreePixmap (disp, upArrowHi);
242	if (downArrowHi) XFreePixmap (disp, downArrowHi);	262	if (downArrowHi) XFreePixmap (disp, downArrowHi);
243	#endif	263	#endif
244	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	264	#ifdef RXVT_SCROLLBAR
245	if (topShadowGC) XFreeGC (disp, topShadowGC);	265	if (topShadowGC) XFreeGC (disp, topShadowGC);
246	if (botShadowGC) XFreeGC (disp, botShadowGC);	266	if (botShadowGC) XFreeGC (disp, botShadowGC);
247	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	267	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
248	#endif	268	#endif
249	if (TermWin.gc) XFreeGC (disp, TermWin.gc);	269	if (gc) XFreeGC (disp, gc);
250		270
251	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
252	delete menuBar.drawable;	271	delete drawable;
253	//if (menuBar.win)
254	// XDestroyWindow (disp, menuBar.win);
255	#endif
256	delete TermWin.drawable;
257	// destroy all windows	272	// destroy all windows
258	if (TermWin.parent[0])	273	if (parent[0])
259	XDestroyWindow (disp, TermWin.parent[0]);	274	XDestroyWindow (disp, parent[0]);
260	}	275	}
261		276
262	// TODO: free pixcolours, colours should become part of rxvt_display	277	// TODO: free pixcolours, colours should become part of rxvt_display
263
264	delete pix_colors_focused;	278	delete pix_colors_focused;
265	#ifdef OFF_FOCUS_FADING	279	#if OFF_FOCUS_FADING
266	delete pix_colors_unfocused;	280	delete pix_colors_unfocused;
267	#endif	281	#endif
268		282
269	displays.put (display);	283	displays.put (display);
270		284
…		…
291	delete keyboard;	305	delete keyboard;
292	#endif	306	#endif
293	}	307	}
294		308
295	void	309	void
		310	rxvt_term::child_exit ()
		311	{
		312	cmd_pid = 0;
		313
		314	if (!OPTION (Opt_hold))
		315	destroy ();
		316	}
		317
		318	void
296	rxvt_term::destroy ()	319	rxvt_term::destroy ()
297	{	320	{
298	if (destroy_ev.active)	321	if (destroy_ev.active)
299	return;	322	return;
300		323
…		…
307	#if USE_XIM	330	#if USE_XIM
308	im_ev.stop (display);	331	im_ev.stop (display);
309	#endif	332	#endif
310	#if HAVE_SCROLLBARS	333	#if HAVE_SCROLLBARS
311	scrollbar_ev.stop (display);	334	scrollbar_ev.stop (display);
312	#endif
313	#if MENUBAR
314	menubar_ev.stop (display);
315	#endif	335	#endif
316	#if TRANSPARENT	336	#if TRANSPARENT
317	rootwin_ev.stop (display);	337	rootwin_ev.stop (display);
318	#endif	338	#endif
319	incr_ev.stop ();	339	incr_ev.stop ();
…		…
343	}	363	}
344		364
345	void	365	void
346	rxvt_term::destroy_cb (time_watcher &w)	366	rxvt_term::destroy_cb (time_watcher &w)
347	{	367	{
348	SET_R (this);	368	make_current ();
349		369
350	delete this;	370	delete this;
351	}	371	}
352		372
353	/----------------------------------------------------------------------/	373	/----------------------------------------------------------------------/
…		…
418	{	438	{
419	if (GET_R->allowedxerror == -1)	439	if (GET_R->allowedxerror == -1)
420	GET_R->allowedxerror = event->error_code;	440	GET_R->allowedxerror = event->error_code;
421	else	441	else
422	{	442	{
423	//TODO: GET_R is most likely not the terminal which caused the error	443	// GET_R is most likely not the terminal which caused the error,
424	//TODO: maybe just output the error and continue?	444	// so just output the error and continue
425	#if ENABLE_FRILLS	445	#if ENABLE_FRILLS
426	print_x_error (display, event);	446	print_x_error (display, event);
427	#else	447	#else
428	old_xerror_handler (display, event);	448	old_xerror_handler (display, event);
429	#endif	449	#endif
…		…
439	DisplayString (display));	459	DisplayString (display));
440	rxvt_emergency_cleanup ();	460	rxvt_emergency_cleanup ();
441	_exit (EXIT_FAILURE);	461	_exit (EXIT_FAILURE);
442	}	462	}
443		463
444	/*
445	* Catch a fatal signal and tidy up before quitting
446	*/
447	void
448	rxvt_term::sig_term (sig_watcher &w)
449	{
450	#ifdef DEBUG_CMD
451	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
452	#endif
453	rxvt_emergency_cleanup ();
454	signal (w.signum, SIG_DFL);
455	kill (getpid (), w.signum);
456	}
457
458	/----------------------------------------------------------------------/	464	/----------------------------------------------------------------------/
459	/* rxvt_init () */
460	bool	465	bool
461	rxvt_term::init (int argc, const char const argv)	466	rxvt_term::init (int argc, const char const argv)
462	{	467	{
463	SET_R (this);	468	SET_R (this);
464
465	set_locale ("");	469	set_locale ("");
		470	set_environ (envv); // few things in X do not call setlocale :(
466		471
467	if (!init_vars ())	472	if (!init_vars ())
468	return false;	473	return false;
469		474
470	init_secondary ();	475	init_secondary ();
…		…
473		478
474	#ifdef KEYSYM_RESOURCE	479	#ifdef KEYSYM_RESOURCE
475	keyboard->register_done ();	480	keyboard->register_done ();
476	#endif	481	#endif
477		482
478	#if MENUBAR_MAX
479	menubar_read (rs[Rs_menu]);
480	#endif
481	#ifdef HAVE_SCROLLBARS	483	#ifdef HAVE_SCROLLBARS
482	if (options & Opt_scrollBar)	484	if (OPTION (Opt_scrollBar))
483	scrollBar.setIdle (); /* set existence for size calculations */	485	scrollBar.setIdle (); /* set existence for size calculations */
484	#endif	486	#endif
485		487
		488	#if ENABLE_PERL
		489	if (!rs[Rs_perl_ext_1])
		490	rs[Rs_perl_ext_1] = "default";
		491
		492	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		493	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		494	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		495	{
		496	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
		497	// ignore some perl-related arguments if some bozo installed us set[ug]id
		498	if (rxvt_tainted ())
		499	{
		500	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
		501	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		502	{
		503	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
		504	rs[Rs_perl_lib] = 0;
		505	rs[Rs_perl_eval] = 0;
		506	}
		507	}
		508	#endif
		509	rxvt_perl.init (this);
		510	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		511	}
		512	#endif
		513
486	create_windows (argc, argv);	514	create_windows (argc, argv);
487		515
488	dDisp;	516	dDisp;
489		517
490	init_xlocale ();	518	init_xlocale ();
491		519
492	scr_reset (); /* initialize screen */	520	scr_reset (); // initialize screen
493		521
494	#if 0	522	#if 0
495	XSynchronize (disp, True);	523	XSynchronize (disp, True);
496	#endif	524	#endif
497		525
498	#ifdef HAVE_SCROLLBARS	526	#ifdef HAVE_SCROLLBARS
499	if (options & Opt_scrollBar)	527	if (OPTION (Opt_scrollBar))
500	resize_scrollbar (); /* create and map scrollbar */	528	resize_scrollbar (); /* create and map scrollbar */
501	#endif	529	#endif
502	#if (MENUBAR_MAX)
503	if (menubar_visible ())
504	XMapWindow (disp, menuBar.win);
505	#endif
506	#ifdef TRANSPARENT	530	#ifdef TRANSPARENT
507	if (options & Opt_transparent)	531	if (OPTION (Opt_transparent))
508	{	532	{
509	XSelectInput (disp, display->root, PropertyChangeMask);	533	XSelectInput (disp, display->root, PropertyChangeMask);
510	check_our_parents ();	534	check_our_parents ();
511	rootwin_ev.start (display, display->root);	535	rootwin_ev.start (display, display->root);
512	}	536	}
513	#endif	537	#endif
514		538
515	XMapWindow (disp, TermWin.vt);	539	XMapWindow (disp, vt);
516	XMapWindow (disp, TermWin.parent[0]);	540	XMapWindow (disp, parent[0]);
517		541
518	set_colorfgbg ();	542	set_colorfgbg ();
519		543
520	init_command (cmd_argv);	544	init_command (cmd_argv);
521		545
522	free (cmd_argv);	546	free (cmd_argv);
523		547
		548	if (pty.pty >= 0)
524	pty_ev.start (pty.pty, EVENT_READ);	549	pty_ev.start (pty.pty, EVENT_READ);
525		550
526	check_ev.start ();	551	check_ev.start ();
527		552
		553	HOOK_INVOKE ((this, HOOK_START, DT_END));
		554
528	return true;	555	return true;
529	}	556	}
530		557
		558	static struct sig_handlers
		559	{
		560	sig_watcher sw_chld, sw_term, sw_int;
		561
		562	void sig_chld (sig_watcher &w)
		563	{
		564	// we are being called for every SIGCHLD, find the corresponding term
		565	int pid;
		566
		567	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
		568	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
		569	if (pid == (*t)->cmd_pid)
		570	{
		571	(*t)->child_exit ();
		572	break;
		573	}
		574	}
		575
		576	/*
		577	* Catch a fatal signal and tidy up before quitting
		578	*/
		579	void
		580	sig_term (sig_watcher &w)
		581	{
		582	#ifdef DEBUG_CMD
		583	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
		584	#endif
		585	rxvt_emergency_cleanup ();
		586	signal (w.signum, SIG_DFL);
		587	kill (getpid (), w.signum);
		588	}
		589
		590	sig_handlers ()
		591	: sw_chld (this, &sig_handlers::sig_chld),
		592	sw_term (this, &sig_handlers::sig_term),
		593	sw_int (this, &sig_handlers::sig_term)
		594	{
		595	}
		596	} sig_handlers;
		597
		598	char **rxvt_environ; // startup environment
		599
531	void	600	void
532	rxvt_init ()	601	rxvt_init ()
533	{	602	{
		603	rxvt_environ = environ;
		604
534	/*	605	/*
535	* Save and then give up any super-user privileges	606	* Save and then give up any super-user privileges
536	* If we need privileges in any area then we must specifically request it.	607	* If we need privileges in any area then we must specifically request it.
537	* We should only need to be root in these cases:	608	* We should only need to be root in these cases:
538	* 1. write utmp entries on some systems	609	* 1. write utmp entries on some systems
…		…
542	rxvt_privileges (IGNORE);	613	rxvt_privileges (IGNORE);
543		614
544	signal (SIGHUP, SIG_IGN);	615	signal (SIGHUP, SIG_IGN);
545	signal (SIGPIPE, SIG_IGN);	616	signal (SIGPIPE, SIG_IGN);
546		617
		618	sig_handlers.sw_chld.start (SIGCHLD);
		619	sig_handlers.sw_term.start (SIGTERM);
		620	sig_handlers.sw_int.start (SIGINT);
		621
547	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	622	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
548	/* signal (SIGURG, SIG_DFL); */	623	/* signal (SIGURG, SIG_DFL); */
549		624
550	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	625	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
551	// TODO: handle this with exceptions and tolerate the memory loss	626	// TODO: handle this with exceptions and tolerate the memory loss
552	XSetIOErrorHandler (rxvt_xioerror_handler);	627	XSetIOErrorHandler (rxvt_xioerror_handler);
553	}
554		628
555	/* ------------------------------------------------------------------------- *	629	XrmInitialize ();
556	* SIGNAL HANDLING & EXIT HANDLER *
557	* ------------------------------------------------------------------------- */
558	/*
559	* Catch a SIGCHLD signal and exit if the direct child has died
560	*/
561
562	void
563	rxvt_term::sig_chld (sig_watcher &w)
564	{
565	// we are being called for every SIGCHLD, not just ours
566	int pid;
567
568	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
569	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
570	if (pid == (*t)->cmd_pid)
571	{
572	(*t)->destroy ();
573	break;
574	}
575	}	630	}
576		631
577	/* ------------------------------------------------------------------------- *	632	/* ------------------------------------------------------------------------- *
578	* MEMORY ALLOCATION WRAPPERS *	633	* MEMORY ALLOCATION WRAPPERS *
579	* ------------------------------------------------------------------------- */	634	* ------------------------------------------------------------------------- */
…		…
586	rxvt_fatal ("memory allocation failure. aborting.\n");	641	rxvt_fatal ("memory allocation failure. aborting.\n");
587		642
588	return p;	643	return p;
589	}	644	}
590		645
591	/* INTPROTO */	646	void *
592	void *
593	rxvt_calloc (size_t number, size_t size)	647	rxvt_calloc (size_t number, size_t size)
594	{	648	{
595	void *p = calloc (number, size);	649	void *p = calloc (number, size);
596		650
597	if (!p)	651	if (!p)
598	rxvt_fatal ("memory allocation failure. aborting.\n");	652	rxvt_fatal ("memory allocation failure. aborting.\n");
599		653
600	return p;	654	return p;
601	}	655	}
602		656
603	/* INTPROTO */
604	void *	657	void *
605	rxvt_realloc (void *ptr, size_t size)	658	rxvt_realloc (void *ptr, size_t size)
606	{	659	{
607	void *p = realloc (ptr, size);	660	void *p = realloc (ptr, size);
608		661
…		…
617	* ------------------------------------------------------------------------- */	670	* ------------------------------------------------------------------------- */
618	/* take care of suid/sgid super-user (root) privileges */	671	/* take care of suid/sgid super-user (root) privileges */
619	void	672	void
620	rxvt_privileges (rxvt_privaction action)	673	rxvt_privileges (rxvt_privaction action)
621	{	674	{
622	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
623	static uid_t euid;
624	static gid_t egid;
625	#endif
626
627	#if ! defined(__CYGWIN32__)	675	#if ! defined(__CYGWIN32__)
628	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)	676	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
629	/* setreuid () is the poor man's setuid (), seteuid () */	677	/* setreuid () is the poor man's setuid (), seteuid () */
630	# define seteuid(a) setreuid(-1, (a))	678	# define seteuid(a) setreuid(-1, (a))
631	# define setegid(a) setregid(-1, (a))	679	# define setegid(a) setregid(-1, (a))
…		…
637	case IGNORE:	685	case IGNORE:
638	/*	686	/*
639	* change effective uid/gid - not real uid/gid - so we can switch	687	* change effective uid/gid - not real uid/gid - so we can switch
640	* back to root later, as required	688	* back to root later, as required
641	*/	689	*/
		690	setegid (getgid ());
642	seteuid (getuid ());	691	seteuid (getuid ());
643	setegid (getgid ());
644	break;	692	break;
645	case SAVE:	693	case SAVE:
646	euid = geteuid ();
647	egid = getegid ();	694	saved_egid = getegid ();
		695	saved_euid = geteuid ();
648	break;	696	break;
649	case RESTORE:	697	case RESTORE:
650	seteuid (euid);
651	setegid (egid);	698	setegid (saved_egid);
		699	seteuid (saved_euid);
652	break;	700	break;
653	}	701	}
654	# else	702	# else
655	switch (action)	703	switch (action)
656	{	704	{
657	case IGNORE:	705	case IGNORE:
		706	setgid (getgid ());
658	setuid (getuid ());	707	setuid (getuid ());
659	setgid (getgid ());
660	/* FALLTHROUGH */	708	/* FALLTHROUGH */
661	case SAVE:	709	case SAVE:
662	/* FALLTHROUGH */	710	/* FALLTHROUGH */
663	case RESTORE:	711	case RESTORE:
664	break;	712	break;
…		…
669		717
670	#ifdef UTMP_SUPPORT	718	#ifdef UTMP_SUPPORT
671	void	719	void
672	rxvt_term::privileged_utmp (rxvt_privaction action)	720	rxvt_term::privileged_utmp (rxvt_privaction action)
673	{	721	{
674	if ((options & Opt_utmpInhibit)	722	if (OPTION (Opt_utmpInhibit))
675	\|\| !pty.name \|\| !*pty.name)
676	return;	723	return;
677		724
678	rxvt_privileges (RESTORE);	725	rxvt_privileges (RESTORE);
679		726
680	if (action == SAVE)	727	if (action == SAVE)
681	makeutent (pty.name, rs[Rs_display_name]);	728	pty.login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
682	else	729	else
683	cleanutent ();	730	pty.logout ();
684		731
685	rxvt_privileges (IGNORE);	732	rxvt_privileges (IGNORE);
686	}	733	}
687	#endif	734	#endif
688		735
…		…
690	/*	737	/*
691	* window size/position calculcations for XSizeHint and other storage.	738	* window size/position calculcations for XSizeHint and other storage.
692	* if width/height are non-zero then override calculated width/height	739	* if width/height are non-zero then override calculated width/height
693	*/	740	*/
694	void	741	void
695	rxvt_term::window_calc (unsigned int width, unsigned int height)	742	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
696	{	743	{
697	short recalc_x, recalc_y;	744	short recalc_x, recalc_y;
698	int x, y, sb_w, mb_h, flags;	745	int x, y, sb_w, flags;
699	unsigned int w, h;	746	unsigned int w, h;
700	unsigned int max_width, max_height;	747	unsigned int max_width, max_height;
701	dDisp;	748	dDisp;
702		749
703	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	750	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
704	TermWin.ncol, TermWin.nrow, szHint.width,	751	ncol, nrow, szHint.width, szHint.height));
705	szHint.height));	752
706	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	753	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
707	szHint.win_gravity = NorthWestGravity;	754	szHint.win_gravity = NorthWestGravity;
708	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	755	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
709		756
710	recalc_x = recalc_y = 0;	757	recalc_x = recalc_y = 0;
711	flags = 0;	758	flags = 0;
		759
712	if (!parsed_geometry)	760	if (!parsed_geometry)
713	{	761	{
714	parsed_geometry = 1;	762	parsed_geometry = 1;
		763
715	if (rs[Rs_geometry])	764	if (rs[Rs_geometry])
716	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	765	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
		766
717	if (flags & WidthValue)	767	if (flags & WidthValue)
718	{	768	{
719	TermWin.ncol = BOUND_POSITIVE_INT16 (w);	769	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
720	szHint.flags \|= USSize;	770	szHint.flags \|= USSize;
721	}	771	}
		772
722	if (flags & HeightValue)	773	if (flags & HeightValue)
723	{	774	{
724	TermWin.nrow = BOUND_POSITIVE_INT16 (h);	775	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
725	szHint.flags \|= USSize;	776	szHint.flags \|= USSize;
726	}	777	}
		778
727	if (flags & XValue)	779	if (flags & XValue)
728	{	780	{
729	szHint.x = x;	781	szHint.x = x;
730	szHint.flags \|= USPosition;	782	szHint.flags \|= USPosition;
		783
731	if (flags & XNegative)	784	if (flags & XNegative)
732	{	785	{
733	recalc_x = 1;	786	recalc_x = 1;
734	szHint.win_gravity = NorthEastGravity;	787	szHint.win_gravity = NorthEastGravity;
735	}	788	}
736	}	789	}
		790
737	if (flags & YValue)	791	if (flags & YValue)
738	{	792	{
739	szHint.y = y;	793	szHint.y = y;
740	szHint.flags \|= USPosition;	794	szHint.flags \|= USPosition;
		795
741	if (flags & YNegative)	796	if (flags & YNegative)
742	{	797	{
743	recalc_y = 1;	798	recalc_y = 1;
		799
744	if (szHint.win_gravity == NorthEastGravity)	800	if (szHint.win_gravity == NorthEastGravity)
745	szHint.win_gravity = SouthEastGravity;	801	szHint.win_gravity = SouthEastGravity;
746	else	802	else
747	szHint.win_gravity = SouthWestGravity;	803	szHint.win_gravity = SouthWestGravity;
748	}	804	}
749	}	805	}
750	}	806	}
751		807
752	/* TODO: BOUNDS */	808	/* TODO: BOUNDS */
753	TermWin.width = TermWin.ncol * TermWin.fwidth;	809	width = ncol * fwidth;
754	TermWin.height = TermWin.nrow * TermWin.fheight;	810	height = nrow * fheight;
755	max_width = MAX_COLS * TermWin.fwidth;	811	max_width = MAX_COLS * fwidth;
756	max_height = MAX_ROWS * TermWin.fheight;	812	max_height = MAX_ROWS * fheight;
757		813
758	szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;	814	szHint.base_width = szHint.base_height = 2 * int_bwidth;
759		815
760	sb_w = mb_h = 0;	816	sb_w = 0;
761	window_vt_x = window_vt_y = TermWin.int_bwidth;	817	window_vt_x = window_vt_y = int_bwidth;
762		818
763	if (scrollbar_visible ())	819	if (scrollBar.state)
764	{	820	{
765	sb_w = scrollbar_TotalWidth ();	821	sb_w = scrollbar_TotalWidth ();
766	szHint.base_width += sb_w;	822	szHint.base_width += sb_w;
767	if (!(options & Opt_scrollBar_right))	823	if (!OPTION (Opt_scrollBar_right))
768	window_vt_x += sb_w;	824	window_vt_x += sb_w;
769	}	825	}
770		826
771	if (menubar_visible ())
772	{
773	mb_h = menuBar_TotalHeight ();
774	szHint.base_height += mb_h;
775	window_vt_y += mb_h;
776	}
777
778	szHint.width_inc = TermWin.fwidth;	827	szHint.width_inc = fwidth;
779	szHint.height_inc = TermWin.fheight;	828	szHint.height_inc = fheight;
780	szHint.min_width = szHint.base_width + szHint.width_inc;	829	szHint.min_width = szHint.base_width + szHint.width_inc;
781	szHint.min_height = szHint.base_height + szHint.height_inc;	830	szHint.min_height = szHint.base_height + szHint.height_inc;
782		831
783	if (width && width - szHint.base_width < max_width)	832	if (newwidth && newwidth - szHint.base_width < max_width)
784	{	833	{
785	szHint.width = width;	834	szHint.width = newwidth;
786	TermWin.width = width - szHint.base_width;	835	width = newwidth - szHint.base_width;
787	}	836	}
788	else	837	else
789	{	838	{
790	MIN_IT (TermWin.width, max_width);	839	min_it (width, max_width);
791	szHint.width = szHint.base_width + TermWin.width;	840	szHint.width = szHint.base_width + width;
792	}	841	}
793		842
794	if (height && height - szHint.base_height < max_height)	843	if (newheight && newheight - szHint.base_height < max_height)
795	{	844	{
796	szHint.height = height;	845	szHint.height = newheight;
797	TermWin.height = height - szHint.base_height;	846	height = newheight - szHint.base_height;
798	}	847	}
799	else	848	else
800	{	849	{
801	MIN_IT (TermWin.height, max_height);	850	min_it (height, max_height);
802	szHint.height = szHint.base_height + TermWin.height;	851	szHint.height = szHint.base_height + height;
803	}	852	}
804		853
805	if (scrollbar_visible () && (options & Opt_scrollBar_right))	854	if (scrollBar.state && OPTION (Opt_scrollBar_right))
806	window_sb_x = szHint.width - sb_w;	855	window_sb_x = szHint.width - sb_w;
807		856
808	if (recalc_x)	857	if (recalc_x)
809	szHint.x += (DisplayWidth (disp, display->screen)	858	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
810	- szHint.width - 2 * TermWin.ext_bwidth);
811	if (recalc_y)	859	if (recalc_y)
812	szHint.y += (DisplayHeight (disp, display->screen)	860	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
813	- szHint.height - 2 * TermWin.ext_bwidth);
814		861
815	TermWin.ncol = TermWin.width / TermWin.fwidth;	862	ncol = width / fwidth;
816	TermWin.nrow = TermWin.height / TermWin.fheight;	863	nrow = height / fheight;
817	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	864	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
818	TermWin.ncol, TermWin.nrow, szHint.width,	865	ncol, nrow, szHint.width,
819	szHint.height));	866	szHint.height));
820	return;	867	return;
821	}	868	}
822		869
823	/----------------------------------------------------------------------/	870	/----------------------------------------------------------------------/
…		…
831	if (pty.pty < 0)	878	if (pty.pty < 0)
832	return;	879	return;
833		880
834	struct winsize ws;	881	struct winsize ws;
835		882
836	ws.ws_col = TermWin.ncol;	883	ws.ws_col = ncol;
837	ws.ws_row = TermWin.nrow;	884	ws.ws_row = nrow;
838	ws.ws_xpixel = TermWin.width;	885	ws.ws_xpixel = width;
839	ws.ws_ypixel = TermWin.height;	886	ws.ws_ypixel = height;
840	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	887	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);
841		888
842	#if 0	889	#if 0
843	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	890	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
844	if (cmd_pid) /* force through to the command */	891	if (cmd_pid) /* force through to the command */
845	kill (cmd_pid, SIGWINCH);	892	kill (-cmd_pid, SIGWINCH);
846	#endif	893	#endif
847	}	894	}
848		895
849	/----------------------------------------------------------------------/	896	/----------------------------------------------------------------------/
850	/* set_fonts () - load and set the various fonts	897	/* set_fonts () - load and set the various fonts
851	/*	898	*
852	* init = 1 - initialize	899	* init = 1 - initialize
853	*	900	*
854	* fontname == FONT_UP - switch to bigger font	901	* fontname == FONT_UP - switch to bigger font
855	* fontname == FONT_DN - switch to smaller font	902	* fontname == FONT_DN - switch to smaller font
856	*/	903	*/
…		…
868	return false;	915	return false;
869	}	916	}
870		917
871	#if ENABLE_STYLES	918	#if ENABLE_STYLES
872	for (int i = RS_styleCount; --i; )	919	for (int i = RS_styleCount; --i; )
873	if (TermWin.fontset[i] != TermWin.fontset[0])	920	if (fontset[i] != fontset[0])
874	delete TermWin.fontset[i];	921	delete fontset[i];
875	#endif	922	#endif
876		923
877	delete TermWin.fontset[0];	924	delete fontset[0];
878	TermWin.fontset[0] = fs;	925	fontset[0] = fs;
879		926
880	prop = (*fs)[1]->properties ();	927	prop = (*fs)[1]->properties ();
881	prop.height += TermWin.lineSpace;	928	prop.height += lineSpace;
882	fs->set_prop (prop);	929	fs->set_prop (prop);
883		930
884	TermWin.fwidth = prop.width;	931	fwidth = prop.width;
885	TermWin.fheight = prop.height;	932	fheight = prop.height;
886	TermWin.fweight = prop.weight;	933	fbase = prop.ascent;
887	TermWin.fslant = prop.slant;
888	TermWin.fbase = (*fs)[1]->ascent;
889		934
890	for (int style = 1; style < 4; style++)	935	for (int style = 1; style < 4; style++)
891	{	936	{
892	#if ENABLE_STYLES	937	#if ENABLE_STYLES
893	const char *res = rs[Rs_font + style];	938	const char *res = rs[Rs_font + style];
894		939
895	if (res && !*res)	940	if (res && !*res)
896	TermWin.fontset[style] = TermWin.fontset[0];	941	fontset[style] = fontset[0];
897	else	942	else
898	{	943	{
899	TermWin.fontset[style] = fs = new rxvt_fontset (this);	944	fontset[style] = fs = new rxvt_fontset (this);
900	rxvt_fontprop prop2 = prop;	945	rxvt_fontprop prop2 = prop;
901		946
902	if (res)	947	if (res)
903	prop2.weight = prop2.slant = rxvt_fontprop::unset;	948	prop2.weight = prop2.slant = rxvt_fontprop::unset;
904	else	949	else
905	{	950	{
906	res = TermWin.fontset[0]->fontdesc;	951	res = fontset[0]->fontdesc;
907		952
908	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	953	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
909	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	954	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
910	}	955	}
911		956
912	fs->populate (res);	957	fs->populate (res);
913	fs->set_prop (prop2);	958	fs->set_prop (prop2);
914	}	959	}
915	#else	960	#else
916	TermWin.fontset[style] = TermWin.fontset[0];	961	fontset[style] = fontset[0];
917	#endif	962	#endif
918	}	963	}
919		964
920	if (TermWin.parent[0])	965	if (parent[0])
921	{	966	{
922	resize_all_windows (0, 0, 0);	967	resize_all_windows (0, 0, 0);
923	scr_remap_chars ();	968	scr_remap_chars ();
924	scr_touch (true);	969	scr_touch (true);
925	}	970	}
…		…
927	return true;	972	return true;
928	}	973	}
929		974
930	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	975	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
931	{	976	{
932	// TODO: SMART_WINDOW_TITLE
933	XChangeProperty (display->display, TermWin.parent[0],	977	XChangeProperty (display->display, parent[0],
934	prop, XA_STRING, 8, PropModeReplace,	978	prop, XA_STRING, 8, PropModeReplace,
935	(const unsigned char *)str, len >= 0 ? len : strlen (str));	979	(const unsigned char *)str, len >= 0 ? len : strlen (str));
936	}	980	}
937		981
938	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	982	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
939	{	983	{
940	// TODO: SMART_WINDOW_TITLE
941	wchar_t *ws = rxvt_mbstowcs (str, len);	984	wchar_t *ws = rxvt_mbstowcs (str, len);
942	char *s = rxvt_wcstoutf8 (ws);	985	char *s = rxvt_wcstoutf8 (ws);
943		986
944	XChangeProperty (display->display, TermWin.parent[0],	987	XChangeProperty (display->display, parent[0],
945	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	988	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
946	(const unsigned char *)s, strlen (s));	989	(const unsigned char *)s, strlen (s));
947		990
948	free (s);	991	free (s);
949	free (ws);	992	free (ws);
…		…
954	/* xterm sequences - title, iconName, color (exptl) */	997	/* xterm sequences - title, iconName, color (exptl) */
955	void	998	void
956	rxvt_term::set_title (const char *str)	999	rxvt_term::set_title (const char *str)
957	{	1000	{
958	set_string_property (XA_WM_NAME, str);	1001	set_string_property (XA_WM_NAME, str);
959	#if ENABLE_FRILLS	1002	#if ENABLE_EWMH
960	set_utf8_property (xa[XA_NET_WM_NAME], str);	1003	set_utf8_property (xa[XA_NET_WM_NAME], str);
961	#endif	1004	#endif
962	}	1005	}
963		1006
964	void	1007	void
965	rxvt_term::set_icon_name (const char *str)	1008	rxvt_term::set_icon_name (const char *str)
966	{	1009	{
967	set_string_property (XA_WM_ICON_NAME, str);	1010	set_string_property (XA_WM_ICON_NAME, str);
968	#if ENABLE_FRILLS	1011	#if ENABLE_EWMH
969	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	1012	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
970	#endif	1013	#endif
971	}	1014	}
972		1015
973	#ifdef XTERM_COLOR_CHANGE	1016	#ifdef XTERM_COLOR_CHANGE
…		…
986	i = atoi (color);	1029	i = atoi (color);
987		1030
988	if (i >= 8 && i <= 15)	1031	if (i >= 8 && i <= 15)
989	{ /* bright colors */	1032	{ /* bright colors */
990	i -= 8;	1033	i -= 8;
991	# ifndef NO_BRIGHTCOLOR
992	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	1034	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
993	SET_PIXCOLOR (idx);	1035	SET_PIXCOLOR (idx);
994	goto Done;	1036	goto done;
995	# endif
996	}	1037	}
997		1038
998	if (i >= 0 && i <= 7)	1039	if (i >= 0 && i <= 7)
999	{ /* normal colors */	1040	{ /* normal colors */
1000	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	1041	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1001	SET_PIXCOLOR (idx);	1042	SET_PIXCOLOR (idx);
1002	goto Done;	1043	goto done;
1003	}	1044	}
1004	}	1045	}
1005		1046
1006	if (!rXParseAllocColor (&xcol, color))	1047	if (!rXParseAllocColor (&xcol, color))
1007	return;	1048	return;
…		…
1027	pix_colors_focused[idx] = xcol;	1068	pix_colors_focused[idx] = xcol;
1028	SET_PIXCOLOR (idx);	1069	SET_PIXCOLOR (idx);
1029		1070
1030	/* XSetWindowAttributes attr; */	1071	/* XSetWindowAttributes attr; */
1031	/* Cursor cursor; */	1072	/* Cursor cursor; */
1032	Done:	1073	done:
		1074
1033	#ifdef OFF_FOCUS_FADING	1075	#if OFF_FOCUS_FADING
1034	if (rs[Rs_fade])	1076	if (rs[Rs_fade])
1035	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));	1077	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1036	#endif	1078	#endif
1037		1079
1038	/TODO: handle Color_BD, scrollbar background, etc. /	1080	/TODO: handle Color_BD, scrollbar background, etc. /
1039		1081
1040	recolour_cursor ();	1082	recolour_cursor ();
…		…
1111		1153
1112	/* -------------------------------------------------------------------- *	1154	/* -------------------------------------------------------------------- *
1113	* - WINDOW RESIZING - *	1155	* - WINDOW RESIZING - *
1114	* -------------------------------------------------------------------- */	1156	* -------------------------------------------------------------------- */
1115	void	1157	void
1116	rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)	1158	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1117	{	1159	{
1118	int fix_screen;	1160	int fix_screen;
1119	#ifdef SMART_RESIZE
1120	int old_width = szHint.width, old_height = szHint.height;	1161	int old_width = szHint.width, old_height = szHint.height;
1121	#endif
1122	dDisp;	1162	dDisp;
1123		1163
1124	window_calc (width, height);	1164	window_calc (newwidth, newheight);
1125	XSetWMNormalHints (disp, TermWin.parent[0], &szHint);	1165	XSetWMNormalHints (disp, parent[0], &szHint);
1126		1166
1127	if (!ignoreparent)	1167	if (!ignoreparent)
1128	{	1168	{
1129	#ifdef SMART_RESIZE	1169	#ifdef SMART_RESIZE
1130	/*	1170	/*
…		…
1134	int x, y, x1, y1;	1174	int x, y, x1, y1;
1135	int dx, dy;	1175	int dx, dy;
1136	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1176	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1137	Window unused_cr;	1177	Window unused_cr;
1138		1178
1139	XTranslateCoordinates (disp, TermWin.parent[0], display->root,	1179	XTranslateCoordinates (disp, parent[0], display->root,
1140	0, 0, &x, &y, &unused_cr);	1180	0, 0, &x, &y, &unused_cr);
1141	XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,	1181	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1142	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1182	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1143	/*	1183	/*
1144	* if display->root isn't the parent window, a WM will probably have offset	1184	* if display->root isn't the parent window, a WM will probably have offset
1145	* our position for handles and decorations. Counter it	1185	* our position for handles and decorations. Counter it
1146	*/	1186	*/
…		…
1163	if (y < y1) /* top half */	1203	if (y < y1) /* top half */
1164	dy = 0;	1204	dy = 0;
1165	else if (y == y1) /* exact center */	1205	else if (y == y1) /* exact center */
1166	dy /= 2;	1206	dy /= 2;
1167		1207
1168	XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,	1208	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1169	szHint.width, szHint.height);	1209	szHint.width, szHint.height);
1170	#else	1210	#else
1171	XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);	1211	XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1172	#endif	1212	#endif
1173	}	1213	}
1174		1214
1175	fix_screen = TermWin.ncol != prev_ncol \|\| TermWin.nrow != prev_nrow;	1215	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1176		1216
1177	if (fix_screen \|\| width != old_width \|\| height != old_height)	1217	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1178	{	1218	{
1179	if (scrollbar_visible ())	1219	if (scrollBar.state)
1180	{	1220	{
1181	XMoveResizeWindow (disp, scrollBar.win,	1221	XMoveResizeWindow (disp, scrollBar.win,
1182	window_sb_x, 0,	1222	window_sb_x, 0,
1183	scrollbar_TotalWidth (), szHint.height);	1223	scrollbar_TotalWidth (), szHint.height);
1184	resize_scrollbar ();	1224	resize_scrollbar ();
1185	}	1225	}
1186		1226
1187	if (menubar_visible ())
1188	XMoveResizeWindow (disp, menuBar.win,
1189	window_vt_x, 0,
1190	TermWin_TotalWidth (), menuBar_TotalHeight ());
1191
1192	XMoveResizeWindow (disp, TermWin.vt,	1227	XMoveResizeWindow (disp, vt,
1193	window_vt_x, window_vt_y,	1228	window_vt_x, window_vt_y,
1194	TermWin_TotalWidth (), TermWin_TotalHeight ());	1229	width, height);
1195		1230
1196	scr_clear ();	1231	scr_clear ();
1197	#ifdef XPM_BACKGROUND	1232	#ifdef XPM_BACKGROUND
1198	resize_pixmap ();	1233	resize_pixmap ();
1199	#endif	1234	#endif
…		…
1205	int old_ncol = prev_ncol;	1240	int old_ncol = prev_ncol;
1206		1241
1207	/* scr_reset only works on the primary screen */	1242	/* scr_reset only works on the primary screen */
1208	if (old_height) /* this is not the first time through */	1243	if (old_height) /* this is not the first time through */
1209	{	1244	{
1210	unsigned int ncol = TermWin.ncol;	1245	unsigned int ocol = ncol;
1211	TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this	1246	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1212	curr_screen = scr_change_screen (PRIMARY);	1247	curr_screen = scr_change_screen (PRIMARY);
1213	TermWin.ncol = ncol;	1248	ncol = ocol;
1214	}	1249	}
1215		1250
1216	scr_reset ();	1251	scr_reset ();
1217		1252
1218	if (curr_screen >= 0) /* this is not the first time through */	1253	if (curr_screen >= 0) /* this is not the first time through */
1219	{	1254	{
1220	scr_change_screen (curr_screen);	1255	scr_change_screen (curr_screen);
1221	selection_check (old_ncol != TermWin.ncol ? 4 : 0);	1256	selection_check (old_ncol != ncol ? 4 : 0);
1222	}	1257	}
1223	}	1258	}
1224		1259
1225	old_width = szHint.width;	1260	old_width = szHint.width;
1226	old_height = szHint.height;	1261	old_height = szHint.height;
1227		1262
1228	#ifdef XPM_BACKGROUND	1263	#ifdef XPM_BACKGROUND
1229	if (TermWin.pixmap)	1264	if (pixmap)
1230	scr_touch (false);	1265	scr_touch (false);
1231	#endif	1266	#endif
1232		1267
1233	#ifdef USE_XIM	1268	#ifdef USE_XIM
1234	IMSetStatusPosition ();	1269	IMSetStatusPosition ();
…		…
1238	/*	1273	/*
1239	* Set the width/height of the vt window in characters. Units are pixels.	1274	* Set the width/height of the vt window in characters. Units are pixels.
1240	* good for toggling 80/132 columns	1275	* good for toggling 80/132 columns
1241	*/	1276	*/
1242	void	1277	void
1243	rxvt_term::set_widthheight (unsigned int width, unsigned int height)	1278	rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1244	{	1279	{
1245	XWindowAttributes wattr;	1280	XWindowAttributes wattr;
1246		1281
1247	if (width == 0 \|\| height == 0)	1282	if (newwidth == 0 \|\| newheight == 0)
1248	{	1283	{
1249	XGetWindowAttributes (display->display, display->root, &wattr);	1284	XGetWindowAttributes (display->display, display->root, &wattr);
		1285
1250	if (width == 0)	1286	if (newwidth == 0)
1251	width = wattr.width - szHint.base_width;	1287	newwidth = wattr.width - szHint.base_width;
1252	if (height == 0)	1288	if (newheight == 0)
1253	height = wattr.height - szHint.base_height;	1289	newheight = wattr.height - szHint.base_height;
1254	}
1255
1256	if (width != TermWin.width \|\| height != TermWin.height)
1257	{	1290	}
		1291
		1292	if (newwidth != width \|\| newheight != height)
		1293	{
1258	width += szHint.base_width;	1294	newwidth += szHint.base_width;
1259	height += szHint.base_height;	1295	newheight += szHint.base_height;
1260	resize_all_windows (width, height, 0);	1296	resize_all_windows (newwidth, newheight, 0);
1261	}	1297	}
1262	}	1298	}
1263		1299
1264	/* -------------------------------------------------------------------- *	1300	/* -------------------------------------------------------------------- *
1265	* - X INPUT METHOD ROUTINES - *	1301	* - X INPUT METHOD ROUTINES - *
…		…
1275		1311
1276	void	1312	void
1277	rxvt_term::im_set_size (XRectangle &size)	1313	rxvt_term::im_set_size (XRectangle &size)
1278	{	1314	{
1279	// the int_bwidth terms make no sense to me	1315	// the int_bwidth terms make no sense to me
1280	size.x = TermWin.int_bwidth;	1316	size.x = int_bwidth;
1281	size.y = TermWin.int_bwidth;	1317	size.y = int_bwidth;
1282	size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;	1318	size.width = Width2Pixel (ncol) + int_bwidth;
1283	size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;	1319	size.height = Height2Pixel (nrow) + int_bwidth;
1284	}	1320	}
1285		1321
1286	void	1322	void
1287	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,	1323	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1288	XRectangle &status_rect,	1324	XRectangle &status_rect,
1289	const XRectangle &needed_rect)	1325	const XRectangle &needed_rect)
1290	{	1326	{
1291	preedit_rect.x = needed_rect.width;	1327	preedit_rect.x = needed_rect.width;
1292	preedit_rect.y = 0;	1328	preedit_rect.y = 0;
1293	preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;	1329	preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1294	preedit_rect.height = TermWin.fheight;	1330	preedit_rect.height = fheight;
1295		1331
1296	status_rect.x = 0;	1332	status_rect.x = 0;
1297	status_rect.y = 0;	1333	status_rect.y = 0;
1298	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;	1334	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1299	status_rect.height = TermWin.fheight;	1335	status_rect.height = fheight;
1300	}	1336	}
1301		1337
1302	/* Checking whether input method is running. */	1338	/* Checking whether input method is running. */
1303	bool	1339	bool
1304	rxvt_term::IMisRunning ()	1340	rxvt_term::IMisRunning ()
…		…
1332	{	1368	{
1333	XPoint nspot;	1369	XPoint nspot;
1334	XVaNestedList preedit_attr;	1370	XVaNestedList preedit_attr;
1335		1371
1336	if (!Input_Context	1372	if (!Input_Context
1337	\|\| !TermWin.focus	1373	\|\| !focus
1338	\|\| !(input_style & XIMPreeditPosition))	1374	\|\| !(input_style & XIMPreeditPosition))
1339	return;	1375	return;
1340		1376
1341	im_set_position (nspot);	1377	im_set_position (nspot);
1342		1378
…		…
1378	XRectangle rect, status_rect, needed_rect;	1414	XRectangle rect, status_rect, needed_rect;
1379	unsigned long fg, bg;	1415	unsigned long fg, bg;
1380	const char *p;	1416	const char *p;
1381	char **s;	1417	char **s;
1382	XIMStyles *xim_styles;	1418	XIMStyles *xim_styles;
		1419
		1420	set_environ (envv);
1383		1421
1384	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1422	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1385	return false;	1423	return false;
1386		1424
1387	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1425	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1462	"----R---%d------*,"	1500	"----R---%d------*,"
1463	"----R---%d------*,"	1501	"----R---%d------*,"
1464	"----R---%d------*,"	1502	"----R---%d------*,"
1465	"----R---%d------*,"	1503	"----R---%d------*,"
1466	"*",	1504	"*",
1467	TermWin.fheight,	1505	fheight,
1468	TermWin.fheight + 1, TermWin.fheight - 1,	1506	fheight + 1, fheight - 1,
1469	TermWin.fheight - 2, TermWin.fheight + 2);	1507	fheight - 2, fheight + 2);
1470		1508
1471	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1509	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1472	&missing_charset_list, &missing_charset_count, &def_string);	1510	&missing_charset_list, &missing_charset_count, &def_string);
1473		1511
1474	if (missing_charset_list)	1512	if (missing_charset_list)
…		…
1520	NULL);	1558	NULL);
1521	}	1559	}
1522		1560
1523	Input_Context = XCreateIC (xim,	1561	Input_Context = XCreateIC (xim,
1524	XNInputStyle, input_style,	1562	XNInputStyle, input_style,
1525	XNClientWindow, TermWin.vt,	1563	XNClientWindow, vt,
1526	XNFocusWindow, TermWin.parent[0],	1564	XNFocusWindow, parent[0],
1527	preedit_attr ? XNPreeditAttributes : NULL,	1565	preedit_attr ? XNPreeditAttributes : NULL,
1528	preedit_attr,	1566	preedit_attr,
1529	status_attr ? XNStatusAttributes : NULL,	1567	status_attr ? XNStatusAttributes : NULL,
1530	status_attr, NULL);	1568	status_attr, NULL);
1531		1569
…		…
1548	}	1586	}
1549		1587
1550	void	1588	void
1551	rxvt_term::im_cb ()	1589	rxvt_term::im_cb ()
1552	{	1590	{
1553	int i, found, had_im;	1591	int i;
1554	const char *p;	1592	const char *p;
1555	char **s;	1593	char **s;
1556	char buf[IMBUFSIZ];	1594	char buf[IMBUFSIZ];
1557		1595
1558	SET_R (this);	1596	make_current ();
1559		1597
1560	im_destroy ();	1598	im_destroy ();
1561		1599
1562	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1600	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1563	if (Input_Context)	1601	if (Input_Context)
…		…
1615	{	1653	{
1616	XRectangle preedit_rect, status_rect, *needed_rect;	1654	XRectangle preedit_rect, status_rect, *needed_rect;
1617	XVaNestedList preedit_attr, status_attr;	1655	XVaNestedList preedit_attr, status_attr;
1618		1656
1619	if (!Input_Context	1657	if (!Input_Context
1620	\|\| !TermWin.focus	1658	\|\| !focus
1621	\|\| !(input_style & XIMPreeditArea)	1659	\|\| !(input_style & XIMPreeditArea)
1622	\|\| !IMisRunning ())	1660	\|\| !IMisRunning ())
1623	return;	1661	return;
1624		1662
1625	/* Getting the necessary width of preedit area */	1663	/* 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.135 by root, Sun Feb 13 11:07:57 2005 UTC vs. Revision 1.183 by root, Tue Jan 17 10:19:13 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.135 by root, Sun Feb 13 11:07:57 2005 UTC vs.
Revision 1.183 by root, Tue Jan 17 10:19:13 2006 UTC