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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.290 by ayin, Tue Dec 18 12:52:30 2007 UTC vs.
Revision 1.310 by root, Wed Feb 27 01:05:55 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.
…		…
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);
…		…
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	#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	HOOK_INVOKE ((this, HOOK_START, DT_END));
576
577	#if ENABLE_XEMBED
578	if (rs[Rs_embed])
579	{
580	long info[2] = { 0, XEMBED_MAPPED };
581
582	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
583	32, PropModeReplace, (unsigned char *)&info, 2);
584	}
585	#endif
586
587	XMapWindow (dpy, vt);
588	XMapWindow (dpy, parent[0]);
589	}
590
591	static struct sig_handlers	446	static struct sig_handlers
592	{	447	{
593	ev::sig sw_term, sw_int;	448	ev::sig sw_term, sw_int;
594		449
595	/*	450	/*
…		…
647	*/	502	*/
648	void	503	void
649	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	504	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
650	{	505	{
651	short recalc_x, recalc_y;	506	short recalc_x, recalc_y;
652	int x, y, sb_w, flags;	507	int x, y, flags;
653	unsigned int w, h;	508	unsigned int w, h;
654	unsigned int max_width, max_height;	509	unsigned int max_width, max_height;
655		510
656	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	511	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
657	szHint.win_gravity = NorthWestGravity;	512	szHint.win_gravity = NorthWestGravity;
…		…
667	if (rs[Rs_geometry])	522	if (rs[Rs_geometry])
668	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	523	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
669		524
670	if (flags & WidthValue)	525	if (flags & WidthValue)
671	{	526	{
		527	if (!w)
		528	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		529
672	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	530	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
673	szHint.flags \|= USSize;	531	szHint.flags \|= USSize;
674	}	532	}
675		533
676	if (flags & HeightValue)	534	if (flags & HeightValue)
677	{	535	{
		536	if (!h)
		537	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		538
678	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	539	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
679	szHint.flags \|= USSize;	540	szHint.flags \|= USSize;
680	}	541	}
681		542
682	if (flags & XValue)	543	if (flags & XValue)
683	{	544	{
…		…
714	max_width = MAX_COLS * fwidth;	575	max_width = MAX_COLS * fwidth;
715	max_height = MAX_ROWS * fheight;	576	max_height = MAX_ROWS * fheight;
716		577
717	szHint.base_width = szHint.base_height = 2 * int_bwidth;	578	szHint.base_width = szHint.base_height = 2 * int_bwidth;
718		579
719	sb_w = 0;
720	window_vt_x = window_vt_y = int_bwidth;	580	window_vt_x = window_vt_y = int_bwidth;
721		581
722	if (scrollBar.state)	582	if (scrollBar.state)
723	{	583	{
724	sb_w = scrollbar_TotalWidth ();	584	int sb_w = scrollBar.total_width ();
725	szHint.base_width += sb_w;	585	szHint.base_width += sb_w;
726		586
727	if (!option (Opt_scrollBar_right))	587	if (!option (Opt_scrollBar_right))
728	window_vt_x += sb_w;	588	window_vt_x += sb_w;
729	}	589	}
…		…
752	else	612	else
753	{	613	{
754	min_it (height, max_height);	614	min_it (height, max_height);
755	szHint.height = szHint.base_height + height;	615	szHint.height = szHint.base_height + height;
756	}	616	}
757
758	if (scrollBar.state && option (Opt_scrollBar_right))
759	window_sb_x = szHint.width - sb_w;
760		617
761	if (recalc_x)	618	if (recalc_x)
762	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	619	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
763		620
764	if (recalc_y)	621	if (recalc_y)
…		…
923	void	780	void
924	rxvt_term::set_window_color (int idx, const char *color)	781	rxvt_term::set_window_color (int idx, const char *color)
925	{	782	{
926	#ifdef XTERM_COLOR_CHANGE	783	#ifdef XTERM_COLOR_CHANGE
927	rxvt_color xcol;	784	rxvt_color xcol;
928	int i;
929		785
930	if (color == NULL \|\| *color == '\0')	786	if (color == NULL \|\| *color == '\0')
931	return;	787	return;
932		788
933	color = strdup (color);	789	color = strdup (color);
…		…
935	rs[Rs_color + idx] = color;	791	rs[Rs_color + idx] = color;
936		792
937	/* handle color aliases */	793	/* handle color aliases */
938	if (isdigit (*color))	794	if (isdigit (*color))
939	{	795	{
940	i = atoi (color);	796	int i = atoi (color);
941		797
942	if (i >= 8 && i <= 15)	798	if (i >= 8 && i <= 15)
943	{	799	{
944	/* bright colors */	800	/* bright colors */
945	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	801	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
…		…
1105	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	961	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1106		962
1107	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	963	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1108	{	964	{
1109	if (scrollBar.state)	965	if (scrollBar.state)
1110	{	966	scrollBar.resize ();
1111	XMoveResizeWindow (dpy, scrollBar.win,
1112	window_sb_x, 0,
1113	scrollbar_TotalWidth (), szHint.height);
1114	resize_scrollbar ();
1115	}
1116		967
1117	XMoveResizeWindow (dpy, vt,	968	XMoveResizeWindow (dpy, vt,
1118	window_vt_x, window_vt_y,	969	window_vt_x, window_vt_y,
1119	width, height);	970	width, height);
1120		971
…		…
1694	unsigned char *prop = NULL;	1545	unsigned char *prop = NULL;
1695	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1546	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1696	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1547	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1697	&nitems, &bytes_after, &prop);	1548	&nitems, &bytes_after, &prop);
1698	if (result == Success && prop && atype == XA_PIXMAP)	1549	if (result == Success && prop && atype == XA_PIXMAP)
1699	{
1700	return (Pixmap )prop;	1550	return (Pixmap )prop;
1701	}
1702	}	1551	}
		1552
1703	return None;	1553	return None;
1704	}	1554	}
1705		1555
1706	#ifdef HAVE_BG_PIXMAP	1556	#ifdef HAVE_BG_PIXMAP
1707	# if TRACE_PIXMAPS	1557	# if TRACE_PIXMAPS
1708	# undef update_background	1558	# undef update_background
		1559	void
1709	int rxvt_term::trace_update_background (const char *file, int line)	1560	rxvt_term::trace_update_background (const char *file, int line)
1710	{	1561	{
1711	fprintf (stderr, "%s:%d:update_background()\n", file, line);	1562	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1712	update_background ();	1563	update_background ();
1713	}	1564	}
1714	# endif	1565	# endif
1715		1566
1716	int	1567	void
1717	rxvt_term::update_background ()	1568	rxvt_term::update_background ()
1718	{	1569	{
		1570	if (update_background_ev.is_active ())
		1571	return;
		1572
1719	bgPixmap.invalidate ();	1573	bgPixmap.invalidate ();
1720		1574
1721	/* no chance of real time refresh if we are blurring! */	1575	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1722	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1576
		1577	if (to_wait <= 0.)
1723	bgPixmap.render ();	1578	bgPixmap.render ();
1724	else	1579	else
1725	{
1726	ev_tstamp refresh;
1727	update_background_ev.stop ();
1728
1729	if (!bgPixmap.need_client_side_rendering ())
1730	refresh = .05;
1731	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1732	refresh = .20; /* very slow !!! */
1733	else
1734	refresh = .07;
1735	update_background_ev.start (refresh);	1580	update_background_ev.start (to_wait);
1736	}
1737
1738	return 0;
1739	}	1581	}
1740		1582
1741	void	1583	void
1742	rxvt_term::update_background_cb (ev::timer &w, int revents)	1584	rxvt_term::update_background_cb (ev::timer &w, int revents)
1743	{	1585	{
1744	make_current ();	1586	make_current ();
		1587
		1588	update_background_ev.stop ();
1745	bgPixmap.render ();	1589	bgPixmap.render ();
1746	refresh_check ();	1590	refresh_check ();
1747	}	1591	}
1748		1592
1749	#endif /* HAVE_BG_PIXMAP */	1593	#endif /* HAVE_BG_PIXMAP */

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.290 by ayin, Tue Dec 18 12:52:30 2007 UTC vs. Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.290 by ayin, Tue Dec 18 12:52:30 2007 UTC vs.
Revision 1.310 by root, Wed Feb 27 01:05:55 2008 UTC