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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC vs.
Revision 1.358 by sf-exg, Sat Jul 9 13:40:13 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));
…		…
186	#endif	187	#endif
187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	188	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);	189	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	190	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	191	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194		194
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		196
…		…
225	delete fontset[i];	225	delete fontset[i];
226	#endif	226	#endif
227	delete fontset[0];	227	delete fontset[0];
228		228
229	#ifdef HAVE_BG_PIXMAP	229	#ifdef HAVE_BG_PIXMAP
230	bgPixmap.destroy ();	230	bg_destroy ();
231	#endif	231	#endif
232		232
233	if (display)	233	if (display)
234	{	234	{
235	selection_clear ();	235	selection_clear ();
		236	selection_clear (true);
236		237
237	#ifdef USE_XIM	238	#ifdef USE_XIM
238	im_destroy ();	239	im_destroy ();
239	#endif	240	#endif
240	scrollBar.destroy ();	241	scrollBar.destroy ();
241	if (gc) XFreeGC (dpy, gc);	242	if (gc) XFreeGC (dpy, gc);
242		243
243	delete drawable;	244	delete drawable;
244	// destroy all windows	245	// destroy all windows
245	if (parent[0])	246	if (parent)
246	XDestroyWindow (dpy, parent[0]);	247	XDestroyWindow (dpy, parent);
247		248
248	for (int i = 0; i < TOTAL_COLORS; i++)	249	for (int i = 0; i < TOTAL_COLORS; i++)
249	if (ISSET_PIXCOLOR (i))	250	if (ISSET_PIXCOLOR (i))
250	{	251	{
251	pix_colors_focused [i].free (this);	252	pix_colors_focused [i].free (this);
…		…
265	/* clear all resources */	266	/* clear all resources */
266	for (int i = 0; i < allocated.size (); i++)	267	for (int i = 0; i < allocated.size (); i++)
267	free (allocated [i]);	268	free (allocated [i]);
268		269
269	free (selection.text);	270	free (selection.text);
		271	free (selection.clip_text);
270	// TODO: manage env vars in child only(!)	272	// TODO: manage env vars in child only(!)
271	free (env_display);	273	free (env_display);
272	free (env_term);	274	free (env_term);
273	free (locale);	275	free (locale);
274	free (v_buffer);	276	free (v_buffer);
275	free (incr_buf);	277
		278	delete selection_req;
276		279
277	delete envv;	280	delete envv;
278	delete argv;	281	delete argv;
279		282
280	#ifdef KEYSYM_RESOURCE	283	#ifdef KEYSYM_RESOURCE
…		…
316	#endif	319	#endif
317	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
319	rootwin_ev.stop (display);	322	rootwin_ev.stop (display);
320	#endif	323	#endif
321	incr_ev.stop ();
322	termwin_ev.stop (display);	324	termwin_ev.stop (display);
323	vt_ev.stop (display);	325	vt_ev.stop (display);
324	}	326	}
325		327
326	flush_ev.stop ();	328	flush_ev.stop ();
…		…
348	rxvt_term::destroy_cb (ev::idle &w, int revents)	350	rxvt_term::destroy_cb (ev::idle &w, int revents)
349	{	351	{
350	make_current ();	352	make_current ();
351		353
352	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);
353	}	367	}
354		368
355	/----------------------------------------------------------------------/	369	/----------------------------------------------------------------------/
356	/*	370	/*
357	* Exit gracefully, clearing the utmp entry and restoring tty attributes	371	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
371	print_x_error (Display dpy, XErrorEvent event)	385	print_x_error (Display dpy, XErrorEvent event)
372	{	386	{
373	char buffer[BUFSIZ];	387	char buffer[BUFSIZ];
374	char mesg[BUFSIZ];	388	char mesg[BUFSIZ];
375	char number[32];	389	char number[32];
376	char *mtype = "XlibMessage";	390	const char mtype[] = "XlibMessage";
377	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	391	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
378	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	392	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
379	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");
380	rxvt_warn ("%s: %s\n", mesg, buffer);	394	rxvt_warn ("%s: %s\n", mesg, buffer);
381	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	395	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
382	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	396	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
383	sprintf(number, "%d", event->request_code);	397	sprintf(number, "%d", event->request_code);
384	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	398	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
385	rxvt_warn ("(which is %s)\n", buffer);	399	rxvt_warn ("(which is %s)\n", buffer);
386	if (event->request_code >= 128) {	400	if (event->request_code >= 128) {
387	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	401	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
388	mesg, BUFSIZ);	402	mesg, BUFSIZ);
389	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
390	}	404	}
391	if ((event->error_code == BadWindow) \|\|	405	if ((event->error_code == BadWindow) \|\|
392	(event->error_code == BadPixmap) \|\|	406	(event->error_code == BadPixmap) \|\|
393	(event->error_code == BadCursor) \|\|	407	(event->error_code == BadCursor) \|\|
394	(event->error_code == BadFont) \|\|	408	(event->error_code == BadFont) \|\|
395	(event->error_code == BadDrawable) \|\|	409	(event->error_code == BadDrawable) \|\|
396	(event->error_code == BadColor) \|\|	410	(event->error_code == BadColor) \|\|
397	(event->error_code == BadGC) \|\|	411	(event->error_code == BadGC) \|\|
398	(event->error_code == BadIDChoice) \|\|	412	(event->error_code == BadIDChoice) \|\|
399	(event->error_code == BadValue) \|\|	413	(event->error_code == BadValue) \|\|
400	(event->error_code == BadAtom)) {	414	(event->error_code == BadAtom)) {
401	if (event->error_code == BadValue)	415	if (event->error_code == BadValue)
402	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	416	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
403	mesg, BUFSIZ);	417	mesg, BUFSIZ);
404	else if (event->error_code == BadAtom)	418	else if (event->error_code == BadAtom)
405	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	419	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
406	mesg, BUFSIZ);	420	mesg, BUFSIZ);
407	else	421	else
408	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	422	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
409	mesg, BUFSIZ);	423	mesg, BUFSIZ);
410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	424	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
411	}	425	}
412	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	426	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
413	mesg, BUFSIZ);	427	mesg, BUFSIZ);
414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
415	}	429	}
416	#endif	430	#endif
417		431
418	int	432	int
…		…
465	rxvt_emergency_cleanup ();	479	rxvt_emergency_cleanup ();
466	w.stop ();	480	w.stop ();
467	kill (getpid (), w.signum);	481	kill (getpid (), w.signum);
468	}	482	}
469		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
470	char **rxvt_environ; // startup environment	551	char **rxvt_environ; // startup environment
471		552
472	void	553	void
473	rxvt_init ()	554	rxvt_init ()
474	{	555	{
475	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))));
476		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
477	if (!ev_default_loop (0))	565	if (!ev_default_loop ())
478	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	566	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
479		567
480	rxvt_environ = environ;	568	rxvt_environ = environ;
481		569
482	signal (SIGHUP, SIG_IGN);	570	signal (SIGHUP, SIG_IGN);
483	signal (SIGPIPE, SIG_IGN);	571	signal (SIGPIPE, SIG_IGN);
484		572
485	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	573	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
486	sig_handlers.sw_int.start (SIGINT); ev_unref ();	574	sig_handlers.sw_int.start (SIGINT); ev_unref ();
487
488	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
489	/* signal (SIGURG, SIG_DFL); */
490		575
491	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	576	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
492	// TODO: handle this with exceptions and tolerate the memory loss	577	// TODO: handle this with exceptions and tolerate the memory loss
493	XSetIOErrorHandler (rxvt_xioerror_handler);	578	XSetIOErrorHandler (rxvt_xioerror_handler);
494		579
…		…
522	if (rs[Rs_geometry])	607	if (rs[Rs_geometry])
523	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	608	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
524		609
525	if (flags & WidthValue)	610	if (flags & WidthValue)
526	{	611	{
		612	if (!w)
		613	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		614
527	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	615	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
528	szHint.flags \|= USSize;	616	szHint.flags \|= USSize;
529	}	617	}
530		618
531	if (flags & HeightValue)	619	if (flags & HeightValue)
532	{	620	{
		621	if (!h)
		622	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		623
533	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	624	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
534	szHint.flags \|= USSize;	625	szHint.flags \|= USSize;
535	}	626	}
536		627
537	if (flags & XValue)	628	if (flags & XValue)
538	{	629	{
…		…
559	szHint.win_gravity = SouthEastGravity;	650	szHint.win_gravity = SouthEastGravity;
560	else	651	else
561	szHint.win_gravity = SouthWestGravity;	652	szHint.win_gravity = SouthWestGravity;
562	}	653	}
563	}	654	}
564
565	if (!szHint.width \|\| !szHint.height)
566	rxvt_fatal ("window width or height must not be zero, aborting.\n");
567	}	655	}
568		656
569	/* TODO: BOUNDS */	657	/* TODO: BOUNDS */
570	width = ncol * fwidth;	658	width = ncol * fwidth;
571	height = nrow * fheight;	659	height = nrow * fheight;
…		…
616	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	704	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
617		705
618	if (recalc_y)	706	if (recalc_y)
619	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	707	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
620		708
621	ncol = width / fwidth;	709	ncol = width / fwidth;
622	nrow = height / fheight;	710	nrow = height / fheight;
623	}	711	}
624		712
625	/----------------------------------------------------------------------/	713	/----------------------------------------------------------------------/
626	/*	714	/*
…		…
637		725
638	ws.ws_col = ncol;	726	ws.ws_col = ncol;
639	ws.ws_row = nrow;	727	ws.ws_row = nrow;
640	ws.ws_xpixel = width;	728	ws.ws_xpixel = width;
641	ws.ws_ypixel = height;	729	ws.ws_ypixel = height;
642	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	730	ioctl (pty->pty, TIOCSWINSZ, &ws);
643		731
644	#if 0	732	#if 0
645	// TIOCSWINSZ is supposed to do this automatically and correctly	733	// TIOCSWINSZ is supposed to do this automatically and correctly
646	if (cmd_pid) /* force through to the command */	734	if (cmd_pid) /* force through to the command */
647	kill (-cmd_pid, SIGWINCH);	735	kill (-cmd_pid, SIGWINCH);
648	#endif	736	#endif
649	}	737	}
650		738
651	/----------------------------------------------------------------------/	739	/----------------------------------------------------------------------/
652	/* set_fonts () - load and set the various fonts	740	/* load and set the various fonts */
653	*
654	* init = 1 - initialize
655	*
656	* fontname == FONT_UP - switch to bigger font
657	* fontname == FONT_DN - switch to smaller font
658	*/
659	bool	741	bool
660	rxvt_term::set_fonts ()	742	rxvt_term::set_fonts ()
661	{	743	{
662	rxvt_fontset *fs = new rxvt_fontset (this);	744	rxvt_fontset *fs = new rxvt_fontset (this);
663	rxvt_fontprop prop;	745	rxvt_fontprop prop;
…		…
677	#endif	759	#endif
678		760
679	delete fontset[0];	761	delete fontset[0];
680	fontset[0] = fs;	762	fontset[0] = fs;
681		763
682	prop = (*fs)[1]->properties ();	764	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
683	prop.height += lineSpace;	765	prop.height += lineSpace;
		766	prop.width += letterSpace;
684		767
685	fs->set_prop (prop, false);	768	fs->set_prop (prop, false);
686		769
687	fwidth = prop.width;	770	fwidth = prop.width;
688	fheight = prop.height;	771	fheight = prop.height;
…		…
719	#else	802	#else
720	fontset[style] = fontset[0];	803	fontset[style] = fontset[0];
721	#endif	804	#endif
722	}	805	}
723		806
724	if (parent[0])	807	if (parent)
725	{	808	{
726	resize_all_windows (0, 0, 0);	809	resize_all_windows (0, 0, 0);
727	scr_remap_chars ();	810	scr_remap_chars ();
728	scr_touch (true);	811	scr_touch (true);
729	}	812	}
…		…
732	}	815	}
733		816
734	void	817	void
735	rxvt_term::set_string_property (Atom prop, const char *str, int len)	818	rxvt_term::set_string_property (Atom prop, const char *str, int len)
736	{	819	{
737	XChangeProperty (dpy, parent[0],	820	XChangeProperty (dpy, parent,
738	prop, XA_STRING, 8, PropModeReplace,	821	prop, XA_STRING, 8, PropModeReplace,
739	(const unsigned char *)str, len >= 0 ? len : strlen (str));	822	(const unsigned char *)str, len >= 0 ? len : strlen (str));
740	}	823	}
741		824
742	void	825	void
		826	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		827	{
		828	XTextProperty ct;
		829
		830	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		831	{
		832	XSetTextProperty (dpy, parent, &ct, prop);
		833	XFree (ct.value);
		834	}
		835	}
		836
		837	void
743	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	838	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
744	{	839	{
745	wchar_t *ws = rxvt_mbstowcs (str, len);	840	wchar_t *ws = rxvt_mbstowcs (str, len);
746	char *s = rxvt_wcstoutf8 (ws);	841	char *s = rxvt_wcstoutf8 (ws);
747		842
748	XChangeProperty (dpy, parent[0],	843	XChangeProperty (dpy, parent,
749	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	844	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
750	(const unsigned char *)s, strlen (s));	845	(const unsigned char *)s, strlen (s));
751		846
752	free (s);	847	free (s);
753	free (ws);	848	free (ws);
…		…
757	/----------------------------------------------------------------------/	852	/----------------------------------------------------------------------/
758	/* xterm sequences - title, iconName, color (exptl) */	853	/* xterm sequences - title, iconName, color (exptl) */
759	void	854	void
760	rxvt_term::set_title (const char *str)	855	rxvt_term::set_title (const char *str)
761	{	856	{
762	set_string_property (XA_WM_NAME, str);	857	set_mbstring_property (XA_WM_NAME, str);
763	#if ENABLE_EWMH	858	#if ENABLE_EWMH
764	set_utf8_property (xa[XA_NET_WM_NAME], str);	859	set_utf8_property (xa[XA_NET_WM_NAME], str);
765	#endif	860	#endif
766	}	861	}
767		862
768	void	863	void
769	rxvt_term::set_icon_name (const char *str)	864	rxvt_term::set_icon_name (const char *str)
770	{	865	{
771	set_string_property (XA_WM_ICON_NAME, str);	866	set_mbstring_property (XA_WM_ICON_NAME, str);
772	#if ENABLE_EWMH	867	#if ENABLE_EWMH
773	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	868	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
774	#endif	869	#endif
775	}	870	}
776		871
…		…
848	void	943	void
849	rxvt_term::set_colorfgbg ()	944	rxvt_term::set_colorfgbg ()
850	{	945	{
851	unsigned int i;	946	unsigned int i;
852	const char *xpmb = "";	947	const char *xpmb = "";
853	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	948	char fstr[] = "default";
		949	char bstr[] = "default";
854		950
855	strcpy (fstr, "default");
856	strcpy (bstr, "default");
857	for (i = Color_Black; i <= Color_White; i++)	951	for (i = Color_Black; i <= Color_White; i++)
858	if (pix_colors[Color_fg] == pix_colors[i])	952	if (pix_colors[Color_fg] == pix_colors[i])
859	{	953	{
860	sprintf (fstr, "%d", (i - Color_Black));	954	sprintf (fstr, "%d", i - Color_Black);
861	break;	955	break;
862	}	956	}
863		957
864	for (i = Color_Black; i <= Color_White; i++)	958	for (i = Color_Black; i <= Color_White; i++)
865	if (pix_colors[Color_bg] == pix_colors[i])	959	if (pix_colors[Color_bg] == pix_colors[i])
866	{	960	{
867	sprintf (bstr, "%d", (i - Color_Black));	961	sprintf (bstr, "%d", i - Color_Black);
868	#ifdef BG_IMAGE_FROM_FILE	962	#ifdef BG_IMAGE_FROM_FILE
869	xpmb = "default;";	963	xpmb = "default;";
870	#endif	964	#endif
871	break;	965	break;
872	}	966	}
…		…
902	int old_width = szHint.width;	996	int old_width = szHint.width;
903	int old_height = szHint.height;	997	int old_height = szHint.height;
904		998
905	window_calc (newwidth, newheight);	999	window_calc (newwidth, newheight);
906		1000
907	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1001	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1002
		1003	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1004	if (set_hint)
		1005	{
		1006	szHint.flags &= ~(PBaseSize \| PResizeInc);
908	XSetWMNormalHints (dpy, parent[0], &szHint);	1007	XSetWMNormalHints (dpy, parent, &szHint);
		1008	szHint.flags \|= PBaseSize \| PResizeInc;
		1009	}
909		1010
910	if (!ignoreparent)	1011	if (!ignoreparent)
911	{	1012	{
912	#ifdef SMART_RESIZE	1013	#ifdef SMART_RESIZE
913	/*	1014	/*
…		…
917	int x, y, x1, y1;	1018	int x, y, x1, y1;
918	int dx, dy;	1019	int dx, dy;
919	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1020	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
920	Window unused_cr;	1021	Window unused_cr;
921		1022
922	XTranslateCoordinates (dpy, parent[0], display->root,	1023	XTranslateCoordinates (dpy, parent, display->root,
923	0, 0, &x, &y, &unused_cr);	1024	0, 0, &x, &y, &unused_cr);
924	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1025	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
925	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1026	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
926	/*	1027	/*
927	* if display->root isn't the parent window, a WM will probably have offset	1028	* if display->root isn't the parent window, a WM will probably have offset
928	* our position for handles and decorations. Counter it	1029	* our position for handles and decorations. Counter it
929	*/	1030	*/
…		…
946	if (y < y1) /* top half */	1047	if (y < y1) /* top half */
947	dy = 0;	1048	dy = 0;
948	else if (y == y1) /* exact center */	1049	else if (y == y1) /* exact center */
949	dy /= 2;	1050	dy /= 2;
950		1051
951	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1052	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
952	szHint.width, szHint.height);	1053	szHint.width, szHint.height);
953	#else	1054	#else
954	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1055	XResizeWindow (dpy, parent, szHint.width, szHint.height);
955	#endif	1056	#endif
956	}	1057	}
		1058
		1059	if (set_hint)
		1060	XSetWMNormalHints (dpy, parent, &szHint);
957		1061
958	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1062	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
959		1063
960	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1064	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
961	{	1065	{
…		…
965	XMoveResizeWindow (dpy, vt,	1069	XMoveResizeWindow (dpy, vt,
966	window_vt_x, window_vt_y,	1070	window_vt_x, window_vt_y,
967	width, height);	1071	width, height);
968		1072
969	#ifdef HAVE_BG_PIXMAP	1073	#ifdef HAVE_BG_PIXMAP
970	if (bgPixmap.window_size_sensitive ())	1074	if (bg_window_size_sensitive ())
971	update_background ();	1075	update_background ();
972	#endif	1076	#endif
973
974	scr_clear ();
975	}	1077	}
976		1078
977	if (fix_screen \|\| old_height == 0)	1079	if (fix_screen \|\| old_height == 0)
978	scr_reset ();	1080	scr_reset ();
979		1081
980	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
981	//scr_touch (false);
982
983	#ifdef HAVE_BG_PIXMAP
984	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
985	// if (bgPixmap.pixmap)
986	// scr_touch (false);
987	#endif
988
989	#ifdef USE_XIM	1082	#ifdef USE_XIM
990	IMSetPosition ();	1083	im_set_position ();
991	#endif	1084	#endif
992	}	1085	}
993		1086
994	/*	1087	/*
995	* Set the width/height of the vt window in characters. Units are pixels.	1088	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1056	status_rect.height = fheight;	1149	status_rect.height = fheight;
1057	}	1150	}
1058		1151
1059	/* Checking whether input method is running. */	1152	/* Checking whether input method is running. */
1060	bool	1153	bool
1061	rxvt_term::IMisRunning ()	1154	rxvt_term::im_is_running ()
1062	{	1155	{
1063	char *p;
1064	Atom atom;	1156	Atom atom;
1065	Window win;	1157	Window win;
1066	char server[IMBUFSIZ];	1158	char server[IMBUFSIZ];
1067		1159
1068	/* get current locale modifier */	1160	/* get current locale modifier */
1069	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1161	if (char *p = XSetLocaleModifiers (0))
1070	{	1162	{
1071	strcpy (server, "@server=");	1163	strcpy (server, "@server=");
1072	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1164	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1073		1165
1074	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1166	if (p = strchr (server + 1, '@')) /* first one only */
1075	*p = '\0';	1167	*p = '\0';
1076		1168
1077	atom = XInternAtom (dpy, server, False);	1169	atom = XInternAtom (dpy, server, False);
1078	win = XGetSelectionOwner (dpy, atom);	1170	win = XGetSelectionOwner (dpy, atom);
1079		1171
1080	if (win != None)	1172	if (win != None)
1081	return True;	1173	return true;
1082	}	1174	}
1083		1175
1084	return False;	1176	return false;
1085	}	1177	}
1086		1178
1087	void	1179	void
1088	rxvt_term::IMSendSpot ()	1180	rxvt_term::im_send_spot ()
1089	{	1181	{
1090	XPoint nspot;	1182	XPoint nspot;
1091	XVaNestedList preedit_attr;	1183	XVaNestedList preedit_attr;
1092		1184
1093	if (!Input_Context	1185	if (!Input_Context
…		…
1146		1238
1147	term->make_current ();	1239	term->make_current ();
1148		1240
1149	if (text)	1241	if (text)
1150	{	1242	{
1151	void *str;	1243	wchar_t *str;
1152		1244
1153	if (!text->encoding_is_wchar && text->string.multi_byte)	1245	if (!text->encoding_is_wchar && text->string.multi_byte)
1154	{	1246	{
1155	// of course, X makes it ugly again	1247	// of course, X makes it ugly again
1156	if (term->rs[Rs_imLocale])	1248	if (term->rs[Rs_imLocale])
1157	SET_LOCALE (term->rs[Rs_imLocale]);	1249	SET_LOCALE (term->rs[Rs_imLocale]);
1158		1250
1159	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1251	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1160	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1252	mbstowcs (str, text->string.multi_byte, text->length + 1);
1161		1253
1162	if (term->rs[Rs_imLocale])	1254	if (term->rs[Rs_imLocale])
1163	SET_LOCALE (term->locale);	1255	SET_LOCALE (term->locale);
1164	}	1256	}
1165	else	1257	else
1166	str = (void *)text->string.wide_char;	1258	str = text->string.wide_char;
1167		1259
1168	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1260	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1169	DT_INT, call_data->caret,	1261	DT_INT, call_data->caret,
1170	DT_INT, call_data->chg_first,	1262	DT_INT, call_data->chg_first,
1171	DT_INT, call_data->chg_length,	1263	DT_INT, call_data->chg_length,
…		…
1199	/*	1291	/*
1200	* Try to open a XIM with the current modifiers, then see if we can	1292	* Try to open a XIM with the current modifiers, then see if we can
1201	* open a suitable preedit type	1293	* open a suitable preedit type
1202	*/	1294	*/
1203	bool	1295	bool
1204	rxvt_term::IM_get_IC (const char *modifiers)	1296	rxvt_term::im_get_ic (const char *modifiers)
1205	{	1297	{
1206	int i, j, found;	1298	int i, j, found;
1207	XIM xim;	1299	XIM xim;
1208	XPoint spot;	1300	XPoint spot;
1209	XRectangle rect, status_rect, needed_rect;	1301	XRectangle rect, status_rect, needed_rect;
1210	unsigned long fg, bg;	1302	unsigned long fg, bg;
1211	const char *p;	1303	const char *p;
1212	char **s;	1304	char **s;
1213	XIMStyles *xim_styles;	1305	XIMStyles *xim_styles;
1214	#ifdef ENABLE_XIM_ONTHESPOT
1215	XIMCallback xcb[4];
1216	#endif
1217		1306
1218	set_environ (envv);	1307	set_environ (envv);
1219		1308
1220	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1309	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1221	return false;	1310	return false;
…		…
1242	p = pet[pi];	1331	p = pet[pi];
1243		1332
1244	if (!p)	1333	if (!p)
1245	continue;	1334	continue;
1246		1335
1247	s = rxvt_splitcommastring (p);	1336	s = rxvt_strsplit (',', p);
1248		1337
1249	for (i = found = 0; !found && s[i]; i++)	1338	for (i = found = 0; !found && s[i]; i++)
1250	{	1339	{
1251	if (!strcmp (s[i], "OverTheSpot"))	1340	if (!strcmp (s[i], "OverTheSpot"))
1252	input_style = XIMPreeditPosition \| XIMStatusNothing;	1341	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1264	input_style = XIMPreeditNothing \| XIMStatusNothing;	1353	input_style = XIMPreeditNothing \| XIMStatusNothing;
1265		1354
1266	for (j = 0; j < xim_styles->count_styles; j++)	1355	for (j = 0; j < xim_styles->count_styles; j++)
1267	if (input_style == xim_styles->supported_styles[j])	1356	if (input_style == xim_styles->supported_styles[j])
1268	{	1357	{
1269	rxvt_freecommastring (s);	1358	rxvt_free_strsplit (s);
1270		1359
1271	found = 1;	1360	found = 1;
1272	goto foundpet;	1361	goto foundpet;
1273	}	1362	}
1274		1363
1275	}	1364	}
1276		1365
1277	rxvt_freecommastring (s);	1366	rxvt_free_strsplit (s);
1278	}	1367	}
1279		1368
1280	foundpet:	1369	foundpet:
1281		1370
1282	XFree (xim_styles);	1371	XFree (xim_styles);
…		…
1361	NULL);	1450	NULL);
1362	}	1451	}
1363	#if ENABLE_XIM_ONTHESPOT	1452	#if ENABLE_XIM_ONTHESPOT
1364	else if (input_style & XIMPreeditCallbacks)	1453	else if (input_style & XIMPreeditCallbacks)
1365	{	1454	{
		1455	XIMCallback xcb[4];
		1456
1366	im_set_position (spot);	1457	im_set_position (spot);
1367		1458
1368	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;	1459	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1369	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;	1460	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1370	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;	1461	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
…		…
1385	#endif	1476	#endif
1386		1477
1387	Input_Context = XCreateIC (xim,	1478	Input_Context = XCreateIC (xim,
1388	XNInputStyle, input_style,	1479	XNInputStyle, input_style,
1389	XNClientWindow, vt,	1480	XNClientWindow, vt,
1390	XNFocusWindow, parent[0],	1481	XNFocusWindow, parent,
1391	preedit_attr ? XNPreeditAttributes : NULL,	1482	preedit_attr ? XNPreeditAttributes : NULL,
1392	preedit_attr,	1483	preedit_attr,
1393	status_attr ? XNStatusAttributes : NULL,	1484	status_attr ? XNStatusAttributes : NULL,
1394	status_attr, NULL);	1485	status_attr, NULL);
1395		1486
…		…
1408	// unfortunately, only the focus window is used by XIM, hard to fix	1499	// unfortunately, only the focus window is used by XIM, hard to fix
1409	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1500	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1410	vt_select_input ();	1501	vt_select_input ();
1411	#endif	1502	#endif
1412		1503
1413	IMSetPosition ();	1504	im_set_position ();
1414		1505
1415	return true;	1506	return true;
1416	}	1507	}
1417		1508
1418	void	1509	void
…		…
1438	p = rs[Rs_inputMethod];	1529	p = rs[Rs_inputMethod];
1439	if (p && *p)	1530	if (p && *p)
1440	{	1531	{
1441	bool found = false;	1532	bool found = false;
1442		1533
1443	s = rxvt_splitcommastring (p);	1534	s = rxvt_strsplit (',', p);
1444		1535
1445	for (i = 0; s[i]; i++)	1536	for (i = 0; s[i]; i++)
1446	{	1537	{
1447	if (*s[i])	1538	if (*s[i])
1448	{	1539	{
1449	strcpy (buf, "@im=");	1540	strcpy (buf, "@im=");
1450	strncat (buf, s[i], IMBUFSIZ - 5);	1541	strncat (buf, s[i], IMBUFSIZ - 5);
1451	if (IM_get_IC (buf))	1542	if (im_get_ic (buf))
1452	{	1543	{
1453	found = true;	1544	found = true;
1454	break;	1545	break;
1455	}	1546	}
1456	}	1547	}
1457	}	1548	}
1458		1549
1459	rxvt_freecommastring (s);	1550	rxvt_free_strsplit (s);
1460		1551
1461	if (found)	1552	if (found)
1462	goto done;	1553	goto done;
1463	}	1554	}
1464		1555
1465	/* try with XMODIFIERS env. var. */	1556	/* try with XMODIFIERS env. var. */
1466	if (IM_get_IC (""))	1557	if (im_get_ic (""))
1467	goto done;	1558	goto done;
1468		1559
1469	/* try with no modifiers base IF the user didn't specify an IM */	1560	/* try with no modifiers base IF the user didn't specify an IM */
1470	if (IM_get_IC ("@im=none"))	1561	if (im_get_ic ("@im=none"))
1471	goto done;	1562	goto done;
1472		1563
1473	done:	1564	done:
1474	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1565	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1475	if (rs[Rs_imLocale])	1566	if (rs[Rs_imLocale])
1476	SET_LOCALE (locale);	1567	SET_LOCALE (locale);
1477	#endif	1568	#endif
1478	}	1569	}
1479		1570
1480	void	1571	void
1481	rxvt_term::IMSetPosition ()	1572	rxvt_term::im_set_position ()
1482	{	1573	{
1483	XRectangle preedit_rect, status_rect, *needed_rect;	1574	XRectangle preedit_rect, status_rect, *needed_rect;
1484	XVaNestedList preedit_attr, status_attr;	1575	XVaNestedList preedit_attr, status_attr;
1485		1576
1486	if (!Input_Context	1577	if (!Input_Context
1487	\|\| !focus	1578	\|\| !focus
1488	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))	1579	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1489	\|\| !IMisRunning ())	1580	\|\| !im_is_running ())
1490	return;	1581	return;
1491		1582
1492	if (input_style & XIMPreeditPosition)	1583	if (input_style & XIMPreeditPosition)
1493	{	1584	{
1494	im_set_size (preedit_rect);	1585	im_set_size (preedit_rect);
…		…
1524		1615
1525	void	1616	void
1526	rxvt_term::get_window_origin (int &x, int &y)	1617	rxvt_term::get_window_origin (int &x, int &y)
1527	{	1618	{
1528	Window cr;	1619	Window cr;
1529	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1620	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1530	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1531	}	1621	}
1532		1622
1533	Pixmap	1623	Pixmap
1534	rxvt_term::get_pixmap_property (int prop_id)	1624	rxvt_term::get_pixmap_property (Atom property)
1535	{	1625	{
1536	if (prop_id > 0 && prop_id < NUM_XA)	1626	Pixmap pixmap = None;
1537	if (xa[prop_id])	1627
1538	{
1539	int aformat;	1628	int aformat;
1540	unsigned long nitems, bytes_after;	1629	unsigned long nitems, bytes_after;
1541	Atom atype;	1630	Atom atype;
1542	unsigned char *prop = NULL;	1631	unsigned char *prop;
1543	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1632	int result = XGetWindowProperty (dpy, display->root, property,
1544	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1633	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1545	&nitems, &bytes_after, &prop);	1634	&nitems, &bytes_after, &prop);
1546	if (result == Success && prop && atype == XA_PIXMAP)	1635	if (result == Success)
		1636	{
		1637	if (atype == XA_PIXMAP)
1547	return (Pixmap )prop;	1638	pixmap = (Pixmap )prop;
		1639	XFree (prop);
1548	}	1640	}
1549		1641
1550	return None;	1642	return pixmap;
1551	}	1643	}
1552		1644
1553	#ifdef HAVE_BG_PIXMAP	1645	#ifdef HAVE_BG_PIXMAP
1554	# if TRACE_PIXMAPS
1555	# undef update_background
1556	void
1557	rxvt_term::trace_update_background (const char *file, int line)
1558	{
1559	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1560	update_background ();
1561	}
1562	# endif
1563		1646
1564	void	1647	void
1565	rxvt_term::update_background ()	1648	rxvt_term::update_background ()
1566	{	1649	{
1567	if (update_background_ev.is_active ())	1650	if (update_background_ev.is_active ())
1568	return;	1651	return;
1569		1652
1570	bgPixmap.invalidate ();	1653	bg_invalidate ();
1571		1654
1572	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1655	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1573		1656
1574	if (to_wait <= 0.)	1657	if (to_wait <= 0.)
1575	bgPixmap.render ();	1658	bg_render ();
1576	else	1659	else
1577	update_background_ev.start (to_wait);	1660	update_background_ev.start (to_wait);
1578	}	1661	}
1579		1662
1580	void	1663	void
1581	rxvt_term::update_background_cb (ev::timer &w, int revents)	1664	rxvt_term::update_background_cb (ev::timer &w, int revents)
1582	{	1665	{
1583	make_current ();	1666	make_current ();
1584		1667
1585	update_background_ev.stop ();	1668	update_background_ev.stop ();
1586	bgPixmap.render ();	1669	bg_render ();
1587	refresh_check ();	1670	refresh_check ();
1588	}	1671	}
1589		1672
1590	#endif /* HAVE_BG_PIXMAP */	1673	#endif /* HAVE_BG_PIXMAP */
1591		1674

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC vs. Revision 1.358 by sf-exg, Sat Jul 9 13:40:13 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC vs.
Revision 1.358 by sf-exg, Sat Jul 9 13:40:13 2011 UTC