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.108 by root, Wed Aug 25 05:03:33 2004 UTC vs.
Revision 1.258 by ayin, Thu Nov 15 11:36:15 2007 UTC

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

Diff Legend

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