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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.303 by ayin, Sun Jan 27 22:48:33 2008 UTC vs.
Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 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	#ifdef XTERM_SCROLLBAR	241	scrollBar.destroy ();
241	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
242	if (ShadowGC) XFreeGC (dpy, ShadowGC);
243	#endif
244	#ifdef PLAIN_SCROLLBAR
245	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
246	#endif
247	#ifdef NEXT_SCROLLBAR
248	if (blackGC) XFreeGC (dpy, blackGC);
249	if (whiteGC) XFreeGC (dpy, whiteGC);
250	if (grayGC) XFreeGC (dpy, grayGC);
251	if (darkGC) XFreeGC (dpy, darkGC);
252	if (stippleGC) XFreeGC (dpy, stippleGC);
253	if (dimple) XFreePixmap (dpy, dimple);
254	if (upArrow) XFreePixmap (dpy, upArrow);
255	if (downArrow) XFreePixmap (dpy, downArrow);
256	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
257	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
258	#endif
259	#ifdef RXVT_SCROLLBAR
260	if (topShadowGC) XFreeGC (dpy, topShadowGC);
261	if (botShadowGC) XFreeGC (dpy, botShadowGC);
262	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
263	#endif
264	if (gc) XFreeGC (dpy, gc);	242	if (gc) XFreeGC (dpy, gc);
265		243
266	delete drawable;	244	delete drawable;
267	// destroy all windows	245	// destroy all windows
268	if (parent[0])	246	if (parent)
269	XDestroyWindow (dpy, parent[0]);	247	XDestroyWindow (dpy, parent);
270		248
271	for (int i = 0; i < TOTAL_COLORS; i++)	249	for (int i = 0; i < TOTAL_COLORS; i++)
272	if (ISSET_PIXCOLOR (i))	250	if (ISSET_PIXCOLOR (i))
273	{	251	{
274	pix_colors_focused [i].free (this);	252	pix_colors_focused [i].free (this);
…		…
288	/* clear all resources */	266	/* clear all resources */
289	for (int i = 0; i < allocated.size (); i++)	267	for (int i = 0; i < allocated.size (); i++)
290	free (allocated [i]);	268	free (allocated [i]);
291		269
292	free (selection.text);	270	free (selection.text);
		271	free (selection.clip_text);
293	// TODO: manage env vars in child only(!)	272	// TODO: manage env vars in child only(!)
294	free (env_display);	273	free (env_display);
295	free (env_term);	274	free (env_term);
296	free (locale);	275	free (locale);
297	free (v_buffer);	276	free (v_buffer);
298	free (incr_buf);	277
		278	delete selection_req;
299		279
300	delete envv;	280	delete envv;
301	delete argv;	281	delete argv;
302		282
303	#ifdef KEYSYM_RESOURCE	283	#ifdef KEYSYM_RESOURCE
…		…
339	#endif	319	#endif
340	scrollbar_ev.stop (display);	320	scrollbar_ev.stop (display);
341	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
342	rootwin_ev.stop (display);	322	rootwin_ev.stop (display);
343	#endif	323	#endif
344	incr_ev.stop ();
345	termwin_ev.stop (display);	324	termwin_ev.stop (display);
346	vt_ev.stop (display);	325	vt_ev.stop (display);
347	}	326	}
348		327
349	flush_ev.stop ();	328	flush_ev.stop ();
…		…
371	rxvt_term::destroy_cb (ev::idle &w, int revents)	350	rxvt_term::destroy_cb (ev::idle &w, int revents)
372	{	351	{
373	make_current ();	352	make_current ();
374		353
375	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);
376	}	367	}
377		368
378	/----------------------------------------------------------------------/	369	/----------------------------------------------------------------------/
379	/*	370	/*
380	* Exit gracefully, clearing the utmp entry and restoring tty attributes	371	* Exit gracefully, clearing the utmp entry and restoring tty attributes
…		…
394	print_x_error (Display dpy, XErrorEvent event)	385	print_x_error (Display dpy, XErrorEvent event)
395	{	386	{
396	char buffer[BUFSIZ];	387	char buffer[BUFSIZ];
397	char mesg[BUFSIZ];	388	char mesg[BUFSIZ];
398	char number[32];	389	char number[32];
399	char *mtype = "XlibMessage";	390	const char mtype[] = "XlibMessage";
400	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	391	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	392	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402	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");
403	rxvt_warn ("%s: %s\n", mesg, buffer);	394	rxvt_warn ("%s: %s\n", mesg, buffer);
404	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	395	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	396	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
406	sprintf(number, "%d", event->request_code);	397	sprintf(number, "%d", event->request_code);
407	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	398	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
408	rxvt_warn ("(which is %s)\n", buffer);	399	rxvt_warn ("(which is %s)\n", buffer);
409	if (event->request_code >= 128) {	400	if (event->request_code >= 128) {
410	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	401	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
411	mesg, BUFSIZ);	402	mesg, BUFSIZ);
412	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
413	}	404	}
414	if ((event->error_code == BadWindow) \|\|	405	if ((event->error_code == BadWindow) \|\|
415	(event->error_code == BadPixmap) \|\|	406	(event->error_code == BadPixmap) \|\|
416	(event->error_code == BadCursor) \|\|	407	(event->error_code == BadCursor) \|\|
417	(event->error_code == BadFont) \|\|	408	(event->error_code == BadFont) \|\|
418	(event->error_code == BadDrawable) \|\|	409	(event->error_code == BadDrawable) \|\|
419	(event->error_code == BadColor) \|\|	410	(event->error_code == BadColor) \|\|
420	(event->error_code == BadGC) \|\|	411	(event->error_code == BadGC) \|\|
421	(event->error_code == BadIDChoice) \|\|	412	(event->error_code == BadIDChoice) \|\|
422	(event->error_code == BadValue) \|\|	413	(event->error_code == BadValue) \|\|
423	(event->error_code == BadAtom)) {	414	(event->error_code == BadAtom)) {
424	if (event->error_code == BadValue)	415	if (event->error_code == BadValue)
425	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	416	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
426	mesg, BUFSIZ);	417	mesg, BUFSIZ);
427	else if (event->error_code == BadAtom)	418	else if (event->error_code == BadAtom)
428	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	419	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
429	mesg, BUFSIZ);	420	mesg, BUFSIZ);
430	else	421	else
431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	422	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
432	mesg, BUFSIZ);	423	mesg, BUFSIZ);
433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	424	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434	}	425	}
435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	426	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
436	mesg, BUFSIZ);	427	mesg, BUFSIZ);
437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438	}	429	}
439	#endif	430	#endif
440		431
441	int	432	int
…		…
488	rxvt_emergency_cleanup ();	479	rxvt_emergency_cleanup ();
489	w.stop ();	480	w.stop ();
490	kill (getpid (), w.signum);	481	kill (getpid (), w.signum);
491	}	482	}
492		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
493	char **rxvt_environ; // startup environment	551	char **rxvt_environ; // startup environment
494		552
495	void	553	void
496	rxvt_init ()	554	rxvt_init ()
497	{	555	{
498	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))));
499		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
500	if (!ev_default_loop (0))	565	if (!ev_default_loop ())
501	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	566	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
502		567
503	rxvt_environ = environ;	568	rxvt_environ = environ;
504		569
505	signal (SIGHUP, SIG_IGN);	570	signal (SIGHUP, SIG_IGN);
506	signal (SIGPIPE, SIG_IGN);	571	signal (SIGPIPE, SIG_IGN);
507		572
508	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	573	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
509	sig_handlers.sw_int.start (SIGINT); ev_unref ();	574	sig_handlers.sw_int.start (SIGINT); ev_unref ();
510
511	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
512	/* signal (SIGURG, SIG_DFL); */
513		575
514	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	576	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
515	// TODO: handle this with exceptions and tolerate the memory loss	577	// TODO: handle this with exceptions and tolerate the memory loss
516	XSetIOErrorHandler (rxvt_xioerror_handler);	578	XSetIOErrorHandler (rxvt_xioerror_handler);
517		579
…		…
525	*/	587	*/
526	void	588	void
527	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	589	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
528	{	590	{
529	short recalc_x, recalc_y;	591	short recalc_x, recalc_y;
530	int x, y, sb_w, flags;	592	int x, y, flags;
531	unsigned int w, h;	593	unsigned int w, h;
532	unsigned int max_width, max_height;	594	unsigned int max_width, max_height;
533		595
534	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	596	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
535	szHint.win_gravity = NorthWestGravity;	597	szHint.win_gravity = NorthWestGravity;
…		…
545	if (rs[Rs_geometry])	607	if (rs[Rs_geometry])
546	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	608	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
547		609
548	if (flags & WidthValue)	610	if (flags & WidthValue)
549	{	611	{
		612	if (!w)
		613	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		614
550	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	615	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
551	szHint.flags \|= USSize;	616	szHint.flags \|= USSize;
552	}	617	}
553		618
554	if (flags & HeightValue)	619	if (flags & HeightValue)
555	{	620	{
		621	if (!h)
		622	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		623
556	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	624	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
557	szHint.flags \|= USSize;	625	szHint.flags \|= USSize;
558	}	626	}
559		627
560	if (flags & XValue)	628	if (flags & XValue)
561	{	629	{
…		…
592	max_width = MAX_COLS * fwidth;	660	max_width = MAX_COLS * fwidth;
593	max_height = MAX_ROWS * fheight;	661	max_height = MAX_ROWS * fheight;
594		662
595	szHint.base_width = szHint.base_height = 2 * int_bwidth;	663	szHint.base_width = szHint.base_height = 2 * int_bwidth;
596		664
597	sb_w = 0;
598	window_vt_x = window_vt_y = int_bwidth;	665	window_vt_x = window_vt_y = int_bwidth;
599		666
600	if (scrollBar.state)	667	if (scrollBar.state)
601	{	668	{
602	sb_w = scrollbar_TotalWidth ();	669	int sb_w = scrollBar.total_width ();
603	szHint.base_width += sb_w;	670	szHint.base_width += sb_w;
604		671
605	if (!option (Opt_scrollBar_right))	672	if (!option (Opt_scrollBar_right))
606	window_vt_x += sb_w;	673	window_vt_x += sb_w;
607	}	674	}
…		…
631	{	698	{
632	min_it (height, max_height);	699	min_it (height, max_height);
633	szHint.height = szHint.base_height + height;	700	szHint.height = szHint.base_height + height;
634	}	701	}
635		702
636	if (scrollBar.state && option (Opt_scrollBar_right))
637	window_sb_x = szHint.width - sb_w;
638
639	if (recalc_x)	703	if (recalc_x)
640	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	704	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
641		705
642	if (recalc_y)	706	if (recalc_y)
643	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	707	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
644		708
645	ncol = width / fwidth;	709	ncol = width / fwidth;
646	nrow = height / fheight;	710	nrow = height / fheight;
647	}	711	}
648		712
649	/----------------------------------------------------------------------/	713	/----------------------------------------------------------------------/
650	/*	714	/*
…		…
661		725
662	ws.ws_col = ncol;	726	ws.ws_col = ncol;
663	ws.ws_row = nrow;	727	ws.ws_row = nrow;
664	ws.ws_xpixel = width;	728	ws.ws_xpixel = width;
665	ws.ws_ypixel = height;	729	ws.ws_ypixel = height;
666	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	730	ioctl (pty->pty, TIOCSWINSZ, &ws);
667		731
668	#if 0	732	#if 0
669	// TIOCSWINSZ is supposed to do this automatically and correctly	733	// TIOCSWINSZ is supposed to do this automatically and correctly
670	if (cmd_pid) /* force through to the command */	734	if (cmd_pid) /* force through to the command */
671	kill (-cmd_pid, SIGWINCH);	735	kill (-cmd_pid, SIGWINCH);
672	#endif	736	#endif
673	}	737	}
674		738
675	/----------------------------------------------------------------------/	739	/----------------------------------------------------------------------/
676	/* set_fonts () - load and set the various fonts	740	/* load and set the various fonts */
677	*
678	* init = 1 - initialize
679	*
680	* fontname == FONT_UP - switch to bigger font
681	* fontname == FONT_DN - switch to smaller font
682	*/
683	bool	741	bool
684	rxvt_term::set_fonts ()	742	rxvt_term::set_fonts ()
685	{	743	{
686	rxvt_fontset *fs = new rxvt_fontset (this);	744	rxvt_fontset *fs = new rxvt_fontset (this);
687	rxvt_fontprop prop;	745	rxvt_fontprop prop;
…		…
701	#endif	759	#endif
702		760
703	delete fontset[0];	761	delete fontset[0];
704	fontset[0] = fs;	762	fontset[0] = fs;
705		763
706	prop = (*fs)[1]->properties ();	764	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
707	prop.height += lineSpace;	765	prop.height += lineSpace;
		766	prop.width += letterSpace;
708		767
709	fs->set_prop (prop, false);	768	fs->set_prop (prop, false);
710		769
711	fwidth = prop.width;	770	fwidth = prop.width;
712	fheight = prop.height;	771	fheight = prop.height;
…		…
743	#else	802	#else
744	fontset[style] = fontset[0];	803	fontset[style] = fontset[0];
745	#endif	804	#endif
746	}	805	}
747		806
748	if (parent[0])	807	if (parent)
749	{	808	{
750	resize_all_windows (0, 0, 0);	809	resize_all_windows (0, 0, 0);
751	scr_remap_chars ();	810	scr_remap_chars ();
752	scr_touch (true);	811	scr_touch (true);
753	}	812	}
…		…
756	}	815	}
757		816
758	void	817	void
759	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)
760	{	819	{
761	XChangeProperty (dpy, parent[0],	820	XChangeProperty (dpy, parent,
762	prop, XA_STRING, 8, PropModeReplace,	821	prop, XA_STRING, 8, PropModeReplace,
763	(const unsigned char *)str, len >= 0 ? len : strlen (str));	822	(const unsigned char *)str, len >= 0 ? len : strlen (str));
764	}	823	}
765		824
766	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
767	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)
768	{	839	{
769	wchar_t *ws = rxvt_mbstowcs (str, len);	840	wchar_t *ws = rxvt_mbstowcs (str, len);
770	char *s = rxvt_wcstoutf8 (ws);	841	char *s = rxvt_wcstoutf8 (ws);
771		842
772	XChangeProperty (dpy, parent[0],	843	XChangeProperty (dpy, parent,
773	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	844	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
774	(const unsigned char *)s, strlen (s));	845	(const unsigned char *)s, strlen (s));
775		846
776	free (s);	847	free (s);
777	free (ws);	848	free (ws);
…		…
781	/----------------------------------------------------------------------/	852	/----------------------------------------------------------------------/
782	/* xterm sequences - title, iconName, color (exptl) */	853	/* xterm sequences - title, iconName, color (exptl) */
783	void	854	void
784	rxvt_term::set_title (const char *str)	855	rxvt_term::set_title (const char *str)
785	{	856	{
786	set_string_property (XA_WM_NAME, str);	857	set_mbstring_property (XA_WM_NAME, str);
787	#if ENABLE_EWMH	858	#if ENABLE_EWMH
788	set_utf8_property (xa[XA_NET_WM_NAME], str);	859	set_utf8_property (xa[XA_NET_WM_NAME], str);
789	#endif	860	#endif
790	}	861	}
791		862
792	void	863	void
793	rxvt_term::set_icon_name (const char *str)	864	rxvt_term::set_icon_name (const char *str)
794	{	865	{
795	set_string_property (XA_WM_ICON_NAME, str);	866	set_mbstring_property (XA_WM_ICON_NAME, str);
796	#if ENABLE_EWMH	867	#if ENABLE_EWMH
797	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	868	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
798	#endif	869	#endif
799	}	870	}
800		871
801	void	872	void
802	rxvt_term::set_window_color (int idx, const char *color)	873	rxvt_term::set_window_color (int idx, const char *color)
803	{	874	{
804	#ifdef XTERM_COLOR_CHANGE	875	#ifdef XTERM_COLOR_CHANGE
805	rxvt_color xcol;	876	rxvt_color xcol;
806	int i;
807		877
808	if (color == NULL \|\| *color == '\0')	878	if (color == NULL \|\| *color == '\0')
809	return;	879	return;
810		880
811	color = strdup (color);	881	color = strdup (color);
…		…
813	rs[Rs_color + idx] = color;	883	rs[Rs_color + idx] = color;
814		884
815	/* handle color aliases */	885	/* handle color aliases */
816	if (isdigit (*color))	886	if (isdigit (*color))
817	{	887	{
818	i = atoi (color);	888	int i = atoi (color);
819		889
820	if (i >= 8 && i <= 15)	890	if (i >= 8 && i <= 15)
821	{	891	{
822	/* bright colors */	892	/* bright colors */
823	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	893	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
873	void	943	void
874	rxvt_term::set_colorfgbg ()	944	rxvt_term::set_colorfgbg ()
875	{	945	{
876	unsigned int i;	946	unsigned int i;
877	const char *xpmb = "";	947	const char *xpmb = "";
878	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	948	char fstr[] = "default";
		949	char bstr[] = "default";
879		950
880	strcpy (fstr, "default");
881	strcpy (bstr, "default");
882	for (i = Color_Black; i <= Color_White; i++)	951	for (i = Color_Black; i <= Color_White; i++)
883	if (pix_colors[Color_fg] == pix_colors[i])	952	if (pix_colors[Color_fg] == pix_colors[i])
884	{	953	{
885	sprintf (fstr, "%d", (i - Color_Black));	954	sprintf (fstr, "%d", i - Color_Black);
886	break;	955	break;
887	}	956	}
888		957
889	for (i = Color_Black; i <= Color_White; i++)	958	for (i = Color_Black; i <= Color_White; i++)
890	if (pix_colors[Color_bg] == pix_colors[i])	959	if (pix_colors[Color_bg] == pix_colors[i])
891	{	960	{
892	sprintf (bstr, "%d", (i - Color_Black));	961	sprintf (bstr, "%d", i - Color_Black);
893	#ifdef BG_IMAGE_FROM_FILE	962	#ifdef BG_IMAGE_FROM_FILE
894	xpmb = "default;";	963	xpmb = "default;";
895	#endif	964	#endif
896	break;	965	break;
897	}	966	}
…		…
927	int old_width = szHint.width;	996	int old_width = szHint.width;
928	int old_height = szHint.height;	997	int old_height = szHint.height;
929		998
930	window_calc (newwidth, newheight);	999	window_calc (newwidth, newheight);
931		1000
932	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);
933	XSetWMNormalHints (dpy, parent[0], &szHint);	1007	XSetWMNormalHints (dpy, parent, &szHint);
		1008	szHint.flags \|= PBaseSize \| PResizeInc;
		1009	}
934		1010
935	if (!ignoreparent)	1011	if (!ignoreparent)
936	{	1012	{
937	#ifdef SMART_RESIZE	1013	#ifdef SMART_RESIZE
938	/*	1014	/*
…		…
942	int x, y, x1, y1;	1018	int x, y, x1, y1;
943	int dx, dy;	1019	int dx, dy;
944	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1020	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
945	Window unused_cr;	1021	Window unused_cr;
946		1022
947	XTranslateCoordinates (dpy, parent[0], display->root,	1023	XTranslateCoordinates (dpy, parent, display->root,
948	0, 0, &x, &y, &unused_cr);	1024	0, 0, &x, &y, &unused_cr);
949	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1025	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
950	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1026	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
951	/*	1027	/*
952	* 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
953	* our position for handles and decorations. Counter it	1029	* our position for handles and decorations. Counter it
954	*/	1030	*/
…		…
971	if (y < y1) /* top half */	1047	if (y < y1) /* top half */
972	dy = 0;	1048	dy = 0;
973	else if (y == y1) /* exact center */	1049	else if (y == y1) /* exact center */
974	dy /= 2;	1050	dy /= 2;
975		1051
976	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1052	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
977	szHint.width, szHint.height);	1053	szHint.width, szHint.height);
978	#else	1054	#else
979	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1055	XResizeWindow (dpy, parent, szHint.width, szHint.height);
980	#endif	1056	#endif
981	}	1057	}
		1058
		1059	if (set_hint)
		1060	XSetWMNormalHints (dpy, parent, &szHint);
982		1061
983	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1062	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
984		1063
985	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1064	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
986	{	1065	{
987	if (scrollBar.state)	1066	if (scrollBar.state)
988	{	1067	scrollBar.resize ();
989	XMoveResizeWindow (dpy, scrollBar.win,
990	window_sb_x, 0,
991	scrollbar_TotalWidth (), szHint.height);
992	resize_scrollbar ();
993	}
994		1068
995	XMoveResizeWindow (dpy, vt,	1069	XMoveResizeWindow (dpy, vt,
996	window_vt_x, window_vt_y,	1070	window_vt_x, window_vt_y,
997	width, height);	1071	width, height);
998		1072
999	#ifdef HAVE_BG_PIXMAP	1073	#ifdef HAVE_BG_PIXMAP
1000	if (bgPixmap.window_size_sensitive ())	1074	if (bg_window_size_sensitive ())
1001	update_background ();	1075	update_background ();
1002	#endif	1076	#endif
1003
1004	scr_clear ();
1005	}	1077	}
1006		1078
1007	if (fix_screen \|\| old_height == 0)	1079	if (fix_screen \|\| old_height == 0)
1008	scr_reset ();	1080	scr_reset ();
1009
1010	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1011	//scr_touch (false);
1012
1013	#ifdef HAVE_BG_PIXMAP
1014	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1015	// if (bgPixmap.pixmap)
1016	// scr_touch (false);
1017	#endif
1018		1081
1019	#ifdef USE_XIM	1082	#ifdef USE_XIM
1020	IMSetPosition ();	1083	IMSetPosition ();
1021	#endif	1084	#endif
1022	}	1085	}
…		…
1088		1151
1089	/* Checking whether input method is running. */	1152	/* Checking whether input method is running. */
1090	bool	1153	bool
1091	rxvt_term::IMisRunning ()	1154	rxvt_term::IMisRunning ()
1092	{	1155	{
1093	char *p;
1094	Atom atom;	1156	Atom atom;
1095	Window win;	1157	Window win;
1096	char server[IMBUFSIZ];	1158	char server[IMBUFSIZ];
1097		1159
1098	/* get current locale modifier */	1160	/* get current locale modifier */
1099	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1161	if (char *p = XSetLocaleModifiers (0))
1100	{	1162	{
1101	strcpy (server, "@server=");	1163	strcpy (server, "@server=");
1102	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1164	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1103		1165
1104	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1166	if (p = strchr (server + 1, '@')) /* first one only */
1105	*p = '\0';	1167	*p = '\0';
1106		1168
1107	atom = XInternAtom (dpy, server, False);	1169	atom = XInternAtom (dpy, server, False);
1108	win = XGetSelectionOwner (dpy, atom);	1170	win = XGetSelectionOwner (dpy, atom);
1109		1171
1110	if (win != None)	1172	if (win != None)
1111	return True;	1173	return true;
1112	}	1174	}
1113		1175
1114	return False;	1176	return false;
1115	}	1177	}
1116		1178
1117	void	1179	void
1118	rxvt_term::IMSendSpot ()	1180	rxvt_term::IMSendSpot ()
1119	{	1181	{
…		…
1176		1238
1177	term->make_current ();	1239	term->make_current ();
1178		1240
1179	if (text)	1241	if (text)
1180	{	1242	{
1181	void *str;	1243	wchar_t *str;
1182		1244
1183	if (!text->encoding_is_wchar && text->string.multi_byte)	1245	if (!text->encoding_is_wchar && text->string.multi_byte)
1184	{	1246	{
1185	// of course, X makes it ugly again	1247	// of course, X makes it ugly again
1186	if (term->rs[Rs_imLocale])	1248	if (term->rs[Rs_imLocale])
1187	SET_LOCALE (term->rs[Rs_imLocale]);	1249	SET_LOCALE (term->rs[Rs_imLocale]);
1188		1250
1189	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1251	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1190	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1252	mbstowcs (str, text->string.multi_byte, text->length + 1);
1191		1253
1192	if (term->rs[Rs_imLocale])	1254	if (term->rs[Rs_imLocale])
1193	SET_LOCALE (term->locale);	1255	SET_LOCALE (term->locale);
1194	}	1256	}
1195	else	1257	else
1196	str = (void *)text->string.wide_char;	1258	str = text->string.wide_char;
1197		1259
1198	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1260	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1199	DT_INT, call_data->caret,	1261	DT_INT, call_data->caret,
1200	DT_INT, call_data->chg_first,	1262	DT_INT, call_data->chg_first,
1201	DT_INT, call_data->chg_length,	1263	DT_INT, call_data->chg_length,
…		…
1239	XRectangle rect, status_rect, needed_rect;	1301	XRectangle rect, status_rect, needed_rect;
1240	unsigned long fg, bg;	1302	unsigned long fg, bg;
1241	const char *p;	1303	const char *p;
1242	char **s;	1304	char **s;
1243	XIMStyles *xim_styles;	1305	XIMStyles *xim_styles;
1244	#ifdef ENABLE_XIM_ONTHESPOT
1245	XIMCallback xcb[4];
1246	#endif
1247		1306
1248	set_environ (envv);	1307	set_environ (envv);
1249		1308
1250	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1309	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1251	return false;	1310	return false;
…		…
1272	p = pet[pi];	1331	p = pet[pi];
1273		1332
1274	if (!p)	1333	if (!p)
1275	continue;	1334	continue;
1276		1335
1277	s = rxvt_splitcommastring (p);	1336	s = rxvt_strsplit (',', p);
1278		1337
1279	for (i = found = 0; !found && s[i]; i++)	1338	for (i = found = 0; !found && s[i]; i++)
1280	{	1339	{
1281	if (!strcmp (s[i], "OverTheSpot"))	1340	if (!strcmp (s[i], "OverTheSpot"))
1282	input_style = XIMPreeditPosition \| XIMStatusNothing;	1341	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1294	input_style = XIMPreeditNothing \| XIMStatusNothing;	1353	input_style = XIMPreeditNothing \| XIMStatusNothing;
1295		1354
1296	for (j = 0; j < xim_styles->count_styles; j++)	1355	for (j = 0; j < xim_styles->count_styles; j++)
1297	if (input_style == xim_styles->supported_styles[j])	1356	if (input_style == xim_styles->supported_styles[j])
1298	{	1357	{
1299	rxvt_freecommastring (s);	1358	rxvt_free_strsplit (s);
1300		1359
1301	found = 1;	1360	found = 1;
1302	goto foundpet;	1361	goto foundpet;
1303	}	1362	}
1304		1363
1305	}	1364	}
1306		1365
1307	rxvt_freecommastring (s);	1366	rxvt_free_strsplit (s);
1308	}	1367	}
1309		1368
1310	foundpet:	1369	foundpet:
1311		1370
1312	XFree (xim_styles);	1371	XFree (xim_styles);
…		…
1391	NULL);	1450	NULL);
1392	}	1451	}
1393	#if ENABLE_XIM_ONTHESPOT	1452	#if ENABLE_XIM_ONTHESPOT
1394	else if (input_style & XIMPreeditCallbacks)	1453	else if (input_style & XIMPreeditCallbacks)
1395	{	1454	{
		1455	XIMCallback xcb[4];
		1456
1396	im_set_position (spot);	1457	im_set_position (spot);
1397		1458
1398	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;
1399	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;
1400	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;
…		…
1415	#endif	1476	#endif
1416		1477
1417	Input_Context = XCreateIC (xim,	1478	Input_Context = XCreateIC (xim,
1418	XNInputStyle, input_style,	1479	XNInputStyle, input_style,
1419	XNClientWindow, vt,	1480	XNClientWindow, vt,
1420	XNFocusWindow, parent[0],	1481	XNFocusWindow, parent,
1421	preedit_attr ? XNPreeditAttributes : NULL,	1482	preedit_attr ? XNPreeditAttributes : NULL,
1422	preedit_attr,	1483	preedit_attr,
1423	status_attr ? XNStatusAttributes : NULL,	1484	status_attr ? XNStatusAttributes : NULL,
1424	status_attr, NULL);	1485	status_attr, NULL);
1425		1486
…		…
1468	p = rs[Rs_inputMethod];	1529	p = rs[Rs_inputMethod];
1469	if (p && *p)	1530	if (p && *p)
1470	{	1531	{
1471	bool found = false;	1532	bool found = false;
1472		1533
1473	s = rxvt_splitcommastring (p);	1534	s = rxvt_strsplit (',', p);
1474		1535
1475	for (i = 0; s[i]; i++)	1536	for (i = 0; s[i]; i++)
1476	{	1537	{
1477	if (*s[i])	1538	if (*s[i])
1478	{	1539	{
…		…
1484	break;	1545	break;
1485	}	1546	}
1486	}	1547	}
1487	}	1548	}
1488		1549
1489	rxvt_freecommastring (s);	1550	rxvt_free_strsplit (s);
1490		1551
1491	if (found)	1552	if (found)
1492	goto done;	1553	goto done;
1493	}	1554	}
1494		1555
…		…
1554		1615
1555	void	1616	void
1556	rxvt_term::get_window_origin (int &x, int &y)	1617	rxvt_term::get_window_origin (int &x, int &y)
1557	{	1618	{
1558	Window cr;	1619	Window cr;
1559	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1620	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1560	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1561	}	1621	}
1562		1622
1563	Pixmap	1623	Pixmap
1564	rxvt_term::get_pixmap_property (int prop_id)	1624	rxvt_term::get_pixmap_property (Atom property)
1565	{	1625	{
1566	if (prop_id > 0 && prop_id < NUM_XA)	1626	Pixmap pixmap = None;
1567	if (xa[prop_id])	1627
1568	{
1569	int aformat;	1628	int aformat;
1570	unsigned long nitems, bytes_after;	1629	unsigned long nitems, bytes_after;
1571	Atom atype;	1630	Atom atype;
1572	unsigned char *prop = NULL;	1631	unsigned char *prop;
1573	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1632	int result = XGetWindowProperty (dpy, display->root, property,
1574	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1633	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1575	&nitems, &bytes_after, &prop);	1634	&nitems, &bytes_after, &prop);
1576	if (result == Success && prop && atype == XA_PIXMAP)	1635	if (result == Success)
		1636	{
		1637	if (atype == XA_PIXMAP)
1577	return (Pixmap )prop;	1638	pixmap = (Pixmap )prop;
		1639	XFree (prop);
1578	}	1640	}
1579		1641
1580	return None;	1642	return pixmap;
1581	}	1643	}
1582		1644
1583	#ifdef HAVE_BG_PIXMAP	1645	#ifdef HAVE_BG_PIXMAP
1584	# if TRACE_PIXMAPS
1585	# undef update_background
1586	void
1587	rxvt_term::trace_update_background (const char *file, int line)
1588	{
1589	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1590	update_background ();
1591	}
1592	# endif
1593		1646
1594	void	1647	void
1595	rxvt_term::update_background ()	1648	rxvt_term::update_background ()
1596	{	1649	{
1597	if (update_background_ev.is_active ())	1650	if (update_background_ev.is_active ())
1598	return;	1651	return;
1599		1652
1600	bgPixmap.invalidate ();	1653	bg_invalidate ();
1601		1654
1602	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1655	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1603		1656
1604	if (to_wait <= 0.)	1657	if (to_wait <= 0.)
1605	bgPixmap.render ();	1658	bg_render ();
1606	else	1659	else
1607	update_background_ev.start (to_wait);	1660	update_background_ev.start (to_wait);
1608	}	1661	}
1609		1662
1610	void	1663	void
1611	rxvt_term::update_background_cb (ev::timer &w, int revents)	1664	rxvt_term::update_background_cb (ev::timer &w, int revents)
1612	{	1665	{
1613	make_current ();	1666	make_current ();
1614		1667
1615	update_background_ev.stop ();	1668	update_background_ev.stop ();
1616	bgPixmap.render ();	1669	bg_render ();
1617	refresh_check ();	1670	refresh_check ();
1618	}	1671	}
1619		1672
1620	#endif /* HAVE_BG_PIXMAP */	1673	#endif /* HAVE_BG_PIXMAP */
1621		1674

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.303 by ayin, Sun Jan 27 22:48:33 2008 UTC vs. Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.303 by ayin, Sun Jan 27 22:48:33 2008 UTC vs.
Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 2011 UTC