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

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