ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.34 by pcg, Fri Feb 20 22:27:27 2004 UTC vs.
Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC

1	/*--------------------------------*-C-*---------------------------------*	1	/*--------------------------------*-C-*---------------------------------*
2	* File: main.c	2	* File: main.C
3	*----------------------------------------------------------------------*	3	*----------------------------------------------------------------------*
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7	* - original version	7	* - original version
…		…
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-2006 Marc Lehmann <pcg@goof.com>
16	*	17	*
17	* 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
18	* 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
19	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
20	* (at your option) any later version.	21	* (at your option) any later version.
…		…
29	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
30	*---------------------------------------------------------------------*/	31	*---------------------------------------------------------------------*/
31		32
32	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
33	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
34	#include "main.intpro" /* PROTOS for internal routines */	35	#include "keyboard.h"
		36	#include "rxvtperl.h"
35		37
		38	#include <limits>
		39
36	#include <signal.h>	40	#include <csignal>
		41	#include <cstring>
37		42
38	#ifdef TTY_GID_SUPPORT	43	#ifdef TTY_GID_SUPPORT
39	# include <grp.h>	44	# include <grp.h>
40	#endif	45	#endif
41		46
42	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
43	# include <termios.h>	48	# include <termios.h>
44	#endif	49	#endif
45		50
46	#include <cstring>	51	vector<rxvt_term *> rxvt_term::termlist;
47		52
48	static char curlocale[128];	53	static char curlocale[128], savelocale[128];
49		54
50	void	55	bool
51	rxvt_set_locale (const char *locale)	56	rxvt_set_locale (const char *locale)
52	{	57	{
53	if (locale && STRNCMP (locale, curlocale, 128))	58	if (!locale || !strncmp (locale, curlocale, 128))
54	{	59	return false;
		60
55	STRNCPY (curlocale, locale, 128);	61	strncpy (curlocale, locale, 128);
56	setlocale (LC_CTYPE, curlocale);	62	setlocale (LC_CTYPE, curlocale);
57	}	63	return true;
58	}	64	}
59		65
		66	bool
		67	rxvt_push_locale (const char *locale)
		68	{
		69	strcpy (savelocale, curlocale);
		70	rxvt_set_locale (locale);
		71	}
		72
60	void *	73	void
61	rxvt_term::operator new (size_t s)	74	rxvt_pop_locale ()
62	{	75	{
63	void *p = malloc (s);	76	rxvt_set_locale (savelocale);
		77	}
64		78
65	MEMSET (p, 0, s);	79	#if ENABLE_COMBINING
		80	class rxvt_composite_vec rxvt_composite;
		81
		82	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
		83	{
		84	compose_char *cc;
		85
		86	// break compose chains, as stupid readline really likes to duplicate
		87	// composing characters for some reason near the end of a line.
		88	cc = (*this)[c1];
		89	while (cc)
		90	{
		91	if (cc->c2 == c2) return c1;
		92	cc = (*this)[cc->c1];
		93	}
		94
		95	// check to see wether this combination already exists otherwise
		96	for (cc = v.end (); cc-- > v.begin (); )
		97	{
		98	if (cc->c1 == c1 && cc->c2 == c2)
		99	return COMPOSE_LO + (cc - v.begin ());
		100	}
		101
		102	// allocate a new combination
		103	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
		104	{
		105	static int seen;
		106
		107	if (!seen++)
		108	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
		109
		110	return REPLACEMENT_CHAR;
		111	}
		112
		113	v.push_back (compose_char (c1, c2));
		114
		115	return v.size () - 1 + COMPOSE_LO;
		116	}
		117
		118	int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
		119	{
		120	compose_char *cc = (*this)[c];
		121
		122	if (!cc)
		123	{
		124	if (r) *r = c;
		125	return 1;
		126	}
		127
		128	int len = expand (cc->c1, r);
		129
		130	if (r) r += len;
		131
		132	if (cc->c2 != NOCHAR)
		133	{
		134	len++;
		135	if (r) *r++ = cc->c2;
		136	}
		137
66	return p;	138	return len;
67	}
68		139
69	void
70	rxvt_term::operator delete (void *p, size_t s)
71	{
72	free (p);
73	}	140	}
		141	#endif
74		142
75	rxvt_term::rxvt_term ()	143	rxvt_term::rxvt_term ()
76	:	144	:
		145	#if TRANSPARENT
77	rootwin_ev (this, &rxvt_term::rootwin_cb),	146	rootwin_ev (this, &rxvt_term::rootwin_cb),
		147	#endif
		148	#ifdef HAVE_SCROLLBARS
		149	scrollbar_ev (this, &rxvt_term::x_cb),
		150	#endif
		151	#ifdef MENUBAR
		152	menubar_ev (this, &rxvt_term::x_cb),
		153	#endif
		154	#ifdef CURSOR_BLINK
		155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
		156	#endif
		157	#ifdef TEXT_BLINK
		158	text_blink_ev (this, &rxvt_term::text_blink_cb),
		159	#endif
		160	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		161	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
		162	#endif
		163	#ifdef SELECTION_SCROLLING
		164	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
		165	#endif
		166	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		167	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
		168	#endif
		169	#ifdef POINTER_BLANK
		170	pointer_ev (this, &rxvt_term::pointer_cb),
		171	#endif
		172	#ifdef USE_XIM
		173	im_ev (this, &rxvt_term::im_cb),
		174	#endif
78	termwin_ev (this, &rxvt_term::x_cb),	175	termwin_ev (this, &rxvt_term::x_cb),
79	vt_ev (this, &rxvt_term::x_cb),	176	vt_ev (this, &rxvt_term::x_cb),
80	#ifdef HAVE_SCROLLBARS
81	scrollbar_ev (this, &rxvt_term::x_cb),
82	#endif
83	#ifdef MENUBAR
84	menubar_ev (this, &rxvt_term::x_cb), fixme
85	#endif
86	#ifdef CURSOR_BLINK
87	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88	#endif
89	#ifdef TEXT_BLINK
90	text_blink_ev (this, &rxvt_term::text_blink_cb),
91	#endif
92	#ifdef POINTER_BLANK
93	pointer_ev (this, &rxvt_term::pointer_cb),
94	#endif
95	check_ev (this, &rxvt_term::check_cb),	177	check_ev (this, &rxvt_term::check_cb),
		178	flush_ev (this, &rxvt_term::flush_cb),
96	destroy_ev (this, &rxvt_term::destroy_cb),	179	destroy_ev (this, &rxvt_term::destroy_cb),
97	pty_ev (this, &rxvt_term::pty_cb),	180	pty_ev (this, &rxvt_term::pty_cb),
98	incr_ev (this, &rxvt_term::incr_cb),	181	incr_ev (this, &rxvt_term::incr_cb)
99	#ifdef USE_XIM
100	im_ev (this, &rxvt_term::im_cb)
101	#endif
102	{	182	{
103	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	183	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
104	}
105		184
106	rxvt_term::~rxvt_term ()	185	termlist.push_back (this);
		186
		187	#ifdef KEYSYM_RESOURCE
		188	keyboard = new keyboard_manager;
		189
		190	if (!keyboard)
		191	rxvt_fatal ("out of memory, aborting.\n");
		192	#endif
		193	}
		194
		195	// clean up the most important stuff, do *not* call x or free mem etc.
		196	// for use before an emergency exit
		197	void rxvt_term::emergency_cleanup ()
107	{	198	{
108	if (cmd_fd >= 0)	199	if (cmd_pid)
109	close (cmd_fd);	200	kill (-cmd_pid, SIGHUP);
110		201
111	#ifndef NO_SETOWNER_TTYDEV
112	privileged_ttydev (RESTORE);
113	#endif
114	#ifdef UTMP_SUPPORT	202	#ifdef UTMP_SUPPORT
115	privileged_utmp (RESTORE);	203	privileged_utmp (RESTORE);
116	#endif	204	#endif
117		205
		206	pty.put ();
		207	}
		208
		209	rxvt_term::~rxvt_term ()
		210	{
		211	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		212
		213	termlist.erase (find (termlist.begin (), termlist.end(), this));
		214
		215	emergency_cleanup ();
		216
		217	#if ENABLE_STYLES
		218	for (int i = RS_styleCount; --i; )
		219	if (fontset[i] != fontset[0])
		220	delete fontset[i];
		221	#endif
118	delete TermWin.fontset;	222	delete fontset[0];
119		223
120	if (display)	224	if (display)
		225	{
		226	dDisp;
		227
		228	selection_clear ();
		229
		230	#ifdef USE_XIM
		231	im_destroy ();
		232	#endif
		233	#ifdef MENUBAR
		234	if (menubarGC) XFreeGC (disp, menubarGC);
		235	#endif
		236	#ifdef XTERM_SCROLLBAR
		237	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
		238	if (ShadowGC) XFreeGC (disp, ShadowGC);
		239	#endif
		240	#ifdef PLAIN_SCROLLBAR
		241	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
		242	#endif
		243	#ifdef NEXT_SCROLLBAR
		244	if (blackGC) XFreeGC (disp, blackGC);
		245	if (whiteGC) XFreeGC (disp, whiteGC);
		246	if (grayGC) XFreeGC (disp, grayGC);
		247	if (darkGC) XFreeGC (disp, darkGC);
		248	if (stippleGC) XFreeGC (disp, stippleGC);
		249	if (dimple) XFreePixmap (disp, dimple);
		250	if (upArrow) XFreePixmap (disp, upArrow);
		251	if (downArrow) XFreePixmap (disp, downArrow);
		252	if (upArrowHi) XFreePixmap (disp, upArrowHi);
		253	if (downArrowHi) XFreePixmap (disp, downArrowHi);
		254	#endif
		255	#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
		256	if (topShadowGC) XFreeGC (disp, topShadowGC);
		257	if (botShadowGC) XFreeGC (disp, botShadowGC);
		258	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
		259	#endif
		260	if (gc) XFreeGC (disp, gc);
		261
		262	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
		263	delete menuBar.drawable;
		264	//if (menuBar.win)
		265	// XDestroyWindow (disp, menuBar.win);
		266	#endif
		267	delete drawable;
		268	// destroy all windows
121	if (TermWin.parent[0])	269	if (parent[0])
122	XDestroyWindow (display->display, TermWin.parent[0]);	270	XDestroyWindow (disp, parent[0]);
		271	}
123		272
124	// TODO: free pixcolours, colours should become part of rxvt_display	273	// TODO: free pixcolours, colours should become part of rxvt_display
125		274
126	delete PixColors;	275	delete pix_colors_focused;
		276	#if OFF_FOCUS_FADING
		277	delete pix_colors_unfocused;
		278	#endif
127		279
128	displays.put (display);	280	displays.put (display);
129		281
130	scr_release ();	282	scr_release ();
131		283
		284	/* clear all resources */
		285	for (int i = 0; i < allocated.size (); i++)
		286	free (allocated [i]);
		287
		288	free (selection.text);
		289	// TODO: manage env vars in child only(!)
132	free (env_windowid);	290	free (env_windowid);
133	free (env_display);	291	free (env_display);
134	free (env_term);	292	free (env_term);
135	free (env_colorfgbg);	293	free (env_colorfgbg);
136	free (locale);	294	free (locale);
137	free (codeset);	295	free (v_buffer);
		296	free (incr_buf);
138		297
139	delete envv;	298	delete envv;
140	delete argv;	299	delete argv;
		300
		301	#ifdef KEYSYM_RESOURCE
		302	delete keyboard;
		303	#endif
		304	}
		305
		306	void
		307	rxvt_term::child_exit ()
		308	{
		309	cmd_pid = 0;
		310
		311	if (!OPTION (Opt_hold))
		312	destroy ();
141	}	313	}
142		314
143	void	315	void
144	rxvt_term::destroy ()	316	rxvt_term::destroy ()
145	{	317	{
		318	if (destroy_ev.active)
		319	return;
		320
		321	#if ENABLE_OVERLAY
		322	scr_overlay_off ();
		323	#endif
		324
146	if (display)	325	if (display)
147	{	326	{
		327	#if USE_XIM
		328	im_ev.stop (display);
		329	#endif
		330	#if HAVE_SCROLLBARS
		331	scrollbar_ev.stop (display);
		332	#endif
		333	#if MENUBAR
		334	menubar_ev.stop (display);
		335	#endif
		336	#if TRANSPARENT
148	rootwin_ev.stop (display);	337	rootwin_ev.stop (display);
		338	#endif
		339	incr_ev.stop ();
149	termwin_ev.stop (display);	340	termwin_ev.stop (display);
150	vt_ev.stop (display);	341	vt_ev.stop (display);
151	#ifdef USE_XIM
152	im_destroy ();
153	im_ev.stop (display);
154	#endif
155	#ifdef HAVE_SCROLLBARS
156	scrollbar_ev.stop (display);
157	#endif
158	#ifdef MENUBAR
159	menubar_ev.stop (display);
160	#endif
161	}	342	}
162		343
163	check_ev.stop ();	344	check_ev.stop ();
164	pty_ev.stop ();	345	pty_ev.stop ();
165	#ifdef CURSOR_BLINK	346	#ifdef CURSOR_BLINK
166	cursor_blink_ev.stop ();	347	cursor_blink_ev.stop ();
167	#endif	348	#endif
168	#ifdef TEXT_BLINK	349	#ifdef TEXT_BLINK
169	text_blink_ev.stop ();	350	text_blink_ev.stop ();
170	#endif	351	#endif
		352	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		353	cont_scroll_ev.stop ();
		354	#endif
		355	#ifdef SELECTION_SCROLLING
		356	sel_scroll_ev.stop ();
		357	#endif
171	#ifdef POINTER_BLANK	358	#ifdef POINTER_BLANK
172	pointer_ev.stop ();	359	pointer_ev.stop ();
173	#endif	360	#endif
174		361
175	destroy_ev.start (0);	362	destroy_ev.start (0);
…		…
182		369
183	delete this;	370	delete this;
184	}	371	}
185		372
186	/*----------------------------------------------------------------------*/	373	/*----------------------------------------------------------------------*/
187	/* rxvt_init () */	374	/*
188	/* LIBPROTO */	375	* Exit gracefully, clearing the utmp entry and restoring tty attributes
189	rxvt_t	376	* TODO: if debugging, this should free up any known resources if we can
190	rxvt_init (int argc, const char *const *argv)	377	*/
191	{	378	static XErrorHandler old_xerror_handler;
192	SET_R (new rxvt_term);
193		379
194	if (!GET_R->init_vars () || !GET_R->init (argc, argv))	380	static void
		381	rxvt_emergency_cleanup ()
		382	{
		383	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
		384	(*t)->emergency_cleanup ();
		385	}
		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);
195	{	408	}
196	delete GET_R;	409	if ((event->error_code == BadWindow) ||
197	SET_R (0);	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);
198	}	429	}
199		430	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
200	return GET_R;	431	mesg, BUFSIZ);
		432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
201	}	433	}
		434	#endif
202		435
		436	int
203	static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);	437	rxvt_xerror_handler (Display *display, XErrorEvent *event)
204
205	void
206	rxvt_init_signals ()
207	{	438	{
208	/* install exit handler for cleanup */	439	if (GET_R->allowedxerror == -1)
209	#if 0	440	GET_R->allowedxerror = event->error_code;
210	#ifdef HAVE_ATEXIT	441	else
211	atexit (rxvt_clean_exit);	442	{
		443	// GET_R is most likely not the terminal which caused the error,
		444	// so just output the error and continue
		445	#if ENABLE_FRILLS
		446	print_x_error (display, event);
212	#else	447	#else
		448	old_xerror_handler (display, event);
213	#endif	449	#endif
214	#endif	450	}
215		451
216	struct sigaction sa;	452	return 0;
217
218	sigfillset (&sa.sa_mask);
219	sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
220	sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
221	sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
222	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
223	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
224	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
225	sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
226
227	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
228	/* signal (SIGURG, SIG_DFL); */
229
230	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
231	//XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
232	}	453	}
233		454
		455	int
		456	rxvt_xioerror_handler (Display *display)
		457	{
		458	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
		459	DisplayString (display));
		460	rxvt_emergency_cleanup ();
		461	_exit (EXIT_FAILURE);
		462	}
		463
		464	/*----------------------------------------------------------------------*/
234	bool	465	bool
235	rxvt_term::init (int argc, const char *const *argv)	466	rxvt_term::init (int argc, const char *const *argv)
		467	{
		468	SET_R (this);
		469
		470	set_locale ("");
		471
		472	if (!init_vars ())
		473	return false;
		474
		475	init_secondary ();
		476
		477	const char **cmd_argv = init_resources (argc, argv);
		478
		479	#ifdef KEYSYM_RESOURCE
		480	keyboard->register_done ();
		481	#endif
		482
		483	#if MENUBAR_MAX
		484	menubar_read (rs[Rs_menu]);
		485	#endif
		486	#ifdef HAVE_SCROLLBARS
		487	if (OPTION (Opt_scrollBar))
		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	}
		502	#endif
		503
		504	create_windows (argc, argv);
		505
		506	dDisp;
		507
		508	init_xlocale ();
		509
		510	scr_reset (); /* initialize screen */
		511
		512	#if 0
		513	XSynchronize (disp, True);
		514	#endif
		515
		516	#ifdef HAVE_SCROLLBARS
		517	if (OPTION (Opt_scrollBar))
		518	resize_scrollbar (); /* create and map scrollbar */
		519	#endif
		520	#if (MENUBAR_MAX)
		521	if (menubar_visible ())
		522	XMapWindow (disp, menuBar.win);
		523	#endif
		524	#ifdef TRANSPARENT
		525	if (OPTION (Opt_transparent))
		526	{
		527	XSelectInput (disp, display->root, PropertyChangeMask);
		528	check_our_parents ();
		529	rootwin_ev.start (display, display->root);
		530	}
		531	#endif
		532
		533	XMapWindow (disp, vt);
		534	XMapWindow (disp, parent[0]);
		535
		536	set_colorfgbg ();
		537
		538	init_command (cmd_argv);
		539
		540	free (cmd_argv);
		541
		542	if (pty.pty >= 0)
		543	pty_ev.start (pty.pty, EVENT_READ);
		544
		545	check_ev.start ();
		546
		547	HOOK_INVOKE ((this, HOOK_START, DT_END));
		548
		549	return true;
		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;
		591
		592	void
		593	rxvt_init ()
236	{	594	{
237	/*	595	/*
238	* Save and then give up any super-user privileges	596	* Save and then give up any super-user privileges
239	* If we need privileges in any area then we must specifically request it.	597	* If we need privileges in any area then we must specifically request it.
240	* We should only need to be root in these cases:	598	* We should only need to be root in these cases:
241	* 1. write utmp entries on some systems	599	* 1. write utmp entries on some systems
242	* 2. chown tty on some systems	600	* 2. chown tty on some systems
243	*/	601	*/
244	privileges (SAVE);	602	rxvt_privileges (SAVE);
245	privileges (IGNORE);	603	rxvt_privileges (IGNORE);
246		604
247	init_secondary ();	605	signal (SIGHUP, SIG_IGN);
		606	signal (SIGPIPE, SIG_IGN);
248		607
249	const char **cmd_argv = init_resources (argc, argv);	608	sig_handlers.sw_chld.start (SIGCHLD);
		609	sig_handlers.sw_term.start (SIGTERM);
		610	sig_handlers.sw_int.start (SIGINT);
250		611
251	set_locale ("");	612	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
		613	/* signal (SIGURG, SIG_DFL); */
252		614
253	#if (MENUBAR_MAX)	615	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
254	menubar_read (rs[Rs_menu]);	616	// TODO: handle this with exceptions and tolerate the memory loss
255	#endif	617	XSetIOErrorHandler (rxvt_xioerror_handler);
256	#ifdef HAVE_SCROLLBARS
257	if (Options & Opt_scrollBar)
258	scrollBar.setIdle (); /* set existence for size calculations */
259	#endif
260
261	create_windows (argc, argv);
262
263	init_xlocale ();
264
265	scr_reset (); /* initialize screen */
266	#ifdef RXVT_GRAPHICS
267	Gr_reset (); /* reset graphics */
268	#endif
269
270	#if 1
271	XSynchronize (display->display, True);
272	#endif
273
274	#ifdef HAVE_SCROLLBARS
275	if (Options & Opt_scrollBar)
276	resize_scrollbar (); /* create and map scrollbar */
277	#endif
278	#if (MENUBAR_MAX)
279	if (menubar_visible (r))
280	XMapWindow (display->display, menuBar.win);
281	#endif
282	#ifdef TRANSPARENT
283	if (Options & Opt_transparent)
284	{
285	XSelectInput (display->display, display->root, PropertyChangeMask);
286	check_our_parents ();
287	}
288	#endif
289
290	rootwin_ev.start (display, display->root);
291
292	XMapWindow (display->display, TermWin.vt);
293	XMapWindow (display->display, TermWin.parent[0]);
294
295	init_command (cmd_argv);
296
297	pty_ev.start (cmd_fd, EVENT_READ);
298
299	check_ev.start ();
300
301	return true;
302	}
303
304	/* ------------------------------------------------------------------------- *
305	* SIGNAL HANDLING & EXIT HANDLER *
306	* ------------------------------------------------------------------------- */
307	/*
308	* Catch a SIGCHLD signal and exit if the direct child has died
309	*/
310	/* ARGSUSED */
311	/* EXTPROTO */
312	RETSIGTYPE
313	rxvt_Child_signal (int sig __attribute__ ((unused)))
314	{
315	int pid, save_errno = errno;
316	while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
317	;
318	errno = save_errno;
319
320	#if 0
321	if (pid == cmd_pid)
322	exit (EXIT_SUCCESS);
323	#endif
324	}
325
326	/*
327	* Catch a fatal signal and tidy up before quitting
328	*/
329	/* EXTPROTO */
330	RETSIGTYPE
331	rxvt_Exit_signal (int sig)
332	{
333	signal (sig, SIG_DFL);
334	#ifdef DEBUG_CMD
335	rxvt_print_error ("signal %d", sig);
336	#endif
337	rxvt_clean_exit ();
338	kill (getpid (), sig);
339	}
340
341	/* INTPROTO */
342	int
343	rxvt_xerror_handler (Display *display, XErrorEvent *event)
344	{
345	if (GET_R->allowedxerror == -1)
346	GET_R->allowedxerror = event->error_code;
347	else
348	{
349	old_xerror_handler (display, event);
350	GET_R->destroy ();
351	}
352
353	return 0;
354	}
355
356	/*----------------------------------------------------------------------*/
357	/*
358	* Exit gracefully, clearing the utmp entry and restoring tty attributes
359	* TODO: if debugging, this should free up any known resources if we can
360	*/
361	/* EXTPROTO */
362	void
363	rxvt_clean_exit ()
364	{
365	// TODO: rxvtd should clean up all ressources
366	if (GET_R)
367	GET_R->destroy ();
368	}	618	}
369		619
370	/* ------------------------------------------------------------------------- *	620	/* ------------------------------------------------------------------------- *
371	* MEMORY ALLOCATION WRAPPERS *	621	* MEMORY ALLOCATION WRAPPERS *
372	* ------------------------------------------------------------------------- */	622	* ------------------------------------------------------------------------- */
373	/* EXTPROTO */	623	void *
374	void *
375	rxvt_malloc (size_t size)	624	rxvt_malloc (size_t size)
376	{	625	{
377	void *p;
378
379	p = malloc (size);	626	void *p = malloc (size);
		627
380	if (p)	628	if (!p)
		629	rxvt_fatal ("memory allocation failure. aborting.\n");
		630
381	return p;	631	return p;
382
383	fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
384	rxvt_clean_exit ();
385	exit (EXIT_FAILURE);
386	/* NOTREACHED */
387	}	632	}
388		633
389	/* EXTPROTO */	634	void *
390	void *
391	rxvt_calloc (size_t number, size_t size)	635	rxvt_calloc (size_t number, size_t size)
392	{	636	{
393	void *p;
394
395	p = calloc (number, size);	637	void *p = calloc (number, size);
		638
396	if (p)	639	if (!p)
		640	rxvt_fatal ("memory allocation failure. aborting.\n");
		641
397	return p;	642	return p;
398
399	fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
400	rxvt_clean_exit ();
401	exit (EXIT_FAILURE);
402	/* NOTREACHED */
403	}	643	}
404		644
405	/* EXTPROTO */
406	void *	645	void *
407	rxvt_realloc (void *ptr, size_t size)	646	rxvt_realloc (void *ptr, size_t size)
408	{	647	{
409	void *p;
410
411	if (ptr)
412	p = realloc (ptr, size);	648	void *p = realloc (ptr, size);
413	else	649
414	p = malloc (size);
415	if (p)	650	if (!p)
		651	rxvt_fatal ("memory allocation failure. aborting.\n");
		652
416	return p;	653	return p;
417
418	fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
419	rxvt_clean_exit ();
420	exit (EXIT_FAILURE);
421	/* NOTREACHED */
422	}	654	}
423		655
424	/* ------------------------------------------------------------------------- *	656	/* ------------------------------------------------------------------------- *
425	* PRIVILEGED OPERATIONS *	657	* PRIVILEGED OPERATIONS *
426	* ------------------------------------------------------------------------- */	658	* ------------------------------------------------------------------------- */
427	/* take care of suid/sgid super-user (root) privileges */	659	/* take care of suid/sgid super-user (root) privileges */
428	void	660	void
429	rxvt_term::privileges (int mode)	661	rxvt_privileges (rxvt_privaction action)
430	{	662	{
		663	#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
		664	static uid_t euid;
		665	static gid_t egid;
		666	#endif
		667
431	#if ! defined(__CYGWIN32__)	668	#if ! defined(__CYGWIN32__)
432	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)	669	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
433	/* setreuid () is the poor man's setuid (), seteuid () */	670	/* setreuid () is the poor man's setuid (), seteuid () */
434	# define seteuid(a) setreuid(-1, (a))	671	# define seteuid(a) setreuid(-1, (a))
435	# define setegid(a) setregid(-1, (a))	672	# define setegid(a) setregid(-1, (a))
436	# define HAVE_SETEUID	673	# define HAVE_SETEUID
437	# endif	674	# endif
438	# ifdef HAVE_SETEUID	675	# ifdef HAVE_SETEUID
439	switch (mode)	676	switch (action)
440	{	677	{
441	case IGNORE:	678	case IGNORE:
442	/*	679	/*
443	* change effective uid/gid - not real uid/gid - so we can switch	680	* change effective uid/gid - not real uid/gid - so we can switch
444	* back to root later, as required	681	* back to root later, as required
…		…
454	seteuid (euid);	691	seteuid (euid);
455	setegid (egid);	692	setegid (egid);
456	break;	693	break;
457	}	694	}
458	# else	695	# else
459	switch (mode)	696	switch (action)
460	{	697	{
461	case IGNORE:	698	case IGNORE:
462	setuid (getuid ());	699	setuid (getuid ());
463	setgid (getgid ());	700	setgid (getgid ());
464	/* FALLTHROUGH */	701	/* FALLTHROUGH */
…		…
471	#endif	708	#endif
472	}	709	}
473		710
474	#ifdef UTMP_SUPPORT	711	#ifdef UTMP_SUPPORT
475	void	712	void
476	rxvt_term::privileged_utmp (char action)	713	rxvt_term::privileged_utmp (rxvt_privaction action)
477	{	714	{
478	D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",	715	if (OPTION (Opt_utmpInhibit)
479	action, next_utmp_action, getpid ()));	716	|| !pty.name || !*pty.name)
480	if (next_utmp_action != action || (action != SAVE && action != RESTORE)
481	|| (Options & Opt_utmpInhibit)
482	|| ttydev == NULL || *ttydev == '\0')
483	return;	717	return;
484		718
485	privileges (RESTORE);	719	rxvt_privileges (RESTORE);
		720
486	if (action == SAVE)	721	if (action == SAVE)
487	{
488	next_utmp_action = RESTORE;
489	makeutent (ttydev, rs[Rs_display_name]);	722	makeutent (pty.name, rs[Rs_display_name]);
490	}
491	else	723	else
492	{ /* action == RESTORE */
493	next_utmp_action = IGNORE;
494	cleanutent ();	724	cleanutent ();
495	}	725
496	privileges (IGNORE);	726	rxvt_privileges (IGNORE);
497	}
498	#endif
499
500	#ifndef NO_SETOWNER_TTYDEV
501	void
502	rxvt_term::privileged_ttydev (char action)
503	{
504	D_MAIN ((stderr,
505	"privileged_ttydev (%c); waiting for: %c (pid: %d)",
506	action, next_tty_action, getpid ()));
507	if (next_tty_action != action || (action != SAVE && action != RESTORE)
508	|| ttydev == NULL || *ttydev == '\0')
509	return;
510
511	privileges (RESTORE);
512
513	if (action == SAVE)
514	{
515	next_tty_action = RESTORE;
516	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
517	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
518	if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
519	next_tty_action = IGNORE;
520	else
521	# endif
522
523	{
524	chown (ttydev, getuid (), ttygid); /* fail silently */
525	chmod (ttydev, ttymode);
526	# ifdef HAVE_REVOKE
527	revoke (ttydev);
528	# endif
529
530	}
531	}
532	else
533	{ /* action == RESTORE */
534	next_tty_action = IGNORE;
535	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
536	chmod (ttydev, ttyfd_stat.st_mode);
537	chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
538	# else
539	chmod (ttydev,
540	(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
541	chown (ttydev, 0, 0);
542	# endif
543
544	}
545
546	privileges (IGNORE);
547
548	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
549	D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
550	action == RESTORE ? "Restoring" : (action ==
551	SAVE ? "Saving" :
552	"UNKNOWN ERROR for"), ttydev,
553	ttyfd_stat.st_mode, ttyfd_stat.st_uid,
554	ttyfd_stat.st_gid));
555	# endif
556	}	727	}
557	#endif	728	#endif
558		729
559	/*----------------------------------------------------------------------*/	730	/*----------------------------------------------------------------------*/
560	/*	731	/*
561	* window size/position calculcations for XSizeHint and other storage.	732	* window size/position calculcations for XSizeHint and other storage.
562	* if width/height are non-zero then override calculated width/height	733	* if width/height are non-zero then override calculated width/height
563	*/	734	*/
564	void	735	void
565	rxvt_term::window_calc (unsigned int width, unsigned int height)	736	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
566	{	737	{
567	short recalc_x, recalc_y;	738	short recalc_x, recalc_y;
568	int x, y, sb_w, mb_h, flags;	739	int x, y, sb_w, mb_h, flags;
569	unsigned int w, h;	740	unsigned int w, h;
570	unsigned int max_width, max_height;	741	unsigned int max_width, max_height;
		742	dDisp;
571		743
572	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",
573	TermWin.ncol, TermWin.nrow, szHint.width,	745	ncol, nrow, szHint.width, szHint.height));
574	szHint.height));	746
575	szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;	747	szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
576	szHint.win_gravity = NorthWestGravity;	748	szHint.win_gravity = NorthWestGravity;
577	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	749	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
578		750
579	recalc_x = recalc_y = 0;	751	recalc_x = recalc_y = 0;
580	flags = 0;	752	flags = 0;
		753
581	if (!parsed_geometry)	754	if (!parsed_geometry)
582	{	755	{
583	parsed_geometry = 1;	756	parsed_geometry = 1;
		757
584	if (rs[Rs_geometry])	758	if (rs[Rs_geometry])
585	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	759	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
		760
586	if (flags & WidthValue)	761	if (flags & WidthValue)
587	{	762	{
588	TermWin.ncol = BOUND_POSITIVE_INT16 (w);	763	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
589	szHint.flags |= USSize;	764	szHint.flags |= USSize;
590	}	765	}
		766
591	if (flags & HeightValue)	767	if (flags & HeightValue)
592	{	768	{
593	TermWin.nrow = BOUND_POSITIVE_INT16 (h);	769	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
594	szHint.flags |= USSize;	770	szHint.flags |= USSize;
595	}	771	}
		772
596	if (flags & XValue)	773	if (flags & XValue)
597	{	774	{
598	szHint.x = x;	775	szHint.x = x;
599	szHint.flags |= USPosition;	776	szHint.flags |= USPosition;
		777
600	if (flags & XNegative)	778	if (flags & XNegative)
601	{	779	{
602	recalc_x = 1;	780	recalc_x = 1;
603	szHint.win_gravity = NorthEastGravity;	781	szHint.win_gravity = NorthEastGravity;
604	}	782	}
605	}	783	}
		784
606	if (flags & YValue)	785	if (flags & YValue)
607	{	786	{
608	szHint.y = y;	787	szHint.y = y;
609	szHint.flags |= USPosition;	788	szHint.flags |= USPosition;
		789
610	if (flags & YNegative)	790	if (flags & YNegative)
611	{	791	{
612	recalc_y = 1;	792	recalc_y = 1;
		793
613	if (szHint.win_gravity == NorthEastGravity)	794	if (szHint.win_gravity == NorthEastGravity)
614	szHint.win_gravity = SouthEastGravity;	795	szHint.win_gravity = SouthEastGravity;
615	else	796	else
616	szHint.win_gravity = SouthWestGravity;	797	szHint.win_gravity = SouthWestGravity;
617	}	798	}
618	}	799	}
619	}	800	}
		801
620	/* TODO: BOUNDS */	802	/* TODO: BOUNDS */
621	TermWin.width = TermWin.ncol * TermWin.fwidth;	803	width = ncol * fwidth;
622	TermWin.height = TermWin.nrow * TermWin.fheight;	804	height = nrow * fheight;
623	max_width = MAX_COLS * TermWin.fwidth;	805	max_width = MAX_COLS * fwidth;
624	max_height = MAX_ROWS * TermWin.fheight;	806	max_height = MAX_ROWS * fheight;
625		807
626	szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;	808	szHint.base_width = szHint.base_height = 2 * int_bwidth;
627		809
628	sb_w = mb_h = 0;	810	sb_w = mb_h = 0;
629	window_vt_x = window_vt_y = 0;	811	window_vt_x = window_vt_y = int_bwidth;
		812
630	if (scrollbar_visible ())	813	if (scrollbar_visible ())
631	{	814	{
632	sb_w = scrollbar_TotalWidth ();	815	sb_w = scrollbar_TotalWidth ();
633	szHint.base_width += sb_w;	816	szHint.base_width += sb_w;
634	if (! (Options & Opt_scrollBar_right))	817	if (!OPTION (Opt_scrollBar_right))
635	window_vt_x = sb_w;	818	window_vt_x += sb_w;
636	}	819	}
		820
637	if (menubar_visible ())	821	if (menubar_visible ())
638	{	822	{
639	mb_h = menuBar_TotalHeight ();	823	mb_h = menuBar_TotalHeight ();
640	szHint.base_height += mb_h;	824	szHint.base_height += mb_h;
641	window_vt_y = mb_h;	825	window_vt_y += mb_h;
642	}	826	}
		827
643	szHint.width_inc = TermWin.fwidth;	828	szHint.width_inc = fwidth;
644	szHint.height_inc = TermWin.fheight;	829	szHint.height_inc = fheight;
645	szHint.min_width = szHint.base_width + szHint.width_inc;	830	szHint.min_width = szHint.base_width + szHint.width_inc;
646	szHint.min_height = szHint.base_height + szHint.height_inc;	831	szHint.min_height = szHint.base_height + szHint.height_inc;
647		832
648	if (width && width - szHint.base_width < max_width)	833	if (newwidth && newwidth - szHint.base_width < max_width)
649	{	834	{
650	szHint.width = width;	835	szHint.width = newwidth;
651	TermWin.width = width - szHint.base_width;	836	width = newwidth - szHint.base_width;
652	}	837	}
653	else	838	else
654	{	839	{
655	MIN_IT (TermWin.width, max_width);	840	min_it (width, max_width);
656	szHint.width = szHint.base_width + TermWin.width;	841	szHint.width = szHint.base_width + width;
657	}	842	}
		843
658	if (height && height - szHint.base_height < max_height)	844	if (newheight && newheight - szHint.base_height < max_height)
659	{	845	{
660	szHint.height = height;	846	szHint.height = newheight;
661	TermWin.height = height - szHint.base_height;	847	height = newheight - szHint.base_height;
662	}	848	}
663	else	849	else
664	{	850	{
665	MIN_IT (TermWin.height, max_height);	851	min_it (height, max_height);
666	szHint.height = szHint.base_height + TermWin.height;	852	szHint.height = szHint.base_height + height;
667	}	853	}
		854
668	if (scrollbar_visible () && (Options & Opt_scrollBar_right))	855	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
669	window_sb_x = szHint.width - sb_w;	856	window_sb_x = szHint.width - sb_w;
670		857
671	if (recalc_x)	858	if (recalc_x)
672	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))	859	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
673	- szHint.width - 2 * TermWin.ext_bwidth);
674	if (recalc_y)	860	if (recalc_y)
675	szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))	861	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
676	- szHint.height - 2 * TermWin.ext_bwidth);
677		862
678	TermWin.ncol = TermWin.width / TermWin.fwidth;	863	ncol = width / fwidth;
679	TermWin.nrow = TermWin.height / TermWin.fheight;	864	nrow = height / fheight;
680	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",
681	TermWin.ncol, TermWin.nrow, szHint.width,	866	ncol, nrow, szHint.width,
682	szHint.height));	867	szHint.height));
683	return;	868	return;
684	}	869	}
685		870
686	/*----------------------------------------------------------------------*/	871	/*----------------------------------------------------------------------*/
…		…
689	* Called after a window size change.	874	* Called after a window size change.
690	*/	875	*/
691	void	876	void
692	rxvt_term::tt_winch ()	877	rxvt_term::tt_winch ()
693	{	878	{
		879	if (pty.pty < 0)
		880	return;
		881
694	struct winsize ws;	882	struct winsize ws;
695		883
696	if (cmd_fd < 0)
697	return;
698
699	ws.ws_col = TermWin.ncol;	884	ws.ws_col = ncol;
700	ws.ws_row = TermWin.nrow;	885	ws.ws_row = nrow;
701	ws.ws_xpixel = ws.ws_ypixel = 0;	886	ws.ws_xpixel = width;
702	#ifndef DEBUG_SIZE	887	ws.ws_ypixel = height;
703	(void)ioctl (cmd_fd, TIOCSWINSZ, &ws);	888	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);
704	#else	889
705	if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)	890	#if 0
706	D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));	891	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
707	# ifdef SIGWINCH
708	else if (cmd_pid) /* force through to the command */	892	if (cmd_pid) /* force through to the command */
709	kill (cmd_pid, SIGWINCH);	893	kill (-cmd_pid, SIGWINCH);
710	# endif
711	#endif	894	#endif
712	}	895	}
713		896
714	/*----------------------------------------------------------------------*/	897	/*----------------------------------------------------------------------*/
715	/* rxvt_change_font () - Switch to a new font */	898	/* set_fonts () - load and set the various fonts
716	/*	899	*
717	* init = 1 - initialize	900	* init = 1 - initialize
718	*	901	*
719	* fontname == FONT_UP - switch to bigger font	902	* fontname == FONT_UP - switch to bigger font
720	* fontname == FONT_DN - switch to smaller font	903	* fontname == FONT_DN - switch to smaller font
721	*/	904	*/
722	void	905	bool
723	rxvt_term::change_font (int init, const char *fontname)	906	rxvt_term::set_fonts ()
724	{}	907	{
		908	rxvt_fontset *fs = new rxvt_fontset (this);
		909	rxvt_fontprop prop;
725		910
726	void	911	if (!fs
727	rxvt_term::font_up_down (int n, int direction)	912	|| !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
728	{}	913	|| !fs->realize_font (1))
		914	{
		915	delete fs;
		916	return false;
		917	}
		918
		919	#if ENABLE_STYLES
		920	for (int i = RS_styleCount; --i; )
		921	if (fontset[i] != fontset[0])
		922	delete fontset[i];
		923	#endif
		924
		925	delete fontset[0];
		926	fontset[0] = fs;
		927
		928	prop = (*fs)[1]->properties ();
		929	prop.height += lineSpace;
		930	fs->set_prop (prop);
		931
		932	fwidth = prop.width;
		933	fheight = prop.height;
		934	fbase = prop.ascent;
		935
		936	for (int style = 1; style < 4; style++)
		937	{
		938	#if ENABLE_STYLES
		939	const char *res = rs[Rs_font + style];
		940
		941	if (res && !*res)
		942	fontset[style] = fontset[0];
		943	else
		944	{
		945	fontset[style] = fs = new rxvt_fontset (this);
		946	rxvt_fontprop prop2 = prop;
		947
		948	if (res)
		949	prop2.weight = prop2.slant = rxvt_fontprop::unset;
		950	else
		951	{
		952	res = fontset[0]->fontdesc;
		953
		954	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
		955	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		956	}
		957
		958	fs->populate (res);
		959	fs->set_prop (prop2);
		960	}
		961	#else
		962	fontset[style] = fontset[0];
		963	#endif
		964	}
		965
		966	if (parent[0])
		967	{
		968	resize_all_windows (0, 0, 0);
		969	scr_remap_chars ();
		970	scr_touch (true);
		971	}
		972
		973	return true;
		974	}
		975
		976	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
		977	{
		978	XChangeProperty (display->display, parent[0],
		979	prop, XA_STRING, 8, PropModeReplace,
		980	(const unsigned char *)str, len >= 0 ? len : strlen (str));
		981	}
		982
		983	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
		984	{
		985	wchar_t *ws = rxvt_mbstowcs (str, len);
		986	char *s = rxvt_wcstoutf8 (ws);
		987
		988	XChangeProperty (display->display, parent[0],
		989	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
		990	(const unsigned char *)s, strlen (s));
		991
		992	free (s);
		993	free (ws);
		994	}
729		995
730	/*----------------------------------------------------------------------*/	996	/*----------------------------------------------------------------------*/
731	/*----------------------------------------------------------------------*/	997	/*----------------------------------------------------------------------*/
732	/* xterm sequences - title, iconName, color (exptl) */	998	/* xterm sequences - title, iconName, color (exptl) */
733	void	999	void
734	rxvt_term::set_title (const char *str)	1000	rxvt_term::set_title (const char *str)
735	{	1001	{
736	#ifndef SMART_WINDOW_TITLE	1002	set_string_property (XA_WM_NAME, str);
737	XStoreName (display->display, TermWin.parent[0], str);	1003	#if ENABLE_EWMH
738	#else	1004	set_utf8_property (xa[XA_NET_WM_NAME], str);
739	char *name;
740
741	if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
742	name = NULL;
743	if (name == NULL || STRCMP (name, str))
744	XStoreName (display->display, TermWin.parent[0], str);
745	if (name)
746	XFree (name);
747	#endif	1005	#endif
748	}	1006	}
749		1007
750	void	1008	void
751	rxvt_term::set_iconName (const char *str)	1009	rxvt_term::set_icon_name (const char *str)
752	{	1010	{
753	#ifndef SMART_WINDOW_TITLE	1011	set_string_property (XA_WM_ICON_NAME, str);
754	XSetIconName (display->display, TermWin.parent[0], str);	1012	#if ENABLE_EWMH
755	#else	1013	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
756	char *name;
757
758	if (XGetIconName (display->display, TermWin.parent[0], &name))
759	name = NULL;
760	if (name == NULL || STRCMP (name, str))
761	XSetIconName (display->display, TermWin.parent[0], str);
762	if (name)
763	XFree (name);
764	#endif	1014	#endif
765	}	1015	}
766		1016
767	#ifdef XTERM_COLOR_CHANGE	1017	#ifdef XTERM_COLOR_CHANGE
768	void	1018	void
769	rxvt_term::set_window_color (int idx, const char *color)	1019	rxvt_term::set_window_color (int idx, const char *color)
770	{	1020	{
771	rxvt_color xcol;	1021	rxvt_color xcol;
772	int i;	1022	int i;
773		1023
774	if (color == NULL || *color == '\0')	1024	if (color == NULL || *color == '\0')
775	return;	1025	return;
776		1026
777	/* handle color aliases */	1027	/* handle color aliases */
778	if (isdigit (*color))	1028	if (isdigit (*color))
779	{	1029	{
780	i = atoi (color);	1030	i = atoi (color);
		1031
781	if (i >= 8 && i <= 15)	1032	if (i >= 8 && i <= 15)
782	{ /* bright colors */	1033	{ /* bright colors */
783	i -= 8;	1034	i -= 8;
784	# ifndef NO_BRIGHTCOLOR
785	PixColors[idx] = PixColors[minBrightCOLOR + i];	1035	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
786	SET_PIXCOLOR (idx);	1036	SET_PIXCOLOR (idx);
787	goto Done;	1037	goto done;
788	# endif
789
790	}	1038	}
		1039
791	if (i >= 0 && i <= 7)	1040	if (i >= 0 && i <= 7)
792	{ /* normal colors */	1041	{ /* normal colors */
793	PixColors[idx] = PixColors[minCOLOR + i];	1042	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
794	SET_PIXCOLOR (idx);	1043	SET_PIXCOLOR (idx);
795	goto Done;	1044	goto done;
796	}	1045	}
797	}	1046	}
		1047
798	if (!rXParseAllocColor (& xcol, color))	1048	if (!rXParseAllocColor (&xcol, color))
799	return;	1049	return;
		1050
800	/* XStoreColor (display->display, XCMAP, XColor*); */	1051	/* XStoreColor (display->display, display->cmap, XColor*); */
801		1052
802	/*	1053	/*
803	* FIXME: should free colors here, but no idea how to do it so instead,	1054	* FIXME: should free colors here, but no idea how to do it so instead,
804	* so just keep gobbling up the colormap	1055	* so just keep gobbling up the colormap
805	*/	1056	*/
806	# if 0	1057	# if 0
807	for (i = Color_Black; i <= Color_White; i++)	1058	for (i = Color_Black; i <= Color_White; i++)
808	if (PixColors[idx] == PixColors[i])	1059	if (pix_colors[idx] == pix_colors[i])
809	break;	1060	break;
810	if (i > Color_White)	1061	if (i > Color_White)
811	{	1062	{
812	/* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */	1063	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
813	XFreeColors (display->display, XCMAP, (PixColors + idx), 1,	1064	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
814	DisplayPlanes (display->display, display->screen));	1065	DisplayPlanes (display->display, display->screen));
815	}	1066	}
816	# endif	1067	# endif
817		1068
818	PixColors[idx] = xcol;	1069	pix_colors_focused[idx] = xcol;
819	SET_PIXCOLOR (idx);	1070	SET_PIXCOLOR (idx);
820		1071
821	/* XSetWindowAttributes attr; */	1072	/* XSetWindowAttributes attr; */
822	/* Cursor cursor; */	1073	/* Cursor cursor; */
823	Done:	1074	done:
824	if (idx == Color_bg && ! (Options & Opt_transparent))
825	XSetWindowBackground (display->display, TermWin.vt,
826	PixColors[Color_bg]);
827		1075
		1076	#if OFF_FOCUS_FADING
		1077	if (rs[Rs_fade])
		1078	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
		1079	#endif
		1080
828	/* handle Color_BD, scrollbar background, etc. */	1081	/*TODO: handle Color_BD, scrollbar background, etc. */
829		1082
830	set_colorfgbg ();
831	recolour_cursor ();	1083	recolour_cursor ();
832	/* the only reasonable way to enforce a clean update */	1084	scr_recolour ();
833	scr_poweron ();
834	}	1085	}
835		1086
836	#else	1087	#else
837	# define set_window_color (idx,color) ((void)0)	1088	# define set_window_color (idx,color) ((void)0)
838	#endif /* XTERM_COLOR_CHANGE */	1089	#endif /* XTERM_COLOR_CHANGE */
839		1090
840	void	1091	void
841	rxvt_term::recolour_cursor ()	1092	rxvt_term::recolour_cursor ()
842	{	1093	{
843	#if TODO
844	rxvt_color xcol[2];	1094	XColor xcol[2];
845		1095
846	xcol[0] = PixColors[Color_pointer];	1096	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
847	xcol[1] = PixColors[Color_bg];	1097	? pix_colors_focused[Color_pointer_fg]
		1098	: pix_colors_focused[Color_fg];
		1099	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
		1100	? pix_colors_focused[Color_pointer_bg]
		1101	: pix_colors_focused[Color_bg];
		1102
848	XQueryColors (display->display, XCMAP, xcol, 2);	1103	XQueryColors (display->display, display->cmap, xcol, 2);
849	XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));	1104	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
850	#endif
851	}	1105	}
852		1106
853	/*----------------------------------------------------------------------*/	1107	/*----------------------------------------------------------------------*/
854	/*	1108	/*
855	* find if fg/bg matches any of the normal (low-intensity) colors	1109	* find if fg/bg matches any of the normal (low-intensity) colors
856	*/	1110	*/
857	void	1111	void
858	rxvt_term::set_colorfgbg ()	1112	rxvt_term::set_colorfgbg ()
859	{	1113	{
860	unsigned int i;	1114	unsigned int i;
861	const char *xpmb = "\0";	1115	const char *xpmb = "\0";
862	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1116	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
863		1117
864	env_colorfgbg =
865	(char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);	1118	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
866	STRCPY (fstr, "default");	1119	strcpy (fstr, "default");
867	STRCPY (bstr, "default");	1120	strcpy (bstr, "default");
868	for (i = Color_Black; i <= Color_White; i++)	1121	for (i = Color_Black; i <= Color_White; i++)
869	if (PixColors[Color_fg] == PixColors[i])	1122	if (pix_colors[Color_fg] == pix_colors[i])
870	{	1123	{
871	sprintf (fstr, "%d", (i - Color_Black));	1124	sprintf (fstr, "%d", (i - Color_Black));
872	break;	1125	break;
873	}	1126	}
		1127
874	for (i = Color_Black; i <= Color_White; i++)	1128	for (i = Color_Black; i <= Color_White; i++)
875	if (PixColors[Color_bg] == PixColors[i])	1129	if (pix_colors[Color_bg] == pix_colors[i])
876	{	1130	{
877	sprintf (bstr, "%d", (i - Color_Black));	1131	sprintf (bstr, "%d", (i - Color_Black));
878	#ifdef XPM_BACKGROUND	1132	#ifdef XPM_BACKGROUND
879	xpmb = "default;";	1133	xpmb = "default;";
880	#endif	1134	#endif
881	break;	1135	break;
882	}	1136	}
883		1137
884	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1138	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
885
886	#ifndef NO_BRIGHTCOLOR
887	colorfgbg = DEFAULT_RSTYLE;
888	for (i = minCOLOR; i <= maxCOLOR; i++)
889	{
890	if (PixColors[Color_fg] == PixColors[i])
891	colorfgbg = SET_FGCOLOR (colorfgbg, i);
892	if (PixColors[Color_bg] == PixColors[i])
893	colorfgbg = SET_BGCOLOR (colorfgbg, i);
894	}
895	#endif
896	}	1139	}
897		1140
898	/*----------------------------------------------------------------------*/	1141	/*----------------------------------------------------------------------*/
899	/*
900	* Colour determination for low colour displays, routine from
901	* Hans de Goede <hans@highrise.nl>
902	*/
903		1142
904	int	1143	int
905	rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)	1144	rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
906	{	1145	{
907	if (!screen_in_out->set (display, colour))	1146	if (!screen_in_out->set (display, colour))
908	{	1147	{
909	rxvt_print_error ("can't allocate colour: %s", colour);	1148	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
910	return false;	1149	return false;
911	}	1150	}
912		1151
913	return true;	1152	return true;
914	}	1153	}
915		1154
916	/* -------------------------------------------------------------------- *	1155	/* -------------------------------------------------------------------- *
917	* - WINDOW RESIZING - *	1156	* - WINDOW RESIZING - *
918	* -------------------------------------------------------------------- */	1157	* -------------------------------------------------------------------- */
919	void	1158	void
920	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)
921	{	1160	{
922	int fix_screen;	1161	int fix_screen;
923
924	#ifdef SMART_RESIZE
925	int old_width = szHint.width, old_height = szHint.height;	1162	int old_width = szHint.width, old_height = szHint.height;
926	#endif	1163	dDisp;
927		1164
928	window_calc (width, height);	1165	window_calc (newwidth, newheight);
929	XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);	1166	XSetWMNormalHints (disp, parent[0], &szHint);
		1167
930	if (!ignoreparent)	1168	if (!ignoreparent)
931	{	1169	{
932	#ifdef SMART_RESIZE	1170	#ifdef SMART_RESIZE
933	/*	1171	/*
934	* resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>	1172	* resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
…		…
937	int x, y, x1, y1;	1175	int x, y, x1, y1;
938	int dx, dy;	1176	int dx, dy;
939	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1177	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
940	Window unused_cr;	1178	Window unused_cr;
941		1179
942	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	1180	XTranslateCoordinates (disp, parent[0], display->root,
943	0, 0, &x, &y, &unused_cr);	1181	0, 0, &x, &y, &unused_cr);
944	XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,	1182	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
945	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1183	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
946	/*	1184	/*
947	* 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
948	* our position for handles and decorations. Counter it	1186	* our position for handles and decorations. Counter it
949	*/	1187	*/
…		…
951	{	1189	{
952	x -= x1;	1190	x -= x1;
953	y -= y1;	1191	y -= y1;
954	}	1192	}
955		1193
956	x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;	1194	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
957	y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;	1195	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
958	dx = old_width - szHint.width;	1196	dx = old_width - szHint.width;
959	dy = old_height - szHint.height;	1197	dy = old_height - szHint.height;
960		1198
961	/* Check position of the center of the window */	1199	/* Check position of the center of the window */
962	if (x < x1) /* left half */	1200	if (x < x1) /* left half */
…		…
966	if (y < y1) /* top half */	1204	if (y < y1) /* top half */
967	dy = 0;	1205	dy = 0;
968	else if (y == y1) /* exact center */	1206	else if (y == y1) /* exact center */
969	dy /= 2;	1207	dy /= 2;
970		1208
971	XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,	1209	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
972	szHint.width, szHint.height);	1210	szHint.width, szHint.height);
973	#else	1211	#else
974	XResizeWindow (display->display, TermWin.parent[0], szHint.width,	1212	XResizeWindow (disp, parent[0], szHint.width, szHint.height);
975	szHint.height);
976	#endif	1213	#endif
977
978	}	1214	}
979		1215
980	fix_screen = (TermWin.ncol != prev_ncol	1216	fix_screen = ncol != prev_ncol || nrow != prev_nrow;
981	|| TermWin.nrow != prev_nrow);
982		1217
983	if (fix_screen || width != old_width || height != old_height)	1218	if (fix_screen || newwidth != old_width || newheight != old_height)
984	{	1219	{
985	if (scrollbar_visible ())	1220	if (scrollbar_visible ())
986	{	1221	{
987	XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,	1222	XMoveResizeWindow (disp, scrollBar.win,
		1223	window_sb_x, 0,
988	0, scrollbar_TotalWidth (), szHint.height);	1224	scrollbar_TotalWidth (), szHint.height);
989	resize_scrollbar ();	1225	resize_scrollbar ();
990	}	1226	}
991		1227
992	if (menubar_visible ())	1228	if (menubar_visible ())
993	XMoveResizeWindow (display->display, menuBar.win, window_vt_x,	1229	XMoveResizeWindow (disp, menuBar.win,
		1230	window_vt_x, 0,
994	0, TermWin_TotalWidth (), menuBar_TotalHeight ());	1231	width, menuBar_TotalHeight ());
995		1232
996	XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,	1233	XMoveResizeWindow (disp, vt,
997	window_vt_y, TermWin_TotalWidth (),	1234	window_vt_x, window_vt_y,
998	TermWin_TotalHeight ());	1235	width, height);
999	#ifdef RXVT_GRAPHICS	1236
1000	if (old_height)
1001	Gr_Resize (old_width - szHint.base_width,
1002	old_height - szHint.base_height);
1003	#endif
1004	scr_clear ();	1237	scr_clear ();
1005	#ifdef XPM_BACKGROUND	1238	#ifdef XPM_BACKGROUND
1006	resize_pixmap ();	1239	resize_pixmap ();
1007	#endif	1240	#endif
1008
1009	}	1241	}
1010		1242
1011	if (fix_screen || old_height == 0)	1243	if (fix_screen || old_height == 0)
1012	{	1244	{
1013	int curr_screen = -1;	1245	int curr_screen = -1;
1014	int old_ncol = prev_ncol;	1246	int old_ncol = prev_ncol;
1015		1247
1016	/* scr_reset only works on the primary screen */	1248	/* scr_reset only works on the primary screen */
1017	if (old_height) /* this is not the first time through */	1249	if (old_height) /* this is not the first time through */
1018	{	1250	{
1019	unsigned int ncol = TermWin.ncol;	1251	unsigned int ocol = ncol;
1020	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
1021	curr_screen = scr_change_screen (PRIMARY);	1253	curr_screen = scr_change_screen (PRIMARY);
1022	TermWin.ncol = ncol;	1254	ncol = ocol;
1023	}	1255	}
1024		1256
1025	scr_reset ();	1257	scr_reset ();
1026		1258
1027	if (curr_screen >= 0) /* this is not the first time through */	1259	if (curr_screen >= 0) /* this is not the first time through */
1028	{	1260	{
1029	scr_change_screen (curr_screen);	1261	scr_change_screen (curr_screen);
1030	selection_check (old_ncol != TermWin.ncol ? 4 : 0);	1262	selection_check (old_ncol != ncol ? 4 : 0);
1031	}	1263	}
1032	}	1264	}
1033		1265
1034	old_width = szHint.width;	1266	old_width = szHint.width;
1035	old_height = szHint.height;	1267	old_height = szHint.height;
		1268
		1269	#ifdef XPM_BACKGROUND
		1270	if (pixmap)
		1271	scr_touch (false);
		1272	#endif
1036		1273
1037	#ifdef USE_XIM	1274	#ifdef USE_XIM
1038	IMSetStatusPosition ();	1275	IMSetStatusPosition ();
1039	#endif	1276	#endif
1040	}	1277	}
…		…
1042	/*	1279	/*
1043	* 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.
1044	* good for toggling 80/132 columns	1281	* good for toggling 80/132 columns
1045	*/	1282	*/
1046	void	1283	void
1047	rxvt_term::set_widthheight (unsigned int width, unsigned int height)	1284	rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1048	{	1285	{
1049	XWindowAttributes wattr;	1286	XWindowAttributes wattr;
1050		1287
1051	if (width == 0 || height == 0)	1288	if (newwidth == 0 || newheight == 0)
1052	{	1289	{
1053	XGetWindowAttributes (display->display, display->root, &wattr);	1290	XGetWindowAttributes (display->display, display->root, &wattr);
		1291
1054	if (width == 0)	1292	if (newwidth == 0)
1055	width = wattr.width - szHint.base_width;	1293	newwidth = wattr.width - szHint.base_width;
1056	if (height == 0)	1294	if (newheight == 0)
1057	height = wattr.height - szHint.base_height;	1295	newheight = wattr.height - szHint.base_height;
1058	}
1059	if (width != TermWin.width || height != TermWin.height)
1060	{	1296	}
		1297
		1298	if (newwidth != width || newheight != height)
		1299	{
1061	width += szHint.base_width;	1300	newwidth += szHint.base_width;
1062	height += szHint.base_height;	1301	newheight += szHint.base_height;
1063	resize_all_windows (width, height, 0);	1302	resize_all_windows (newwidth, newheight, 0);
1064	}	1303	}
1065	}	1304	}
1066		1305
1067	/* -------------------------------------------------------------------- *	1306	/* -------------------------------------------------------------------- *
1068	* - X INPUT METHOD ROUTINES - *	1307	* - X INPUT METHOD ROUTINES - *
1069	* -------------------------------------------------------------------- */	1308	* -------------------------------------------------------------------- */
1070	#ifdef USE_XIM	1309	#ifdef USE_XIM
1071		1310
1072	void	1311	void
		1312	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
		1313	{
		1314	fg = pix_colors[Color_fg];
		1315	bg = pix_colors[Color_bg];
		1316	}
		1317
		1318	void
1073	rxvt_term::im_set_size (XRectangle *size)	1319	rxvt_term::im_set_size (XRectangle &size)
1074	{	1320	{
1075	size->x = TermWin.int_bwidth;	1321	// the int_bwidth terms make no sense to me
1076	size->y = TermWin.int_bwidth;	1322	size.x = int_bwidth;
1077	size->width = Width2Pixel (TermWin.ncol);	1323	size.y = int_bwidth;
1078	size->height = Height2Pixel (TermWin.nrow);	1324	size.width = Width2Pixel (ncol) + int_bwidth;
		1325	size.height = Height2Pixel (nrow) + int_bwidth;
1079	}	1326	}
1080		1327
1081	void	1328	void
1082	rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)	1329	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
		1330	XRectangle &status_rect,
		1331	const XRectangle &needed_rect)
1083	{	1332	{
1084	*fg = PixColors[Color_fg];	1333	preedit_rect.x = needed_rect.width;
1085	*bg = PixColors[Color_bg];	1334	preedit_rect.y = 0;
		1335	preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
		1336	preedit_rect.height = fheight;
		1337
		1338	status_rect.x = 0;
		1339	status_rect.y = 0;
		1340	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
		1341	status_rect.height = fheight;
1086	}	1342	}
1087		1343
1088	/* Checking whether input method is running. */	1344	/* Checking whether input method is running. */
1089	bool	1345	bool
1090	rxvt_term::IMisRunning ()	1346	rxvt_term::IMisRunning ()
1091	{	1347	{
1092	char *p;	1348	char *p;
1093	Atom atom;	1349	Atom atom;
1094	Window win;	1350	Window win;
1095	char server[IMBUFSIZ];	1351	char server[IMBUFSIZ];
1096		1352
1097	/* get current locale modifier */	1353	/* get current locale modifier */
1098	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1354	if ((p = XSetLocaleModifiers (NULL)) != NULL)
1099	{	1355	{
1100	STRCPY (server, "@server=");	1356	strcpy (server, "@server=");
1101	STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1357	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
		1358
1102	if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */	1359	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1103	*p = '\0';	1360	*p = '\0';
1104		1361
1105	atom = XInternAtom (display->display, server, False);	1362	atom = XInternAtom (display->display, server, False);
1106	win = XGetSelectionOwner (display->display, atom);	1363	win = XGetSelectionOwner (display->display, atom);
		1364
1107	if (win != None)	1365	if (win != None)
1108	return True;	1366	return True;
1109	}	1367	}
		1368
1110	return False;	1369	return False;
1111	}	1370	}
1112		1371
1113	void	1372	void
1114	rxvt_term::IMSendSpot ()	1373	rxvt_term::IMSendSpot ()
1115	{	1374	{
1116	XPoint spot;	1375	XPoint nspot;
1117	XVaNestedList preedit_attr;	1376	XVaNestedList preedit_attr;
1118		1377
1119	if (Input_Context == NULL	1378	if (!Input_Context
		1379	|| !focus
1120	|| !TermWin.focus || ! (input_style & XIMPreeditPosition)	1380	|| !(input_style & XIMPreeditPosition))
1121	|| ! (event_type == KeyPress
1122	|| event_type == Expose
1123	|| event_type == NoExpose
1124	|| event_type == SelectionNotify
1125	|| event_type == ButtonRelease || event_type == FocusIn)
1126	|| !IMisRunning ())
1127	return;	1381	return;
1128		1382
1129	im_set_position (&spot);	1383	im_set_position (nspot);
		1384
		1385	if (nspot.x == spot.x && nspot.y == spot.y)
		1386	return;
		1387
		1388	spot = nspot;
1130		1389
1131	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);	1390	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1132	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);	1391	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1133	XFree (preedit_attr);	1392	XFree (preedit_attr);
1134	}	1393	}
1135		1394
1136	void	1395	void
1137	rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1138	XRectangle * needed_rect)
1139	{
1140	int mbh, vtx = 0;
1141
1142	if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1143	vtx = scrollbar_TotalWidth ();
1144
1145	mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1146	mbh -= TermWin.lineSpace;
1147
1148	preedit_rect->x = needed_rect->width + vtx;
1149	preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1150
1151	preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1152	preedit_rect->height = Height2Pixel (1);
1153
1154	status_rect->x = vtx;
1155	status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1156
1157	status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1158	status_rect->height = Height2Pixel (1);
1159	}
1160
1161	void
1162	rxvt_term::im_destroy ()	1396	rxvt_term::im_destroy ()
1163	{	1397	{
1164	if (Input_Context)
1165	{
1166	XDestroyIC (Input_Context);
1167	Input_Context = NULL;
1168	}
1169
1170	if (input_method)	1398	if (input_method)
1171	{	1399	{
		1400	if (Input_Context && input_method->xim)
		1401	XDestroyIC (Input_Context);
		1402
1172	display->put_xim (input_method);	1403	display->put_xim (input_method);
1173	input_method = 0;	1404	input_method = 0;
1174	}	1405	}
		1406
		1407	Input_Context = 0;
1175	}	1408	}
1176		1409
1177	/*	1410	/*
1178	* Try to open a XIM with the current modifiers, then see if we can	1411	* Try to open a XIM with the current modifiers, then see if we can
1179	* open a suitable preedit type	1412	* open a suitable preedit type
1180	*/	1413	*/
1181	bool	1414	bool
1182	rxvt_term::IM_get_IC (const char *modifiers)	1415	rxvt_term::IM_get_IC (const char *modifiers)
1183	{	1416	{
1184	int i, j, found;	1417	int i, j, found;
1185	XIM xim;	1418	XIM xim;
1186	XPoint spot;	1419	XPoint spot;
1187	XRectangle rect, status_rect, needed_rect;	1420	XRectangle rect, status_rect, needed_rect;
1188	unsigned long fg, bg;	1421	unsigned long fg, bg;
1189	const char *p;	1422	const char *p;
1190	char **s;	1423	char **s;
1191	XIMStyles *xim_styles;	1424	XIMStyles *xim_styles;
1192	XVaNestedList preedit_attr, status_attr;
1193		1425
1194	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1426	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1195	return false;	1427	return false;
1196		1428
1197	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1429	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1198	input_method = display->get_xim (locale, modifiers);	1430	input_method = display->get_xim (locale, modifiers);
1199	if (input_method == NULL)	1431	if (input_method == NULL)
1200	return false;	1432	return false;
1201		1433
1202	xim = input_method->xim;	1434	xim = input_method->xim;
		1435	spot.x = spot.y = -1;
1203		1436
1204	xim_styles = NULL;	1437	xim_styles = NULL;
1205	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)	1438	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1206	|| !xim_styles || !xim_styles->count_styles)	1439	|| !xim_styles || !xim_styles->count_styles)
1207	{	1440	{
1208	display->put_xim (input_method);	1441	im_destroy ();
1209	return false;	1442	return false;
1210	}	1443	}
1211		1444
1212	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";	1445	const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
		1446
		1447	for (int pi = 0; pi < 2; pi++)
		1448	{
		1449	p = pet[pi];
		1450
		1451	if (!p)
		1452	continue;
		1453
1213	s = rxvt_splitcommastring (p);	1454	s = rxvt_splitcommastring (p);
		1455
1214	for (i = found = 0; !found && s[i]; i++)	1456	for (i = found = 0; !found && s[i]; i++)
1215	{	1457	{
1216	if (!STRCMP (s[i], "OverTheSpot"))	1458	if (!strcmp (s[i], "OverTheSpot"))
1217	input_style = (XIMPreeditPosition | XIMStatusNothing);	1459	input_style = (XIMPreeditPosition | XIMStatusNothing);
1218	else if (!STRCMP (s[i], "OffTheSpot"))	1460	else if (!strcmp (s[i], "OffTheSpot"))
1219	input_style = (XIMPreeditArea | XIMStatusArea);	1461	input_style = (XIMPreeditArea | XIMStatusArea);
1220	else if (!STRCMP (s[i], "Root"))	1462	else if (!strcmp (s[i], "Root"))
1221	input_style = (XIMPreeditNothing | XIMStatusNothing);	1463	input_style = (XIMPreeditNothing | XIMStatusNothing);
		1464	else if (!strcmp (s[i], "None"))
		1465	input_style = (XIMPreeditNone | XIMStatusNone);
1222		1466
1223	for (j = 0; j < xim_styles->count_styles; j++)	1467	for (j = 0; j < xim_styles->count_styles; j++)
1224	if (input_style == xim_styles->supported_styles[j])	1468	if (input_style == xim_styles->supported_styles[j])
1225	{	1469	{
		1470	rxvt_freecommastring (s);
		1471
1226	found = 1;	1472	found = 1;
1227	break;	1473	goto foundpet;
		1474	}
		1475
1228	}	1476	}
1229	}
1230		1477
1231	for (i = 0; s[i]; i++)	1478	rxvt_freecommastring (s);
1232	free (s[i]);	1479	}
1233		1480
1234	free (s);	1481	foundpet:
		1482
1235	XFree (xim_styles);	1483	XFree (xim_styles);
1236		1484
1237	if (!found)	1485	if (!found)
1238	{	1486	{
1239	display->put_xim (input_method);	1487	im_destroy ();
1240	return false;	1488	return false;
1241	}	1489	}
1242		1490
1243	preedit_attr = status_attr = NULL;	1491	XFontSet fs = 0;
		1492	XVaNestedList preedit_attr = 0, status_attr = 0;
		1493
		1494	if (input_style & (XIMPreeditPosition | XIMPreeditArea))
		1495	{
		1496	// fake us a font-set, please
		1497	char **missing_charset_list;
		1498	int missing_charset_count;
		1499	char *def_string;
		1500	char pat[512];
		1501
		1502	sprintf (pat,
		1503	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1504	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1505	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1506	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1507	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1508	"*",
		1509	fheight,
		1510	fheight + 1, fheight - 1,
		1511	fheight - 2, fheight + 2);
		1512
		1513	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
		1514	&missing_charset_list, &missing_charset_count, &def_string);
		1515
		1516	if (missing_charset_list)
		1517	XFreeStringList (missing_charset_list);
		1518
		1519	if (!fs)
		1520	{
		1521	input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
		1522	rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
		1523	}
		1524	}
1244		1525
1245	if (input_style & XIMPreeditPosition)	1526	if (input_style & XIMPreeditPosition)
1246	{	1527	{
1247	im_set_size (&rect);	1528	im_set_size (rect);
1248	im_set_position (&spot);	1529	im_set_position (spot);
1249	im_set_color (&fg, &bg);	1530	im_set_color (fg, bg);
1250		1531
1251	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1532	preedit_attr = XVaCreateNestedList (0,
		1533	XNForeground, fg,
		1534	XNBackground, bg,
		1535	XNArea, &rect,
1252	XNSpotLocation, &spot,	1536	XNSpotLocation, &spot,
1253	XNForeground, fg, XNBackground, bg,
1254	//XNFontSet, TermWin.fontset,	1537	XNFontSet, fs,
1255	NULL);	1538	NULL);
1256	}	1539	}
1257	else if (input_style & XIMPreeditArea)	1540	else if (input_style & XIMPreeditArea)
1258	{	1541	{
1259	im_set_color (&fg, &bg);	1542	im_set_color (fg, bg);
1260		1543
1261	/*	1544	/*
1262	* The necessary width of preedit area is unknown	1545	* The necessary width of preedit area is unknown
1263	* until create input context.	1546	* until create input context.
1264	*/	1547	*/
1265	needed_rect.width = 0;	1548	needed_rect.width = 0;
1266
1267	im_set_preedit_area (&rect, &status_rect, &needed_rect);	1549	im_set_preedit_area (rect, status_rect, needed_rect);
1268		1550
1269	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1551	preedit_attr = XVaCreateNestedList (0,
		1552	XNForeground, fg,
1270	XNForeground, fg, XNBackground, bg,	1553	XNBackground, bg,
		1554	XNArea, &rect,
		1555	XNFontSet, fs,
		1556	NULL);
		1557	status_attr = XVaCreateNestedList (0,
		1558	XNForeground, fg,
		1559	XNBackground, bg,
		1560	XNArea, &status_rect,
1271	//XNFontSet, TermWin.fontset,	1561	XNFontSet, fs,
1272	NULL);	1562	NULL);
1273	status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1274	XNForeground, fg, XNBackground, bg,
1275	//XNFontSet, TermWin.fontset,
1276	NULL);
1277	}	1563	}
1278		1564
1279	Input_Context = XCreateIC (xim, XNInputStyle, input_style,	1565	Input_Context = XCreateIC (xim,
		1566	XNInputStyle, input_style,
1280	XNClientWindow, TermWin.parent[0],	1567	XNClientWindow, vt,
1281	XNFocusWindow, TermWin.parent[0],	1568	XNFocusWindow, parent[0],
1282	preedit_attr ? XNPreeditAttributes : NULL,	1569	preedit_attr ? XNPreeditAttributes : NULL,
1283	preedit_attr,	1570	preedit_attr,
1284	status_attr ? XNStatusAttributes : NULL,	1571	status_attr ? XNStatusAttributes : NULL,
1285	status_attr, NULL);	1572	status_attr, NULL);
		1573
1286	if (preedit_attr) XFree (preedit_attr);	1574	if (preedit_attr) XFree (preedit_attr);
1287	if (status_attr) XFree (status_attr);	1575	if (status_attr) XFree (status_attr);
		1576	if (fs) XFreeFontSet (display->display, fs);
1288		1577
1289	if (Input_Context == NULL)	1578	if (Input_Context == NULL)
1290	{	1579	{
1291	rxvt_print_error ("failed to create input context");	1580	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1292	display->put_xim (input_method);	1581	im_destroy ();
1293	return false;	1582	return false;
1294	}	1583	}
1295		1584
1296	if (input_style & XIMPreeditArea)	1585	if (input_style & XIMPreeditArea)
1297	IMSetStatusPosition ();	1586	IMSetStatusPosition ();
…		…
1301	}	1590	}
1302		1591
1303	void	1592	void
1304	rxvt_term::im_cb ()	1593	rxvt_term::im_cb ()
1305	{	1594	{
1306	int i, found, had_im;	1595	int i;
1307	const char *p;	1596	const char *p;
1308	char **s;	1597	char **s;
1309	char buf[IMBUFSIZ];	1598	char buf[IMBUFSIZ];
1310		1599
		1600	SET_R (this);
		1601
1311	im_destroy ();	1602	im_destroy ();
1312		1603
1313	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1604	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1314	if (Input_Context)	1605	if (Input_Context)
1315	return;	1606	return;
1316		1607
1317	#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)	1608	#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1318	if (rs[Rs_imLocale])	1609	if (rs[Rs_imLocale])
1319	setlocale (LC_CTYPE, rs[Rs_imLocale]);	1610	SET_LOCALE (rs[Rs_imLocale]);
1320	#endif	1611	#endif
1321		1612
1322	p = rs[Rs_inputMethod];	1613	p = rs[Rs_inputMethod];
1323	if (p && *p)	1614	if (p && *p)
1324	{	1615	{
1325	bool found = false;	1616	bool found = false;
1326		1617
1327	s = rxvt_splitcommastring (p);	1618	s = rxvt_splitcommastring (p);
		1619
1328	for (i = 0; s[i]; i++)	1620	for (i = 0; s[i]; i++)
1329	{	1621	{
1330	if (*s[i])	1622	if (*s[i])
1331	{	1623	{
1332	STRCPY (buf, "@im=");	1624	strcpy (buf, "@im=");
1333	STRNCAT (buf, s[i], IMBUFSIZ - 5);	1625	strncat (buf, s[i], IMBUFSIZ - 5);
1334	if (IM_get_IC (buf))	1626	if (IM_get_IC (buf))
1335	{	1627	{
1336	found = true;	1628	found = true;
1337	break;	1629	break;
1338	}	1630	}
1339	}	1631	}
1340	}	1632	}
1341	for (i = 0; s[i]; i++)	1633
1342	free (s[i]);	1634	rxvt_freecommastring (s);
1343	free (s);
1344		1635
1345	if (found)	1636	if (found)
1346	goto done;	1637	goto done;
1347	}	1638	}
1348		1639
…		…
1355	goto done;	1646	goto done;
1356		1647
1357	done:	1648	done:
1358	#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)	1649	#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1359	if (rs[Rs_imLocale])	1650	if (rs[Rs_imLocale])
1360	setlocale (LC_CTYPE, locale);	1651	SET_LOCALE (locale);
1361	#endif	1652	#endif
1362	}	1653	}
1363		1654
1364	void	1655	void
1365	rxvt_term::IMSetStatusPosition ()	1656	rxvt_term::IMSetStatusPosition ()
1366	{	1657	{
1367	XRectangle preedit_rect, status_rect, *needed_rect;	1658	XRectangle preedit_rect, status_rect, *needed_rect;
1368	XVaNestedList preedit_attr, status_attr;	1659	XVaNestedList preedit_attr, status_attr;
1369		1660
1370	if (Input_Context == NULL	1661	if (!Input_Context
		1662	|| !focus
1371	|| !TermWin.focus || ! (input_style & XIMPreeditArea)	1663	|| !(input_style & XIMPreeditArea)
1372	|| !IMisRunning ())	1664	|| !IMisRunning ())
1373	return;	1665	return;
1374		1666
1375	/* Getting the necessary width of preedit area */	1667	/* Getting the necessary width of preedit area */
1376	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1668	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1377	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1669	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1378	XFree (status_attr);	1670	XFree (status_attr);
1379		1671
1380	im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);	1672	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
		1673	XFree (needed_rect);
1381		1674
1382	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1675	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1383	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1676	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1384		1677
1385	XSetICValues (Input_Context,	1678	XSetICValues (Input_Context,
1386	XNPreeditAttributes, preedit_attr,	1679	XNPreeditAttributes, preedit_attr,
1387	XNStatusAttributes, status_attr, NULL);	1680	XNStatusAttributes, status_attr, NULL);
1388		1681
1389	XFree (preedit_attr);	1682	XFree (preedit_attr);
1390	XFree (status_attr);	1683	XFree (status_attr);
1391	}	1684	}
1392	#endif /* USE_XIM */	1685	#endif /* USE_XIM */

Diff Legend

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