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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.148 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.202 by root, Wed Jan 25 01:08:38 2006 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "keyboard.h"
		36	#include "rxvtperl.h"
		37
		38	#include <limits>
35		39
36	#include <csignal>	40	#include <csignal>
37	#include <cstring>	41	#include <cstring>
38		42
39	#ifdef TTY_GID_SUPPORT	43	#ifdef TTY_GID_SUPPORT
…		…
42		46
43	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
44	# include <termios.h>	48	# include <termios.h>
45	#endif	49	#endif
46		50
47	#ifdef KEYSYM_RESOURCE
48	# include "keyboard.h"
49	#endif
50
51	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
52		52
		53	// used to tell global functions which terminal instance is "active"
		54	rxvt_t rxvt_current_term;
		55
53	static char curlocale[128];	56	static char curlocale[128], savelocale[128];
54		57
55	bool	58	bool
56	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
57	{	60	{
58	if (!locale \|\| !strncmp (locale, curlocale, 128))	61	if (!locale \|\| !strncmp (locale, curlocale, 128))
59	return false;	62	return false;
60		63
61	strncpy (curlocale, locale, 128);	64	strncpy (curlocale, locale, 128);
62	setlocale (LC_CTYPE, curlocale);	65	setlocale (LC_CTYPE, curlocale);
63	return true;	66	return true;
		67	}
		68
		69	void
		70	rxvt_push_locale (const char *locale) NOTHROW
		71	{
		72	strcpy (savelocale, curlocale);
		73	rxvt_set_locale (locale);
		74	}
		75
		76	void
		77	rxvt_pop_locale () NOTHROW
		78	{
		79	rxvt_set_locale (savelocale);
64	}	80	}
65		81
66	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
67	class rxvt_composite_vec rxvt_composite;	83	class rxvt_composite_vec rxvt_composite;
68		84
…		…
133	rootwin_ev (this, &rxvt_term::rootwin_cb),	149	rootwin_ev (this, &rxvt_term::rootwin_cb),
134	#endif	150	#endif
135	#ifdef HAVE_SCROLLBARS	151	#ifdef HAVE_SCROLLBARS
136	scrollbar_ev (this, &rxvt_term::x_cb),	152	scrollbar_ev (this, &rxvt_term::x_cb),
137	#endif	153	#endif
138	#ifdef MENUBAR
139	menubar_ev (this, &rxvt_term::x_cb),
140	#endif
141	#ifdef CURSOR_BLINK	154	#ifdef CURSOR_BLINK
142	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143	#endif	156	#endif
144	#ifdef TEXT_BLINK	157	#ifdef TEXT_BLINK
145	text_blink_ev (this, &rxvt_term::text_blink_cb),	158	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
157	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
158	#endif	171	#endif
159	#ifdef USE_XIM	172	#ifdef USE_XIM
160	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
161	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
162	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
163	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
164	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
165	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
166	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
167	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
168	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
171		188
172	termlist.push_back (this);	189	termlist.push_back (this);
173		190
174	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
175	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
176
177	if (!keyboard)
178	rxvt_fatal ("out of memory, aborting.\n");
179	#endif	193	#endif
180	}	194	}
181		195
182	// clean up the most important stuff, do not call x or free mem etc.	196	// clean up the most important stuff, do not call x or free mem etc.
183	// for use before an emergency exit	197	// for use before an emergency exit
184	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
185	{	199	{
186	if (cmd_pid)	200	if (cmd_pid)
187	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
188		202
189	#ifdef UTMP_SUPPORT	203	delete pty; pty = 0;
190	privileged_utmp (RESTORE);
191	#endif
192
193	pty.put ();
194	}	204	}
195		205
196	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
197	{	207	{
198	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
199		209
200	emergency_cleanup ();	210	emergency_cleanup ();
201		211
202	#if ENABLE_STYLES	212	#if ENABLE_STYLES
203	for (int i = RS_styleCount; --i; )	213	for (int i = RS_styleCount; --i; )
204	if (TermWin.fontset[i] != TermWin.fontset[0])	214	if (fontset[i] != fontset[0])
205	delete TermWin.fontset[i];	215	delete fontset[i];
206	#endif	216	#endif
207	delete TermWin.fontset[0];	217	delete fontset[0];
208		218
209	if (display)	219	if (display)
210	{	220	{
211	dDisp;	221	dDisp;
212		222
213	selection_clear ();	223	selection_clear ();
214		224
215	#ifdef USE_XIM	225	#ifdef USE_XIM
216	im_destroy ();	226	im_destroy ();
217	#endif
218	#ifdef MENUBAR
219	if (menubarGC) XFreeGC (disp, menubarGC);
220	#endif	227	#endif
221	#ifdef XTERM_SCROLLBAR	228	#ifdef XTERM_SCROLLBAR
222	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	229	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
223	if (ShadowGC) XFreeGC (disp, ShadowGC);	230	if (ShadowGC) XFreeGC (disp, ShadowGC);
224	#endif	231	#endif
…		…
235	if (upArrow) XFreePixmap (disp, upArrow);	242	if (upArrow) XFreePixmap (disp, upArrow);
236	if (downArrow) XFreePixmap (disp, downArrow);	243	if (downArrow) XFreePixmap (disp, downArrow);
237	if (upArrowHi) XFreePixmap (disp, upArrowHi);	244	if (upArrowHi) XFreePixmap (disp, upArrowHi);
238	if (downArrowHi) XFreePixmap (disp, downArrowHi);	245	if (downArrowHi) XFreePixmap (disp, downArrowHi);
239	#endif	246	#endif
240	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	247	#ifdef RXVT_SCROLLBAR
241	if (topShadowGC) XFreeGC (disp, topShadowGC);	248	if (topShadowGC) XFreeGC (disp, topShadowGC);
242	if (botShadowGC) XFreeGC (disp, botShadowGC);	249	if (botShadowGC) XFreeGC (disp, botShadowGC);
243	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	250	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
244	#endif	251	#endif
245	if (TermWin.gc) XFreeGC (disp, TermWin.gc);	252	if (gc) XFreeGC (disp, gc);
246		253
247	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
248	delete menuBar.drawable;	254	delete drawable;
249	//if (menuBar.win)
250	// XDestroyWindow (disp, menuBar.win);
251	#endif
252	delete TermWin.drawable;
253	// destroy all windows	255	// destroy all windows
254	if (TermWin.parent[0])	256	if (parent[0])
255	XDestroyWindow (disp, TermWin.parent[0]);	257	XDestroyWindow (disp, parent[0]);
256	}	258	}
257		259
258	// TODO: free pixcolours, colours should become part of rxvt_display	260	// TODO: free pixcolours, colours should become part of rxvt_display
259
260	delete pix_colors_focused;	261	delete pix_colors_focused;
261	#if OFF_FOCUS_FADING	262	#if OFF_FOCUS_FADING
262	delete pix_colors_unfocused;	263	delete pix_colors_unfocused;
263	#endif	264	#endif
264		265
…		…
286	#ifdef KEYSYM_RESOURCE	287	#ifdef KEYSYM_RESOURCE
287	delete keyboard;	288	delete keyboard;
288	#endif	289	#endif
289	}	290	}
290		291
		292	// child has exited, usually destroys
		293	void
		294	rxvt_term::child_cb (child_watcher &w, int status)
		295	{
		296	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		297
		298	cmd_pid = 0;
		299
		300	if (!OPTION (Opt_hold))
		301	destroy ();
		302	}
		303
291	void	304	void
292	rxvt_term::destroy ()	305	rxvt_term::destroy ()
293	{	306	{
294	if (destroy_ev.active)	307	if (destroy_ev.active)
295	return;	308	return;
296		309
		310	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		311
297	#if ENABLE_OVERLAY	312	#if ENABLE_OVERLAY
298	scr_overlay_off ();	313	scr_overlay_off ();
299	#endif	314	#endif
300		315
301	if (display)	316	if (display)
…		…
303	#if USE_XIM	318	#if USE_XIM
304	im_ev.stop (display);	319	im_ev.stop (display);
305	#endif	320	#endif
306	#if HAVE_SCROLLBARS	321	#if HAVE_SCROLLBARS
307	scrollbar_ev.stop (display);	322	scrollbar_ev.stop (display);
308	#endif
309	#if MENUBAR
310	menubar_ev.stop (display);
311	#endif	323	#endif
312	#if TRANSPARENT	324	#if TRANSPARENT
313	rootwin_ev.stop (display);	325	rootwin_ev.stop (display);
314	#endif	326	#endif
315	incr_ev.stop ();	327	incr_ev.stop ();
…		…
339	}	351	}
340		352
341	void	353	void
342	rxvt_term::destroy_cb (time_watcher &w)	354	rxvt_term::destroy_cb (time_watcher &w)
343	{	355	{
344	SET_R (this);	356	make_current ();
345		357
346	delete this;	358	delete this;
347	}	359	}
348		360
349	/----------------------------------------------------------------------/	361	/----------------------------------------------------------------------/
…		…
437	_exit (EXIT_FAILURE);	449	_exit (EXIT_FAILURE);
438	}	450	}
439		451
440	/----------------------------------------------------------------------/	452	/----------------------------------------------------------------------/
441	bool	453	bool
442	rxvt_term::init (int argc, const char const argv)	454	rxvt_term::init (int argc, const char const argv, stringvec *envv)
443	{	455	{
		456	this->envv = envv;
		457
444	SET_R (this);	458	SET_R (this);
445
446	set_locale ("");	459	set_locale ("");
		460	set_environ (envv); // few things in X do not call setlocale :(
447		461
448	if (!init_vars ())	462	if (!init_vars ())
449	return false;	463	return false;
450		464
451	init_secondary ();	465	init_secondary ();
…		…
454		468
455	#ifdef KEYSYM_RESOURCE	469	#ifdef KEYSYM_RESOURCE
456	keyboard->register_done ();	470	keyboard->register_done ();
457	#endif	471	#endif
458		472
459	#if MENUBAR_MAX
460	menubar_read (rs[Rs_menu]);
461	#endif
462	#ifdef HAVE_SCROLLBARS	473	#ifdef HAVE_SCROLLBARS
463	if (options & Opt_scrollBar)	474	if (OPTION (Opt_scrollBar))
464	scrollBar.setIdle (); /* set existence for size calculations */	475	scrollBar.setIdle (); /* set existence for size calculations */
465	#endif	476	#endif
466		477
		478	pty = ptytty::create ();
		479
467	create_windows (argc, argv);	480	create_windows (argc, argv);
468		481
469	dDisp;	482	dDisp;
470		483
471	init_xlocale ();	484	init_xlocale ();
472		485
473	scr_reset (); /* initialize screen */	486	scr_reset (); // initialize screen
474		487
475	#if 0	488	#if 0
476	XSynchronize (disp, True);	489	XSynchronize (disp, True);
477	#endif	490	#endif
478		491
479	#ifdef HAVE_SCROLLBARS	492	#ifdef HAVE_SCROLLBARS
480	if (options & Opt_scrollBar)	493	if (OPTION (Opt_scrollBar))
481	resize_scrollbar (); /* create and map scrollbar */	494	resize_scrollbar (); /* create and map scrollbar */
482	#endif	495	#endif
483	#if (MENUBAR_MAX)
484	if (menubar_visible ())
485	XMapWindow (disp, menuBar.win);
486	#endif
487	#ifdef TRANSPARENT	496	#ifdef TRANSPARENT
488	if (options & Opt_transparent)	497	if (OPTION (Opt_transparent))
489	{	498	{
490	XSelectInput (disp, display->root, PropertyChangeMask);	499	XSelectInput (disp, display->root, PropertyChangeMask);
491	check_our_parents ();	500	check_our_parents ();
492	rootwin_ev.start (display, display->root);	501	rootwin_ev.start (display, display->root);
493	}	502	}
494	#endif	503	#endif
495		504
496	XMapWindow (disp, TermWin.vt);
497	XMapWindow (disp, TermWin.parent[0]);
498
499	set_colorfgbg ();	505	set_colorfgbg ();
500		506
501	init_command (cmd_argv);	507	init_command (cmd_argv);
502		508
503	free (cmd_argv);	509	free (cmd_argv);
504		510
		511	if (pty->pty >= 0)
505	pty_ev.start (pty.pty, EVENT_READ);	512	pty_ev.start (pty->pty, EVENT_READ);
506		513
507	check_ev.start ();	514	check_ev.start ();
508		515
		516	HOOK_INVOKE ((this, HOOK_START, DT_END));
		517
		518	XMapWindow (disp, vt);
		519	XMapWindow (disp, parent[0]);
		520
509	return true;	521	return true;
510	}	522	}
511		523
512	static struct sig_handlers	524	static struct sig_handlers
513	{	525	{
514	sig_watcher sw_chld, sw_term, sw_int;	526	sig_watcher sw_term, sw_int;
515		527
516	void sig_chld (sig_watcher &w)
517	{
518	// we are being called for every SIGCHLD, find the corresponding term
519	int pid;
520
521	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523	if (pid == (*t)->cmd_pid)
524	{
525	(*t)->destroy ();
526	break;
527	}
528	}
529
530	/*	528	/*
531	* Catch a fatal signal and tidy up before quitting	529	* Catch a fatal signal and tidy up before quitting
532	*/	530	*/
533	void	531	void
534	sig_term (sig_watcher &w)	532	sig_term (sig_watcher &w)
535	{	533	{
536	#ifdef DEBUG_CMD
537	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
538	#endif
539	rxvt_emergency_cleanup ();	534	rxvt_emergency_cleanup ();
540	signal (w.signum, SIG_DFL);	535	signal (w.signum, SIG_DFL);
541	kill (getpid (), w.signum);	536	kill (getpid (), w.signum);
542	}	537	}
543		538
544	sig_handlers ()	539	sig_handlers ()
545	: sw_chld (this, &sig_handlers::sig_chld),
546	sw_term (this, &sig_handlers::sig_term),	540	: sw_term (this, &sig_handlers::sig_term),
547	sw_int (this, &sig_handlers::sig_term)	541	sw_int (this, &sig_handlers::sig_term)
548	{	542	{
549	}	543	}
550	} sig_handlers;	544	} sig_handlers;
551		545
		546	char **rxvt_environ; // startup environment
		547
552	void	548	void
553	rxvt_init ()	549	rxvt_init ()
554	{	550	{
555	/*	551	ptytty::init ();
556	* Save and then give up any super-user privileges	552
557	* If we need privileges in any area then we must specifically request it.	553	rxvt_environ = environ;
558	* We should only need to be root in these cases:
559	* 1. write utmp entries on some systems
560	* 2. chown tty on some systems
561	*/
562	rxvt_privileges (SAVE);
563	rxvt_privileges (IGNORE);
564		554
565	signal (SIGHUP, SIG_IGN);	555	signal (SIGHUP, SIG_IGN);
566	signal (SIGPIPE, SIG_IGN);	556	signal (SIGPIPE, SIG_IGN);
567		557
568	sig_handlers.sw_chld.start (SIGCHLD);
569	sig_handlers.sw_term.start (SIGTERM);	558	sig_handlers.sw_term.start (SIGTERM);
570	sig_handlers.sw_int.start (SIGINT);	559	sig_handlers.sw_int.start (SIGINT);
571		560
572	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	561	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
573	/* signal (SIGURG, SIG_DFL); */	562	/* signal (SIGURG, SIG_DFL); */
574		563
575	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	564	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576	// TODO: handle this with exceptions and tolerate the memory loss	565	// TODO: handle this with exceptions and tolerate the memory loss
577	XSetIOErrorHandler (rxvt_xioerror_handler);	566	XSetIOErrorHandler (rxvt_xioerror_handler);
		567
		568	XrmInitialize ();
578	}	569	}
579		570
580	/* ------------------------------------------------------------------------- *	571	/* ------------------------------------------------------------------------- *
581	* MEMORY ALLOCATION WRAPPERS *	572	* MEMORY ALLOCATION WRAPPERS *
582	* ------------------------------------------------------------------------- */	573	* ------------------------------------------------------------------------- */
…		…
600	rxvt_fatal ("memory allocation failure. aborting.\n");	591	rxvt_fatal ("memory allocation failure. aborting.\n");
601		592
602	return p;	593	return p;
603	}	594	}
604		595
605	void *	596	void *
606	rxvt_realloc (void *ptr, size_t size)	597	rxvt_realloc (void *ptr, size_t size)
607	{	598	{
608	void *p = realloc (ptr, size);	599	void *p = realloc (ptr, size);
609		600
610	if (!p)	601	if (!p)
611	rxvt_fatal ("memory allocation failure. aborting.\n");	602	rxvt_fatal ("memory allocation failure. aborting.\n");
612		603
613	return p;	604	return p;
614	}	605	}
615
616	/* ------------------------------------------------------------------------- *
617	* PRIVILEGED OPERATIONS *
618	* ------------------------------------------------------------------------- */
619	/* take care of suid/sgid super-user (root) privileges */
620	void
621	rxvt_privileges (rxvt_privaction action)
622	{
623	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
624	static uid_t euid;
625	static gid_t egid;
626	#endif
627
628	#if ! defined(__CYGWIN32__)
629	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630	/* setreuid () is the poor man's setuid (), seteuid () */
631	# define seteuid(a) setreuid(-1, (a))
632	# define setegid(a) setregid(-1, (a))
633	# define HAVE_SETEUID
634	# endif
635	# ifdef HAVE_SETEUID
636	switch (action)
637	{
638	case IGNORE:
639	/*
640	* change effective uid/gid - not real uid/gid - so we can switch
641	* back to root later, as required
642	*/
643	seteuid (getuid ());
644	setegid (getgid ());
645	break;
646	case SAVE:
647	euid = geteuid ();
648	egid = getegid ();
649	break;
650	case RESTORE:
651	seteuid (euid);
652	setegid (egid);
653	break;
654	}
655	# else
656	switch (action)
657	{
658	case IGNORE:
659	setuid (getuid ());
660	setgid (getgid ());
661	/* FALLTHROUGH */
662	case SAVE:
663	/* FALLTHROUGH */
664	case RESTORE:
665	break;
666	}
667	# endif
668	#endif
669	}
670
671	#ifdef UTMP_SUPPORT
672	void
673	rxvt_term::privileged_utmp (rxvt_privaction action)
674	{
675	if ((options & Opt_utmpInhibit)
676	\|\| !pty.name \|\| !*pty.name)
677	return;
678
679	rxvt_privileges (RESTORE);
680
681	if (action == SAVE)
682	makeutent (pty.name, rs[Rs_display_name]);
683	else
684	cleanutent ();
685
686	rxvt_privileges (IGNORE);
687	}
688	#endif
689		606
690	/----------------------------------------------------------------------/	607	/----------------------------------------------------------------------/
691	/*	608	/*
692	* window size/position calculcations for XSizeHint and other storage.	609	* window size/position calculcations for XSizeHint and other storage.
693	* if width/height are non-zero then override calculated width/height	610	* if width/height are non-zero then override calculated width/height
694	*/	611	*/
695	void	612	void
696	rxvt_term::window_calc (unsigned int width, unsigned int height)	613	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697	{	614	{
698	short recalc_x, recalc_y;	615	short recalc_x, recalc_y;
699	int x, y, sb_w, mb_h, flags;	616	int x, y, sb_w, flags;
700	unsigned int w, h;	617	unsigned int w, h;
701	unsigned int max_width, max_height;	618	unsigned int max_width, max_height;
702	dDisp;	619	dDisp;
703		620
704	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705	TermWin.ncol, TermWin.nrow, szHint.width,
706	szHint.height));
707	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	621	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
708	szHint.win_gravity = NorthWestGravity;	622	szHint.win_gravity = NorthWestGravity;
709	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	623	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710		624
711	recalc_x = recalc_y = 0;	625	recalc_x = recalc_y = 0;
712	flags = 0;	626	flags = 0;
		627
713	if (!parsed_geometry)	628	if (!parsed_geometry)
714	{	629	{
715	parsed_geometry = 1;	630	parsed_geometry = 1;
		631
716	if (rs[Rs_geometry])	632	if (rs[Rs_geometry])
717	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	633	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718		634
719	if (flags & WidthValue)	635	if (flags & WidthValue)
720	{	636	{
721	TermWin.ncol = BOUND_POSITIVE_INT16 (w);	637	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
722	szHint.flags \|= USSize;	638	szHint.flags \|= USSize;
723	}	639	}
724		640
725	if (flags & HeightValue)	641	if (flags & HeightValue)
726	{	642	{
727	TermWin.nrow = BOUND_POSITIVE_INT16 (h);	643	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
728	szHint.flags \|= USSize;	644	szHint.flags \|= USSize;
729	}	645	}
730		646
731	if (flags & XValue)	647	if (flags & XValue)
732	{	648	{
733	szHint.x = x;	649	szHint.x = x;
734	szHint.flags \|= USPosition;	650	szHint.flags \|= USPosition;
		651
735	if (flags & XNegative)	652	if (flags & XNegative)
736	{	653	{
737	recalc_x = 1;	654	recalc_x = 1;
738	szHint.win_gravity = NorthEastGravity;	655	szHint.win_gravity = NorthEastGravity;
739	}	656	}
…		…
741		658
742	if (flags & YValue)	659	if (flags & YValue)
743	{	660	{
744	szHint.y = y;	661	szHint.y = y;
745	szHint.flags \|= USPosition;	662	szHint.flags \|= USPosition;
		663
746	if (flags & YNegative)	664	if (flags & YNegative)
747	{	665	{
748	recalc_y = 1;	666	recalc_y = 1;
		667
749	if (szHint.win_gravity == NorthEastGravity)	668	if (szHint.win_gravity == NorthEastGravity)
750	szHint.win_gravity = SouthEastGravity;	669	szHint.win_gravity = SouthEastGravity;
751	else	670	else
752	szHint.win_gravity = SouthWestGravity;	671	szHint.win_gravity = SouthWestGravity;
753	}	672	}
754	}	673	}
755	}	674	}
756		675
757	/* TODO: BOUNDS */	676	/* TODO: BOUNDS */
758	TermWin.width = TermWin.ncol * TermWin.fwidth;	677	width = ncol * fwidth;
759	TermWin.height = TermWin.nrow * TermWin.fheight;	678	height = nrow * fheight;
760	max_width = MAX_COLS * TermWin.fwidth;	679	max_width = MAX_COLS * fwidth;
761	max_height = MAX_ROWS * TermWin.fheight;	680	max_height = MAX_ROWS * fheight;
762		681
763	szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;	682	szHint.base_width = szHint.base_height = 2 * int_bwidth;
764		683
765	sb_w = mb_h = 0;	684	sb_w = 0;
766	window_vt_x = window_vt_y = TermWin.int_bwidth;	685	window_vt_x = window_vt_y = int_bwidth;
767		686
768	if (scrollbar_visible ())	687	if (scrollBar.state)
769	{	688	{
770	sb_w = scrollbar_TotalWidth ();	689	sb_w = scrollbar_TotalWidth ();
771	szHint.base_width += sb_w;	690	szHint.base_width += sb_w;
772	if (!(options & Opt_scrollBar_right))	691	if (!OPTION (Opt_scrollBar_right))
773	window_vt_x += sb_w;	692	window_vt_x += sb_w;
774	}	693	}
775		694
776	if (menubar_visible ())
777	{
778	mb_h = menuBar_TotalHeight ();
779	szHint.base_height += mb_h;
780	window_vt_y += mb_h;
781	}
782
783	szHint.width_inc = TermWin.fwidth;	695	szHint.width_inc = fwidth;
784	szHint.height_inc = TermWin.fheight;	696	szHint.height_inc = fheight;
785	szHint.min_width = szHint.base_width + szHint.width_inc;	697	szHint.min_width = szHint.base_width + szHint.width_inc;
786	szHint.min_height = szHint.base_height + szHint.height_inc;	698	szHint.min_height = szHint.base_height + szHint.height_inc;
787		699
788	if (width && width - szHint.base_width < max_width)	700	if (newwidth && newwidth - szHint.base_width < max_width)
789	{	701	{
790	szHint.width = width;	702	szHint.width = newwidth;
791	TermWin.width = width - szHint.base_width;	703	width = newwidth - szHint.base_width;
792	}	704	}
793	else	705	else
794	{	706	{
795	MIN_IT (TermWin.width, max_width);	707	min_it (width, max_width);
796	szHint.width = szHint.base_width + TermWin.width;	708	szHint.width = szHint.base_width + width;
797	}	709	}
798		710
799	if (height && height - szHint.base_height < max_height)	711	if (newheight && newheight - szHint.base_height < max_height)
800	{	712	{
801	szHint.height = height;	713	szHint.height = newheight;
802	TermWin.height = height - szHint.base_height;	714	height = newheight - szHint.base_height;
803	}	715	}
804	else	716	else
805	{	717	{
806	MIN_IT (TermWin.height, max_height);	718	min_it (height, max_height);
807	szHint.height = szHint.base_height + TermWin.height;	719	szHint.height = szHint.base_height + height;
808	}	720	}
809		721
810	if (scrollbar_visible () && (options & Opt_scrollBar_right))	722	if (scrollBar.state && OPTION (Opt_scrollBar_right))
811	window_sb_x = szHint.width - sb_w;	723	window_sb_x = szHint.width - sb_w;
812		724
813	if (recalc_x)	725	if (recalc_x)
814	szHint.x += (DisplayWidth (disp, display->screen)	726	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
815	- szHint.width - 2 * TermWin.ext_bwidth);
816	if (recalc_y)	727	if (recalc_y)
817	szHint.y += (DisplayHeight (disp, display->screen)	728	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
818	- szHint.height - 2 * TermWin.ext_bwidth);
819		729
820	TermWin.ncol = TermWin.width / TermWin.fwidth;	730	ncol = width / fwidth;
821	TermWin.nrow = TermWin.height / TermWin.fheight;	731	nrow = height / fheight;
822	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
823	TermWin.ncol, TermWin.nrow, szHint.width,
824	szHint.height));
825	return;
826	}	732	}
827		733
828	/----------------------------------------------------------------------/	734	/----------------------------------------------------------------------/
829	/*	735	/*
830	* Tell the teletype handler what size the window is.	736	* Tell the teletype handler what size the window is.
831	* Called after a window size change.	737	* Called after a window size change.
832	*/	738	*/
833	void	739	void
834	rxvt_term::tt_winch ()	740	rxvt_term::tt_winch ()
835	{	741	{
836	if (pty.pty < 0)	742	if (pty->pty < 0)
837	return;	743	return;
838		744
839	struct winsize ws;	745	struct winsize ws;
840		746
841	ws.ws_col = TermWin.ncol;	747	ws.ws_col = ncol;
842	ws.ws_row = TermWin.nrow;	748	ws.ws_row = nrow;
843	ws.ws_xpixel = TermWin.width;	749	ws.ws_xpixel = width;
844	ws.ws_ypixel = TermWin.height;	750	ws.ws_ypixel = height;
845	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	751	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
846		752
847	#if 0	753	#if 0
848	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	754	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
849	if (cmd_pid) /* force through to the command */	755	if (cmd_pid) /* force through to the command */
850	kill (-cmd_pid, SIGWINCH);	756	kill (-cmd_pid, SIGWINCH);
…		…
873	return false;	779	return false;
874	}	780	}
875		781
876	#if ENABLE_STYLES	782	#if ENABLE_STYLES
877	for (int i = RS_styleCount; --i; )	783	for (int i = RS_styleCount; --i; )
878	if (TermWin.fontset[i] != TermWin.fontset[0])	784	if (fontset[i] != fontset[0])
879	delete TermWin.fontset[i];	785	delete fontset[i];
880	#endif	786	#endif
881		787
882	delete TermWin.fontset[0];	788	delete fontset[0];
883	TermWin.fontset[0] = fs;	789	fontset[0] = fs;
884		790
885	prop = (*fs)[1]->properties ();	791	prop = (*fs)[1]->properties ();
886	prop.height += TermWin.lineSpace;	792	prop.height += lineSpace;
887	fs->set_prop (prop);	793	fs->set_prop (prop);
888		794
889	TermWin.fwidth = prop.width;	795	fwidth = prop.width;
890	TermWin.fheight = prop.height;	796	fheight = prop.height;
891	TermWin.fweight = prop.weight;	797	fbase = prop.ascent;
892	TermWin.fslant = prop.slant;
893	TermWin.fbase = (*fs)[1]->ascent;
894		798
895	for (int style = 1; style < 4; style++)	799	for (int style = 1; style < 4; style++)
896	{	800	{
897	#if ENABLE_STYLES	801	#if ENABLE_STYLES
898	const char *res = rs[Rs_font + style];	802	const char *res = rs[Rs_font + style];
899		803
900	if (res && !*res)	804	if (res && !*res)
901	TermWin.fontset[style] = TermWin.fontset[0];	805	fontset[style] = fontset[0];
902	else	806	else
903	{	807	{
904	TermWin.fontset[style] = fs = new rxvt_fontset (this);	808	fontset[style] = fs = new rxvt_fontset (this);
905	rxvt_fontprop prop2 = prop;	809	rxvt_fontprop prop2 = prop;
906		810
907	if (res)	811	if (res)
908	prop2.weight = prop2.slant = rxvt_fontprop::unset;	812	prop2.weight = prop2.slant = rxvt_fontprop::unset;
909	else	813	else
910	{	814	{
911	res = TermWin.fontset[0]->fontdesc;	815	res = fontset[0]->fontdesc;
912		816
913	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	817	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
914	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	818	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
915	}	819	}
916		820
917	fs->populate (res);	821	fs->populate (res);
918	fs->set_prop (prop2);	822	fs->set_prop (prop2);
919	}	823	}
920	#else	824	#else
921	TermWin.fontset[style] = TermWin.fontset[0];	825	fontset[style] = fontset[0];
922	#endif	826	#endif
923	}	827	}
924		828
925	if (TermWin.parent[0])	829	if (parent[0])
926	{	830	{
927	resize_all_windows (0, 0, 0);	831	resize_all_windows (0, 0, 0);
928	scr_remap_chars ();	832	scr_remap_chars ();
929	scr_touch (true);	833	scr_touch (true);
930	}	834	}
…		…
932	return true;	836	return true;
933	}	837	}
934		838
935	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	839	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
936	{	840	{
937	// TODO: SMART_WINDOW_TITLE
938	XChangeProperty (display->display, TermWin.parent[0],	841	XChangeProperty (display->display, parent[0],
939	prop, XA_STRING, 8, PropModeReplace,	842	prop, XA_STRING, 8, PropModeReplace,
940	(const unsigned char *)str, len >= 0 ? len : strlen (str));	843	(const unsigned char *)str, len >= 0 ? len : strlen (str));
941	}	844	}
942		845
943	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	846	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944	{	847	{
945	// TODO: SMART_WINDOW_TITLE
946	wchar_t *ws = rxvt_mbstowcs (str, len);	848	wchar_t *ws = rxvt_mbstowcs (str, len);
947	char *s = rxvt_wcstoutf8 (ws);	849	char *s = rxvt_wcstoutf8 (ws);
948		850
949	XChangeProperty (display->display, TermWin.parent[0],	851	XChangeProperty (display->display, parent[0],
950	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	852	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951	(const unsigned char *)s, strlen (s));	853	(const unsigned char *)s, strlen (s));
952		854
953	free (s);	855	free (s);
954	free (ws);	856	free (ws);
…		…
991	i = atoi (color);	893	i = atoi (color);
992		894
993	if (i >= 8 && i <= 15)	895	if (i >= 8 && i <= 15)
994	{ /* bright colors */	896	{ /* bright colors */
995	i -= 8;	897	i -= 8;
996	# ifndef NO_BRIGHTCOLOR
997	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	898	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
998	SET_PIXCOLOR (idx);	899	SET_PIXCOLOR (idx);
999	goto done;	900	goto done;
1000	# endif
1001	}	901	}
1002		902
1003	if (i >= 0 && i <= 7)	903	if (i >= 0 && i <= 7)
1004	{ /* normal colors */	904	{ /* normal colors */
1005	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	905	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
…		…
1117		1017
1118	/* -------------------------------------------------------------------- *	1018	/* -------------------------------------------------------------------- *
1119	* - WINDOW RESIZING - *	1019	* - WINDOW RESIZING - *
1120	* -------------------------------------------------------------------- */	1020	* -------------------------------------------------------------------- */
1121	void	1021	void
1122	rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)	1022	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1123	{	1023	{
1124	int fix_screen;	1024	int fix_screen;
1125	#ifdef SMART_RESIZE	1025	int old_width = szHint.width;
1126	int old_width = szHint.width, old_height = szHint.height;	1026	int old_height = szHint.height;
1127	#endif
1128	dDisp;	1027	dDisp;
1129		1028
1130	window_calc (width, height);	1029	window_calc (newwidth, newheight);
1131	XSetWMNormalHints (disp, TermWin.parent[0], &szHint);	1030	XSetWMNormalHints (disp, parent[0], &szHint);
1132		1031
1133	if (!ignoreparent)	1032	if (!ignoreparent)
1134	{	1033	{
1135	#ifdef SMART_RESIZE	1034	#ifdef SMART_RESIZE
1136	/*	1035	/*
…		…
1140	int x, y, x1, y1;	1039	int x, y, x1, y1;
1141	int dx, dy;	1040	int dx, dy;
1142	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1041	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1143	Window unused_cr;	1042	Window unused_cr;
1144		1043
1145	XTranslateCoordinates (disp, TermWin.parent[0], display->root,	1044	XTranslateCoordinates (disp, parent[0], display->root,
1146	0, 0, &x, &y, &unused_cr);	1045	0, 0, &x, &y, &unused_cr);
1147	XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,	1046	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1148	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1047	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1149	/*	1048	/*
1150	* if display->root isn't the parent window, a WM will probably have offset	1049	* if display->root isn't the parent window, a WM will probably have offset
1151	* our position for handles and decorations. Counter it	1050	* our position for handles and decorations. Counter it
1152	*/	1051	*/
…		…
1154	{	1053	{
1155	x -= x1;	1054	x -= x1;
1156	y -= y1;	1055	y -= y1;
1157	}	1056	}
1158		1057
1159	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1058	x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1160	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1059	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1161	dx = old_width - szHint.width;	1060	dx = old_width - szHint.width;
1162	dy = old_height - szHint.height;	1061	dy = old_height - szHint.height;
1163		1062
1164	/* Check position of the center of the window */	1063	/* Check position of the center of the window */
1165	if (x < x1) /* left half */	1064	if (x < x1) /* left half */
1166	dx = 0;	1065	dx = 0;
…		…
1169	if (y < y1) /* top half */	1068	if (y < y1) /* top half */
1170	dy = 0;	1069	dy = 0;
1171	else if (y == y1) /* exact center */	1070	else if (y == y1) /* exact center */
1172	dy /= 2;	1071	dy /= 2;
1173		1072
1174	XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,	1073	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1175	szHint.width, szHint.height);	1074	szHint.width, szHint.height);
1176	#else	1075	#else
1177	XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);	1076	XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1178	#endif	1077	#endif
1179	}	1078	}
1180		1079
1181	fix_screen = TermWin.ncol != prev_ncol \|\| TermWin.nrow != prev_nrow;	1080	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1182		1081
1183	if (fix_screen \|\| width != old_width \|\| height != old_height)	1082	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1184	{	1083	{
1185	if (scrollbar_visible ())	1084	if (scrollBar.state)
1186	{	1085	{
1187	XMoveResizeWindow (disp, scrollBar.win,	1086	XMoveResizeWindow (disp, scrollBar.win,
1188	window_sb_x, 0,	1087	window_sb_x, 0,
1189	scrollbar_TotalWidth (), szHint.height);	1088	scrollbar_TotalWidth (), szHint.height);
1190	resize_scrollbar ();	1089	resize_scrollbar ();
1191	}	1090	}
1192		1091
1193	if (menubar_visible ())
1194	XMoveResizeWindow (disp, menuBar.win,
1195	window_vt_x, 0,
1196	TermWin_TotalWidth (), menuBar_TotalHeight ());
1197
1198	XMoveResizeWindow (disp, TermWin.vt,	1092	XMoveResizeWindow (disp, vt,
1199	window_vt_x, window_vt_y,	1093	window_vt_x, window_vt_y,
1200	TermWin_TotalWidth (), TermWin_TotalHeight ());	1094	width, height);
1201		1095
1202	scr_clear ();	1096	scr_clear ();
1203	#ifdef XPM_BACKGROUND	1097	#ifdef XPM_BACKGROUND
1204	resize_pixmap ();	1098	resize_pixmap ();
1205	#endif	1099	#endif
1206	}	1100	}
1207		1101
1208	if (fix_screen \|\| old_height == 0)	1102	if (fix_screen \|\| old_height == 0)
1209	{
1210	int curr_screen = -1;
1211	int old_ncol = prev_ncol;
1212
1213	/* scr_reset only works on the primary screen */
1214	if (old_height) /* this is not the first time through */
1215	{
1216	unsigned int ncol = TermWin.ncol;
1217	TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1218	curr_screen = scr_change_screen (PRIMARY);
1219	TermWin.ncol = ncol;
1220	}
1221
1222	scr_reset ();	1103	scr_reset ();
1223
1224	if (curr_screen >= 0) /* this is not the first time through */
1225	{
1226	scr_change_screen (curr_screen);
1227	selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1228	}
1229	}
1230
1231	old_width = szHint.width;
1232	old_height = szHint.height;
1233		1104
1234	#ifdef XPM_BACKGROUND	1105	#ifdef XPM_BACKGROUND
1235	if (TermWin.pixmap)	1106	if (pixmap)
1236	scr_touch (false);	1107	scr_touch (false);
1237	#endif	1108	#endif
1238		1109
1239	#ifdef USE_XIM	1110	#ifdef USE_XIM
1240	IMSetStatusPosition ();	1111	IMSetStatusPosition ();
…		…
1244	/*	1115	/*
1245	* Set the width/height of the vt window in characters. Units are pixels.	1116	* Set the width/height of the vt window in characters. Units are pixels.
1246	* good for toggling 80/132 columns	1117	* good for toggling 80/132 columns
1247	*/	1118	*/
1248	void	1119	void
1249	rxvt_term::set_widthheight (unsigned int width, unsigned int height)	1120	rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1250	{	1121	{
1251	XWindowAttributes wattr;	1122	XWindowAttributes wattr;
1252		1123
1253	if (width == 0 \|\| height == 0)	1124	if (newwidth == 0 \|\| newheight == 0)
1254	{	1125	{
1255	XGetWindowAttributes (display->display, display->root, &wattr);	1126	XGetWindowAttributes (display->display, display->root, &wattr);
1256		1127
1257	if (width == 0)	1128	if (newwidth == 0)
1258	width = wattr.width - szHint.base_width;	1129	newwidth = wattr.width - szHint.base_width;
1259	if (height == 0)	1130	if (newheight == 0)
1260	height = wattr.height - szHint.base_height;	1131	newheight = wattr.height - szHint.base_height;
1261	}
1262
1263	if (width != TermWin.width \|\| height != TermWin.height)
1264	{	1132	}
		1133
		1134	if (newwidth != width \|\| newheight != height)
		1135	{
1265	width += szHint.base_width;	1136	newwidth += szHint.base_width;
1266	height += szHint.base_height;	1137	newheight += szHint.base_height;
1267	resize_all_windows (width, height, 0);	1138	resize_all_windows (newwidth, newheight, 0);
1268	}	1139	}
1269	}	1140	}
1270		1141
1271	/* -------------------------------------------------------------------- *	1142	/* -------------------------------------------------------------------- *
1272	* - X INPUT METHOD ROUTINES - *	1143	* - X INPUT METHOD ROUTINES - *
…		…
1282		1153
1283	void	1154	void
1284	rxvt_term::im_set_size (XRectangle &size)	1155	rxvt_term::im_set_size (XRectangle &size)
1285	{	1156	{
1286	// the int_bwidth terms make no sense to me	1157	// the int_bwidth terms make no sense to me
1287	size.x = TermWin.int_bwidth;	1158	size.x = int_bwidth;
1288	size.y = TermWin.int_bwidth;	1159	size.y = int_bwidth;
1289	size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;	1160	size.width = Width2Pixel (ncol) + int_bwidth;
1290	size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;	1161	size.height = Height2Pixel (nrow) + int_bwidth;
1291	}	1162	}
1292		1163
1293	void	1164	void
1294	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,	1165	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295	XRectangle &status_rect,	1166	XRectangle &status_rect,
1296	const XRectangle &needed_rect)	1167	const XRectangle &needed_rect)
1297	{	1168	{
1298	preedit_rect.x = needed_rect.width;	1169	preedit_rect.x = needed_rect.width;
1299	preedit_rect.y = 0;	1170	preedit_rect.y = 0;
1300	preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;	1171	preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301	preedit_rect.height = TermWin.fheight;	1172	preedit_rect.height = fheight;
1302		1173
1303	status_rect.x = 0;	1174	status_rect.x = 0;
1304	status_rect.y = 0;	1175	status_rect.y = 0;
1305	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;	1176	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1306	status_rect.height = TermWin.fheight;	1177	status_rect.height = fheight;
1307	}	1178	}
1308		1179
1309	/* Checking whether input method is running. */	1180	/* Checking whether input method is running. */
1310	bool	1181	bool
1311	rxvt_term::IMisRunning ()	1182	rxvt_term::IMisRunning ()
…		…
1339	{	1210	{
1340	XPoint nspot;	1211	XPoint nspot;
1341	XVaNestedList preedit_attr;	1212	XVaNestedList preedit_attr;
1342		1213
1343	if (!Input_Context	1214	if (!Input_Context
1344	\|\| !TermWin.focus	1215	\|\| !focus
1345	\|\| !(input_style & XIMPreeditPosition))	1216	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1346	return;	1217	return;
1347		1218
1348	im_set_position (nspot);	1219	im_set_position (nspot);
1349		1220
1350	if (nspot.x == spot.x && nspot.y == spot.y)	1221	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1369	input_method = 0;	1240	input_method = 0;
1370	}	1241	}
1371		1242
1372	Input_Context = 0;	1243	Input_Context = 0;
1373	}	1244	}
		1245
		1246	#ifdef ENABLE_XIM_ONTHESPOT
		1247
		1248	static void
		1249	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1250	{
		1251	((rxvt_term *)client_data)->make_current ();
		1252	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1253	}
		1254
		1255	static void
		1256	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1257	{
		1258	((rxvt_term *)client_data)->make_current ();
		1259	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1260	}
		1261
		1262	static void
		1263	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1264	{
		1265	rxvt_term term = (rxvt_term )client_data;
		1266	XIMText *text = call_data->text;
		1267
		1268	term->make_current ();
		1269
		1270	if (text)
		1271	{
		1272	void *str;
		1273
		1274	if (!text->encoding_is_wchar && text->string.multi_byte)
		1275	{
		1276	// of course, X makes it ugly again
		1277	if (term->rs[Rs_imLocale])
		1278	SET_LOCALE (term->rs[Rs_imLocale]);
		1279
		1280	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1281	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1282
		1283	if (term->rs[Rs_imLocale])
		1284	SET_LOCALE (term->locale);
		1285	}
		1286	else
		1287	str = (void *)text->string.wide_char;
		1288
		1289	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1290	DT_INT, call_data->caret,
		1291	DT_INT, call_data->chg_first,
		1292	DT_INT, call_data->chg_length,
		1293	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1294	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1295	DT_END));
		1296	}
		1297	else
		1298	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1299	DT_INT, call_data->caret,
		1300	DT_INT, call_data->chg_first,
		1301	DT_INT, call_data->chg_length,
		1302	DT_END));
		1303	}
		1304
		1305	#if 0
		1306	static void
		1307	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1308	{
		1309	((rxvt_term *)client_data)->make_current ();
		1310	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1311	DT_INT, call_data->position,
		1312	DT_INT, call_data->direction,
		1313	DT_INT, call_data->style,
		1314	DT_END));
		1315	}
		1316	#endif
		1317
		1318	#endif
1374		1319
1375	/*	1320	/*
1376	* Try to open a XIM with the current modifiers, then see if we can	1321	* Try to open a XIM with the current modifiers, then see if we can
1377	* open a suitable preedit type	1322	* open a suitable preedit type
1378	*/	1323	*/
…		…
1385	XRectangle rect, status_rect, needed_rect;	1330	XRectangle rect, status_rect, needed_rect;
1386	unsigned long fg, bg;	1331	unsigned long fg, bg;
1387	const char *p;	1332	const char *p;
1388	char **s;	1333	char **s;
1389	XIMStyles *xim_styles;	1334	XIMStyles *xim_styles;
		1335	#ifdef ENABLE_XIM_ONTHESPOT
		1336	XIMCallback xcb[4];
		1337	#endif
		1338
		1339	set_environ (envv);
1390		1340
1391	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1341	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1392	return false;	1342	return false;
1393		1343
1394	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1395	input_method = display->get_xim (locale, modifiers);	1344	input_method = display->get_xim (locale, modifiers);
1396	if (input_method == NULL)	1345	if (input_method == NULL)
1397	return false;	1346	return false;
1398		1347
1399	xim = input_method->xim;	1348	xim = input_method->xim;
…		…
1419	s = rxvt_splitcommastring (p);	1368	s = rxvt_splitcommastring (p);
1420		1369
1421	for (i = found = 0; !found && s[i]; i++)	1370	for (i = found = 0; !found && s[i]; i++)
1422	{	1371	{
1423	if (!strcmp (s[i], "OverTheSpot"))	1372	if (!strcmp (s[i], "OverTheSpot"))
1424	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1373	input_style = XIMPreeditPosition \| XIMStatusNothing;
1425	else if (!strcmp (s[i], "OffTheSpot"))	1374	else if (!strcmp (s[i], "OffTheSpot"))
1426	input_style = (XIMPreeditArea \| XIMStatusArea);	1375	input_style = XIMPreeditArea \| XIMStatusArea;
1427	else if (!strcmp (s[i], "Root"))	1376	else if (!strcmp (s[i], "Root"))
1428	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1377	input_style = XIMPreeditNothing \| XIMStatusNothing;
1429	else if (!strcmp (s[i], "None"))	1378	else if (!strcmp (s[i], "None"))
1430	input_style = (XIMPreeditNone \| XIMStatusNone);	1379	input_style = XIMPreeditNone \| XIMStatusNone;
		1380	#ifdef ENABLE_XIM_ONTHESPOT
		1381	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1382	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1383	#endif
		1384	else
		1385	input_style = XIMPreeditNothing \| XIMStatusNothing;
1431		1386
1432	for (j = 0; j < xim_styles->count_styles; j++)	1387	for (j = 0; j < xim_styles->count_styles; j++)
1433	if (input_style == xim_styles->supported_styles[j])	1388	if (input_style == xim_styles->supported_styles[j])
1434	{	1389	{
1435	rxvt_freecommastring (s);	1390	rxvt_freecommastring (s);
…		…
1469	"----R---%d------*,"	1424	"----R---%d------*,"
1470	"----R---%d------*,"	1425	"----R---%d------*,"
1471	"----R---%d------*,"	1426	"----R---%d------*,"
1472	"----R---%d------*,"	1427	"----R---%d------*,"
1473	"*",	1428	"*",
1474	TermWin.fheight,	1429	fheight,
1475	TermWin.fheight + 1, TermWin.fheight - 1,	1430	fheight + 1, fheight - 1,
1476	TermWin.fheight - 2, TermWin.fheight + 2);	1431	fheight - 2, fheight + 2);
1477		1432
1478	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1433	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479	&missing_charset_list, &missing_charset_count, &def_string);	1434	&missing_charset_list, &missing_charset_count, &def_string);
1480		1435
1481	if (missing_charset_list)	1436	if (missing_charset_list)
…		…
1524	XNBackground, bg,	1479	XNBackground, bg,
1525	XNArea, &status_rect,	1480	XNArea, &status_rect,
1526	XNFontSet, fs,	1481	XNFontSet, fs,
1527	NULL);	1482	NULL);
1528	}	1483	}
		1484	else if (input_style & XIMPreeditCallbacks)
		1485	{
		1486	im_set_position (spot);
		1487
		1488	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1489	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1490	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1491	#if 0
		1492	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1493	#endif
		1494
		1495	preedit_attr = XVaCreateNestedList (0,
		1496	XNSpotLocation, &spot,
		1497	XNPreeditStartCallback, &xcb[0],
		1498	XNPreeditDoneCallback , &xcb[1],
		1499	XNPreeditDrawCallback , &xcb[2],
		1500	#if 0
		1501	XNPreeditCaretCallback, &xcb[3],
		1502	#endif
		1503	NULL);
		1504	}
1529		1505
1530	Input_Context = XCreateIC (xim,	1506	Input_Context = XCreateIC (xim,
1531	XNInputStyle, input_style,	1507	XNInputStyle, input_style,
1532	XNClientWindow, TermWin.vt,	1508	XNClientWindow, vt,
1533	XNFocusWindow, TermWin.parent[0],	1509	XNFocusWindow, parent[0],
1534	preedit_attr ? XNPreeditAttributes : NULL,	1510	preedit_attr ? XNPreeditAttributes : NULL,
1535	preedit_attr,	1511	preedit_attr,
1536	status_attr ? XNStatusAttributes : NULL,	1512	status_attr ? XNStatusAttributes : NULL,
1537	status_attr, NULL);	1513	status_attr, NULL);
1538		1514
…		…
1545	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1521	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1546	im_destroy ();	1522	im_destroy ();
1547	return false;	1523	return false;
1548	}	1524	}
1549		1525
		1526	#if 0
		1527	// unfortunately, only the focus window is used by XIM, hard to fix
		1528	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1529	vt_select_input ();
		1530	#endif
		1531
1550	if (input_style & XIMPreeditArea)	1532	if (input_style & XIMPreeditArea)
1551	IMSetStatusPosition ();	1533	IMSetStatusPosition ();
1552		1534
1553	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1554	return true;	1535	return true;
1555	}	1536	}
1556		1537
1557	void	1538	void
1558	rxvt_term::im_cb ()	1539	rxvt_term::im_cb ()
…		…
1560	int i;	1541	int i;
1561	const char *p;	1542	const char *p;
1562	char **s;	1543	char **s;
1563	char buf[IMBUFSIZ];	1544	char buf[IMBUFSIZ];
1564		1545
1565	SET_R (this);	1546	make_current ();
1566		1547
1567	im_destroy ();	1548	im_destroy ();
1568		1549
1569	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1570	if (Input_Context)	1550	if (Input_Context)
1571	return;	1551	return;
1572		1552
1573	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1553	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1574	if (rs[Rs_imLocale])	1554	if (rs[Rs_imLocale])
…		…
1622	{	1602	{
1623	XRectangle preedit_rect, status_rect, *needed_rect;	1603	XRectangle preedit_rect, status_rect, *needed_rect;
1624	XVaNestedList preedit_attr, status_attr;	1604	XVaNestedList preedit_attr, status_attr;
1625		1605
1626	if (!Input_Context	1606	if (!Input_Context
1627	\|\| !TermWin.focus	1607	\|\| !focus
1628	\|\| !(input_style & XIMPreeditArea)	1608	\|\| !(input_style & XIMPreeditArea)
1629	\|\| !IMisRunning ())	1609	\|\| !IMisRunning ())
1630	return;	1610	return;
1631		1611
1632	/* Getting the necessary width of preedit area */	1612	/* Getting the necessary width of preedit area */
…		…
1647	XFree (preedit_attr);	1627	XFree (preedit_attr);
1648	XFree (status_attr);	1628	XFree (status_attr);
1649	}	1629	}
1650	#endif /* USE_XIM */	1630	#endif /* USE_XIM */
1651		1631
1652	/----------------------------------------------------------------------/
1653	rxvt_t rxvt_current_term;
1654
1655	/----------------------- end-of-file (C source) -----------------------/	1632	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.148 by root, Wed Nov 30 21:05:39 2005 UTC vs. Revision 1.202 by root, Wed Jan 25 01:08:38 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.148 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.202 by root, Wed Jan 25 01:08:38 2006 UTC