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

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

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.135 by root, Sun Feb 13 11:07:57 2005 UTC vs.
Revision 1.171 by root, Wed Jan 11 03:13:26 2006 UTC