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

Diff Legend

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