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

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

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.136 by root, Mon Feb 14 18:47:54 2005 UTC vs. Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.136 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC