[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.302 by root, Fri Jan 25 16:04:57 2008 UTC vs.
Revision 1.355 by sf-exg, Thu Apr 7 12:19:40 2011 UTC

…		…
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-2008 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2010 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 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "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 <cassert>
40	#include <csignal>	42	#include <csignal>
41	#include <cstring>	43	#include <cstring>
42		44
43	#include <termios.h>	45	#include <termios.h>
44		46
…		…
49	# ifdef HAVE_SETLOCALE	51	# ifdef HAVE_SETLOCALE
50	# include <clocale>	52	# include <clocale>
51	# endif	53	# endif
52	#endif	54	#endif
53		55
		56	struct termios rxvt_term::def_tio;
54	vector<rxvt_term *> rxvt_term::termlist;	57	vector<rxvt_term *> rxvt_term::termlist;
55		58
56	// used to tell global functions which terminal instance is "active"	59	// used to tell global functions which terminal instance is "active"
57	rxvt_t rxvt_current_term;	60	rxvt_t rxvt_current_term;
58		61
…		…
93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	96	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94	{	97	{
95	compose_char *cc;	98	compose_char *cc;
96		99
97	// break compose chains, as stupid readline really likes to duplicate	100	// break compose chains, as stupid readline really likes to duplicate
98	// composing characters for some reason near the end of a line.	101	// composing characters for some reason, near the end of a line.
99	cc = (*this)[c1];	102	cc = (*this)[c1];
100	while (cc)	103	while (cc)
101	{	104	{
102	if (cc->c2 == c2) return c1;	105	if (cc->c2 == c2) return c1;
103	cc = (*this)[cc->c1];	106	cc = (*this)[cc->c1];
104	}	107	}
105		108
106	// check to see wether this combination already exists otherwise	109	// check to see whether this combination already exists otherwise
107	for (cc = v.end (); cc-- > v.begin (); )	110	for (cc = v.end (); cc-- > v.begin (); )
108	{
109	if (cc->c1 == c1 && cc->c2 == c2)	111	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	112	return COMPOSE_LO + (cc - v.begin ());
111	}
112		113
113	// allocate a new combination	114	// allocate a new combination
114	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	115	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115	{	116	{
116	static int seen;	117	static int seen;
117		118
118	if (!seen++)	119	if (!seen++)
119	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");	120	rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120		121
121	return REPLACEMENT_CHAR;	122	return REPLACEMENT_CHAR;
122	}	123	}
123		124
124	v.push_back (compose_char (c1, c2));	125	v.push_back (compose_char (c1, c2));
…		…
172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	173	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173	#endif	174	#endif
174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	175	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	176	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176	#endif	177	#endif
177	#ifdef HAVE_SCROLLBARS
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#endif
180	#ifdef USE_XIM	179	#ifdef USE_XIM
181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	180	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182	#endif	181	#endif
183	#ifdef POINTER_BLANK	182	#ifdef POINTER_BLANK
184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	183	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
…		…
188	#endif	187	#endif
189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	188	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);	189	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	190	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	191	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196		194
197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198		196
…		…
227	delete fontset[i];	225	delete fontset[i];
228	#endif	226	#endif
229	delete fontset[0];	227	delete fontset[0];
230		228
231	#ifdef HAVE_BG_PIXMAP	229	#ifdef HAVE_BG_PIXMAP
232	bgPixmap.destroy ();	230	bg_destroy ();
233	#endif	231	#endif
234		232
235	if (display)	233	if (display)
236	{	234	{
237	selection_clear ();	235	selection_clear ();
		236	selection_clear (true);
238		237
239	#ifdef USE_XIM	238	#ifdef USE_XIM
240	im_destroy ();	239	im_destroy ();
241	#endif	240	#endif
242	#ifdef XTERM_SCROLLBAR	241	scrollBar.destroy ();
243	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
244	if (ShadowGC) XFreeGC (dpy, ShadowGC);
245	#endif
246	#ifdef PLAIN_SCROLLBAR
247	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
248	#endif
249	#ifdef NEXT_SCROLLBAR
250	if (blackGC) XFreeGC (dpy, blackGC);
251	if (whiteGC) XFreeGC (dpy, whiteGC);
252	if (grayGC) XFreeGC (dpy, grayGC);
253	if (darkGC) XFreeGC (dpy, darkGC);
254	if (stippleGC) XFreeGC (dpy, stippleGC);
255	if (dimple) XFreePixmap (dpy, dimple);
256	if (upArrow) XFreePixmap (dpy, upArrow);
257	if (downArrow) XFreePixmap (dpy, downArrow);
258	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
259	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
260	#endif
261	#ifdef RXVT_SCROLLBAR
262	if (topShadowGC) XFreeGC (dpy, topShadowGC);
263	if (botShadowGC) XFreeGC (dpy, botShadowGC);
264	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
265	#endif
266	if (gc) XFreeGC (dpy, gc);	242	if (gc) XFreeGC (dpy, gc);
267		243
268	delete drawable;	244	delete drawable;
269	// destroy all windows	245	// destroy all windows
270	if (parent[0])	246	if (parent)
271	XDestroyWindow (dpy, parent[0]);	247	XDestroyWindow (dpy, parent);
272		248
273	for (int i = 0; i < TOTAL_COLORS; i++)	249	for (int i = 0; i < TOTAL_COLORS; i++)
274	if (ISSET_PIXCOLOR (i))	250	if (ISSET_PIXCOLOR (i))
275	{	251	{
276	pix_colors_focused [i].free (this);	252	pix_colors_focused [i].free (this);
…		…
290	/* clear all resources */	266	/* clear all resources */
291	for (int i = 0; i < allocated.size (); i++)	267	for (int i = 0; i < allocated.size (); i++)
292	free (allocated [i]);	268	free (allocated [i]);
293		269
294	free (selection.text);	270	free (selection.text);
		271	free (selection.clip_text);
295	// TODO: manage env vars in child only(!)	272	// TODO: manage env vars in child only(!)
296	free (env_display);	273	free (env_display);
297	free (env_term);	274	free (env_term);
298	free (locale);	275	free (locale);
299	free (v_buffer);	276	free (v_buffer);
300	free (incr_buf);	277
		278	delete selection_req;
301		279
302	delete envv;	280	delete envv;
303	delete argv;	281	delete argv;
304		282
305	#ifdef KEYSYM_RESOURCE	283	#ifdef KEYSYM_RESOURCE
…		…
337	if (display)	315	if (display)
338	{	316	{
339	#if USE_XIM	317	#if USE_XIM
340	im_ev.stop (display);	318	im_ev.stop (display);
341	#endif	319	#endif
342	#if HAVE_SCROLLBARS
343	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
344	#endif
345	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
346	rootwin_ev.stop (display);	322	rootwin_ev.stop (display);
347	#endif	323	#endif
348	incr_ev.stop ();
349	termwin_ev.stop (display);	324	termwin_ev.stop (display);
350	vt_ev.stop (display);	325	vt_ev.stop (display);
351	}	326	}
352		327
353	flush_ev.stop ();	328	flush_ev.stop ();
…		…
375	rxvt_term::destroy_cb (ev::idle &w, int revents)	350	rxvt_term::destroy_cb (ev::idle &w, int revents)
376	{	351	{
377	make_current ();	352	make_current ();
378		353
379	delete this;	354	delete this;
		355	}
		356
		357	void
		358	rxvt_term::set_option (uint8_t opt, bool set)
		359	{
		360	if (!opt)
		361	return;
		362
		363	uint8_t mask = 1 << (opt & 7);
		364	uint8_t &val = options [opt >> 3];
		365
		366	val = val & ~mask \| (set ? mask : 0);
380	}	367	}
381		368
382	/----------------------------------------------------------------------/	369	/----------------------------------------------------------------------/
383	/*	370	/*
384	* Exit gracefully, clearing the utmp entry and restoring tty attributes	371	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
398	print_x_error (Display dpy, XErrorEvent event)	385	print_x_error (Display dpy, XErrorEvent event)
399	{	386	{
400	char buffer[BUFSIZ];	387	char buffer[BUFSIZ];
401	char mesg[BUFSIZ];	388	char mesg[BUFSIZ];
402	char number[32];	389	char number[32];
403	char *mtype = "XlibMessage";	390	const char mtype[] = "XlibMessage";
404	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	391	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	392	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406	rxvt_warn ("An X Error occured, trying to continue after report.\n");	393	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407	rxvt_warn ("%s: %s\n", mesg, buffer);	394	rxvt_warn ("%s: %s\n", mesg, buffer);
408	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	395	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	396	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410	sprintf(number, "%d", event->request_code);	397	sprintf(number, "%d", event->request_code);
411	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	398	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412	rxvt_warn ("(which is %s)\n", buffer);	399	rxvt_warn ("(which is %s)\n", buffer);
413	if (event->request_code >= 128) {	400	if (event->request_code >= 128) {
414	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	401	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415	mesg, BUFSIZ);	402	mesg, BUFSIZ);
416	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417	}	404	}
418	if ((event->error_code == BadWindow) \|\|	405	if ((event->error_code == BadWindow) \|\|
419	(event->error_code == BadPixmap) \|\|	406	(event->error_code == BadPixmap) \|\|
420	(event->error_code == BadCursor) \|\|	407	(event->error_code == BadCursor) \|\|
421	(event->error_code == BadFont) \|\|	408	(event->error_code == BadFont) \|\|
422	(event->error_code == BadDrawable) \|\|	409	(event->error_code == BadDrawable) \|\|
423	(event->error_code == BadColor) \|\|	410	(event->error_code == BadColor) \|\|
424	(event->error_code == BadGC) \|\|	411	(event->error_code == BadGC) \|\|
425	(event->error_code == BadIDChoice) \|\|	412	(event->error_code == BadIDChoice) \|\|
426	(event->error_code == BadValue) \|\|	413	(event->error_code == BadValue) \|\|
427	(event->error_code == BadAtom)) {	414	(event->error_code == BadAtom)) {
428	if (event->error_code == BadValue)	415	if (event->error_code == BadValue)
429	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	416	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430	mesg, BUFSIZ);	417	mesg, BUFSIZ);
431	else if (event->error_code == BadAtom)	418	else if (event->error_code == BadAtom)
432	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	419	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433	mesg, BUFSIZ);	420	mesg, BUFSIZ);
434	else	421	else
435	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	422	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436	mesg, BUFSIZ);	423	mesg, BUFSIZ);
437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	424	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438	}	425	}
439	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	426	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440	mesg, BUFSIZ);	427	mesg, BUFSIZ);
441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442	}	429	}
443	#endif	430	#endif
444		431
445	int	432	int
…		…
492	rxvt_emergency_cleanup ();	479	rxvt_emergency_cleanup ();
493	w.stop ();	480	w.stop ();
494	kill (getpid (), w.signum);	481	kill (getpid (), w.signum);
495	}	482	}
496		483
		484	static void
		485	rxvt_get_ttymode (struct termios *tio)
		486	{
		487	if (tcgetattr (STDIN_FILENO, tio) < 0)
		488	memset (tio, 0, sizeof (struct termios));
		489
		490	for (int i = 0; i < NCCS; i++)
		491	tio->c_cc[i] = VDISABLE;
		492
		493	tio->c_cc[VINTR] = CINTR;
		494	tio->c_cc[VQUIT] = CQUIT;
		495	tio->c_cc[VERASE] = CERASE;
		496	#ifdef VERASE2
		497	tio->c_cc[VERASE2] = CERASE2;
		498	#endif
		499	tio->c_cc[VKILL] = CKILL;
		500	tio->c_cc[VEOF] = CEOF;
		501	tio->c_cc[VSTART] = CSTART;
		502	tio->c_cc[VSTOP] = CSTOP;
		503	tio->c_cc[VSUSP] = CSUSP;
		504	# ifdef VDSUSP
		505	tio->c_cc[VDSUSP] = CDSUSP;
		506	# endif
		507	# ifdef VREPRINT
		508	tio->c_cc[VREPRINT] = CRPRNT;
		509	# endif
		510	# ifdef VDISCRD
		511	tio->c_cc[VDISCRD] = CFLUSH;
		512	# endif
		513	# ifdef VWERSE
		514	tio->c_cc[VWERSE] = CWERASE;
		515	# endif
		516	# ifdef VLNEXT
		517	tio->c_cc[VLNEXT] = CLNEXT;
		518	# endif
		519	# ifdef VSTATUS
		520	tio->c_cc[VSTATUS] = CSTATUS;
		521	# endif
		522
		523	# if VMIN != VEOF
		524	tio->c_cc[VMIN] = 1;
		525	# endif
		526	# if VTIME != VEOL
		527	tio->c_cc[VTIME] = 0;
		528	# endif
		529
		530	/* input modes */
		531	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		532	# ifdef IMAXBEL
		533	\| IMAXBEL
		534	# endif
		535	\| IXON);
		536
		537	/* output modes */
		538	tio->c_oflag = (OPOST \| ONLCR);
		539
		540	/* control modes */
		541	tio->c_cflag = (CS8 \| CREAD);
		542
		543	/* local modes */
		544	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		545	# if defined (ECHOCTL) && defined (ECHOKE)
		546	\| ECHOCTL \| ECHOKE
		547	# endif
		548	\| ECHOE \| ECHOK);
		549	}
		550
497	char **rxvt_environ; // startup environment	551	char **rxvt_environ; // startup environment
498		552
499	void	553	void
500	rxvt_init ()	554	rxvt_init ()
501	{	555	{
502	ptytty::init ();	556	assert (("fontMask must not overlap other RS masks",
		557	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
503		558
		559	rxvt_get_ttymode (&rxvt_term::def_tio);
		560
		561	// get rid of stdin/stdout as we don't need them, to free resources
		562	dup2 (STDERR_FILENO, STDIN_FILENO);
		563	dup2 (STDERR_FILENO, STDOUT_FILENO);
		564
504	if (!ev_default_loop (0))	565	if (!ev_default_loop ())
505	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	566	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
506		567
507	rxvt_environ = environ;	568	rxvt_environ = environ;
508		569
509	signal (SIGHUP, SIG_IGN);	570	signal (SIGHUP, SIG_IGN);
510	signal (SIGPIPE, SIG_IGN);	571	signal (SIGPIPE, SIG_IGN);
511		572
512	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	573	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
513	sig_handlers.sw_int.start (SIGINT); ev_unref ();	574	sig_handlers.sw_int.start (SIGINT); ev_unref ();
514
515	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
516	/* signal (SIGURG, SIG_DFL); */
517		575
518	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	576	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
519	// TODO: handle this with exceptions and tolerate the memory loss	577	// TODO: handle this with exceptions and tolerate the memory loss
520	XSetIOErrorHandler (rxvt_xioerror_handler);	578	XSetIOErrorHandler (rxvt_xioerror_handler);
521		579
…		…
529	*/	587	*/
530	void	588	void
531	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	589	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
532	{	590	{
533	short recalc_x, recalc_y;	591	short recalc_x, recalc_y;
534	int x, y, sb_w, flags;	592	int x, y, flags;
535	unsigned int w, h;	593	unsigned int w, h;
536	unsigned int max_width, max_height;	594	unsigned int max_width, max_height;
537		595
538	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	596	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
539	szHint.win_gravity = NorthWestGravity;	597	szHint.win_gravity = NorthWestGravity;
…		…
549	if (rs[Rs_geometry])	607	if (rs[Rs_geometry])
550	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	608	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
551		609
552	if (flags & WidthValue)	610	if (flags & WidthValue)
553	{	611	{
		612	if (!w)
		613	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		614
554	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	615	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
555	szHint.flags \|= USSize;	616	szHint.flags \|= USSize;
556	}	617	}
557		618
558	if (flags & HeightValue)	619	if (flags & HeightValue)
559	{	620	{
		621	if (!h)
		622	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		623
560	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	624	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
561	szHint.flags \|= USSize;	625	szHint.flags \|= USSize;
562	}	626	}
563		627
564	if (flags & XValue)	628	if (flags & XValue)
565	{	629	{
…		…
596	max_width = MAX_COLS * fwidth;	660	max_width = MAX_COLS * fwidth;
597	max_height = MAX_ROWS * fheight;	661	max_height = MAX_ROWS * fheight;
598		662
599	szHint.base_width = szHint.base_height = 2 * int_bwidth;	663	szHint.base_width = szHint.base_height = 2 * int_bwidth;
600		664
601	sb_w = 0;
602	window_vt_x = window_vt_y = int_bwidth;	665	window_vt_x = window_vt_y = int_bwidth;
603		666
604	if (scrollBar.state)	667	if (scrollBar.state)
605	{	668	{
606	sb_w = scrollbar_TotalWidth ();	669	int sb_w = scrollBar.total_width ();
607	szHint.base_width += sb_w;	670	szHint.base_width += sb_w;
608		671
609	if (!option (Opt_scrollBar_right))	672	if (!option (Opt_scrollBar_right))
610	window_vt_x += sb_w;	673	window_vt_x += sb_w;
611	}	674	}
…		…
635	{	698	{
636	min_it (height, max_height);	699	min_it (height, max_height);
637	szHint.height = szHint.base_height + height;	700	szHint.height = szHint.base_height + height;
638	}	701	}
639		702
640	if (scrollBar.state && option (Opt_scrollBar_right))
641	window_sb_x = szHint.width - sb_w;
642
643	if (recalc_x)	703	if (recalc_x)
644	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	704	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
645		705
646	if (recalc_y)	706	if (recalc_y)
647	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	707	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
648		708
649	ncol = width / fwidth;	709	ncol = width / fwidth;
650	nrow = height / fheight;	710	nrow = height / fheight;
651	}	711	}
652		712
653	/----------------------------------------------------------------------/	713	/----------------------------------------------------------------------/
654	/*	714	/*
…		…
665		725
666	ws.ws_col = ncol;	726	ws.ws_col = ncol;
667	ws.ws_row = nrow;	727	ws.ws_row = nrow;
668	ws.ws_xpixel = width;	728	ws.ws_xpixel = width;
669	ws.ws_ypixel = height;	729	ws.ws_ypixel = height;
670	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	730	ioctl (pty->pty, TIOCSWINSZ, &ws);
671		731
672	#if 0	732	#if 0
673	// TIOCSWINSZ is supposed to do this automatically and correctly	733	// TIOCSWINSZ is supposed to do this automatically and correctly
674	if (cmd_pid) /* force through to the command */	734	if (cmd_pid) /* force through to the command */
675	kill (-cmd_pid, SIGWINCH);	735	kill (-cmd_pid, SIGWINCH);
…		…
705	#endif	765	#endif
706		766
707	delete fontset[0];	767	delete fontset[0];
708	fontset[0] = fs;	768	fontset[0] = fs;
709		769
710	prop = (*fs)[1]->properties ();	770	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
711	prop.height += lineSpace;	771	prop.height += lineSpace;
		772	prop.width += letterSpace;
712		773
713	fs->set_prop (prop, false);	774	fs->set_prop (prop, false);
714		775
715	fwidth = prop.width;	776	fwidth = prop.width;
716	fheight = prop.height;	777	fheight = prop.height;
…		…
747	#else	808	#else
748	fontset[style] = fontset[0];	809	fontset[style] = fontset[0];
749	#endif	810	#endif
750	}	811	}
751		812
752	if (parent[0])	813	if (parent)
753	{	814	{
754	resize_all_windows (0, 0, 0);	815	resize_all_windows (0, 0, 0);
755	scr_remap_chars ();	816	scr_remap_chars ();
756	scr_touch (true);	817	scr_touch (true);
757	}	818	}
…		…
760	}	821	}
761		822
762	void	823	void
763	rxvt_term::set_string_property (Atom prop, const char *str, int len)	824	rxvt_term::set_string_property (Atom prop, const char *str, int len)
764	{	825	{
765	XChangeProperty (dpy, parent[0],	826	XChangeProperty (dpy, parent,
766	prop, XA_STRING, 8, PropModeReplace,	827	prop, XA_STRING, 8, PropModeReplace,
767	(const unsigned char *)str, len >= 0 ? len : strlen (str));	828	(const unsigned char *)str, len >= 0 ? len : strlen (str));
768	}	829	}
769		830
770	void	831	void
		832	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		833	{
		834	XTextProperty ct;
		835
		836	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		837	{
		838	XSetTextProperty (dpy, parent, &ct, prop);
		839	XFree (ct.value);
		840	}
		841	}
		842
		843	void
771	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	844	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
772	{	845	{
773	wchar_t *ws = rxvt_mbstowcs (str, len);	846	wchar_t *ws = rxvt_mbstowcs (str, len);
774	char *s = rxvt_wcstoutf8 (ws);	847	char *s = rxvt_wcstoutf8 (ws);
775		848
776	XChangeProperty (dpy, parent[0],	849	XChangeProperty (dpy, parent,
777	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	850	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
778	(const unsigned char *)s, strlen (s));	851	(const unsigned char *)s, strlen (s));
779		852
780	free (s);	853	free (s);
781	free (ws);	854	free (ws);
…		…
785	/----------------------------------------------------------------------/	858	/----------------------------------------------------------------------/
786	/* xterm sequences - title, iconName, color (exptl) */	859	/* xterm sequences - title, iconName, color (exptl) */
787	void	860	void
788	rxvt_term::set_title (const char *str)	861	rxvt_term::set_title (const char *str)
789	{	862	{
790	set_string_property (XA_WM_NAME, str);	863	set_mbstring_property (XA_WM_NAME, str);
791	#if ENABLE_EWMH	864	#if ENABLE_EWMH
792	set_utf8_property (xa[XA_NET_WM_NAME], str);	865	set_utf8_property (xa[XA_NET_WM_NAME], str);
793	#endif	866	#endif
794	}	867	}
795		868
796	void	869	void
797	rxvt_term::set_icon_name (const char *str)	870	rxvt_term::set_icon_name (const char *str)
798	{	871	{
799	set_string_property (XA_WM_ICON_NAME, str);	872	set_mbstring_property (XA_WM_ICON_NAME, str);
800	#if ENABLE_EWMH	873	#if ENABLE_EWMH
801	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	874	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
802	#endif	875	#endif
803	}	876	}
804		877
805	void	878	void
806	rxvt_term::set_window_color (int idx, const char *color)	879	rxvt_term::set_window_color (int idx, const char *color)
807	{	880	{
808	#ifdef XTERM_COLOR_CHANGE	881	#ifdef XTERM_COLOR_CHANGE
809	rxvt_color xcol;	882	rxvt_color xcol;
810	int i;
811		883
812	if (color == NULL \|\| *color == '\0')	884	if (color == NULL \|\| *color == '\0')
813	return;	885	return;
814		886
815	color = strdup (color);	887	color = strdup (color);
…		…
817	rs[Rs_color + idx] = color;	889	rs[Rs_color + idx] = color;
818		890
819	/* handle color aliases */	891	/* handle color aliases */
820	if (isdigit (*color))	892	if (isdigit (*color))
821	{	893	{
822	i = atoi (color);	894	int i = atoi (color);
823		895
824	if (i >= 8 && i <= 15)	896	if (i >= 8 && i <= 15)
825	{	897	{
826	/* bright colors */	898	/* bright colors */
827	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	899	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
877	void	949	void
878	rxvt_term::set_colorfgbg ()	950	rxvt_term::set_colorfgbg ()
879	{	951	{
880	unsigned int i;	952	unsigned int i;
881	const char *xpmb = "";	953	const char *xpmb = "";
882	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	954	char fstr[] = "default";
		955	char bstr[] = "default";
883		956
884	strcpy (fstr, "default");
885	strcpy (bstr, "default");
886	for (i = Color_Black; i <= Color_White; i++)	957	for (i = Color_Black; i <= Color_White; i++)
887	if (pix_colors[Color_fg] == pix_colors[i])	958	if (pix_colors[Color_fg] == pix_colors[i])
888	{	959	{
889	sprintf (fstr, "%d", (i - Color_Black));	960	sprintf (fstr, "%d", i - Color_Black);
890	break;	961	break;
891	}	962	}
892		963
893	for (i = Color_Black; i <= Color_White; i++)	964	for (i = Color_Black; i <= Color_White; i++)
894	if (pix_colors[Color_bg] == pix_colors[i])	965	if (pix_colors[Color_bg] == pix_colors[i])
895	{	966	{
896	sprintf (bstr, "%d", (i - Color_Black));	967	sprintf (bstr, "%d", i - Color_Black);
897	#ifdef BG_IMAGE_FROM_FILE	968	#ifdef BG_IMAGE_FROM_FILE
898	xpmb = "default;";	969	xpmb = "default;";
899	#endif	970	#endif
900	break;	971	break;
901	}	972	}
…		…
931	int old_width = szHint.width;	1002	int old_width = szHint.width;
932	int old_height = szHint.height;	1003	int old_height = szHint.height;
933		1004
934	window_calc (newwidth, newheight);	1005	window_calc (newwidth, newheight);
935		1006
936	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1007	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1008
		1009	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1010	if (set_hint)
		1011	{
		1012	szHint.flags &= ~(PBaseSize \| PResizeInc);
937	XSetWMNormalHints (dpy, parent[0], &szHint);	1013	XSetWMNormalHints (dpy, parent, &szHint);
		1014	szHint.flags \|= PBaseSize \| PResizeInc;
		1015	}
938		1016
939	if (!ignoreparent)	1017	if (!ignoreparent)
940	{	1018	{
941	#ifdef SMART_RESIZE	1019	#ifdef SMART_RESIZE
942	/*	1020	/*
…		…
946	int x, y, x1, y1;	1024	int x, y, x1, y1;
947	int dx, dy;	1025	int dx, dy;
948	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1026	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
949	Window unused_cr;	1027	Window unused_cr;
950		1028
951	XTranslateCoordinates (dpy, parent[0], display->root,	1029	XTranslateCoordinates (dpy, parent, display->root,
952	0, 0, &x, &y, &unused_cr);	1030	0, 0, &x, &y, &unused_cr);
953	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1031	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
954	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1032	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
955	/*	1033	/*
956	* if display->root isn't the parent window, a WM will probably have offset	1034	* if display->root isn't the parent window, a WM will probably have offset
957	* our position for handles and decorations. Counter it	1035	* our position for handles and decorations. Counter it
958	*/	1036	*/
…		…
975	if (y < y1) /* top half */	1053	if (y < y1) /* top half */
976	dy = 0;	1054	dy = 0;
977	else if (y == y1) /* exact center */	1055	else if (y == y1) /* exact center */
978	dy /= 2;	1056	dy /= 2;
979		1057
980	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1058	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
981	szHint.width, szHint.height);	1059	szHint.width, szHint.height);
982	#else	1060	#else
983	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1061	XResizeWindow (dpy, parent, szHint.width, szHint.height);
984	#endif	1062	#endif
985	}	1063	}
		1064
		1065	if (set_hint)
		1066	XSetWMNormalHints (dpy, parent, &szHint);
986		1067
987	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1068	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
988		1069
989	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1070	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
990	{	1071	{
991	if (scrollBar.state)	1072	if (scrollBar.state)
992	{	1073	scrollBar.resize ();
993	XMoveResizeWindow (dpy, scrollBar.win,
994	window_sb_x, 0,
995	scrollbar_TotalWidth (), szHint.height);
996	resize_scrollbar ();
997	}
998		1074
999	XMoveResizeWindow (dpy, vt,	1075	XMoveResizeWindow (dpy, vt,
1000	window_vt_x, window_vt_y,	1076	window_vt_x, window_vt_y,
1001	width, height);	1077	width, height);
1002		1078
1003	#ifdef HAVE_BG_PIXMAP	1079	#ifdef HAVE_BG_PIXMAP
1004	if (bgPixmap.window_size_sensitive ())	1080	if (bg_window_size_sensitive ())
1005	update_background ();	1081	update_background ();
1006	#endif	1082	#endif
1007
1008	scr_clear ();
1009	}	1083	}
1010		1084
1011	if (fix_screen \|\| old_height == 0)	1085	if (fix_screen \|\| old_height == 0)
1012	scr_reset ();	1086	scr_reset ();
1013
1014	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1015	//scr_touch (false);
1016
1017	#ifdef HAVE_BG_PIXMAP
1018	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1019	// if (bgPixmap.pixmap)
1020	// scr_touch (false);
1021	#endif
1022		1087
1023	#ifdef USE_XIM	1088	#ifdef USE_XIM
1024	IMSetPosition ();	1089	IMSetPosition ();
1025	#endif	1090	#endif
1026	}	1091	}
…		…
1092		1157
1093	/* Checking whether input method is running. */	1158	/* Checking whether input method is running. */
1094	bool	1159	bool
1095	rxvt_term::IMisRunning ()	1160	rxvt_term::IMisRunning ()
1096	{	1161	{
1097	char *p;
1098	Atom atom;	1162	Atom atom;
1099	Window win;	1163	Window win;
1100	char server[IMBUFSIZ];	1164	char server[IMBUFSIZ];
1101		1165
1102	/* get current locale modifier */	1166	/* get current locale modifier */
1103	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1167	if (char *p = XSetLocaleModifiers (0))
1104	{	1168	{
1105	strcpy (server, "@server=");	1169	strcpy (server, "@server=");
1106	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1170	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1107		1171
1108	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1172	if (p = strchr (server + 1, '@')) /* first one only */
1109	*p = '\0';	1173	*p = '\0';
1110		1174
1111	atom = XInternAtom (dpy, server, False);	1175	atom = XInternAtom (dpy, server, False);
1112	win = XGetSelectionOwner (dpy, atom);	1176	win = XGetSelectionOwner (dpy, atom);
1113		1177
1114	if (win != None)	1178	if (win != None)
1115	return True;	1179	return true;
1116	}	1180	}
1117		1181
1118	return False;	1182	return false;
1119	}	1183	}
1120		1184
1121	void	1185	void
1122	rxvt_term::IMSendSpot ()	1186	rxvt_term::IMSendSpot ()
1123	{	1187	{
…		…
1180		1244
1181	term->make_current ();	1245	term->make_current ();
1182		1246
1183	if (text)	1247	if (text)
1184	{	1248	{
1185	void *str;	1249	wchar_t *str;
1186		1250
1187	if (!text->encoding_is_wchar && text->string.multi_byte)	1251	if (!text->encoding_is_wchar && text->string.multi_byte)
1188	{	1252	{
1189	// of course, X makes it ugly again	1253	// of course, X makes it ugly again
1190	if (term->rs[Rs_imLocale])	1254	if (term->rs[Rs_imLocale])
1191	SET_LOCALE (term->rs[Rs_imLocale]);	1255	SET_LOCALE (term->rs[Rs_imLocale]);
1192		1256
1193	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1257	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1194	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1258	mbstowcs (str, text->string.multi_byte, text->length + 1);
1195		1259
1196	if (term->rs[Rs_imLocale])	1260	if (term->rs[Rs_imLocale])
1197	SET_LOCALE (term->locale);	1261	SET_LOCALE (term->locale);
1198	}	1262	}
1199	else	1263	else
1200	str = (void *)text->string.wide_char;	1264	str = text->string.wide_char;
1201		1265
1202	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1266	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1203	DT_INT, call_data->caret,	1267	DT_INT, call_data->caret,
1204	DT_INT, call_data->chg_first,	1268	DT_INT, call_data->chg_first,
1205	DT_INT, call_data->chg_length,	1269	DT_INT, call_data->chg_length,
…		…
1276	p = pet[pi];	1340	p = pet[pi];
1277		1341
1278	if (!p)	1342	if (!p)
1279	continue;	1343	continue;
1280		1344
1281	s = rxvt_splitcommastring (p);	1345	s = rxvt_strsplit (',', p);
1282		1346
1283	for (i = found = 0; !found && s[i]; i++)	1347	for (i = found = 0; !found && s[i]; i++)
1284	{	1348	{
1285	if (!strcmp (s[i], "OverTheSpot"))	1349	if (!strcmp (s[i], "OverTheSpot"))
1286	input_style = XIMPreeditPosition \| XIMStatusNothing;	1350	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1298	input_style = XIMPreeditNothing \| XIMStatusNothing;	1362	input_style = XIMPreeditNothing \| XIMStatusNothing;
1299		1363
1300	for (j = 0; j < xim_styles->count_styles; j++)	1364	for (j = 0; j < xim_styles->count_styles; j++)
1301	if (input_style == xim_styles->supported_styles[j])	1365	if (input_style == xim_styles->supported_styles[j])
1302	{	1366	{
1303	rxvt_freecommastring (s);	1367	rxvt_free_strsplit (s);
1304		1368
1305	found = 1;	1369	found = 1;
1306	goto foundpet;	1370	goto foundpet;
1307	}	1371	}
1308		1372
1309	}	1373	}
1310		1374
1311	rxvt_freecommastring (s);	1375	rxvt_free_strsplit (s);
1312	}	1376	}
1313		1377
1314	foundpet:	1378	foundpet:
1315		1379
1316	XFree (xim_styles);	1380	XFree (xim_styles);
…		…
1419	#endif	1483	#endif
1420		1484
1421	Input_Context = XCreateIC (xim,	1485	Input_Context = XCreateIC (xim,
1422	XNInputStyle, input_style,	1486	XNInputStyle, input_style,
1423	XNClientWindow, vt,	1487	XNClientWindow, vt,
1424	XNFocusWindow, parent[0],	1488	XNFocusWindow, parent,
1425	preedit_attr ? XNPreeditAttributes : NULL,	1489	preedit_attr ? XNPreeditAttributes : NULL,
1426	preedit_attr,	1490	preedit_attr,
1427	status_attr ? XNStatusAttributes : NULL,	1491	status_attr ? XNStatusAttributes : NULL,
1428	status_attr, NULL);	1492	status_attr, NULL);
1429		1493
…		…
1472	p = rs[Rs_inputMethod];	1536	p = rs[Rs_inputMethod];
1473	if (p && *p)	1537	if (p && *p)
1474	{	1538	{
1475	bool found = false;	1539	bool found = false;
1476		1540
1477	s = rxvt_splitcommastring (p);	1541	s = rxvt_strsplit (',', p);
1478		1542
1479	for (i = 0; s[i]; i++)	1543	for (i = 0; s[i]; i++)
1480	{	1544	{
1481	if (*s[i])	1545	if (*s[i])
1482	{	1546	{
…		…
1488	break;	1552	break;
1489	}	1553	}
1490	}	1554	}
1491	}	1555	}
1492		1556
1493	rxvt_freecommastring (s);	1557	rxvt_free_strsplit (s);
1494		1558
1495	if (found)	1559	if (found)
1496	goto done;	1560	goto done;
1497	}	1561	}
1498		1562
…		…
1558		1622
1559	void	1623	void
1560	rxvt_term::get_window_origin (int &x, int &y)	1624	rxvt_term::get_window_origin (int &x, int &y)
1561	{	1625	{
1562	Window cr;	1626	Window cr;
1563	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1627	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1564	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1565	}	1628	}
1566		1629
1567	Pixmap	1630	Pixmap
1568	rxvt_term::get_pixmap_property (int prop_id)	1631	rxvt_term::get_pixmap_property (Atom property)
1569	{	1632	{
1570	if (prop_id > 0 && prop_id < NUM_XA)	1633	Pixmap pixmap = None;
1571	if (xa[prop_id])	1634
1572	{
1573	int aformat;	1635	int aformat;
1574	unsigned long nitems, bytes_after;	1636	unsigned long nitems, bytes_after;
1575	Atom atype;	1637	Atom atype;
1576	unsigned char *prop = NULL;	1638	unsigned char *prop;
1577	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1639	int result = XGetWindowProperty (dpy, display->root, property,
1578	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1640	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1579	&nitems, &bytes_after, &prop);	1641	&nitems, &bytes_after, &prop);
1580	if (result == Success && prop && atype == XA_PIXMAP)	1642	if (result == Success)
		1643	{
		1644	if (atype == XA_PIXMAP)
1581	return (Pixmap )prop;	1645	pixmap = (Pixmap )prop;
		1646	XFree (prop);
1582	}	1647	}
1583		1648
1584	return None;	1649	return pixmap;
1585	}	1650	}
1586		1651
1587	#ifdef HAVE_BG_PIXMAP	1652	#ifdef HAVE_BG_PIXMAP
1588	# if TRACE_PIXMAPS
1589	# undef update_background
1590	void
1591	rxvt_term::trace_update_background (const char *file, int line)
1592	{
1593	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1594	update_background ();
1595	}
1596	# endif
1597		1653
1598	void	1654	void
1599	rxvt_term::update_background ()	1655	rxvt_term::update_background ()
1600	{	1656	{
1601	if (update_background_ev.is_active ())	1657	if (update_background_ev.is_active ())
1602	return;	1658	return;
1603		1659
1604	bgPixmap.invalidate ();	1660	bg_invalidate ();
1605		1661
1606	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1662	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1607		1663
1608	if (to_wait <= 0.)	1664	if (to_wait <= 0.)
1609	bgPixmap.render ();	1665	bg_render ();
1610	else	1666	else
1611	update_background_ev.start (to_wait);	1667	update_background_ev.start (to_wait);
1612	}	1668	}
1613		1669
1614	void	1670	void
1615	rxvt_term::update_background_cb (ev::timer &w, int revents)	1671	rxvt_term::update_background_cb (ev::timer &w, int revents)
1616	{	1672	{
1617	make_current ();	1673	make_current ();
1618		1674
1619	update_background_ev.stop ();	1675	update_background_ev.stop ();
1620	bgPixmap.render ();	1676	bg_render ();
1621	refresh_check ();	1677	refresh_check ();
1622	}	1678	}
1623		1679
1624	#endif /* HAVE_BG_PIXMAP */	1680	#endif /* HAVE_BG_PIXMAP */
1625		1681

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.302 by root, Fri Jan 25 16:04:57 2008 UTC vs. Revision 1.355 by sf-exg, Thu Apr 7 12:19:40 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.302 by root, Fri Jan 25 16:04:57 2008 UTC vs.
Revision 1.355 by sf-exg, Thu Apr 7 12:19:40 2011 UTC