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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC vs.
Revision 1.314 by root, Wed Nov 5 12:28:15 2008 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.
…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef HAVE_TERMIOS_H
44	# include <termios.h>	43	#include <termios.h>
45	#endif
46		44
47	#ifdef HAVE_XSETLOCALE	45	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	46	# define X_LOCALE
49	# include <X11/Xlocale.h>	47	# include <X11/Xlocale.h>
50	#else	48	#else
…		…
152		150
153	}	151	}
154	#endif	152	#endif
155		153
156	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
157	:	155	{
158	#if HAVE_BG_PIXMAP	156	#if HAVE_BG_PIXMAP
159	update_background_ev(this, &rxvt_term::update_background_cb),	157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160	#endif	158	#endif
161	#ifdef CURSOR_BLINK	159	#ifdef CURSOR_BLINK
162	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
163	#endif	161	#endif
164	#ifdef TEXT_BLINK	162	#ifdef TEXT_BLINK
165	text_blink_ev (this, &rxvt_term::text_blink_cb),	163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
166	#endif	164	#endif
167	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),	166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169	#endif	167	#endif
170	#ifdef SELECTION_SCROLLING	168	#ifdef SELECTION_SCROLLING
171	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),	169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
172	#endif	170	#endif
173	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),	172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
		174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
		175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
		176	#endif
		177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
		178	#ifdef USE_XIM
		179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
175	#endif	180	#endif
176	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
177	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
178	#endif	183	#endif
179	#ifndef NO_BELL	184	#ifndef NO_BELL
180	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
181	#endif	186	#endif
182	child_ev (this, &rxvt_term::child_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
183	prepare_ev (this, &rxvt_term::prepare_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
184	flush_ev (this, &rxvt_term::flush_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
185	destroy_ev (this, &rxvt_term::destroy_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
186	pty_ev (this, &rxvt_term::pty_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
187	incr_ev (this, &rxvt_term::incr_cb)	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
188	{	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
190	callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
191	#endif
192	#ifdef HAVE_SCROLLBARS
193	callback_set (scrollbar_ev, this, rxvt_term, x_cb);
194	#endif
195	#ifdef USE_XIM
196	callback_set (im_ev , this, rxvt_term, im_cb);
197	#endif
198	callback_set (termwin_ev , this, rxvt_term, x_cb);
199	callback_set (vt_ev , this, rxvt_term, x_cb);
200		194
201	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
202		196
203	termlist.push_back (this);	197	termlist.push_back (this);
204		198
…		…
230	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
231	delete fontset[i];	225	delete fontset[i];
232	#endif	226	#endif
233	delete fontset[0];	227	delete fontset[0];
234		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
235	if (display)	239	if (display)
236	{	240	{
237	selection_clear ();	241	selection_clear ();
238		242
239	#ifdef USE_XIM	243	#ifdef USE_XIM
240	im_destroy ();	244	im_destroy ();
241	#endif	245	#endif
242	#ifdef XTERM_SCROLLBAR	246	scrollBar.destroy ();
243	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
244	if (ShadowGC) XFreeGC (dpy, ShadowGC);
245	#endif
246	#ifdef PLAIN_SCROLLBAR
247	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
248	#endif
249	#ifdef NEXT_SCROLLBAR
250	if (blackGC) XFreeGC (dpy, blackGC);
251	if (whiteGC) XFreeGC (dpy, whiteGC);
252	if (grayGC) XFreeGC (dpy, grayGC);
253	if (darkGC) XFreeGC (dpy, darkGC);
254	if (stippleGC) XFreeGC (dpy, stippleGC);
255	if (dimple) XFreePixmap (dpy, dimple);
256	if (upArrow) XFreePixmap (dpy, upArrow);
257	if (downArrow) XFreePixmap (dpy, downArrow);
258	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
259	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
260	#endif
261	#ifdef RXVT_SCROLLBAR
262	if (topShadowGC) XFreeGC (dpy, topShadowGC);
263	if (botShadowGC) XFreeGC (dpy, botShadowGC);
264	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
265	#endif
266	if (gc) XFreeGC (dpy, gc);	247	if (gc) XFreeGC (dpy, gc);
267		248
268	delete drawable;	249	delete drawable;
269	// destroy all windows	250	// destroy all windows
270	if (parent[0])	251	if (parent[0])
…		…
278	pix_colors_unfocused [i].free (this);	259	pix_colors_unfocused [i].free (this);
279	#endif	260	#endif
280	}	261	}
281		262
282	clear ();	263	clear ();
283	}
284		264
285	delete [] pix_colors_focused;	265	display->flush (); /* ideally .put should do this */
286	#if OFF_FOCUS_FADING
287	delete [] pix_colors_unfocused;
288	#endif
289
290	#ifdef HAVE_BG_PIXMAP
291	bgPixmap.destroy ();
292	#endif
293	displays.put (display);	266	displays.put (display);
		267	}
294		268
295	scr_release ();	269	scr_release ();
296		270
297	/* clear all resources */	271	/* clear all resources */
298	for (int i = 0; i < allocated.size (); i++)	272	for (int i = 0; i < allocated.size (); i++)
…		…
330	}	304	}
331		305
332	void	306	void
333	rxvt_term::destroy ()	307	rxvt_term::destroy ()
334	{	308	{
335	if (destroy_ev.active)	309	if (destroy_ev.is_active ())
336	return;	310	return;
337		311
338	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	312	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
339		313
340	#if ENABLE_OVERLAY	314	#if ENABLE_OVERLAY
…		…
344	if (display)	318	if (display)
345	{	319	{
346	#if USE_XIM	320	#if USE_XIM
347	im_ev.stop (display);	321	im_ev.stop (display);
348	#endif	322	#endif
349	#if HAVE_SCROLLBARS
350	scrollbar_ev.stop (display);	323	scrollbar_ev.stop (display);
351	#endif
352	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	324	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
353	rootwin_ev.stop (display);	325	rootwin_ev.stop (display);
354	#endif	326	#endif
355	incr_ev.stop ();	327	incr_ev.stop ();
356	termwin_ev.stop (display);	328	termwin_ev.stop (display);
357	vt_ev.stop (display);	329	vt_ev.stop (display);
358	}	330	}
359		331
360	prepare_ev.stop ();	332	flush_ev.stop ();
361	pty_ev.stop ();	333	pty_ev.stop ();
362	#ifdef CURSOR_BLINK	334	#ifdef CURSOR_BLINK
363	cursor_blink_ev.stop ();	335	cursor_blink_ev.stop ();
364	#endif	336	#endif
365	#ifdef TEXT_BLINK	337	#ifdef TEXT_BLINK
…		…
475	DisplayString (display));	447	DisplayString (display));
476	rxvt_emergency_cleanup ();	448	rxvt_emergency_cleanup ();
477	_exit (EXIT_FAILURE);	449	_exit (EXIT_FAILURE);
478	}	450	}
479		451
480	/----------------------------------------------------------------------/
481	bool
482	rxvt_term::init (int argc, const char const argv, stringvec *envv)
483	{
484	this->envv = envv;
485
486	SET_R (this);
487	set_locale ("");
488	set_environ (envv); // few things in X do not call setlocale :(
489
490	if (!init_vars ())
491	return false;
492
493	init_secondary ();
494
495	const char **cmd_argv = init_resources (argc, argv);
496
497	#ifdef KEYSYM_RESOURCE
498	keyboard->register_done ();
499	#endif
500
501	#ifdef HAVE_SCROLLBARS
502	if (option (Opt_scrollBar))
503	scrollBar.setIdle (); /* set existence for size calculations */
504	#endif
505
506	pty = ptytty::create ();
507
508	create_windows (argc, argv);
509
510	init_xlocale ();
511
512	scr_reset (); // initialize screen
513
514	#if 0
515	XSynchronize (dpy, True);
516	#endif
517
518	#ifdef HAVE_SCROLLBARS
519	if (option (Opt_scrollBar))
520	resize_scrollbar (); /* create and map scrollbar */
521	#endif
522	#ifdef HAVE_BG_PIXMAP
523	{
524	bgPixmap.set_target (this);
525
526	#ifdef ENABLE_TRANSPARENCY
527	if (option (Opt_transparent))
528	{
529	bgPixmap.set_transparent ();
530	#ifdef HAVE_AFTERIMAGE
531	if (rs [Rs_blurradius])
532	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
533	#endif
534	if (ISSET_PIXCOLOR (Color_tint))
535	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
536	if (rs [Rs_shade])
537	bgPixmap.set_shade (rs [Rs_shade]);
538
539	bgPixmap.set_root_pixmap ();
540	XSelectInput (dpy, display->root, PropertyChangeMask);
541	rootwin_ev.start (display, display->root);
542	}
543	#endif
544
545	#ifdef BG_IMAGE_FROM_FILE
546	if (rs[Rs_backgroundPixmap] != NULL)
547	{
548	const char *p = rs[Rs_backgroundPixmap];
549
550	if ((p = strchr (p, ';')) != NULL)
551	{
552	p++;
553	bgPixmap.set_geometry (p);
554	}
555	else
556	bgPixmap.set_defaultGeometry ();
557
558	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
559	if (!bgPixmap.window_position_sensitive ())
560	update_background ();
561	}
562	#endif
563	}
564	#endif
565
566	#if ENABLE_PERL
567	rootwin_ev.start (display, display->root);
568	#endif
569
570	set_colorfgbg ();
571
572	init_command (cmd_argv);
573
574	free (cmd_argv);
575
576	if (pty->pty >= 0)
577	pty_ev.start (pty->pty, ev::READ);
578
579	prepare_ev.start ();
580
581	HOOK_INVOKE ((this, HOOK_START, DT_END));
582
583	#if ENABLE_XEMBED
584	if (rs[Rs_embed])
585	{
586	long info[2] = { 0, XEMBED_MAPPED };
587
588	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
589	32, PropModeReplace, (unsigned char *)&info, 2);
590	}
591	#endif
592
593	XMapWindow (dpy, vt);
594	XMapWindow (dpy, parent[0]);
595
596	return true;
597	}
598
599	static struct sig_handlers	452	static struct sig_handlers
600	{	453	{
601	ev::sig sw_term, sw_int;	454	ev::sig sw_term, sw_int;
602		455
603	/*	456	/*
604	* Catch a fatal signal and tidy up before quitting	457	* Catch a fatal signal and tidy up before quitting
605	*/	458	*/
606	void
607	sig_term (ev::sig &w, int revents)	459	void sig_term (ev::sig &w, int revents);
		460
		461	sig_handlers ()
608	{	462	{
609	rxvt_emergency_cleanup ();	463	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
610	w.stop ();
611	kill (getpid (), w.signum);
612	}
613
614	sig_handlers ()
615	: sw_term (this, &sig_handlers::sig_term),
616	sw_int (this, &sig_handlers::sig_term)	464	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
617	{
618	}	465	}
619	} sig_handlers;	466	} sig_handlers;
		467
		468	void
		469	sig_handlers::sig_term (ev::sig &w, int revents)
		470	{
		471	rxvt_emergency_cleanup ();
		472	w.stop ();
		473	kill (getpid (), w.signum);
		474	}
620		475
621	char **rxvt_environ; // startup environment	476	char **rxvt_environ; // startup environment
622		477
623	void	478	void
624	rxvt_init ()	479	rxvt_init ()
…		…
642	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	497	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
643	// TODO: handle this with exceptions and tolerate the memory loss	498	// TODO: handle this with exceptions and tolerate the memory loss
644	XSetIOErrorHandler (rxvt_xioerror_handler);	499	XSetIOErrorHandler (rxvt_xioerror_handler);
645		500
646	XrmInitialize ();	501	XrmInitialize ();
647	}
648
649	/* ------------------------------------------------------------------------- *
650	* MEMORY ALLOCATION WRAPPERS *
651	* ------------------------------------------------------------------------- */
652	void *
653	rxvt_malloc (size_t size)
654	{
655	void *p = malloc (size);
656
657	if (!p)
658	rxvt_fatal ("memory allocation failure. aborting.\n");
659
660	return p;
661	}
662
663	void *
664	rxvt_calloc (size_t number, size_t size)
665	{
666	void *p = calloc (number, size);
667
668	if (!p)
669	rxvt_fatal ("memory allocation failure. aborting.\n");
670
671	return p;
672	}
673
674	void *
675	rxvt_realloc (void *ptr, size_t size)
676	{
677	void *p = realloc (ptr, size);
678
679	if (!p)
680	rxvt_fatal ("memory allocation failure. aborting.\n");
681
682	return p;
683	}	502	}
684		503
685	/----------------------------------------------------------------------/	504	/----------------------------------------------------------------------/
686	/*	505	/*
687	* window size/position calculations for XSizeHint and other storage.	506	* window size/position calculations for XSizeHint and other storage.
…		…
689	*/	508	*/
690	void	509	void
691	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	510	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
692	{	511	{
693	short recalc_x, recalc_y;	512	short recalc_x, recalc_y;
694	int x, y, sb_w, flags;	513	int x, y, flags;
695	unsigned int w, h;	514	unsigned int w, h;
696	unsigned int max_width, max_height;	515	unsigned int max_width, max_height;
697		516
698	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	517	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
699	szHint.win_gravity = NorthWestGravity;	518	szHint.win_gravity = NorthWestGravity;
…		…
709	if (rs[Rs_geometry])	528	if (rs[Rs_geometry])
710	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	529	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
711		530
712	if (flags & WidthValue)	531	if (flags & WidthValue)
713	{	532	{
		533	if (!w)
		534	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		535
714	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	536	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
715	szHint.flags \|= USSize;	537	szHint.flags \|= USSize;
716	}	538	}
717		539
718	if (flags & HeightValue)	540	if (flags & HeightValue)
719	{	541	{
		542	if (!h)
		543	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		544
720	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	545	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
721	szHint.flags \|= USSize;	546	szHint.flags \|= USSize;
722	}	547	}
723		548
724	if (flags & XValue)	549	if (flags & XValue)
725	{	550	{
…		…
756	max_width = MAX_COLS * fwidth;	581	max_width = MAX_COLS * fwidth;
757	max_height = MAX_ROWS * fheight;	582	max_height = MAX_ROWS * fheight;
758		583
759	szHint.base_width = szHint.base_height = 2 * int_bwidth;	584	szHint.base_width = szHint.base_height = 2 * int_bwidth;
760		585
761	sb_w = 0;
762	window_vt_x = window_vt_y = int_bwidth;	586	window_vt_x = window_vt_y = int_bwidth;
763		587
764	if (scrollBar.state)	588	if (scrollBar.state)
765	{	589	{
766	sb_w = scrollbar_TotalWidth ();	590	int sb_w = scrollBar.total_width ();
767	szHint.base_width += sb_w;	591	szHint.base_width += sb_w;
768		592
769	if (!option (Opt_scrollBar_right))	593	if (!option (Opt_scrollBar_right))
770	window_vt_x += sb_w;	594	window_vt_x += sb_w;
771	}	595	}
…		…
795	{	619	{
796	min_it (height, max_height);	620	min_it (height, max_height);
797	szHint.height = szHint.base_height + height;	621	szHint.height = szHint.base_height + height;
798	}	622	}
799		623
800	if (scrollBar.state && option (Opt_scrollBar_right))
801	window_sb_x = szHint.width - sb_w;
802
803	if (recalc_x)	624	if (recalc_x)
804	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	625	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
805		626
806	if (recalc_y)	627	if (recalc_y)
807	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	628	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
808		629
809	ncol = width / fwidth;	630	ncol = width / fwidth;
810	nrow = height / fheight;	631	nrow = height / fheight;
811	}	632	}
812		633
813	/----------------------------------------------------------------------/	634	/----------------------------------------------------------------------/
814	/*	635	/*
…		…
828	ws.ws_xpixel = width;	649	ws.ws_xpixel = width;
829	ws.ws_ypixel = height;	650	ws.ws_ypixel = height;
830	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	651	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
831		652
832	#if 0	653	#if 0
833	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	654	// TIOCSWINSZ is supposed to do this automatically and correctly
834	if (cmd_pid) /* force through to the command */	655	if (cmd_pid) /* force through to the command */
835	kill (-cmd_pid, SIGWINCH);	656	kill (-cmd_pid, SIGWINCH);
836	#endif	657	#endif
837	}	658	}
838		659
…		…
965	void	786	void
966	rxvt_term::set_window_color (int idx, const char *color)	787	rxvt_term::set_window_color (int idx, const char *color)
967	{	788	{
968	#ifdef XTERM_COLOR_CHANGE	789	#ifdef XTERM_COLOR_CHANGE
969	rxvt_color xcol;	790	rxvt_color xcol;
970	int i;
971		791
972	if (color == NULL \|\| *color == '\0')	792	if (color == NULL \|\| *color == '\0')
973	return;	793	return;
974		794
975	color = strdup (color);	795	color = strdup (color);
…		…
977	rs[Rs_color + idx] = color;	797	rs[Rs_color + idx] = color;
978		798
979	/* handle color aliases */	799	/* handle color aliases */
980	if (isdigit (*color))	800	if (isdigit (*color))
981	{	801	{
982	i = atoi (color);	802	int i = atoi (color);
983		803
984	if (i >= 8 && i <= 15)	804	if (i >= 8 && i <= 15)
985	{	805	{
986	/* bright colors */	806	/* bright colors */
987	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	807	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
1091	int old_width = szHint.width;	911	int old_width = szHint.width;
1092	int old_height = szHint.height;	912	int old_height = szHint.height;
1093		913
1094	window_calc (newwidth, newheight);	914	window_calc (newwidth, newheight);
1095		915
1096	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);
1097	XSetWMNormalHints (dpy, parent[0], &szHint);	922	XSetWMNormalHints (dpy, parent[0], &szHint);
		923	szHint.flags \|= PBaseSize \| PResizeInc;
		924	}
1098		925
1099	if (!ignoreparent)	926	if (!ignoreparent)
1100	{	927	{
1101	#ifdef SMART_RESIZE	928	#ifdef SMART_RESIZE
1102	/*	929	/*
…		…
1142	#else	969	#else
1143	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	970	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1144	#endif	971	#endif
1145	}	972	}
1146		973
		974	if (set_hint)
		975	XSetWMNormalHints (dpy, parent[0], &szHint);
		976
1147	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	977	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1148		978
1149	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	979	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1150	{	980	{
1151	if (scrollBar.state)	981	if (scrollBar.state)
1152	{	982	scrollBar.resize ();
1153	XMoveResizeWindow (dpy, scrollBar.win,
1154	window_sb_x, 0,
1155	scrollbar_TotalWidth (), szHint.height);
1156	resize_scrollbar ();
1157	}
1158		983
1159	XMoveResizeWindow (dpy, vt,	984	XMoveResizeWindow (dpy, vt,
1160	window_vt_x, window_vt_y,	985	window_vt_x, window_vt_y,
1161	width, height);	986	width, height);
1162		987
1163	#ifdef HAVE_BG_PIXMAP	988	#ifdef HAVE_BG_PIXMAP
1164	if (bgPixmap.window_size_sensitive ())	989	if (bgPixmap.window_size_sensitive ())
1165	update_background ();	990	update_background ();
1166	#endif	991	#endif
1167
1168	scr_clear ();
1169	}	992	}
1170		993
1171	if (fix_screen \|\| old_height == 0)	994	if (fix_screen \|\| old_height == 0)
		995	{
1172	scr_reset ();	996	scr_reset ();
		997	}
1173		998
1174	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	999	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1175	//scr_touch (false);	1000	//scr_touch (false);
1176		1001
1177	#ifdef HAVE_BG_PIXMAP	1002	#ifdef HAVE_BG_PIXMAP
…		…
1719	void	1544	void
1720	rxvt_term::get_window_origin (int &x, int &y)	1545	rxvt_term::get_window_origin (int &x, int &y)
1721	{	1546	{
1722	Window cr;	1547	Window cr;
1723	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1548	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1549	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1725	}	1550	}
1726		1551
1727	Pixmap	1552	Pixmap
1728	rxvt_term::get_pixmap_property (int prop_id)	1553	rxvt_term::get_pixmap_property (int prop_id)
1729	{	1554	{
…		…
1736	unsigned char *prop = NULL;	1561	unsigned char *prop = NULL;
1737	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1562	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1563	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739	&nitems, &bytes_after, &prop);	1564	&nitems, &bytes_after, &prop);
1740	if (result == Success && prop && atype == XA_PIXMAP)	1565	if (result == Success && prop && atype == XA_PIXMAP)
1741	{
1742	return (Pixmap )prop;	1566	return (Pixmap )prop;
1743	}
1744	}	1567	}
		1568
1745	return None;	1569	return None;
1746	}	1570	}
1747		1571
1748	#ifdef HAVE_BG_PIXMAP	1572	#ifdef HAVE_BG_PIXMAP
1749	# if TRACE_PIXMAPS	1573	# if TRACE_PIXMAPS
1750	# undef update_background	1574	# undef update_background
		1575	void
1751	int rxvt_term::trace_update_background (const char *file, int line)	1576	rxvt_term::trace_update_background (const char *file, int line)
1752	{	1577	{
1753	fprintf (stderr, "%s:%d:update_background()\n", file, line);	1578	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754	update_background ();	1579	update_background ();
1755	}	1580	}
1756	# endif	1581	# endif
1757		1582
1758	int	1583	void
1759	rxvt_term::update_background ()	1584	rxvt_term::update_background ()
1760	{	1585	{
		1586	if (update_background_ev.is_active ())
		1587	return;
		1588
1761	bgPixmap.invalidate ();	1589	bgPixmap.invalidate ();
1762		1590
1763	/* no chance of real time refresh if we are blurring! */	1591	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1764	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1592
		1593	if (to_wait <= 0.)
1765	bgPixmap.render ();	1594	bgPixmap.render ();
1766	else	1595	else
1767	{
1768	update_background_ev.stop ();
1769
1770	if (!bgPixmap.need_client_side_rendering())
1771	update_background_ev.start (.05);	1596	update_background_ev.start (to_wait);
1772	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1773	update_background_ev.start (.20); /* very slow !!! */
1774	else
1775	update_background_ev.start (.07);
1776	}
1777
1778	return 0;
1779	}	1597	}
1780		1598
1781	void	1599	void
1782	rxvt_term::update_background_cb (ev::timer &w, int revents)	1600	rxvt_term::update_background_cb (ev::timer &w, int revents)
1783	{	1601	{
		1602	make_current ();
		1603
		1604	update_background_ev.stop ();
1784	bgPixmap.render ();	1605	bgPixmap.render ();
		1606	refresh_check ();
1785	}	1607	}
1786		1608
1787	#endif /* HAVE_BG_PIXMAP */	1609	#endif /* HAVE_BG_PIXMAP */
1788		1610
1789	/----------------------- end-of-file (C source) -----------------------/	1611	/----------------------- 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.269 by root, Tue Dec 4 14:50:42 2007 UTC vs. Revision 1.314 by root, Wed Nov 5 12:28:15 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.269 by root, Tue Dec 4 14:50:42 2007 UTC vs.
Revision 1.314 by root, Wed Nov 5 12:28:15 2008 UTC