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

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

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.138 by root, Wed Feb 16 20:32:05 2005 UTC vs.
Revision 1.169 by root, Tue Jan 10 18:09:22 2006 UTC