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

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

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.143 by root, Sun Feb 20 00:09:25 2005 UTC vs.
Revision 1.175 by root, Thu Jan 12 00:35:39 2006 UTC