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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.134 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.165 by root, Sun Jan 8 00:20:12 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
49	# include "keyboard.h"
50	#endif
51
52	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
53		52
54	static char curlocale[128];	53	static char curlocale[128], savelocale[128];
55		54
56	bool	55	bool
57	rxvt_set_locale (const char *locale)	56	rxvt_set_locale (const char *locale)
58	{	57	{
59	if (!locale \|\| !strncmp (locale, curlocale, 128))	58	if (!locale \|\| !strncmp (locale, curlocale, 128))
60	return false;	59	return false;
61		60
62	strncpy (curlocale, locale, 128);	61	strncpy (curlocale, locale, 128);
63	setlocale (LC_CTYPE, curlocale);	62	setlocale (LC_CTYPE, curlocale);
64	return true;	63	return true;
		64	}
		65
		66	bool
		67	rxvt_push_locale (const char *locale)
		68	{
		69	strcpy (savelocale, curlocale);
		70	rxvt_set_locale (locale);
		71	}
		72
		73	void
		74	rxvt_pop_locale ()
		75	{
		76	rxvt_set_locale (savelocale);
65	}	77	}
66		78
67	#if ENABLE_COMBINING	79	#if ENABLE_COMBINING
68	class rxvt_composite_vec rxvt_composite;	80	class rxvt_composite_vec rxvt_composite;
69		81
…		…
158	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
159	#endif	171	#endif
160	#ifdef USE_XIM	172	#ifdef USE_XIM
161	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
162	#endif	174	#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),	175	termwin_ev (this, &rxvt_term::x_cb),
167	vt_ev (this, &rxvt_term::x_cb),	176	vt_ev (this, &rxvt_term::x_cb),
168	check_ev (this, &rxvt_term::check_cb),	177	check_ev (this, &rxvt_term::check_cb),
169	flush_ev (this, &rxvt_term::flush_cb),	178	flush_ev (this, &rxvt_term::flush_cb),
170	destroy_ev (this, &rxvt_term::destroy_cb),	179	destroy_ev (this, &rxvt_term::destroy_cb),
…		…
197	pty.put ();	206	pty.put ();
198	}	207	}
199		208
200	rxvt_term::~rxvt_term ()	209	rxvt_term::~rxvt_term ()
201	{	210	{
		211	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		212
202	termlist.erase (find (termlist.begin (), termlist.end(), this));	213	termlist.erase (find (termlist.begin (), termlist.end(), this));
203		214
204	emergency_cleanup ();	215	emergency_cleanup ();
205		216
206	#if ENABLE_STYLES	217	#if ENABLE_STYLES
207	for (int i = RS_styleCount; --i; )	218	for (int i = RS_styleCount; --i; )
208	if (TermWin.fontset[i] != TermWin.fontset[0])	219	if (fontset[i] != fontset[0])
209	delete TermWin.fontset[i];	220	delete fontset[i];
210	#endif	221	#endif
211	delete TermWin.fontset[0];	222	delete fontset[0];
212		223
213	if (display)	224	if (display)
214	{	225	{
215	dDisp;	226	dDisp;
216		227
…		…
244	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	255	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)
245	if (topShadowGC) XFreeGC (disp, topShadowGC);	256	if (topShadowGC) XFreeGC (disp, topShadowGC);
246	if (botShadowGC) XFreeGC (disp, botShadowGC);	257	if (botShadowGC) XFreeGC (disp, botShadowGC);
247	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	258	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
248	#endif	259	#endif
249	if (TermWin.gc) XFreeGC (disp, TermWin.gc);	260	if (gc) XFreeGC (disp, gc);
250		261
251	#if defined(MENUBAR) && (MENUBAR_MAX > 1)	262	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
252	delete menuBar.drawable;	263	delete menuBar.drawable;
253	//if (menuBar.win)	264	//if (menuBar.win)
254	// XDestroyWindow (disp, menuBar.win);	265	// XDestroyWindow (disp, menuBar.win);
255	#endif	266	#endif
256	delete TermWin.drawable;	267	delete drawable;
257	// destroy all windows	268	// destroy all windows
258	if (TermWin.parent[0])	269	if (parent[0])
259	XDestroyWindow (disp, TermWin.parent[0]);	270	XDestroyWindow (disp, parent[0]);
260	}	271	}
261		272
262	// TODO: free pixcolours, colours should become part of rxvt_display	273	// TODO: free pixcolours, colours should become part of rxvt_display
263		274
264	delete pix_colors_focused;	275	delete pix_colors_focused;
265	#ifdef OFF_FOCUS_FADING	276	#if OFF_FOCUS_FADING
266	delete pix_colors_unfocused;	277	delete pix_colors_unfocused;
267	#endif	278	#endif
268		279
269	displays.put (display);	280	displays.put (display);
270		281
…		…
291	delete keyboard;	302	delete keyboard;
292	#endif	303	#endif
293	}	304	}
294		305
295	void	306	void
		307	rxvt_term::child_exit ()
		308	{
		309	cmd_pid = 0;
		310
		311	if (!OPTION (Opt_hold))
		312	destroy ();
		313	}
		314
		315	void
296	rxvt_term::destroy ()	316	rxvt_term::destroy ()
297	{	317	{
298	if (destroy_ev.active)	318	if (destroy_ev.active)
299	return;	319	return;
300		320
…		…
362	{	382	{
363	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	383	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
364	(*t)->emergency_cleanup ();	384	(*t)->emergency_cleanup ();
365	}	385	}
366		386
		387	#if ENABLE_FRILLS
		388	static void
		389	print_x_error (Display dpy, XErrorEvent event)
		390	{
		391	char buffer[BUFSIZ];
		392	char mesg[BUFSIZ];
		393	char number[32];
		394	char *mtype = "XlibMessage";
		395	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
		396	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
		397	rxvt_warn ("An X Error occured, trying to continue after report.\n");
		398	rxvt_warn ("%s: %s\n", mesg, buffer);
		399	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
		400	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
		401	sprintf(number, "%d", event->request_code);
		402	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
		403	rxvt_warn ("(which is %s)\n", buffer);
		404	if (event->request_code >= 128) {
		405	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
		406	mesg, BUFSIZ);
		407	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
		408	}
		409	if ((event->error_code == BadWindow) \|\|
		410	(event->error_code == BadPixmap) \|\|
		411	(event->error_code == BadCursor) \|\|
		412	(event->error_code == BadFont) \|\|
		413	(event->error_code == BadDrawable) \|\|
		414	(event->error_code == BadColor) \|\|
		415	(event->error_code == BadGC) \|\|
		416	(event->error_code == BadIDChoice) \|\|
		417	(event->error_code == BadValue) \|\|
		418	(event->error_code == BadAtom)) {
		419	if (event->error_code == BadValue)
		420	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
		421	mesg, BUFSIZ);
		422	else if (event->error_code == BadAtom)
		423	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
		424	mesg, BUFSIZ);
		425	else
		426	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
		427	mesg, BUFSIZ);
		428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
		429	}
		430	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
		431	mesg, BUFSIZ);
		432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
		433	}
		434	#endif
		435
367	int	436	int
368	rxvt_xerror_handler (Display display, XErrorEvent event)	437	rxvt_xerror_handler (Display display, XErrorEvent event)
369	{	438	{
370	if (GET_R->allowedxerror == -1)	439	if (GET_R->allowedxerror == -1)
371	GET_R->allowedxerror = event->error_code;	440	GET_R->allowedxerror = event->error_code;
372	else	441	else
373	{	442	{
374	//TODO: GET_R is most likely not the terminal which caused the error	443	// GET_R is most likely not the terminal which caused the error,
375	//TODO: maybe just output the error and continue?	444	// so just output the error and continue
		445	#if ENABLE_FRILLS
		446	print_x_error (display, event);
		447	#else
376	old_xerror_handler (display, event);	448	old_xerror_handler (display, event);
377	GET_R->destroy ();	449	#endif
378	}	450	}
379		451
380	return 0;	452	return 0;
381	}	453	}
382		454
…		…
387	DisplayString (display));	459	DisplayString (display));
388	rxvt_emergency_cleanup ();	460	rxvt_emergency_cleanup ();
389	_exit (EXIT_FAILURE);	461	_exit (EXIT_FAILURE);
390	}	462	}
391		463
392	/*
393	* Catch a fatal signal and tidy up before quitting
394	*/
395	void
396	rxvt_term::sig_term (sig_watcher &w)
397	{
398	#ifdef DEBUG_CMD
399	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
400	#endif
401	rxvt_emergency_cleanup ();
402	signal (w.signum, SIG_DFL);
403	kill (getpid (), w.signum);
404	}
405
406	/----------------------------------------------------------------------/	464	/----------------------------------------------------------------------/
407	/* rxvt_init () */
408	bool	465	bool
409	rxvt_term::init (int argc, const char const argv)	466	rxvt_term::init (int argc, const char const argv)
410	{	467	{
411	SET_R (this);	468	SET_R (this);
412		469
…		…
425		482
426	#if MENUBAR_MAX	483	#if MENUBAR_MAX
427	menubar_read (rs[Rs_menu]);	484	menubar_read (rs[Rs_menu]);
428	#endif	485	#endif
429	#ifdef HAVE_SCROLLBARS	486	#ifdef HAVE_SCROLLBARS
430	if (options & Opt_scrollBar)	487	if (OPTION (Opt_scrollBar))
431	scrollBar.setIdle (); /* set existence for size calculations */	488	scrollBar.setIdle (); /* set existence for size calculations */
		489	#endif
		490
		491	#if ENABLE_PERL
		492	if (!rs[Rs_perl_ext_1])
		493	rs[Rs_perl_ext_1] = "default";
		494
		495	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
		496	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
		497	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
		498	{
		499	rxvt_perl.init ();
		500	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
		501	}
432	#endif	502	#endif
433		503
434	create_windows (argc, argv);	504	create_windows (argc, argv);
435		505
436	dDisp;	506	dDisp;
…		…
442	#if 0	512	#if 0
443	XSynchronize (disp, True);	513	XSynchronize (disp, True);
444	#endif	514	#endif
445		515
446	#ifdef HAVE_SCROLLBARS	516	#ifdef HAVE_SCROLLBARS
447	if (options & Opt_scrollBar)	517	if (OPTION (Opt_scrollBar))
448	resize_scrollbar (); /* create and map scrollbar */	518	resize_scrollbar (); /* create and map scrollbar */
449	#endif	519	#endif
450	#if (MENUBAR_MAX)	520	#if (MENUBAR_MAX)
451	if (menubar_visible ())	521	if (menubar_visible ())
452	XMapWindow (disp, menuBar.win);	522	XMapWindow (disp, menuBar.win);
453	#endif	523	#endif
454	#ifdef TRANSPARENT	524	#ifdef TRANSPARENT
455	if (options & Opt_transparent)	525	if (OPTION (Opt_transparent))
456	{	526	{
457	XSelectInput (disp, display->root, PropertyChangeMask);	527	XSelectInput (disp, display->root, PropertyChangeMask);
458	check_our_parents ();	528	check_our_parents ();
459	rootwin_ev.start (display, display->root);	529	rootwin_ev.start (display, display->root);
460	}	530	}
461	#endif	531	#endif
462		532
463	XMapWindow (disp, TermWin.vt);	533	XMapWindow (disp, vt);
464	XMapWindow (disp, TermWin.parent[0]);	534	XMapWindow (disp, parent[0]);
465		535
466	set_colorfgbg ();	536	set_colorfgbg ();
467		537
468	init_command (cmd_argv);	538	init_command (cmd_argv);
469		539
470	free (cmd_argv);	540	free (cmd_argv);
471		541
		542	if (pty.pty >= 0)
472	pty_ev.start (pty.pty, EVENT_READ);	543	pty_ev.start (pty.pty, EVENT_READ);
473		544
474	check_ev.start ();	545	check_ev.start ();
475		546
		547	HOOK_INVOKE ((this, HOOK_START, DT_END));
		548
476	return true;	549	return true;
477	}	550	}
		551
		552	static struct sig_handlers
		553	{
		554	sig_watcher sw_chld, sw_term, sw_int;
		555
		556	void sig_chld (sig_watcher &w)
		557	{
		558	// we are being called for every SIGCHLD, find the corresponding term
		559	int pid;
		560
		561	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
		562	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
		563	if (pid == (*t)->cmd_pid)
		564	{
		565	(*t)->child_exit ();
		566	break;
		567	}
		568	}
		569
		570	/*
		571	* Catch a fatal signal and tidy up before quitting
		572	*/
		573	void
		574	sig_term (sig_watcher &w)
		575	{
		576	#ifdef DEBUG_CMD
		577	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
		578	#endif
		579	rxvt_emergency_cleanup ();
		580	signal (w.signum, SIG_DFL);
		581	kill (getpid (), w.signum);
		582	}
		583
		584	sig_handlers ()
		585	: sw_chld (this, &sig_handlers::sig_chld),
		586	sw_term (this, &sig_handlers::sig_term),
		587	sw_int (this, &sig_handlers::sig_term)
		588	{
		589	}
		590	} sig_handlers;
478		591
479	void	592	void
480	rxvt_init ()	593	rxvt_init ()
481	{	594	{
482	/*	595	/*
…		…
490	rxvt_privileges (IGNORE);	603	rxvt_privileges (IGNORE);
491		604
492	signal (SIGHUP, SIG_IGN);	605	signal (SIGHUP, SIG_IGN);
493	signal (SIGPIPE, SIG_IGN);	606	signal (SIGPIPE, SIG_IGN);
494		607
		608	sig_handlers.sw_chld.start (SIGCHLD);
		609	sig_handlers.sw_term.start (SIGTERM);
		610	sig_handlers.sw_int.start (SIGINT);
		611
495	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	612	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
496	/* signal (SIGURG, SIG_DFL); */	613	/* signal (SIGURG, SIG_DFL); */
497		614
498	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	615	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
499	// TODO: handle this with exceptions and tolerate the memory loss	616	// TODO: handle this with exceptions and tolerate the memory loss
500	XSetIOErrorHandler (rxvt_xioerror_handler);	617	XSetIOErrorHandler (rxvt_xioerror_handler);
501	}
502
503	/* ------------------------------------------------------------------------- *
504	* SIGNAL HANDLING & EXIT HANDLER *
505	* ------------------------------------------------------------------------- */
506	/*
507	* Catch a SIGCHLD signal and exit if the direct child has died
508	*/
509
510	void
511	rxvt_term::sig_chld (sig_watcher &w)
512	{
513	// we are being called for every SIGCHLD, not just ours
514	int pid;
515
516	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
517	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
518	if (pid == (*t)->cmd_pid)
519	{
520	(*t)->destroy ();
521	break;
522	}
523	}	618	}
524		619
525	/* ------------------------------------------------------------------------- *	620	/* ------------------------------------------------------------------------- *
526	* MEMORY ALLOCATION WRAPPERS *	621	* MEMORY ALLOCATION WRAPPERS *
527	* ------------------------------------------------------------------------- */	622	* ------------------------------------------------------------------------- */
…		…
534	rxvt_fatal ("memory allocation failure. aborting.\n");	629	rxvt_fatal ("memory allocation failure. aborting.\n");
535		630
536	return p;	631	return p;
537	}	632	}
538		633
539	/* INTPROTO */	634	void *
540	void *
541	rxvt_calloc (size_t number, size_t size)	635	rxvt_calloc (size_t number, size_t size)
542	{	636	{
543	void *p = calloc (number, size);	637	void *p = calloc (number, size);
544		638
545	if (!p)	639	if (!p)
546	rxvt_fatal ("memory allocation failure. aborting.\n");	640	rxvt_fatal ("memory allocation failure. aborting.\n");
547		641
548	return p;	642	return p;
549	}	643	}
550		644
551	/* INTPROTO */
552	void *	645	void *
553	rxvt_realloc (void *ptr, size_t size)	646	rxvt_realloc (void *ptr, size_t size)
554	{	647	{
555	void *p = realloc (ptr, size);	648	void *p = realloc (ptr, size);
556		649
…		…
617		710
618	#ifdef UTMP_SUPPORT	711	#ifdef UTMP_SUPPORT
619	void	712	void
620	rxvt_term::privileged_utmp (rxvt_privaction action)	713	rxvt_term::privileged_utmp (rxvt_privaction action)
621	{	714	{
622	if ((options & Opt_utmpInhibit)	715	if (OPTION (Opt_utmpInhibit)
623	\|\| !pty.name \|\| !*pty.name)	716	\|\| !pty.name \|\| !*pty.name)
624	return;	717	return;
625		718
626	rxvt_privileges (RESTORE);	719	rxvt_privileges (RESTORE);
627		720
…		…
638	/*	731	/*
639	* window size/position calculcations for XSizeHint and other storage.	732	* window size/position calculcations for XSizeHint and other storage.
640	* if width/height are non-zero then override calculated width/height	733	* if width/height are non-zero then override calculated width/height
641	*/	734	*/
642	void	735	void
643	rxvt_term::window_calc (unsigned int width, unsigned int height)	736	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
644	{	737	{
645	short recalc_x, recalc_y;	738	short recalc_x, recalc_y;
646	int x, y, sb_w, mb_h, flags;	739	int x, y, sb_w, mb_h, flags;
647	unsigned int w, h;	740	unsigned int w, h;
648	unsigned int max_width, max_height;	741	unsigned int max_width, max_height;
649	dDisp;	742	dDisp;
650		743
651	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	744	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
652	TermWin.ncol, TermWin.nrow, szHint.width,	745	ncol, nrow, szHint.width, szHint.height));
653	szHint.height));	746
654	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	747	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
655	szHint.win_gravity = NorthWestGravity;	748	szHint.win_gravity = NorthWestGravity;
656	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	749	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
657		750
658	recalc_x = recalc_y = 0;	751	recalc_x = recalc_y = 0;
659	flags = 0;	752	flags = 0;
		753
660	if (!parsed_geometry)	754	if (!parsed_geometry)
661	{	755	{
662	parsed_geometry = 1;	756	parsed_geometry = 1;
		757
663	if (rs[Rs_geometry])	758	if (rs[Rs_geometry])
664	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	759	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
		760
665	if (flags & WidthValue)	761	if (flags & WidthValue)
666	{	762	{
667	TermWin.ncol = BOUND_POSITIVE_INT16 (w);	763	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
668	szHint.flags \|= USSize;	764	szHint.flags \|= USSize;
669	}	765	}
		766
670	if (flags & HeightValue)	767	if (flags & HeightValue)
671	{	768	{
672	TermWin.nrow = BOUND_POSITIVE_INT16 (h);	769	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
673	szHint.flags \|= USSize;	770	szHint.flags \|= USSize;
674	}	771	}
		772
675	if (flags & XValue)	773	if (flags & XValue)
676	{	774	{
677	szHint.x = x;	775	szHint.x = x;
678	szHint.flags \|= USPosition;	776	szHint.flags \|= USPosition;
		777
679	if (flags & XNegative)	778	if (flags & XNegative)
680	{	779	{
681	recalc_x = 1;	780	recalc_x = 1;
682	szHint.win_gravity = NorthEastGravity;	781	szHint.win_gravity = NorthEastGravity;
683	}	782	}
684	}	783	}
		784
685	if (flags & YValue)	785	if (flags & YValue)
686	{	786	{
687	szHint.y = y;	787	szHint.y = y;
688	szHint.flags \|= USPosition;	788	szHint.flags \|= USPosition;
		789
689	if (flags & YNegative)	790	if (flags & YNegative)
690	{	791	{
691	recalc_y = 1;	792	recalc_y = 1;
		793
692	if (szHint.win_gravity == NorthEastGravity)	794	if (szHint.win_gravity == NorthEastGravity)
693	szHint.win_gravity = SouthEastGravity;	795	szHint.win_gravity = SouthEastGravity;
694	else	796	else
695	szHint.win_gravity = SouthWestGravity;	797	szHint.win_gravity = SouthWestGravity;
696	}	798	}
697	}	799	}
698	}	800	}
699		801
700	/* TODO: BOUNDS */	802	/* TODO: BOUNDS */
701	TermWin.width = TermWin.ncol * TermWin.fwidth;	803	width = ncol * fwidth;
702	TermWin.height = TermWin.nrow * TermWin.fheight;	804	height = nrow * fheight;
703	max_width = MAX_COLS * TermWin.fwidth;	805	max_width = MAX_COLS * fwidth;
704	max_height = MAX_ROWS * TermWin.fheight;	806	max_height = MAX_ROWS * fheight;
705		807
706	szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;	808	szHint.base_width = szHint.base_height = 2 * int_bwidth;
707		809
708	sb_w = mb_h = 0;	810	sb_w = mb_h = 0;
709	window_vt_x = window_vt_y = TermWin.int_bwidth;	811	window_vt_x = window_vt_y = int_bwidth;
710		812
711	if (scrollbar_visible ())	813	if (scrollbar_visible ())
712	{	814	{
713	sb_w = scrollbar_TotalWidth ();	815	sb_w = scrollbar_TotalWidth ();
714	szHint.base_width += sb_w;	816	szHint.base_width += sb_w;
715	if (!(options & Opt_scrollBar_right))	817	if (!OPTION (Opt_scrollBar_right))
716	window_vt_x += sb_w;	818	window_vt_x += sb_w;
717	}	819	}
718		820
719	if (menubar_visible ())	821	if (menubar_visible ())
720	{	822	{
721	mb_h = menuBar_TotalHeight ();	823	mb_h = menuBar_TotalHeight ();
722	szHint.base_height += mb_h;	824	szHint.base_height += mb_h;
723	window_vt_y += mb_h;	825	window_vt_y += mb_h;
724	}	826	}
725		827
726	szHint.width_inc = TermWin.fwidth;	828	szHint.width_inc = fwidth;
727	szHint.height_inc = TermWin.fheight;	829	szHint.height_inc = fheight;
728	szHint.min_width = szHint.base_width + szHint.width_inc;	830	szHint.min_width = szHint.base_width + szHint.width_inc;
729	szHint.min_height = szHint.base_height + szHint.height_inc;	831	szHint.min_height = szHint.base_height + szHint.height_inc;
730		832
731	if (width && width - szHint.base_width < max_width)	833	if (newwidth && newwidth - szHint.base_width < max_width)
732	{	834	{
733	szHint.width = width;	835	szHint.width = newwidth;
734	TermWin.width = width - szHint.base_width;	836	width = newwidth - szHint.base_width;
735	}	837	}
736	else	838	else
737	{	839	{
738	MIN_IT (TermWin.width, max_width);	840	min_it (width, max_width);
739	szHint.width = szHint.base_width + TermWin.width;	841	szHint.width = szHint.base_width + width;
740	}	842	}
741		843
742	if (height && height - szHint.base_height < max_height)	844	if (newheight && newheight - szHint.base_height < max_height)
743	{	845	{
744	szHint.height = height;	846	szHint.height = newheight;
745	TermWin.height = height - szHint.base_height;	847	height = newheight - szHint.base_height;
746	}	848	}
747	else	849	else
748	{	850	{
749	MIN_IT (TermWin.height, max_height);	851	min_it (height, max_height);
750	szHint.height = szHint.base_height + TermWin.height;	852	szHint.height = szHint.base_height + height;
751	}	853	}
752		854
753	if (scrollbar_visible () && (options & Opt_scrollBar_right))	855	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
754	window_sb_x = szHint.width - sb_w;	856	window_sb_x = szHint.width - sb_w;
755		857
756	if (recalc_x)	858	if (recalc_x)
757	szHint.x += (DisplayWidth (disp, display->screen)	859	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
758	- szHint.width - 2 * TermWin.ext_bwidth);
759	if (recalc_y)	860	if (recalc_y)
760	szHint.y += (DisplayHeight (disp, display->screen)	861	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
761	- szHint.height - 2 * TermWin.ext_bwidth);
762		862
763	TermWin.ncol = TermWin.width / TermWin.fwidth;	863	ncol = width / fwidth;
764	TermWin.nrow = TermWin.height / TermWin.fheight;	864	nrow = height / fheight;
765	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	865	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
766	TermWin.ncol, TermWin.nrow, szHint.width,	866	ncol, nrow, szHint.width,
767	szHint.height));	867	szHint.height));
768	return;	868	return;
769	}	869	}
770		870
771	/----------------------------------------------------------------------/	871	/----------------------------------------------------------------------/
…		…
779	if (pty.pty < 0)	879	if (pty.pty < 0)
780	return;	880	return;
781		881
782	struct winsize ws;	882	struct winsize ws;
783		883
784	ws.ws_col = TermWin.ncol;	884	ws.ws_col = ncol;
785	ws.ws_row = TermWin.nrow;	885	ws.ws_row = nrow;
786	ws.ws_xpixel = TermWin.width;	886	ws.ws_xpixel = width;
787	ws.ws_ypixel = TermWin.height;	887	ws.ws_ypixel = height;
788	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	888	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);
789		889
790	#if 0	890	#if 0
791	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	891	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
792	if (cmd_pid) /* force through to the command */	892	if (cmd_pid) /* force through to the command */
793	kill (cmd_pid, SIGWINCH);	893	kill (-cmd_pid, SIGWINCH);
794	#endif	894	#endif
795	}	895	}
796		896
797	/----------------------------------------------------------------------/	897	/----------------------------------------------------------------------/
798	/* set_fonts () - load and set the various fonts	898	/* set_fonts () - load and set the various fonts
799	/*	899	*
800	* init = 1 - initialize	900	* init = 1 - initialize
801	*	901	*
802	* fontname == FONT_UP - switch to bigger font	902	* fontname == FONT_UP - switch to bigger font
803	* fontname == FONT_DN - switch to smaller font	903	* fontname == FONT_DN - switch to smaller font
804	*/	904	*/
…		…
816	return false;	916	return false;
817	}	917	}
818		918
819	#if ENABLE_STYLES	919	#if ENABLE_STYLES
820	for (int i = RS_styleCount; --i; )	920	for (int i = RS_styleCount; --i; )
821	if (TermWin.fontset[i] != TermWin.fontset[0])	921	if (fontset[i] != fontset[0])
822	delete TermWin.fontset[i];	922	delete fontset[i];
823	#endif	923	#endif
824		924
825	delete TermWin.fontset[0];	925	delete fontset[0];
826	TermWin.fontset[0] = fs;	926	fontset[0] = fs;
827		927
828	prop = (*fs)[1]->properties ();	928	prop = (*fs)[1]->properties ();
829	prop.height += TermWin.lineSpace;	929	prop.height += lineSpace;
830	fs->set_prop (prop);	930	fs->set_prop (prop);
831		931
832	TermWin.fwidth = prop.width;	932	fwidth = prop.width;
833	TermWin.fheight = prop.height;	933	fheight = prop.height;
834	TermWin.fweight = prop.weight;	934	fbase = prop.ascent;
835	TermWin.fslant = prop.slant;
836	TermWin.fbase = (*fs)[1]->ascent;
837		935
838	for (int style = 1; style < 4; style++)	936	for (int style = 1; style < 4; style++)
839	{	937	{
840	#if ENABLE_STYLES	938	#if ENABLE_STYLES
841	const char *res = rs[Rs_font + style];	939	const char *res = rs[Rs_font + style];
842		940
843	if (res && !*res)	941	if (res && !*res)
844	TermWin.fontset[style] = TermWin.fontset[0];	942	fontset[style] = fontset[0];
845	else	943	else
846	{	944	{
847	TermWin.fontset[style] = fs = new rxvt_fontset (this);	945	fontset[style] = fs = new rxvt_fontset (this);
848	rxvt_fontprop prop2 = prop;	946	rxvt_fontprop prop2 = prop;
849		947
850	if (res)	948	if (res)
851	prop2.weight = prop2.slant = rxvt_fontprop::unset;	949	prop2.weight = prop2.slant = rxvt_fontprop::unset;
852	else	950	else
853	{	951	{
854	res = TermWin.fontset[0]->fontdesc;	952	res = fontset[0]->fontdesc;
855		953
856	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	954	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
857	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	955	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
858	}	956	}
859		957
860	fs->populate (res);	958	fs->populate (res);
861	fs->set_prop (prop2);	959	fs->set_prop (prop2);
862	}	960	}
863	#else	961	#else
864	TermWin.fontset[style] = TermWin.fontset[0];	962	fontset[style] = fontset[0];
865	#endif	963	#endif
866	}	964	}
867		965
868	if (TermWin.parent[0])	966	if (parent[0])
869	{	967	{
870	resize_all_windows (0, 0, 0);	968	resize_all_windows (0, 0, 0);
871	scr_remap_chars ();	969	scr_remap_chars ();
872	scr_touch (true);	970	scr_touch (true);
873	}	971	}
…		…
875	return true;	973	return true;
876	}	974	}
877		975
878	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	976	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
879	{	977	{
880	// TODO: SMART_WINDOW_TITLE
881	XChangeProperty (display->display, TermWin.parent[0],	978	XChangeProperty (display->display, parent[0],
882	prop, XA_STRING, 8, PropModeReplace,	979	prop, XA_STRING, 8, PropModeReplace,
883	(const unsigned char *)str, len >= 0 ? len : strlen (str));	980	(const unsigned char *)str, len >= 0 ? len : strlen (str));
884	}	981	}
885		982
886	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	983	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887	{	984	{
888	// TODO: SMART_WINDOW_TITLE
889	wchar_t *ws = rxvt_mbstowcs (str, len);	985	wchar_t *ws = rxvt_mbstowcs (str, len);
890	char *s = rxvt_wcstoutf8 (ws);	986	char *s = rxvt_wcstoutf8 (ws);
891		987
892	XChangeProperty (display->display, TermWin.parent[0],	988	XChangeProperty (display->display, parent[0],
893	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	989	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
894	(const unsigned char *)s, strlen (s));	990	(const unsigned char *)s, strlen (s));
895		991
896	free (s);	992	free (s);
897	free (ws);	993	free (ws);
…		…
902	/* xterm sequences - title, iconName, color (exptl) */	998	/* xterm sequences - title, iconName, color (exptl) */
903	void	999	void
904	rxvt_term::set_title (const char *str)	1000	rxvt_term::set_title (const char *str)
905	{	1001	{
906	set_string_property (XA_WM_NAME, str);	1002	set_string_property (XA_WM_NAME, str);
907	#if ENABLE_FRILLS	1003	#if ENABLE_EWMH
908	set_utf8_property (xa[XA_NET_WM_NAME], str);	1004	set_utf8_property (xa[XA_NET_WM_NAME], str);
909	#endif	1005	#endif
910	}	1006	}
911		1007
912	void	1008	void
913	rxvt_term::set_icon_name (const char *str)	1009	rxvt_term::set_icon_name (const char *str)
914	{	1010	{
915	set_string_property (XA_WM_ICON_NAME, str);	1011	set_string_property (XA_WM_ICON_NAME, str);
916	#if ENABLE_FRILLS	1012	#if ENABLE_EWMH
917	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	1013	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
918	#endif	1014	#endif
919	}	1015	}
920		1016
921	#ifdef XTERM_COLOR_CHANGE	1017	#ifdef XTERM_COLOR_CHANGE
…		…
934	i = atoi (color);	1030	i = atoi (color);
935		1031
936	if (i >= 8 && i <= 15)	1032	if (i >= 8 && i <= 15)
937	{ /* bright colors */	1033	{ /* bright colors */
938	i -= 8;	1034	i -= 8;
939	# ifndef NO_BRIGHTCOLOR
940	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	1035	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
941	SET_PIXCOLOR (idx);	1036	SET_PIXCOLOR (idx);
942	goto Done;	1037	goto done;
943	# endif
944	}	1038	}
945		1039
946	if (i >= 0 && i <= 7)	1040	if (i >= 0 && i <= 7)
947	{ /* normal colors */	1041	{ /* normal colors */
948	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	1042	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
949	SET_PIXCOLOR (idx);	1043	SET_PIXCOLOR (idx);
950	goto Done;	1044	goto done;
951	}	1045	}
952	}	1046	}
953		1047
954	if (!rXParseAllocColor (&xcol, color))	1048	if (!rXParseAllocColor (&xcol, color))
955	return;	1049	return;
…		…
975	pix_colors_focused[idx] = xcol;	1069	pix_colors_focused[idx] = xcol;
976	SET_PIXCOLOR (idx);	1070	SET_PIXCOLOR (idx);
977		1071
978	/* XSetWindowAttributes attr; */	1072	/* XSetWindowAttributes attr; */
979	/* Cursor cursor; */	1073	/* Cursor cursor; */
980	Done:	1074	done:
		1075
981	#ifdef OFF_FOCUS_FADING	1076	#if OFF_FOCUS_FADING
982	if (rs[Rs_fade])	1077	if (rs[Rs_fade])
983	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));	1078	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
984	#endif	1079	#endif
985		1080
986	/TODO: handle Color_BD, scrollbar background, etc. /	1081	/TODO: handle Color_BD, scrollbar background, etc. /
987		1082
988	recolour_cursor ();	1083	recolour_cursor ();
…		…
1059		1154
1060	/* -------------------------------------------------------------------- *	1155	/* -------------------------------------------------------------------- *
1061	* - WINDOW RESIZING - *	1156	* - WINDOW RESIZING - *
1062	* -------------------------------------------------------------------- */	1157	* -------------------------------------------------------------------- */
1063	void	1158	void
1064	rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)	1159	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1065	{	1160	{
1066	int fix_screen;	1161	int fix_screen;
1067	#ifdef SMART_RESIZE
1068	int old_width = szHint.width, old_height = szHint.height;	1162	int old_width = szHint.width, old_height = szHint.height;
1069	#endif
1070	dDisp;	1163	dDisp;
1071		1164
1072	window_calc (width, height);	1165	window_calc (newwidth, newheight);
1073	XSetWMNormalHints (disp, TermWin.parent[0], &szHint);	1166	XSetWMNormalHints (disp, parent[0], &szHint);
1074		1167
1075	if (!ignoreparent)	1168	if (!ignoreparent)
1076	{	1169	{
1077	#ifdef SMART_RESIZE	1170	#ifdef SMART_RESIZE
1078	/*	1171	/*
…		…
1082	int x, y, x1, y1;	1175	int x, y, x1, y1;
1083	int dx, dy;	1176	int dx, dy;
1084	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1177	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1085	Window unused_cr;	1178	Window unused_cr;
1086		1179
1087	XTranslateCoordinates (disp, TermWin.parent[0], display->root,	1180	XTranslateCoordinates (disp, parent[0], display->root,
1088	0, 0, &x, &y, &unused_cr);	1181	0, 0, &x, &y, &unused_cr);
1089	XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,	1182	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1090	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1183	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1091	/*	1184	/*
1092	* if display->root isn't the parent window, a WM will probably have offset	1185	* if display->root isn't the parent window, a WM will probably have offset
1093	* our position for handles and decorations. Counter it	1186	* our position for handles and decorations. Counter it
1094	*/	1187	*/
…		…
1111	if (y < y1) /* top half */	1204	if (y < y1) /* top half */
1112	dy = 0;	1205	dy = 0;
1113	else if (y == y1) /* exact center */	1206	else if (y == y1) /* exact center */
1114	dy /= 2;	1207	dy /= 2;
1115		1208
1116	XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,	1209	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1117	szHint.width, szHint.height);	1210	szHint.width, szHint.height);
1118	#else	1211	#else
1119	XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);	1212	XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1120	#endif	1213	#endif
1121	}	1214	}
1122		1215
1123	fix_screen = TermWin.ncol != prev_ncol \|\| TermWin.nrow != prev_nrow;	1216	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1124		1217
1125	if (fix_screen \|\| width != old_width \|\| height != old_height)	1218	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1126	{	1219	{
1127	if (scrollbar_visible ())	1220	if (scrollbar_visible ())
1128	{	1221	{
1129	XMoveResizeWindow (disp, scrollBar.win,	1222	XMoveResizeWindow (disp, scrollBar.win,
1130	window_sb_x, 0,	1223	window_sb_x, 0,
…		…
1133	}	1226	}
1134		1227
1135	if (menubar_visible ())	1228	if (menubar_visible ())
1136	XMoveResizeWindow (disp, menuBar.win,	1229	XMoveResizeWindow (disp, menuBar.win,
1137	window_vt_x, 0,	1230	window_vt_x, 0,
1138	TermWin_TotalWidth (), menuBar_TotalHeight ());	1231	width, menuBar_TotalHeight ());
1139		1232
1140	XMoveResizeWindow (disp, TermWin.vt,	1233	XMoveResizeWindow (disp, vt,
1141	window_vt_x, window_vt_y,	1234	window_vt_x, window_vt_y,
1142	TermWin_TotalWidth (), TermWin_TotalHeight ());	1235	width, height);
1143		1236
1144	scr_clear ();	1237	scr_clear ();
1145	#ifdef XPM_BACKGROUND	1238	#ifdef XPM_BACKGROUND
1146	resize_pixmap ();	1239	resize_pixmap ();
1147	#endif	1240	#endif
…		…
1153	int old_ncol = prev_ncol;	1246	int old_ncol = prev_ncol;
1154		1247
1155	/* scr_reset only works on the primary screen */	1248	/* scr_reset only works on the primary screen */
1156	if (old_height) /* this is not the first time through */	1249	if (old_height) /* this is not the first time through */
1157	{	1250	{
1158	unsigned int ncol = TermWin.ncol;	1251	unsigned int ocol = ncol;
1159	TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this	1252	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1160	curr_screen = scr_change_screen (PRIMARY);	1253	curr_screen = scr_change_screen (PRIMARY);
1161	TermWin.ncol = ncol;	1254	ncol = ocol;
1162	}	1255	}
1163		1256
1164	scr_reset ();	1257	scr_reset ();
1165		1258
1166	if (curr_screen >= 0) /* this is not the first time through */	1259	if (curr_screen >= 0) /* this is not the first time through */
1167	{	1260	{
1168	scr_change_screen (curr_screen);	1261	scr_change_screen (curr_screen);
1169	selection_check (old_ncol != TermWin.ncol ? 4 : 0);	1262	selection_check (old_ncol != ncol ? 4 : 0);
1170	}	1263	}
1171	}	1264	}
1172		1265
1173	old_width = szHint.width;	1266	old_width = szHint.width;
1174	old_height = szHint.height;	1267	old_height = szHint.height;
1175		1268
1176	#ifdef XPM_BACKGROUND	1269	#ifdef XPM_BACKGROUND
1177	if (TermWin.pixmap)	1270	if (pixmap)
1178	scr_touch (false);	1271	scr_touch (false);
1179	#endif	1272	#endif
1180		1273
1181	#ifdef USE_XIM	1274	#ifdef USE_XIM
1182	IMSetStatusPosition ();	1275	IMSetStatusPosition ();
…		…
1186	/*	1279	/*
1187	* Set the width/height of the vt window in characters. Units are pixels.	1280	* Set the width/height of the vt window in characters. Units are pixels.
1188	* good for toggling 80/132 columns	1281	* good for toggling 80/132 columns
1189	*/	1282	*/
1190	void	1283	void
1191	rxvt_term::set_widthheight (unsigned int width, unsigned int height)	1284	rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1192	{	1285	{
1193	XWindowAttributes wattr;	1286	XWindowAttributes wattr;
1194		1287
1195	if (width == 0 \|\| height == 0)	1288	if (newwidth == 0 \|\| newheight == 0)
1196	{	1289	{
1197	XGetWindowAttributes (display->display, display->root, &wattr);	1290	XGetWindowAttributes (display->display, display->root, &wattr);
		1291
1198	if (width == 0)	1292	if (newwidth == 0)
1199	width = wattr.width - szHint.base_width;	1293	newwidth = wattr.width - szHint.base_width;
1200	if (height == 0)	1294	if (newheight == 0)
1201	height = wattr.height - szHint.base_height;	1295	newheight = wattr.height - szHint.base_height;
1202	}
1203
1204	if (width != TermWin.width \|\| height != TermWin.height)
1205	{	1296	}
		1297
		1298	if (newwidth != width \|\| newheight != height)
		1299	{
1206	width += szHint.base_width;	1300	newwidth += szHint.base_width;
1207	height += szHint.base_height;	1301	newheight += szHint.base_height;
1208	resize_all_windows (width, height, 0);	1302	resize_all_windows (newwidth, newheight, 0);
1209	}	1303	}
1210	}	1304	}
1211		1305
1212	/* -------------------------------------------------------------------- *	1306	/* -------------------------------------------------------------------- *
1213	* - X INPUT METHOD ROUTINES - *	1307	* - X INPUT METHOD ROUTINES - *
…		…
1223		1317
1224	void	1318	void
1225	rxvt_term::im_set_size (XRectangle &size)	1319	rxvt_term::im_set_size (XRectangle &size)
1226	{	1320	{
1227	// the int_bwidth terms make no sense to me	1321	// the int_bwidth terms make no sense to me
1228	size.x = TermWin.int_bwidth;	1322	size.x = int_bwidth;
1229	size.y = TermWin.int_bwidth;	1323	size.y = int_bwidth;
1230	size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;	1324	size.width = Width2Pixel (ncol) + int_bwidth;
1231	size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;	1325	size.height = Height2Pixel (nrow) + int_bwidth;
1232	}	1326	}
1233		1327
1234	void	1328	void
1235	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,	1329	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1236	XRectangle &status_rect,	1330	XRectangle &status_rect,
1237	const XRectangle &needed_rect)	1331	const XRectangle &needed_rect)
1238	{	1332	{
1239	preedit_rect.x = needed_rect.width;	1333	preedit_rect.x = needed_rect.width;
1240	preedit_rect.y = 0;	1334	preedit_rect.y = 0;
1241	preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;	1335	preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1242	preedit_rect.height = TermWin.fheight;	1336	preedit_rect.height = fheight;
1243		1337
1244	status_rect.x = 0;	1338	status_rect.x = 0;
1245	status_rect.y = 0;	1339	status_rect.y = 0;
1246	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;	1340	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1247	status_rect.height = TermWin.fheight;	1341	status_rect.height = fheight;
1248	}	1342	}
1249		1343
1250	/* Checking whether input method is running. */	1344	/* Checking whether input method is running. */
1251	bool	1345	bool
1252	rxvt_term::IMisRunning ()	1346	rxvt_term::IMisRunning ()
…		…
1280	{	1374	{
1281	XPoint nspot;	1375	XPoint nspot;
1282	XVaNestedList preedit_attr;	1376	XVaNestedList preedit_attr;
1283		1377
1284	if (!Input_Context	1378	if (!Input_Context
1285	\|\| !TermWin.focus	1379	\|\| !focus
1286	\|\| !(input_style & XIMPreeditPosition))	1380	\|\| !(input_style & XIMPreeditPosition))
1287	return;	1381	return;
1288		1382
1289	im_set_position (nspot);	1383	im_set_position (nspot);
1290		1384
…		…
1410	"----R---%d------*,"	1504	"----R---%d------*,"
1411	"----R---%d------*,"	1505	"----R---%d------*,"
1412	"----R---%d------*,"	1506	"----R---%d------*,"
1413	"----R---%d------*,"	1507	"----R---%d------*,"
1414	"*",	1508	"*",
1415	TermWin.fheight,	1509	fheight,
1416	TermWin.fheight + 1, TermWin.fheight - 1,	1510	fheight + 1, fheight - 1,
1417	TermWin.fheight - 2, TermWin.fheight + 2);	1511	fheight - 2, fheight + 2);
1418		1512
1419	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1513	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1420	&missing_charset_list, &missing_charset_count, &def_string);	1514	&missing_charset_list, &missing_charset_count, &def_string);
1421		1515
1422	if (missing_charset_list)	1516	if (missing_charset_list)
…		…
1468	NULL);	1562	NULL);
1469	}	1563	}
1470		1564
1471	Input_Context = XCreateIC (xim,	1565	Input_Context = XCreateIC (xim,
1472	XNInputStyle, input_style,	1566	XNInputStyle, input_style,
1473	XNClientWindow, TermWin.vt,	1567	XNClientWindow, vt,
1474	XNFocusWindow, TermWin.parent[0],	1568	XNFocusWindow, parent[0],
1475	preedit_attr ? XNPreeditAttributes : NULL,	1569	preedit_attr ? XNPreeditAttributes : NULL,
1476	preedit_attr,	1570	preedit_attr,
1477	status_attr ? XNStatusAttributes : NULL,	1571	status_attr ? XNStatusAttributes : NULL,
1478	status_attr, NULL);	1572	status_attr, NULL);
1479		1573
…		…
1496	}	1590	}
1497		1591
1498	void	1592	void
1499	rxvt_term::im_cb ()	1593	rxvt_term::im_cb ()
1500	{	1594	{
1501	int i, found, had_im;	1595	int i;
1502	const char *p;	1596	const char *p;
1503	char **s;	1597	char **s;
1504	char buf[IMBUFSIZ];	1598	char buf[IMBUFSIZ];
		1599
		1600	SET_R (this);
1505		1601
1506	im_destroy ();	1602	im_destroy ();
1507		1603
1508	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1604	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1509	if (Input_Context)	1605	if (Input_Context)
…		…
1561	{	1657	{
1562	XRectangle preedit_rect, status_rect, *needed_rect;	1658	XRectangle preedit_rect, status_rect, *needed_rect;
1563	XVaNestedList preedit_attr, status_attr;	1659	XVaNestedList preedit_attr, status_attr;
1564		1660
1565	if (!Input_Context	1661	if (!Input_Context
1566	\|\| !TermWin.focus	1662	\|\| !focus
1567	\|\| !(input_style & XIMPreeditArea)	1663	\|\| !(input_style & XIMPreeditArea)
1568	\|\| !IMisRunning ())	1664	\|\| !IMisRunning ())
1569	return;	1665	return;
1570		1666
1571	/* Getting the necessary width of preedit area */	1667	/* 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.134 by root, Fri Feb 4 11:41:23 2005 UTC vs. Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.134 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC