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

Diff Legend

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