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

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

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.141 by root, Sat Feb 19 01:07:58 2005 UTC vs. Revision 1.173 by root, Wed Jan 11 19:55:34 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.141 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.173 by root, Wed Jan 11 19:55:34 2006 UTC