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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.291 by root, Mon Dec 24 06:51:37 2007 UTC vs.
Revision 1.309 by root, Wed Feb 27 01:02:33 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-2007 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.
…		…
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::rootwin_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);
…		…
226	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
227	delete fontset[i];	225	delete fontset[i];
228	#endif	226	#endif
229	delete fontset[0];	227	delete fontset[0];
230		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
		232
231	if (display)	233	if (display)
232	{	234	{
233	selection_clear ();	235	selection_clear ();
234		236
235	#ifdef USE_XIM	237	#ifdef USE_XIM
236	im_destroy ();	238	im_destroy ();
237	#endif	239	#endif
238	#ifdef XTERM_SCROLLBAR	240	scrollBar.destroy ();
239	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240	if (ShadowGC) XFreeGC (dpy, ShadowGC);
241	#endif
242	#ifdef PLAIN_SCROLLBAR
243	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244	#endif
245	#ifdef NEXT_SCROLLBAR
246	if (blackGC) XFreeGC (dpy, blackGC);
247	if (whiteGC) XFreeGC (dpy, whiteGC);
248	if (grayGC) XFreeGC (dpy, grayGC);
249	if (darkGC) XFreeGC (dpy, darkGC);
250	if (stippleGC) XFreeGC (dpy, stippleGC);
251	if (dimple) XFreePixmap (dpy, dimple);
252	if (upArrow) XFreePixmap (dpy, upArrow);
253	if (downArrow) XFreePixmap (dpy, downArrow);
254	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256	#endif
257	#ifdef RXVT_SCROLLBAR
258	if (topShadowGC) XFreeGC (dpy, topShadowGC);
259	if (botShadowGC) XFreeGC (dpy, botShadowGC);
260	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261	#endif
262	if (gc) XFreeGC (dpy, gc);	241	if (gc) XFreeGC (dpy, gc);
263		242
264	delete drawable;	243	delete drawable;
265	// destroy all windows	244	// destroy all windows
266	if (parent[0])	245	if (parent[0])
…		…
274	pix_colors_unfocused [i].free (this);	253	pix_colors_unfocused [i].free (this);
275	#endif	254	#endif
276	}	255	}
277		256
278	clear ();	257	clear ();
279	}
280		258
281	delete [] pix_colors_focused;
282	#if OFF_FOCUS_FADING
283	delete [] pix_colors_unfocused;
284	#endif
285
286	#ifdef HAVE_BG_PIXMAP
287	bgPixmap.destroy ();
288	#endif
289	display->flush (); /* ideally .put should do this */	259	display->flush (); /* ideally .put should do this */
290	displays.put (display);	260	displays.put (display);
		261	}
291		262
292	scr_release ();	263	scr_release ();
293		264
294	/* clear all resources */	265	/* clear all resources */
295	for (int i = 0; i < allocated.size (); i++)	266	for (int i = 0; i < allocated.size (); i++)
…		…
341	if (display)	312	if (display)
342	{	313	{
343	#if USE_XIM	314	#if USE_XIM
344	im_ev.stop (display);	315	im_ev.stop (display);
345	#endif	316	#endif
346	#if HAVE_SCROLLBARS
347	scrollbar_ev.stop (display);	317	scrollbar_ev.stop (display);
348	#endif
349	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
350	rootwin_ev.stop (display);	319	rootwin_ev.stop (display);
351	#endif	320	#endif
352	incr_ev.stop ();	321	incr_ev.stop ();
353	termwin_ev.stop (display);	322	termwin_ev.stop (display);
…		…
472	DisplayString (display));	441	DisplayString (display));
473	rxvt_emergency_cleanup ();	442	rxvt_emergency_cleanup ();
474	_exit (EXIT_FAILURE);	443	_exit (EXIT_FAILURE);
475	}	444	}
476		445
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
527	#ifdef HAVE_AFTERIMAGE
528	if (rs [Rs_blurradius])
529	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530	#endif
531	if (ISSET_PIXCOLOR (Color_tint))
532	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533
534	if (rs [Rs_shade])
535	bgPixmap.set_shade (rs [Rs_shade]);
536
537	bgPixmap.set_root_pixmap ();
538	XSelectInput (dpy, display->root, PropertyChangeMask);
539	rootwin_ev.start (display, display->root);
540	}
541	#endif
542
543	#ifdef BG_IMAGE_FROM_FILE
544	if (rs[Rs_backgroundPixmap])
545	{
546	const char *p = rs[Rs_backgroundPixmap];
547
548	if ((p = strchr (p, ';')) != 0)
549	{
550	p++;
551	bgPixmap.set_geometry (p);
552	}
553	else
554	bgPixmap.set_defaultGeometry ();
555
556	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
557	if (!bgPixmap.window_position_sensitive ())
558	update_background ();
559	}
560	#endif
561	}
562	#endif
563
564	#if ENABLE_PERL
565	rootwin_ev.start (display, display->root);
566	#endif
567
568	set_colorfgbg ();
569
570	init_command (cmd_argv);
571
572	free (cmd_argv);
573
574	if (pty->pty >= 0)
575	pty_ev.start (pty->pty, ev::READ);
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	446	static struct sig_handlers
594	{	447	{
595	ev::sig sw_term, sw_int;	448	ev::sig sw_term, sw_int;
596		449
597	/*	450	/*
…		…
649	*/	502	*/
650	void	503	void
651	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	504	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
652	{	505	{
653	short recalc_x, recalc_y;	506	short recalc_x, recalc_y;
654	int x, y, sb_w, flags;	507	int x, y, flags;
655	unsigned int w, h;	508	unsigned int w, h;
656	unsigned int max_width, max_height;	509	unsigned int max_width, max_height;
657		510
658	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	511	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
659	szHint.win_gravity = NorthWestGravity;	512	szHint.win_gravity = NorthWestGravity;
…		…
706	szHint.win_gravity = SouthEastGravity;	559	szHint.win_gravity = SouthEastGravity;
707	else	560	else
708	szHint.win_gravity = SouthWestGravity;	561	szHint.win_gravity = SouthWestGravity;
709	}	562	}
710	}	563	}
		564
		565	if (!szHint.width \|\| !szHint.height)
		566	rxvt_fatal ("window width or height must not be zero, aborting.\n");
711	}	567	}
712		568
713	/* TODO: BOUNDS */	569	/* TODO: BOUNDS */
714	width = ncol * fwidth;	570	width = ncol * fwidth;
715	height = nrow * fheight;	571	height = nrow * fheight;
716	max_width = MAX_COLS * fwidth;	572	max_width = MAX_COLS * fwidth;
717	max_height = MAX_ROWS * fheight;	573	max_height = MAX_ROWS * fheight;
718		574
719	szHint.base_width = szHint.base_height = 2 * int_bwidth;	575	szHint.base_width = szHint.base_height = 2 * int_bwidth;
720		576
721	sb_w = 0;
722	window_vt_x = window_vt_y = int_bwidth;	577	window_vt_x = window_vt_y = int_bwidth;
723		578
724	if (scrollBar.state)	579	if (scrollBar.state)
725	{	580	{
726	sb_w = scrollbar_TotalWidth ();	581	int sb_w = scrollBar.total_width ();
727	szHint.base_width += sb_w;	582	szHint.base_width += sb_w;
728		583
729	if (!option (Opt_scrollBar_right))	584	if (!option (Opt_scrollBar_right))
730	window_vt_x += sb_w;	585	window_vt_x += sb_w;
731	}	586	}
…		…
754	else	609	else
755	{	610	{
756	min_it (height, max_height);	611	min_it (height, max_height);
757	szHint.height = szHint.base_height + height;	612	szHint.height = szHint.base_height + height;
758	}	613	}
759
760	if (scrollBar.state && option (Opt_scrollBar_right))
761	window_sb_x = szHint.width - sb_w;
762		614
763	if (recalc_x)	615	if (recalc_x)
764	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	616	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
765		617
766	if (recalc_y)	618	if (recalc_y)
…		…
925	void	777	void
926	rxvt_term::set_window_color (int idx, const char *color)	778	rxvt_term::set_window_color (int idx, const char *color)
927	{	779	{
928	#ifdef XTERM_COLOR_CHANGE	780	#ifdef XTERM_COLOR_CHANGE
929	rxvt_color xcol;	781	rxvt_color xcol;
930	int i;
931		782
932	if (color == NULL \|\| *color == '\0')	783	if (color == NULL \|\| *color == '\0')
933	return;	784	return;
934		785
935	color = strdup (color);	786	color = strdup (color);
…		…
937	rs[Rs_color + idx] = color;	788	rs[Rs_color + idx] = color;
938		789
939	/* handle color aliases */	790	/* handle color aliases */
940	if (isdigit (*color))	791	if (isdigit (*color))
941	{	792	{
942	i = atoi (color);	793	int i = atoi (color);
943		794
944	if (i >= 8 && i <= 15)	795	if (i >= 8 && i <= 15)
945	{	796	{
946	/* bright colors */	797	/* bright colors */
947	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	798	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
1107	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	958	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1108		959
1109	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	960	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1110	{	961	{
1111	if (scrollBar.state)	962	if (scrollBar.state)
1112	{	963	scrollBar.resize ();
1113	XMoveResizeWindow (dpy, scrollBar.win,
1114	window_sb_x, 0,
1115	scrollbar_TotalWidth (), szHint.height);
1116	resize_scrollbar ();
1117	}
1118		964
1119	XMoveResizeWindow (dpy, vt,	965	XMoveResizeWindow (dpy, vt,
1120	window_vt_x, window_vt_y,	966	window_vt_x, window_vt_y,
1121	width, height);	967	width, height);
1122		968
…		…
1696	unsigned char *prop = NULL;	1542	unsigned char *prop = NULL;
1697	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1543	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1698	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1544	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1699	&nitems, &bytes_after, &prop);	1545	&nitems, &bytes_after, &prop);
1700	if (result == Success && prop && atype == XA_PIXMAP)	1546	if (result == Success && prop && atype == XA_PIXMAP)
1701	{
1702	return (Pixmap )prop;	1547	return (Pixmap )prop;
1703	}
1704	}	1548	}
		1549
1705	return None;	1550	return None;
1706	}	1551	}
1707		1552
1708	#ifdef HAVE_BG_PIXMAP	1553	#ifdef HAVE_BG_PIXMAP
1709	# if TRACE_PIXMAPS	1554	# if TRACE_PIXMAPS
…		…
1717	# endif	1562	# endif
1718		1563
1719	void	1564	void
1720	rxvt_term::update_background ()	1565	rxvt_term::update_background ()
1721	{	1566	{
		1567	if (update_background_ev.is_active ())
		1568	return;
		1569
1722	bgPixmap.invalidate ();	1570	bgPixmap.invalidate ();
1723		1571
1724	/* no chance of real time refresh if we are blurring! */	1572	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1725	if (bgPixmap.invalid_since + 0.50 < ev::now ()	1573
1726	&& !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1574	if (to_wait <= 0.)
1727	{
1728	update_background_ev.stop ();
1729	bgPixmap.render ();	1575	bgPixmap.render ();
1730	}
1731	else	1576	else
1732	{
1733	ev_tstamp refresh;
1734
1735	if (!bgPixmap.need_client_side_rendering ())
1736	refresh = .05;
1737	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1738	refresh = .20; /* very slow !!! */
1739	else
1740	refresh = .07;
1741
1742	update_background_ev.start (refresh);	1577	update_background_ev.start (to_wait);
1743	}
1744	}	1578	}
1745		1579
1746	void	1580	void
1747	rxvt_term::update_background_cb (ev::timer &w, int revents)	1581	rxvt_term::update_background_cb (ev::timer &w, int revents)
1748	{	1582	{
1749	make_current ();	1583	make_current ();
		1584
		1585	update_background_ev.stop ();
1750	bgPixmap.render ();	1586	bgPixmap.render ();
1751	refresh_check ();	1587	refresh_check ();
1752	}	1588	}
1753		1589
1754	#endif /* HAVE_BG_PIXMAP */	1590	#endif /* HAVE_BG_PIXMAP */

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.291 by root, Mon Dec 24 06:51:37 2007 UTC vs. Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.291 by root, Mon Dec 24 06:51:37 2007 UTC vs.
Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC