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

Diff Legend

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