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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.280 by ayin, Wed Dec 12 11:35:56 2007 UTC vs.
Revision 1.316 by root, Sun Apr 26 01:51:20 2009 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-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
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.
…		…
170	#endif	170	#endif
171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173	#endif	173	#endif
174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
175	rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176	#endif	176	#endif
177	#ifdef HAVE_SCROLLBARS
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#endif
180	#ifdef USE_XIM	178	#ifdef USE_XIM
181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182	#endif	180	#endif
183	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
185	#endif	183	#endif
186	#ifndef NO_BELL	184	#ifndef NO_BELL
187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
188	#endif	186	#endif
189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190	prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
191	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
…		…
227	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
228	delete fontset[i];	225	delete fontset[i];
229	#endif	226	#endif
230	delete fontset[0];	227	delete fontset[0];
231		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
		232	#ifdef HAVE_AFTERIMAGE
		233	if (asv)
		234	destroy_asvisual (asv, 0);
		235	if (asimman)
		236	destroy_image_manager (asimman, 0);
		237	#endif
		238
232	if (display)	239	if (display)
233	{	240	{
234	selection_clear ();	241	selection_clear ();
235		242
236	#ifdef USE_XIM	243	#ifdef USE_XIM
237	im_destroy ();	244	im_destroy ();
238	#endif	245	#endif
239	#ifdef XTERM_SCROLLBAR	246	scrollBar.destroy ();
240	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
241	if (ShadowGC) XFreeGC (dpy, ShadowGC);
242	#endif
243	#ifdef PLAIN_SCROLLBAR
244	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
245	#endif
246	#ifdef NEXT_SCROLLBAR
247	if (blackGC) XFreeGC (dpy, blackGC);
248	if (whiteGC) XFreeGC (dpy, whiteGC);
249	if (grayGC) XFreeGC (dpy, grayGC);
250	if (darkGC) XFreeGC (dpy, darkGC);
251	if (stippleGC) XFreeGC (dpy, stippleGC);
252	if (dimple) XFreePixmap (dpy, dimple);
253	if (upArrow) XFreePixmap (dpy, upArrow);
254	if (downArrow) XFreePixmap (dpy, downArrow);
255	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
256	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
257	#endif
258	#ifdef RXVT_SCROLLBAR
259	if (topShadowGC) XFreeGC (dpy, topShadowGC);
260	if (botShadowGC) XFreeGC (dpy, botShadowGC);
261	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
262	#endif
263	if (gc) XFreeGC (dpy, gc);	247	if (gc) XFreeGC (dpy, gc);
264		248
265	delete drawable;	249	delete drawable;
266	// destroy all windows	250	// destroy all windows
267	if (parent[0])	251	if (parent[0])
…		…
275	pix_colors_unfocused [i].free (this);	259	pix_colors_unfocused [i].free (this);
276	#endif	260	#endif
277	}	261	}
278		262
279	clear ();	263	clear ();
280	}
281		264
282	delete [] pix_colors_focused;	265	display->flush (); /* ideally .put should do this */
283	#if OFF_FOCUS_FADING
284	delete [] pix_colors_unfocused;
285	#endif
286
287	#ifdef HAVE_BG_PIXMAP
288	bgPixmap.destroy ();
289	#endif
290	displays.put (display);	266	displays.put (display);
		267	}
291		268
292	scr_release ();	269	scr_release ();
293		270
294	/* clear all resources */	271	/* clear all resources */
295	for (int i = 0; i < allocated.size (); i++)	272	for (int i = 0; i < allocated.size (); i++)
…		…
327	}	304	}
328		305
329	void	306	void
330	rxvt_term::destroy ()	307	rxvt_term::destroy ()
331	{	308	{
332	if (ev_is_active (&destroy_ev))	309	if (destroy_ev.is_active ())
333	return;	310	return;
334		311
335	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	312	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
336		313
337	#if ENABLE_OVERLAY	314	#if ENABLE_OVERLAY
…		…
341	if (display)	318	if (display)
342	{	319	{
343	#if USE_XIM	320	#if USE_XIM
344	im_ev.stop (display);	321	im_ev.stop (display);
345	#endif	322	#endif
346	#if HAVE_SCROLLBARS
347	scrollbar_ev.stop (display);	323	scrollbar_ev.stop (display);
348	#endif
349	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	324	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
350	rootwin_ev.stop (display);	325	rootwin_ev.stop (display);
351	#endif	326	#endif
352	incr_ev.stop ();	327	incr_ev.stop ();
353	termwin_ev.stop (display);	328	termwin_ev.stop (display);
354	vt_ev.stop (display);	329	vt_ev.stop (display);
355	}	330	}
356		331
357	prepare_ev.stop ();	332	flush_ev.stop ();
358	pty_ev.stop ();	333	pty_ev.stop ();
359	#ifdef CURSOR_BLINK	334	#ifdef CURSOR_BLINK
360	cursor_blink_ev.stop ();	335	cursor_blink_ev.stop ();
361	#endif	336	#endif
362	#ifdef TEXT_BLINK	337	#ifdef TEXT_BLINK
…		…
472	DisplayString (display));	447	DisplayString (display));
473	rxvt_emergency_cleanup ();	448	rxvt_emergency_cleanup ();
474	_exit (EXIT_FAILURE);	449	_exit (EXIT_FAILURE);
475	}	450	}
476		451
477	/----------------------------------------------------------------------/
478	void
479	rxvt_term::init (int argc, const char const argv, stringvec *envv)
480	{
481	this->envv = envv;
482
483	SET_R (this);
484	set_locale ("");
485	set_environ (envv); // few things in X do not call setlocale :(
486
487	init_vars ();
488
489	init_secondary ();
490
491	const char **cmd_argv = init_resources (argc, argv);
492
493	#ifdef KEYSYM_RESOURCE
494	keyboard->register_done ();
495	#endif
496
497	#ifdef HAVE_SCROLLBARS
498	if (option (Opt_scrollBar))
499	scrollBar.setIdle (); /* set existence for size calculations */
500	#endif
501
502	pty = ptytty::create ();
503
504	create_windows (argc, argv);
505
506	init_xlocale ();
507
508	scr_reset (); // initialize screen
509
510	#if 0
511	XSynchronize (dpy, True);
512	#endif
513
514	#ifdef HAVE_SCROLLBARS
515	if (option (Opt_scrollBar))
516	resize_scrollbar (); /* create and map scrollbar */
517	#endif
518	#ifdef HAVE_BG_PIXMAP
519	{
520	bgPixmap.set_target (this);
521
522	#ifdef ENABLE_TRANSPARENCY
523	if (option (Opt_transparent))
524	{
525	bgPixmap.set_transparent ();
526	#ifdef HAVE_AFTERIMAGE
527	if (rs [Rs_blurradius])
528	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529	#endif
530	if (ISSET_PIXCOLOR (Color_tint))
531	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532	if (rs [Rs_shade])
533	bgPixmap.set_shade (rs [Rs_shade]);
534
535	bgPixmap.set_root_pixmap ();
536	XSelectInput (dpy, display->root, PropertyChangeMask);
537	rootwin_ev.start (display, display->root);
538	}
539	#endif
540
541	#ifdef BG_IMAGE_FROM_FILE
542	if (rs[Rs_backgroundPixmap] != NULL)
543	{
544	const char *p = rs[Rs_backgroundPixmap];
545
546	if ((p = strchr (p, ';')) != NULL)
547	{
548	p++;
549	bgPixmap.set_geometry (p);
550	}
551	else
552	bgPixmap.set_defaultGeometry ();
553
554	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555	if (!bgPixmap.window_position_sensitive ())
556	update_background ();
557	}
558	#endif
559	}
560	#endif
561
562	#if ENABLE_PERL
563	rootwin_ev.start (display, display->root);
564	#endif
565
566	set_colorfgbg ();
567
568	init_command (cmd_argv);
569
570	free (cmd_argv);
571
572	if (pty->pty >= 0)
573	pty_ev.start (pty->pty, ev::READ);
574
575	prepare_ev.start ();
576
577	HOOK_INVOKE ((this, HOOK_START, DT_END));
578
579	#if ENABLE_XEMBED
580	if (rs[Rs_embed])
581	{
582	long info[2] = { 0, XEMBED_MAPPED };
583
584	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
585	32, PropModeReplace, (unsigned char *)&info, 2);
586	}
587	#endif
588
589	XMapWindow (dpy, vt);
590	XMapWindow (dpy, parent[0]);
591	}
592
593	static struct sig_handlers	452	static struct sig_handlers
594	{	453	{
595	ev::sig sw_term, sw_int;	454	ev::sig sw_term, sw_int;
596		455
597	/*	456	/*
…		…
640	XSetIOErrorHandler (rxvt_xioerror_handler);	499	XSetIOErrorHandler (rxvt_xioerror_handler);
641		500
642	XrmInitialize ();	501	XrmInitialize ();
643	}	502	}
644		503
645	/* ------------------------------------------------------------------------- *
646	* MEMORY ALLOCATION WRAPPERS *
647	* ------------------------------------------------------------------------- */
648	void *
649	rxvt_malloc (size_t size)
650	{
651	void *p = malloc (size);
652
653	if (!p)
654	rxvt_fatal ("memory allocation failure. aborting.\n");
655
656	return p;
657	}
658
659	void *
660	rxvt_calloc (size_t number, size_t size)
661	{
662	void *p = calloc (number, size);
663
664	if (!p)
665	rxvt_fatal ("memory allocation failure. aborting.\n");
666
667	return p;
668	}
669
670	void *
671	rxvt_realloc (void *ptr, size_t size)
672	{
673	void *p = realloc (ptr, size);
674
675	if (!p)
676	rxvt_fatal ("memory allocation failure. aborting.\n");
677
678	return p;
679	}
680
681	/----------------------------------------------------------------------/	504	/----------------------------------------------------------------------/
682	/*	505	/*
683	* window size/position calculations for XSizeHint and other storage.	506	* window size/position calculations for XSizeHint and other storage.
684	* if width/height are non-zero then override calculated width/height	507	* if width/height are non-zero then override calculated width/height
685	*/	508	*/
686	void	509	void
687	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	510	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
688	{	511	{
689	short recalc_x, recalc_y;	512	short recalc_x, recalc_y;
690	int x, y, sb_w, flags;	513	int x, y, flags;
691	unsigned int w, h;	514	unsigned int w, h;
692	unsigned int max_width, max_height;	515	unsigned int max_width, max_height;
693		516
694	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	517	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
695	szHint.win_gravity = NorthWestGravity;	518	szHint.win_gravity = NorthWestGravity;
…		…
705	if (rs[Rs_geometry])	528	if (rs[Rs_geometry])
706	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	529	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
707		530
708	if (flags & WidthValue)	531	if (flags & WidthValue)
709	{	532	{
		533	if (!w)
		534	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		535
710	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	536	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
711	szHint.flags \|= USSize;	537	szHint.flags \|= USSize;
712	}	538	}
713		539
714	if (flags & HeightValue)	540	if (flags & HeightValue)
715	{	541	{
		542	if (!h)
		543	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		544
716	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	545	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
717	szHint.flags \|= USSize;	546	szHint.flags \|= USSize;
718	}	547	}
719		548
720	if (flags & XValue)	549	if (flags & XValue)
721	{	550	{
…		…
752	max_width = MAX_COLS * fwidth;	581	max_width = MAX_COLS * fwidth;
753	max_height = MAX_ROWS * fheight;	582	max_height = MAX_ROWS * fheight;
754		583
755	szHint.base_width = szHint.base_height = 2 * int_bwidth;	584	szHint.base_width = szHint.base_height = 2 * int_bwidth;
756		585
757	sb_w = 0;
758	window_vt_x = window_vt_y = int_bwidth;	586	window_vt_x = window_vt_y = int_bwidth;
759		587
760	if (scrollBar.state)	588	if (scrollBar.state)
761	{	589	{
762	sb_w = scrollbar_TotalWidth ();	590	int sb_w = scrollBar.total_width ();
763	szHint.base_width += sb_w;	591	szHint.base_width += sb_w;
764		592
765	if (!option (Opt_scrollBar_right))	593	if (!option (Opt_scrollBar_right))
766	window_vt_x += sb_w;	594	window_vt_x += sb_w;
767	}	595	}
…		…
791	{	619	{
792	min_it (height, max_height);	620	min_it (height, max_height);
793	szHint.height = szHint.base_height + height;	621	szHint.height = szHint.base_height + height;
794	}	622	}
795		623
796	if (scrollBar.state && option (Opt_scrollBar_right))
797	window_sb_x = szHint.width - sb_w;
798
799	if (recalc_x)	624	if (recalc_x)
800	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	625	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
801		626
802	if (recalc_y)	627	if (recalc_y)
803	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	628	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
804		629
805	ncol = width / fwidth;	630	ncol = width / fwidth;
806	nrow = height / fheight;	631	nrow = height / fheight;
807	}	632	}
808		633
809	/----------------------------------------------------------------------/	634	/----------------------------------------------------------------------/
810	/*	635	/*
…		…
961	void	786	void
962	rxvt_term::set_window_color (int idx, const char *color)	787	rxvt_term::set_window_color (int idx, const char *color)
963	{	788	{
964	#ifdef XTERM_COLOR_CHANGE	789	#ifdef XTERM_COLOR_CHANGE
965	rxvt_color xcol;	790	rxvt_color xcol;
966	int i;
967		791
968	if (color == NULL \|\| *color == '\0')	792	if (color == NULL \|\| *color == '\0')
969	return;	793	return;
970		794
971	color = strdup (color);	795	color = strdup (color);
…		…
973	rs[Rs_color + idx] = color;	797	rs[Rs_color + idx] = color;
974		798
975	/* handle color aliases */	799	/* handle color aliases */
976	if (isdigit (*color))	800	if (isdigit (*color))
977	{	801	{
978	i = atoi (color);	802	int i = atoi (color);
979		803
980	if (i >= 8 && i <= 15)	804	if (i >= 8 && i <= 15)
981	{	805	{
982	/* bright colors */	806	/* bright colors */
983	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	807	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
1087	int old_width = szHint.width;	911	int old_width = szHint.width;
1088	int old_height = szHint.height;	912	int old_height = szHint.height;
1089		913
1090	window_calc (newwidth, newheight);	914	window_calc (newwidth, newheight);
1091		915
1092	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	916	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		917
		918	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		919	if (set_hint)
		920	{
		921	szHint.flags &= ~(PBaseSize \| PResizeInc);
1093	XSetWMNormalHints (dpy, parent[0], &szHint);	922	XSetWMNormalHints (dpy, parent[0], &szHint);
		923	szHint.flags \|= PBaseSize \| PResizeInc;
		924	}
1094		925
1095	if (!ignoreparent)	926	if (!ignoreparent)
1096	{	927	{
1097	#ifdef SMART_RESIZE	928	#ifdef SMART_RESIZE
1098	/*	929	/*
…		…
1138	#else	969	#else
1139	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	970	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1140	#endif	971	#endif
1141	}	972	}
1142		973
		974	if (set_hint)
		975	XSetWMNormalHints (dpy, parent[0], &szHint);
		976
1143	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	977	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1144		978
1145	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	979	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1146	{	980	{
1147	if (scrollBar.state)	981	if (scrollBar.state)
1148	{	982	scrollBar.resize ();
1149	XMoveResizeWindow (dpy, scrollBar.win,
1150	window_sb_x, 0,
1151	scrollbar_TotalWidth (), szHint.height);
1152	resize_scrollbar ();
1153	}
1154		983
1155	XMoveResizeWindow (dpy, vt,	984	XMoveResizeWindow (dpy, vt,
1156	window_vt_x, window_vt_y,	985	window_vt_x, window_vt_y,
1157	width, height);	986	width, height);
1158		987
1159	#ifdef HAVE_BG_PIXMAP	988	#ifdef HAVE_BG_PIXMAP
1160	if (bgPixmap.window_size_sensitive ())	989	if (bgPixmap.window_size_sensitive ())
1161	update_background ();	990	update_background ();
1162	#endif	991	#endif
1163
1164	scr_clear ();
1165	}	992	}
1166		993
1167	if (fix_screen \|\| old_height == 0)	994	if (fix_screen \|\| old_height == 0)
1168	scr_reset ();	995	scr_reset ();
1169		996
…		…
1248		1075
1249	/* Checking whether input method is running. */	1076	/* Checking whether input method is running. */
1250	bool	1077	bool
1251	rxvt_term::IMisRunning ()	1078	rxvt_term::IMisRunning ()
1252	{	1079	{
1253	char *p;
1254	Atom atom;	1080	Atom atom;
1255	Window win;	1081	Window win;
1256	char server[IMBUFSIZ];	1082	char server[IMBUFSIZ];
1257		1083
1258	/* get current locale modifier */	1084	/* get current locale modifier */
1259	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1085	if (char *p = XSetLocaleModifiers (0))
1260	{	1086	{
1261	strcpy (server, "@server=");	1087	strcpy (server, "@server=");
1262	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1088	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1263		1089
1264	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1090	if (p = strchr (server + 1, '@')) /* first one only */
1265	*p = '\0';	1091	*p = '\0';
1266		1092
1267	atom = XInternAtom (dpy, server, False);	1093	atom = XInternAtom (dpy, server, False);
1268	win = XGetSelectionOwner (dpy, atom);	1094	win = XGetSelectionOwner (dpy, atom);
1269		1095
…		…
1715	void	1541	void
1716	rxvt_term::get_window_origin (int &x, int &y)	1542	rxvt_term::get_window_origin (int &x, int &y)
1717	{	1543	{
1718	Window cr;	1544	Window cr;
1719	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1545	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1720	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1546	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1721	}	1547	}
1722		1548
1723	Pixmap	1549	Pixmap
1724	rxvt_term::get_pixmap_property (int prop_id)	1550	rxvt_term::get_pixmap_property (int prop_id)
1725	{	1551	{
…		…
1732	unsigned char *prop = NULL;	1558	unsigned char *prop = NULL;
1733	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1559	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1734	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1560	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1735	&nitems, &bytes_after, &prop);	1561	&nitems, &bytes_after, &prop);
1736	if (result == Success && prop && atype == XA_PIXMAP)	1562	if (result == Success && prop && atype == XA_PIXMAP)
1737	{
1738	return (Pixmap )prop;	1563	return (Pixmap )prop;
1739	}
1740	}	1564	}
		1565
1741	return None;	1566	return None;
1742	}	1567	}
1743		1568
1744	#ifdef HAVE_BG_PIXMAP	1569	#ifdef HAVE_BG_PIXMAP
1745	# if TRACE_PIXMAPS	1570	# if TRACE_PIXMAPS
1746	# undef update_background	1571	# undef update_background
		1572	void
1747	int rxvt_term::trace_update_background (const char *file, int line)	1573	rxvt_term::trace_update_background (const char *file, int line)
1748	{	1574	{
1749	fprintf (stderr, "%s:%d:update_background()\n", file, line);	1575	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1750	update_background ();	1576	update_background ();
1751	}	1577	}
1752	# endif	1578	# endif
1753		1579
1754	int	1580	void
1755	rxvt_term::update_background ()	1581	rxvt_term::update_background ()
1756	{	1582	{
		1583	if (update_background_ev.is_active ())
		1584	return;
		1585
1757	bgPixmap.invalidate ();	1586	bgPixmap.invalidate ();
1758		1587
1759	/* no chance of real time refresh if we are blurring! */	1588	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1760	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1589
		1590	if (to_wait <= 0.)
1761	bgPixmap.render ();	1591	bgPixmap.render ();
1762	else	1592	else
1763	{
1764	update_background_ev.stop ();
1765
1766	if (!bgPixmap.need_client_side_rendering())
1767	update_background_ev.start (.05);	1593	update_background_ev.start (to_wait);
1768	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1769	update_background_ev.start (.20); /* very slow !!! */
1770	else
1771	update_background_ev.start (.07);
1772	}
1773
1774	return 0;
1775	}	1594	}
1776		1595
1777	void	1596	void
1778	rxvt_term::update_background_cb (ev::timer &w, int revents)	1597	rxvt_term::update_background_cb (ev::timer &w, int revents)
1779	{	1598	{
		1599	make_current ();
		1600
		1601	update_background_ev.stop ();
1780	bgPixmap.render ();	1602	bgPixmap.render ();
		1603	refresh_check ();
1781	}	1604	}
1782		1605
1783	#endif /* HAVE_BG_PIXMAP */	1606	#endif /* HAVE_BG_PIXMAP */
1784		1607
1785	/----------------------- end-of-file (C source) -----------------------/	1608	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.280 by ayin, Wed Dec 12 11:35:56 2007 UTC vs. Revision 1.316 by root, Sun Apr 26 01:51:20 2009 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.280 by ayin, Wed Dec 12 11:35:56 2007 UTC vs.
Revision 1.316 by root, Sun Apr 26 01:51:20 2009 UTC