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

Diff Legend

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