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

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

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.136 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.170 by root, Wed Jan 11 00:59:58 2006 UTC