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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC vs.
Revision 1.371 by sf-exg, Thu Jan 19 15:44:49 2012 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 <assert.h>
40	#include <csignal>	42	#include <signal.h>
41	#include <cstring>	43	#include <string.h>
42		44
43	#include <termios.h>	45	#include <termios.h>
44		46
45	#ifdef HAVE_XSETLOCALE	47	#ifdef HAVE_XSETLOCALE
46	# define X_LOCALE	48	# define X_LOCALE
47	# include <X11/Xlocale.h>	49	# include <X11/Xlocale.h>
48	#else	50	#else
49	# ifdef HAVE_SETLOCALE
50	# include <clocale>	51	# include <locale.h>
51	# endif	52	#endif
52	#endif
53		53
		54	struct termios rxvt_term::def_tio;
54	vector<rxvt_term *> rxvt_term::termlist;	55	vector<rxvt_term *> rxvt_term::termlist;
55		56
56	// used to tell global functions which terminal instance is "active"	57	// used to tell global functions which terminal instance is "active"
57	rxvt_t rxvt_current_term;	58	rxvt_t rxvt_current_term;
58		59
…		…
93	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)
94	{	95	{
95	compose_char *cc;	96	compose_char *cc;
96		97
97	// break compose chains, as stupid readline really likes to duplicate	98	// break compose chains, as stupid readline really likes to duplicate
98	// composing characters for some reason near the end of a line.	99	// composing characters for some reason, near the end of a line.
99	cc = (*this)[c1];	100	cc = (*this)[c1];
100	while (cc)	101	while (cc)
101	{	102	{
102	if (cc->c2 == c2) return c1;	103	if (cc->c2 == c2) return c1;
103	cc = (*this)[cc->c1];	104	cc = (*this)[cc->c1];
104	}	105	}
105		106
106	// check to see wether this combination already exists otherwise	107	// check to see whether this combination already exists otherwise
107	for (cc = v.end (); cc-- > v.begin (); )	108	for (cc = v.begin (); cc < v.end (); cc++)
108	{
109	if (cc->c1 == c1 && cc->c2 == c2)	109	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	110	return COMPOSE_LO + (cc - v.begin ());
111	}
112		111
113	// allocate a new combination	112	// allocate a new combination
114	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	113	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115	{	114	{
116	static int seen;	115	static int seen;
117		116
118	if (!seen++)	117	if (!seen++)
119	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");	118	rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120		119
121	return REPLACEMENT_CHAR;	120	return REPLACEMENT_CHAR;
122	}	121	}
123		122
124	v.push_back (compose_char (c1, c2));	123	v.push_back (compose_char (c1, c2));
…		…
186	#endif	185	#endif
187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	186	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);	187	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	188	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	189	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);	190	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	191	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194		192
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	193	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		194
…		…
225	delete fontset[i];	223	delete fontset[i];
226	#endif	224	#endif
227	delete fontset[0];	225	delete fontset[0];
228		226
229	#ifdef HAVE_BG_PIXMAP	227	#ifdef HAVE_BG_PIXMAP
230	bgPixmap.destroy ();	228	bg_destroy ();
231	#endif	229	#endif
232		230
233	if (display)	231	if (display)
234	{	232	{
235	selection_clear ();	233	selection_clear ();
		234	selection_clear (true);
236		235
237	#ifdef USE_XIM	236	#ifdef USE_XIM
238	im_destroy ();	237	im_destroy ();
239	#endif	238	#endif
240	scrollBar.destroy ();	239	scrollBar.destroy ();
241	if (gc) XFreeGC (dpy, gc);	240	if (gc) XFreeGC (dpy, gc);
242		241
243	delete drawable;	242	delete drawable;
244	// destroy all windows	243	// destroy all windows
245	if (parent[0])	244	if (parent)
246	XDestroyWindow (dpy, parent[0]);	245	XDestroyWindow (dpy, parent);
247		246
248	for (int i = 0; i < TOTAL_COLORS; i++)	247	for (int i = 0; i < TOTAL_COLORS; i++)
249	if (ISSET_PIXCOLOR (i))	248	if (ISSET_PIXCOLOR (i))
250	{	249	{
251	pix_colors_focused [i].free (this);	250	pix_colors_focused [i].free (this);
…		…
265	/* clear all resources */	264	/* clear all resources */
266	for (int i = 0; i < allocated.size (); i++)	265	for (int i = 0; i < allocated.size (); i++)
267	free (allocated [i]);	266	free (allocated [i]);
268		267
269	free (selection.text);	268	free (selection.text);
270	// TODO: manage env vars in child only(!)	269	free (selection.clip_text);
271	free (env_display);
272	free (env_term);
273	free (locale);	270	free (locale);
274	free (v_buffer);	271	free (v_buffer);
275	free (incr_buf);	272
		273	delete selection_req;
276		274
277	delete envv;	275	delete envv;
278	delete argv;	276	delete argv;
279		277
280	#ifdef KEYSYM_RESOURCE	278	#ifdef KEYSYM_RESOURCE
…		…
316	#endif	314	#endif
317	scrollbar_ev.stop (display);	315	scrollbar_ev.stop (display);
318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	316	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
319	rootwin_ev.stop (display);	317	rootwin_ev.stop (display);
320	#endif	318	#endif
321	incr_ev.stop ();
322	termwin_ev.stop (display);	319	termwin_ev.stop (display);
323	vt_ev.stop (display);	320	vt_ev.stop (display);
324	}	321	}
325		322
326	flush_ev.stop ();	323	flush_ev.stop ();
…		…
348	rxvt_term::destroy_cb (ev::idle &w, int revents)	345	rxvt_term::destroy_cb (ev::idle &w, int revents)
349	{	346	{
350	make_current ();	347	make_current ();
351		348
352	delete this;	349	delete this;
		350	}
		351
		352	void
		353	rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
		354	{
		355	if (!opt)
		356	return;
		357
		358	uint8_t mask = 1 << (opt & 7);
		359	uint8_t &val = options [opt >> 3];
		360
		361	val = val & ~mask \| (set ? mask : 0);
353	}	362	}
354		363
355	/----------------------------------------------------------------------/	364	/----------------------------------------------------------------------/
356	/*	365	/*
357	* Exit gracefully, clearing the utmp entry and restoring tty attributes	366	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
371	print_x_error (Display dpy, XErrorEvent event)	380	print_x_error (Display dpy, XErrorEvent event)
372	{	381	{
373	char buffer[BUFSIZ];	382	char buffer[BUFSIZ];
374	char mesg[BUFSIZ];	383	char mesg[BUFSIZ];
375	char number[32];	384	char number[32];
376	char *mtype = "XlibMessage";	385	const char mtype[] = "XlibMessage";
377	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	386	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
378	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	387	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
379	rxvt_warn ("An X Error occured, trying to continue after report.\n");	388	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
380	rxvt_warn ("%s: %s\n", mesg, buffer);	389	rxvt_warn ("%s: %s\n", mesg, buffer);
381	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	390	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
382	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	391	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
383	sprintf(number, "%d", event->request_code);	392	sprintf(number, "%d", event->request_code);
384	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	393	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
385	rxvt_warn ("(which is %s)\n", buffer);	394	rxvt_warn ("(which is %s)\n", buffer);
386	if (event->request_code >= 128) {	395	if (event->request_code >= 128) {
387	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	396	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
388	mesg, BUFSIZ);	397	mesg, BUFSIZ);
389	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	398	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
390	}	399	}
391	if ((event->error_code == BadWindow) \|\|	400	if ((event->error_code == BadWindow) \|\|
392	(event->error_code == BadPixmap) \|\|	401	(event->error_code == BadPixmap) \|\|
393	(event->error_code == BadCursor) \|\|	402	(event->error_code == BadCursor) \|\|
394	(event->error_code == BadFont) \|\|	403	(event->error_code == BadFont) \|\|
395	(event->error_code == BadDrawable) \|\|	404	(event->error_code == BadDrawable) \|\|
396	(event->error_code == BadColor) \|\|	405	(event->error_code == BadColor) \|\|
397	(event->error_code == BadGC) \|\|	406	(event->error_code == BadGC) \|\|
398	(event->error_code == BadIDChoice) \|\|	407	(event->error_code == BadIDChoice) \|\|
399	(event->error_code == BadValue) \|\|	408	(event->error_code == BadValue) \|\|
400	(event->error_code == BadAtom)) {	409	(event->error_code == BadAtom)) {
401	if (event->error_code == BadValue)	410	if (event->error_code == BadValue)
402	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	411	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
403	mesg, BUFSIZ);	412	mesg, BUFSIZ);
404	else if (event->error_code == BadAtom)	413	else if (event->error_code == BadAtom)
405	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	414	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
406	mesg, BUFSIZ);	415	mesg, BUFSIZ);
407	else	416	else
408	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	417	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
409	mesg, BUFSIZ);	418	mesg, BUFSIZ);
410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	419	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
411	}	420	}
412	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	421	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
413	mesg, BUFSIZ);	422	mesg, BUFSIZ);
414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	423	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
415	}	424	}
416	#endif	425	#endif
417		426
418	int	427	int
…		…
465	rxvt_emergency_cleanup ();	474	rxvt_emergency_cleanup ();
466	w.stop ();	475	w.stop ();
467	kill (getpid (), w.signum);	476	kill (getpid (), w.signum);
468	}	477	}
469		478
		479	static void
		480	rxvt_get_ttymode (struct termios *tio)
		481	{
		482	if (tcgetattr (STDIN_FILENO, tio) < 0)
		483	memset (tio, 0, sizeof (struct termios));
		484
		485	for (int i = 0; i < NCCS; i++)
		486	tio->c_cc[i] = VDISABLE;
		487
		488	tio->c_cc[VINTR] = CINTR;
		489	tio->c_cc[VQUIT] = CQUIT;
		490	tio->c_cc[VERASE] = CERASE;
		491	#ifdef VERASE2
		492	tio->c_cc[VERASE2] = CERASE2;
		493	#endif
		494	tio->c_cc[VKILL] = CKILL;
		495	tio->c_cc[VEOF] = CEOF;
		496	tio->c_cc[VSTART] = CSTART;
		497	tio->c_cc[VSTOP] = CSTOP;
		498	tio->c_cc[VSUSP] = CSUSP;
		499	# ifdef VDSUSP
		500	tio->c_cc[VDSUSP] = CDSUSP;
		501	# endif
		502	# ifdef VREPRINT
		503	tio->c_cc[VREPRINT] = CRPRNT;
		504	# endif
		505	# ifdef VDISCRD
		506	tio->c_cc[VDISCRD] = CFLUSH;
		507	# endif
		508	# ifdef VWERSE
		509	tio->c_cc[VWERSE] = CWERASE;
		510	# endif
		511	# ifdef VLNEXT
		512	tio->c_cc[VLNEXT] = CLNEXT;
		513	# endif
		514	# ifdef VSTATUS
		515	tio->c_cc[VSTATUS] = CSTATUS;
		516	# endif
		517
		518	# if VMIN != VEOF
		519	tio->c_cc[VMIN] = 1;
		520	# endif
		521	# if VTIME != VEOL
		522	tio->c_cc[VTIME] = 0;
		523	# endif
		524
		525	/* input modes */
		526	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		527	# ifdef IMAXBEL
		528	\| IMAXBEL
		529	# endif
		530	\| IXON);
		531
		532	/* output modes */
		533	tio->c_oflag = (OPOST \| ONLCR);
		534
		535	/* control modes */
		536	tio->c_cflag = (CS8 \| CREAD);
		537
		538	/* local modes */
		539	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		540	# if defined (ECHOCTL) && defined (ECHOKE)
		541	\| ECHOCTL \| ECHOKE
		542	# endif
		543	\| ECHOE \| ECHOK);
		544	}
		545
470	char **rxvt_environ; // startup environment	546	char **rxvt_environ; // startup environment
471		547
472	void	548	void
473	rxvt_init ()	549	rxvt_init ()
474	{	550	{
475	ptytty::init ();	551	assert (("fontMask must not overlap other RS masks",
		552	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
476		553
		554	rxvt_get_ttymode (&rxvt_term::def_tio);
		555
		556	// get rid of stdin/stdout as we don't need them, to free resources
		557	dup2 (STDERR_FILENO, STDIN_FILENO);
		558	dup2 (STDERR_FILENO, STDOUT_FILENO);
		559
477	if (!ev_default_loop (0))	560	if (!ev_default_loop ())
478	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	561	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
479		562
480	rxvt_environ = environ;	563	rxvt_environ = environ;
481		564
482	signal (SIGHUP, SIG_IGN);	565	signal (SIGHUP, SIG_IGN);
483	signal (SIGPIPE, SIG_IGN);	566	signal (SIGPIPE, SIG_IGN);
484		567
485	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	568	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
486	sig_handlers.sw_int.start (SIGINT); ev_unref ();	569	sig_handlers.sw_int.start (SIGINT); ev_unref ();
487
488	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
489	/* signal (SIGURG, SIG_DFL); */
490		570
491	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	571	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
492	// TODO: handle this with exceptions and tolerate the memory loss	572	// TODO: handle this with exceptions and tolerate the memory loss
493	XSetIOErrorHandler (rxvt_xioerror_handler);	573	XSetIOErrorHandler (rxvt_xioerror_handler);
494		574
…		…
619	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	699	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
620		700
621	if (recalc_y)	701	if (recalc_y)
622	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	702	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
623		703
624	ncol = width / fwidth;	704	ncol = width / fwidth;
625	nrow = height / fheight;	705	nrow = height / fheight;
		706
		707	// When the size of the vt window is not a multiple of the cell
		708	// size, i.e., when the wm does not honour our size hints, there are
		709	// extra areas not covered by the terminal screen. Such gaps, when a
		710	// bg pixmap is set, would have to be cleared manually to properly
		711	// refresh the background. We take the simpler route and shrink the
		712	// vt window so as to avoid creating gaps.
		713	vt_width = ncol * fwidth;
		714	vt_height = nrow * fheight;
626	}	715	}
627		716
628	/----------------------------------------------------------------------/	717	/----------------------------------------------------------------------/
629	/*	718	/*
630	* Tell the teletype handler what size the window is.	719	* Tell the teletype handler what size the window is.
…		…
638		727
639	struct winsize ws;	728	struct winsize ws;
640		729
641	ws.ws_col = ncol;	730	ws.ws_col = ncol;
642	ws.ws_row = nrow;	731	ws.ws_row = nrow;
643	ws.ws_xpixel = width;	732	ws.ws_xpixel = vt_width;
644	ws.ws_ypixel = height;	733	ws.ws_ypixel = vt_height;
645	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	734	ioctl (pty->pty, TIOCSWINSZ, &ws);
646		735
647	#if 0	736	#if 0
648	// TIOCSWINSZ is supposed to do this automatically and correctly	737	// TIOCSWINSZ is supposed to do this automatically and correctly
649	if (cmd_pid) /* force through to the command */	738	if (cmd_pid) /* force through to the command */
650	kill (-cmd_pid, SIGWINCH);	739	kill (-cmd_pid, SIGWINCH);
651	#endif	740	#endif
652	}	741	}
653		742
654	/----------------------------------------------------------------------/	743	/----------------------------------------------------------------------/
655	/* set_fonts () - load and set the various fonts	744	/* load and set the various fonts */
656	*
657	* init = 1 - initialize
658	*
659	* fontname == FONT_UP - switch to bigger font
660	* fontname == FONT_DN - switch to smaller font
661	*/
662	bool	745	bool
663	rxvt_term::set_fonts ()	746	rxvt_term::set_fonts ()
664	{	747	{
665	rxvt_fontset *fs = new rxvt_fontset (this);	748	rxvt_fontset *fs = new rxvt_fontset (this);
666	rxvt_fontprop prop;	749	rxvt_fontprop prop;
…		…
680	#endif	763	#endif
681		764
682	delete fontset[0];	765	delete fontset[0];
683	fontset[0] = fs;	766	fontset[0] = fs;
684		767
685	prop = (*fs)[1]->properties ();	768	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
686	prop.height += lineSpace;	769	prop.height += lineSpace;
		770	prop.width += letterSpace;
687		771
688	fs->set_prop (prop, false);	772	fs->set_prop (prop, false);
689		773
690	fwidth = prop.width;	774	fwidth = prop.width;
691	fheight = prop.height;	775	fheight = prop.height;
…		…
722	#else	806	#else
723	fontset[style] = fontset[0];	807	fontset[style] = fontset[0];
724	#endif	808	#endif
725	}	809	}
726		810
727	if (parent[0])	811	if (parent)
728	{	812	{
729	resize_all_windows (0, 0, 0);	813	resize_all_windows (0, 0, 0);
730	scr_remap_chars ();	814	scr_remap_chars ();
731	scr_touch (true);	815	scr_touch (true);
732	}	816	}
…		…
735	}	819	}
736		820
737	void	821	void
738	rxvt_term::set_string_property (Atom prop, const char *str, int len)	822	rxvt_term::set_string_property (Atom prop, const char *str, int len)
739	{	823	{
740	XChangeProperty (dpy, parent[0],	824	XChangeProperty (dpy, parent,
741	prop, XA_STRING, 8, PropModeReplace,	825	prop, XA_STRING, 8, PropModeReplace,
742	(const unsigned char *)str, len >= 0 ? len : strlen (str));	826	(const unsigned char *)str, len >= 0 ? len : strlen (str));
743	}	827	}
744		828
745	void	829	void
		830	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		831	{
		832	XTextProperty ct;
		833
		834	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		835	{
		836	XSetTextProperty (dpy, parent, &ct, prop);
		837	XFree (ct.value);
		838	}
		839	}
		840
		841	void
746	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	842	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
747	{	843	{
748	wchar_t *ws = rxvt_mbstowcs (str, len);	844	wchar_t *ws = rxvt_mbstowcs (str, len);
749	char *s = rxvt_wcstoutf8 (ws);	845	char *s = rxvt_wcstoutf8 (ws);
750		846
751	XChangeProperty (dpy, parent[0],	847	XChangeProperty (dpy, parent,
752	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	848	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
753	(const unsigned char *)s, strlen (s));	849	(const unsigned char *)s, strlen (s));
754		850
755	free (s);	851	free (s);
756	free (ws);	852	free (ws);
…		…
760	/----------------------------------------------------------------------/	856	/----------------------------------------------------------------------/
761	/* xterm sequences - title, iconName, color (exptl) */	857	/* xterm sequences - title, iconName, color (exptl) */
762	void	858	void
763	rxvt_term::set_title (const char *str)	859	rxvt_term::set_title (const char *str)
764	{	860	{
765	set_string_property (XA_WM_NAME, str);	861	set_mbstring_property (XA_WM_NAME, str);
766	#if ENABLE_EWMH	862	#if ENABLE_EWMH
767	set_utf8_property (xa[XA_NET_WM_NAME], str);	863	set_utf8_property (xa[XA_NET_WM_NAME], str);
768	#endif	864	#endif
769	}	865	}
770		866
771	void	867	void
772	rxvt_term::set_icon_name (const char *str)	868	rxvt_term::set_icon_name (const char *str)
773	{	869	{
774	set_string_property (XA_WM_ICON_NAME, str);	870	set_mbstring_property (XA_WM_ICON_NAME, str);
775	#if ENABLE_EWMH	871	#if ENABLE_EWMH
776	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	872	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
777	#endif	873	#endif
778	}	874	}
779		875
…		…
846		942
847	/----------------------------------------------------------------------/	943	/----------------------------------------------------------------------/
848	/*	944	/*
849	* find if fg/bg matches any of the normal (low-intensity) colors	945	* find if fg/bg matches any of the normal (low-intensity) colors
850	*/	946	*/
851	void	947	char *
852	rxvt_term::set_colorfgbg ()	948	rxvt_term::get_colorfgbg ()
853	{	949	{
854	unsigned int i;	950	unsigned int i;
855	const char *xpmb = "";	951	const char *xpmb = "";
856	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	952	char fstr[] = "default";
		953	char bstr[] = "default";
		954	char *env_colorfgbg;
857		955
858	strcpy (fstr, "default");
859	strcpy (bstr, "default");
860	for (i = Color_Black; i <= Color_White; i++)	956	for (i = Color_Black; i <= Color_White; i++)
861	if (pix_colors[Color_fg] == pix_colors[i])	957	if (pix_colors[Color_fg] == pix_colors[i])
862	{	958	{
863	sprintf (fstr, "%d", (i - Color_Black));	959	sprintf (fstr, "%d", i - Color_Black);
864	break;	960	break;
865	}	961	}
866		962
867	for (i = Color_Black; i <= Color_White; i++)	963	for (i = Color_Black; i <= Color_White; i++)
868	if (pix_colors[Color_bg] == pix_colors[i])	964	if (pix_colors[Color_bg] == pix_colors[i])
869	{	965	{
870	sprintf (bstr, "%d", (i - Color_Black));	966	sprintf (bstr, "%d", i - Color_Black);
871	#ifdef BG_IMAGE_FROM_FILE	967	#ifdef BG_IMAGE_FROM_FILE
872	xpmb = "default;";	968	xpmb = "default;";
873	#endif	969	#endif
874	break;	970	break;
875	}	971	}
876		972
		973	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
877	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	974	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
		975	return env_colorfgbg;
878	}	976	}
879		977
880	/----------------------------------------------------------------------/	978	/----------------------------------------------------------------------/
881		979
882	bool	980	bool
…		…
905	int old_width = szHint.width;	1003	int old_width = szHint.width;
906	int old_height = szHint.height;	1004	int old_height = szHint.height;
907		1005
908	window_calc (newwidth, newheight);	1006	window_calc (newwidth, newheight);
909		1007
910	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1008	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1009
		1010	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1011	if (set_hint)
		1012	{
		1013	szHint.flags &= ~(PBaseSize \| PResizeInc);
911	XSetWMNormalHints (dpy, parent[0], &szHint);	1014	XSetWMNormalHints (dpy, parent, &szHint);
		1015	szHint.flags \|= PBaseSize \| PResizeInc;
		1016	}
912		1017
913	if (!ignoreparent)	1018	if (!ignoreparent)
914	{	1019	{
915	#ifdef SMART_RESIZE	1020	#ifdef SMART_RESIZE
916	/*	1021	/*
…		…
920	int x, y, x1, y1;	1025	int x, y, x1, y1;
921	int dx, dy;	1026	int dx, dy;
922	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1027	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
923	Window unused_cr;	1028	Window unused_cr;
924		1029
925	XTranslateCoordinates (dpy, parent[0], display->root,	1030	XTranslateCoordinates (dpy, parent, display->root,
926	0, 0, &x, &y, &unused_cr);	1031	0, 0, &x, &y, &unused_cr);
927	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1032	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
928	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1033	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
929	/*	1034	/*
930	* if display->root isn't the parent window, a WM will probably have offset	1035	* if display->root isn't the parent window, a WM will probably have offset
931	* our position for handles and decorations. Counter it	1036	* our position for handles and decorations. Counter it
932	*/	1037	*/
…		…
949	if (y < y1) /* top half */	1054	if (y < y1) /* top half */
950	dy = 0;	1055	dy = 0;
951	else if (y == y1) /* exact center */	1056	else if (y == y1) /* exact center */
952	dy /= 2;	1057	dy /= 2;
953		1058
954	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1059	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
955	szHint.width, szHint.height);	1060	szHint.width, szHint.height);
956	#else	1061	#else
957	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1062	XResizeWindow (dpy, parent, szHint.width, szHint.height);
958	#endif	1063	#endif
959	}	1064	}
		1065
		1066	if (set_hint)
		1067	XSetWMNormalHints (dpy, parent, &szHint);
960		1068
961	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1069	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
962		1070
963	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1071	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
964	{	1072	{
965	if (scrollBar.state)	1073	if (scrollBar.state)
966	scrollBar.resize ();	1074	scrollBar.resize ();
967		1075
968	XMoveResizeWindow (dpy, vt,	1076	XMoveResizeWindow (dpy, vt,
969	window_vt_x, window_vt_y,	1077	window_vt_x, window_vt_y,
970	width, height);	1078	vt_width, vt_height);
971		1079
972	#ifdef HAVE_BG_PIXMAP	1080	#ifdef HAVE_BG_PIXMAP
973	if (bgPixmap.window_size_sensitive ())	1081	if (bg_window_size_sensitive ())
974	update_background ();	1082	update_background ();
975	#endif	1083	#endif
976
977	scr_clear ();
978	}	1084	}
979		1085
980	if (fix_screen \|\| old_height == 0)	1086	if (fix_screen \|\| old_height == 0)
981	scr_reset ();	1087	scr_reset ();
982		1088
983	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
984	//scr_touch (false);
985
986	#ifdef HAVE_BG_PIXMAP
987	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
988	// if (bgPixmap.pixmap)
989	// scr_touch (false);
990	#endif
991
992	#ifdef USE_XIM	1089	#ifdef USE_XIM
993	IMSetPosition ();	1090	im_set_position ();
994	#endif	1091	#endif
995	}	1092	}
996		1093
997	/*	1094	/*
998	* Set the width/height of the vt window in characters. Units are pixels.	1095	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1011	newwidth = wattr.width - szHint.base_width;	1108	newwidth = wattr.width - szHint.base_width;
1012	if (newheight == 0)	1109	if (newheight == 0)
1013	newheight = wattr.height - szHint.base_height;	1110	newheight = wattr.height - szHint.base_height;
1014	}	1111	}
1015		1112
1016	if (newwidth != width \|\| newheight != height)	1113	if (newwidth != vt_width \|\| newheight != vt_height)
1017	{	1114	{
1018	newwidth += szHint.base_width;	1115	newwidth += szHint.base_width;
1019	newheight += szHint.base_height;	1116	newheight += szHint.base_height;
1020	resize_all_windows (newwidth, newheight, 0);	1117	resize_all_windows (newwidth, newheight, 0);
1021	}	1118	}
…		…
1059	status_rect.height = fheight;	1156	status_rect.height = fheight;
1060	}	1157	}
1061		1158
1062	/* Checking whether input method is running. */	1159	/* Checking whether input method is running. */
1063	bool	1160	bool
1064	rxvt_term::IMisRunning ()	1161	rxvt_term::im_is_running ()
1065	{	1162	{
1066	char *p;
1067	Atom atom;	1163	Atom atom;
1068	Window win;	1164	Window win;
1069	char server[IMBUFSIZ];	1165	char server[IMBUFSIZ];
1070		1166
1071	/* get current locale modifier */	1167	/* get current locale modifier */
1072	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1168	if (char *p = XSetLocaleModifiers (0))
1073	{	1169	{
1074	strcpy (server, "@server=");	1170	strcpy (server, "@server=");
1075	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1171	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1076		1172
1077	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1173	if (p = strchr (server + 1, '@')) /* first one only */
1078	*p = '\0';	1174	*p = '\0';
1079		1175
1080	atom = XInternAtom (dpy, server, False);	1176	atom = XInternAtom (dpy, server, False);
1081	win = XGetSelectionOwner (dpy, atom);	1177	win = XGetSelectionOwner (dpy, atom);
1082		1178
1083	if (win != None)	1179	if (win != None)
1084	return True;	1180	return true;
1085	}	1181	}
1086		1182
1087	return False;	1183	return false;
1088	}	1184	}
1089		1185
1090	void	1186	void
1091	rxvt_term::IMSendSpot ()	1187	rxvt_term::im_send_spot ()
1092	{	1188	{
1093	XPoint nspot;	1189	XPoint nspot;
1094	XVaNestedList preedit_attr;	1190	XVaNestedList preedit_attr;
1095		1191
1096	if (!Input_Context	1192	if (!Input_Context
…		…
1149		1245
1150	term->make_current ();	1246	term->make_current ();
1151		1247
1152	if (text)	1248	if (text)
1153	{	1249	{
1154	void *str;	1250	wchar_t *str;
1155		1251
1156	if (!text->encoding_is_wchar && text->string.multi_byte)	1252	if (!text->encoding_is_wchar && text->string.multi_byte)
1157	{	1253	{
1158	// of course, X makes it ugly again	1254	// of course, X makes it ugly again
1159	if (term->rs[Rs_imLocale])	1255	if (term->rs[Rs_imLocale])
1160	SET_LOCALE (term->rs[Rs_imLocale]);	1256	SET_LOCALE (term->rs[Rs_imLocale]);
1161		1257
1162	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1258	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1163	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1259	mbstowcs (str, text->string.multi_byte, text->length + 1);
1164		1260
1165	if (term->rs[Rs_imLocale])	1261	if (term->rs[Rs_imLocale])
1166	SET_LOCALE (term->locale);	1262	SET_LOCALE (term->locale);
1167	}	1263	}
1168	else	1264	else
1169	str = (void *)text->string.wide_char;	1265	str = text->string.wide_char;
1170		1266
1171	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1267	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1172	DT_INT, call_data->caret,	1268	DT_INT, call_data->caret,
1173	DT_INT, call_data->chg_first,	1269	DT_INT, call_data->chg_first,
1174	DT_INT, call_data->chg_length,	1270	DT_INT, call_data->chg_length,
…		…
1202	/*	1298	/*
1203	* Try to open a XIM with the current modifiers, then see if we can	1299	* Try to open a XIM with the current modifiers, then see if we can
1204	* open a suitable preedit type	1300	* open a suitable preedit type
1205	*/	1301	*/
1206	bool	1302	bool
1207	rxvt_term::IM_get_IC (const char *modifiers)	1303	rxvt_term::im_get_ic (const char *modifiers)
1208	{	1304	{
1209	int i, j, found;	1305	int i, j, found;
1210	XIM xim;	1306	XIM xim;
1211	XPoint spot;	1307	XPoint spot;
1212	XRectangle rect, status_rect, needed_rect;	1308	XRectangle rect, status_rect, needed_rect;
1213	unsigned long fg, bg;	1309	unsigned long fg, bg;
1214	const char *p;	1310	const char *p;
1215	char **s;	1311	char **s;
1216	XIMStyles *xim_styles;	1312	XIMStyles *xim_styles;
1217	#ifdef ENABLE_XIM_ONTHESPOT
1218	XIMCallback xcb[4];
1219	#endif
1220		1313
1221	set_environ (envv);	1314	set_environ (envv);
1222		1315
1223	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1316	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1224	return false;	1317	return false;
…		…
1245	p = pet[pi];	1338	p = pet[pi];
1246		1339
1247	if (!p)	1340	if (!p)
1248	continue;	1341	continue;
1249		1342
1250	s = rxvt_splitcommastring (p);	1343	s = rxvt_strsplit (',', p);
1251		1344
1252	for (i = found = 0; !found && s[i]; i++)	1345	for (i = found = 0; !found && s[i]; i++)
1253	{	1346	{
1254	if (!strcmp (s[i], "OverTheSpot"))	1347	if (!strcmp (s[i], "OverTheSpot"))
1255	input_style = XIMPreeditPosition \| XIMStatusNothing;	1348	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1267	input_style = XIMPreeditNothing \| XIMStatusNothing;	1360	input_style = XIMPreeditNothing \| XIMStatusNothing;
1268		1361
1269	for (j = 0; j < xim_styles->count_styles; j++)	1362	for (j = 0; j < xim_styles->count_styles; j++)
1270	if (input_style == xim_styles->supported_styles[j])	1363	if (input_style == xim_styles->supported_styles[j])
1271	{	1364	{
1272	rxvt_freecommastring (s);	1365	rxvt_free_strsplit (s);
1273		1366
1274	found = 1;	1367	found = 1;
1275	goto foundpet;	1368	goto foundpet;
1276	}	1369	}
1277		1370
1278	}	1371	}
1279		1372
1280	rxvt_freecommastring (s);	1373	rxvt_free_strsplit (s);
1281	}	1374	}
1282		1375
1283	foundpet:	1376	foundpet:
1284		1377
1285	XFree (xim_styles);	1378	XFree (xim_styles);
…		…
1364	NULL);	1457	NULL);
1365	}	1458	}
1366	#if ENABLE_XIM_ONTHESPOT	1459	#if ENABLE_XIM_ONTHESPOT
1367	else if (input_style & XIMPreeditCallbacks)	1460	else if (input_style & XIMPreeditCallbacks)
1368	{	1461	{
		1462	XIMCallback xcb[4];
		1463
1369	im_set_position (spot);	1464	im_set_position (spot);
1370		1465
1371	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;	1466	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1372	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;	1467	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1373	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;	1468	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
…		…
1388	#endif	1483	#endif
1389		1484
1390	Input_Context = XCreateIC (xim,	1485	Input_Context = XCreateIC (xim,
1391	XNInputStyle, input_style,	1486	XNInputStyle, input_style,
1392	XNClientWindow, vt,	1487	XNClientWindow, vt,
1393	XNFocusWindow, parent[0],	1488	XNFocusWindow, parent,
1394	preedit_attr ? XNPreeditAttributes : NULL,	1489	preedit_attr ? XNPreeditAttributes : NULL,
1395	preedit_attr,	1490	preedit_attr,
1396	status_attr ? XNStatusAttributes : NULL,	1491	status_attr ? XNStatusAttributes : NULL,
1397	status_attr, NULL);	1492	status_attr, NULL);
1398		1493
…		…
1411	// unfortunately, only the focus window is used by XIM, hard to fix	1506	// unfortunately, only the focus window is used by XIM, hard to fix
1412	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1507	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1413	vt_select_input ();	1508	vt_select_input ();
1414	#endif	1509	#endif
1415		1510
1416	IMSetPosition ();	1511	im_set_position ();
1417		1512
1418	return true;	1513	return true;
1419	}	1514	}
1420		1515
1421	void	1516	void
…		…
1431	im_destroy ();	1526	im_destroy ();
1432		1527
1433	if (Input_Context)	1528	if (Input_Context)
1434	return;	1529	return;
1435		1530
1436	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1437	if (rs[Rs_imLocale])	1531	if (rs[Rs_imLocale])
1438	SET_LOCALE (rs[Rs_imLocale]);	1532	SET_LOCALE (rs[Rs_imLocale]);
1439	#endif
1440		1533
1441	p = rs[Rs_inputMethod];	1534	p = rs[Rs_inputMethod];
1442	if (p && *p)	1535	if (p && *p)
1443	{	1536	{
1444	bool found = false;	1537	bool found = false;
1445		1538
1446	s = rxvt_splitcommastring (p);	1539	s = rxvt_strsplit (',', p);
1447		1540
1448	for (i = 0; s[i]; i++)	1541	for (i = 0; s[i]; i++)
1449	{	1542	{
1450	if (*s[i])	1543	if (*s[i])
1451	{	1544	{
1452	strcpy (buf, "@im=");	1545	strcpy (buf, "@im=");
1453	strncat (buf, s[i], IMBUFSIZ - 5);	1546	strncat (buf, s[i], IMBUFSIZ - 5);
1454	if (IM_get_IC (buf))	1547	if (im_get_ic (buf))
1455	{	1548	{
1456	found = true;	1549	found = true;
1457	break;	1550	break;
1458	}	1551	}
1459	}	1552	}
1460	}	1553	}
1461		1554
1462	rxvt_freecommastring (s);	1555	rxvt_free_strsplit (s);
1463		1556
1464	if (found)	1557	if (found)
1465	goto done;	1558	goto done;
1466	}	1559	}
1467		1560
1468	/* try with XMODIFIERS env. var. */	1561	/* try with XMODIFIERS env. var. */
1469	if (IM_get_IC (""))	1562	if (im_get_ic (""))
1470	goto done;	1563	goto done;
1471		1564
1472	/* try with no modifiers base IF the user didn't specify an IM */	1565	/* try with no modifiers base IF the user didn't specify an IM */
1473	if (IM_get_IC ("@im=none"))	1566	if (im_get_ic ("@im=none"))
1474	goto done;	1567	goto done;
1475		1568
1476	done:	1569	done:
1477	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1478	if (rs[Rs_imLocale])	1570	if (rs[Rs_imLocale])
1479	SET_LOCALE (locale);	1571	SET_LOCALE (locale);
1480	#endif
1481	}	1572	}
1482		1573
1483	void	1574	void
1484	rxvt_term::IMSetPosition ()	1575	rxvt_term::im_set_position ()
1485	{	1576	{
1486	XRectangle preedit_rect, status_rect, *needed_rect;	1577	XRectangle preedit_rect, status_rect, *needed_rect;
1487	XVaNestedList preedit_attr, status_attr;	1578	XVaNestedList preedit_attr, status_attr;
1488		1579
1489	if (!Input_Context	1580	if (!Input_Context
1490	\|\| !focus	1581	\|\| !focus
1491	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))	1582	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1492	\|\| !IMisRunning ())	1583	\|\| !im_is_running ())
1493	return;	1584	return;
1494		1585
1495	if (input_style & XIMPreeditPosition)	1586	if (input_style & XIMPreeditPosition)
1496	{	1587	{
1497	im_set_size (preedit_rect);	1588	im_set_size (preedit_rect);
…		…
1527		1618
1528	void	1619	void
1529	rxvt_term::get_window_origin (int &x, int &y)	1620	rxvt_term::get_window_origin (int &x, int &y)
1530	{	1621	{
1531	Window cr;	1622	Window cr;
1532	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1623	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1533	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1534	}	1624	}
1535		1625
1536	Pixmap	1626	Pixmap
1537	rxvt_term::get_pixmap_property (int prop_id)	1627	rxvt_term::get_pixmap_property (Atom property)
1538	{	1628	{
1539	if (prop_id > 0 && prop_id < NUM_XA)	1629	Pixmap pixmap = None;
1540	if (xa[prop_id])	1630
1541	{
1542	int aformat;	1631	int aformat;
1543	unsigned long nitems, bytes_after;	1632	unsigned long nitems, bytes_after;
1544	Atom atype;	1633	Atom atype;
1545	unsigned char *prop = NULL;	1634	unsigned char *prop;
1546	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1635	int result = XGetWindowProperty (dpy, display->root, property,
1547	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1636	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1548	&nitems, &bytes_after, &prop);	1637	&nitems, &bytes_after, &prop);
1549	if (result == Success && prop && atype == XA_PIXMAP)	1638	if (result == Success)
		1639	{
		1640	if (atype == XA_PIXMAP)
1550	return (Pixmap )prop;	1641	pixmap = (Pixmap )prop;
		1642	XFree (prop);
1551	}	1643	}
1552		1644
1553	return None;	1645	return pixmap;
1554	}	1646	}
1555		1647
1556	#ifdef HAVE_BG_PIXMAP	1648	#ifdef HAVE_BG_PIXMAP
1557	# if TRACE_PIXMAPS
1558	# undef update_background
1559	void
1560	rxvt_term::trace_update_background (const char *file, int line)
1561	{
1562	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1563	update_background ();
1564	}
1565	# endif
1566		1649
1567	void	1650	void
1568	rxvt_term::update_background ()	1651	rxvt_term::update_background ()
1569	{	1652	{
1570	if (update_background_ev.is_active ())	1653	if (update_background_ev.is_active ())
1571	return;	1654	return;
1572		1655
1573	bgPixmap.invalidate ();	1656	bg_invalidate ();
1574		1657
		1658	if (!mapped)
		1659	return;
		1660
1575	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1661	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1576		1662
1577	if (to_wait <= 0.)	1663	if (to_wait <= 0.)
1578	bgPixmap.render ();	1664	bg_render ();
1579	else	1665	else
1580	update_background_ev.start (to_wait);	1666	update_background_ev.start (to_wait);
1581	}	1667	}
1582		1668
1583	void	1669	void
1584	rxvt_term::update_background_cb (ev::timer &w, int revents)	1670	rxvt_term::update_background_cb (ev::timer &w, int revents)
1585	{	1671	{
1586	make_current ();	1672	make_current ();
1587		1673
1588	update_background_ev.stop ();	1674	update_background_ev.stop ();
1589	bgPixmap.render ();	1675	bg_render ();
1590	refresh_check ();	1676	refresh_check ();
1591	}	1677	}
1592		1678
1593	#endif /* HAVE_BG_PIXMAP */	1679	#endif /* HAVE_BG_PIXMAP */
1594		1680

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC vs. Revision 1.371 by sf-exg, Thu Jan 19 15:44:49 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC vs.
Revision 1.371 by sf-exg, Thu Jan 19 15:44:49 2012 UTC