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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.255 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.315 by root, Wed Nov 5 12:29:26 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	{
		156	#if HAVE_BG_PIXMAP
		157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
		158	#endif
		159	#ifdef CURSOR_BLINK
		160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
		161	#endif
		162	#ifdef TEXT_BLINK
		163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
		164	#endif
		165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
		167	#endif
		168	#ifdef SELECTION_SCROLLING
		169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
		170	#endif
		171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
158	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
159	rootwin_ev (this, &rxvt_term::rootwin_cb),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
160	#endif	176	#endif
161	#if HAVE_BG_PIXMAP	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
162	update_background_ev(this, &rxvt_term::update_background_cb),	178	#ifdef USE_XIM
163	#endif	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164	#ifdef HAVE_SCROLLBARS
165	scrollbar_ev (this, &rxvt_term::x_cb),
166	#endif
167	#ifdef CURSOR_BLINK
168	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
169	#endif
170	#ifdef TEXT_BLINK
171	text_blink_ev (this, &rxvt_term::text_blink_cb),
172	#endif
173	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175	#endif
176	#ifdef SELECTION_SCROLLING
177	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178	#endif
179	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181	#endif	180	#endif
182	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
183	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184	#endif
185	#ifdef USE_XIM
186	im_ev (this, &rxvt_term::im_cb),
187	#endif	183	#endif
188	#ifndef NO_BELL	184	#ifndef NO_BELL
189	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190	#endif	186	#endif
191	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198	incr_ev (this, &rxvt_term::incr_cb)	194
199	{
200	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201		196
202	termlist.push_back (this);	197	termlist.push_back (this);
203		198
204	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
229	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
230	delete fontset[i];	225	delete fontset[i];
231	#endif	226	#endif
232	delete fontset[0];	227	delete fontset[0];
233		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
234	if (display)	239	if (display)
235	{	240	{
236	selection_clear ();	241	selection_clear ();
237		242
238	#ifdef USE_XIM	243	#ifdef USE_XIM
239	im_destroy ();	244	im_destroy ();
240	#endif	245	#endif
241	#ifdef XTERM_SCROLLBAR	246	scrollBar.destroy ();
242	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243	if (ShadowGC) XFreeGC (dpy, ShadowGC);
244	#endif
245	#ifdef PLAIN_SCROLLBAR
246	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247	#endif
248	#ifdef NEXT_SCROLLBAR
249	if (blackGC) XFreeGC (dpy, blackGC);
250	if (whiteGC) XFreeGC (dpy, whiteGC);
251	if (grayGC) XFreeGC (dpy, grayGC);
252	if (darkGC) XFreeGC (dpy, darkGC);
253	if (stippleGC) XFreeGC (dpy, stippleGC);
254	if (dimple) XFreePixmap (dpy, dimple);
255	if (upArrow) XFreePixmap (dpy, upArrow);
256	if (downArrow) XFreePixmap (dpy, downArrow);
257	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259	#endif
260	#ifdef RXVT_SCROLLBAR
261	if (topShadowGC) XFreeGC (dpy, topShadowGC);
262	if (botShadowGC) XFreeGC (dpy, botShadowGC);
263	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264	#endif
265	if (gc) XFreeGC (dpy, gc);	247	if (gc) XFreeGC (dpy, gc);
266		248
267	delete drawable;	249	delete drawable;
268	// destroy all windows	250	// destroy all windows
269	if (parent[0])	251	if (parent[0])
…		…
277	pix_colors_unfocused [i].free (this);	259	pix_colors_unfocused [i].free (this);
278	#endif	260	#endif
279	}	261	}
280		262
281	clear ();	263	clear ();
282	}
283		264
284	delete [] pix_colors_focused;	265	display->flush (); /* ideally .put should do this */
285	#if OFF_FOCUS_FADING
286	delete [] pix_colors_unfocused;
287	#endif
288
289	displays.put (display);	266	displays.put (display);
		267	}
290		268
291	scr_release ();	269	scr_release ();
292		270
293	/* clear all resources */	271	/* clear all resources */
294	for (int i = 0; i < allocated.size (); i++)	272	for (int i = 0; i < allocated.size (); i++)
…		…
306	delete argv;	284	delete argv;
307		285
308	#ifdef KEYSYM_RESOURCE	286	#ifdef KEYSYM_RESOURCE
309	delete keyboard;	287	delete keyboard;
310	#endif	288	#endif
		289	#ifndef NO_RESOURCES
		290	XrmDestroyDatabase (option_db);
		291	#endif
311	}	292	}
312		293
313	// child has exited, usually destroys	294	// child has exited, usually destroys
314	void	295	void
315	rxvt_term::child_cb (child_watcher &w, int status)	296	rxvt_term::child_cb (ev::child &w, int status)
316	{	297	{
317	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	298	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
318		299
319	cmd_pid = 0;	300	cmd_pid = 0;
320		301
…		…
323	}	304	}
324		305
325	void	306	void
326	rxvt_term::destroy ()	307	rxvt_term::destroy ()
327	{	308	{
328	if (destroy_ev.active)	309	if (destroy_ev.is_active ())
329	return;	310	return;
330		311
331	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	312	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332		313
333	#if ENABLE_OVERLAY	314	#if ENABLE_OVERLAY
…		…
337	if (display)	318	if (display)
338	{	319	{
339	#if USE_XIM	320	#if USE_XIM
340	im_ev.stop (display);	321	im_ev.stop (display);
341	#endif	322	#endif
342	#if HAVE_SCROLLBARS
343	scrollbar_ev.stop (display);	323	scrollbar_ev.stop (display);
344	#endif
345	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	324	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
346	rootwin_ev.stop (display);	325	rootwin_ev.stop (display);
347	#endif	326	#endif
348	incr_ev.stop ();	327	incr_ev.stop ();
349	termwin_ev.stop (display);	328	termwin_ev.stop (display);
350	vt_ev.stop (display);	329	vt_ev.stop (display);
351	}	330	}
352		331
353	check_ev.stop ();	332	flush_ev.stop ();
354	pty_ev.stop ();	333	pty_ev.stop ();
355	#ifdef CURSOR_BLINK	334	#ifdef CURSOR_BLINK
356	cursor_blink_ev.stop ();	335	cursor_blink_ev.stop ();
357	#endif	336	#endif
358	#ifdef TEXT_BLINK	337	#ifdef TEXT_BLINK
…		…
366	#endif	345	#endif
367	#ifdef POINTER_BLANK	346	#ifdef POINTER_BLANK
368	pointer_ev.stop ();	347	pointer_ev.stop ();
369	#endif	348	#endif
370		349
371	destroy_ev.start (0);	350	destroy_ev.start ();
372	}	351	}
373		352
374	void	353	void
375	rxvt_term::destroy_cb (time_watcher &w)	354	rxvt_term::destroy_cb (ev::idle &w, int revents)
376	{	355	{
377	make_current ();	356	make_current ();
378		357
379	delete this;	358	delete this;
380	}	359	}
…		…
468	DisplayString (display));	447	DisplayString (display));
469	rxvt_emergency_cleanup ();	448	rxvt_emergency_cleanup ();
470	_exit (EXIT_FAILURE);	449	_exit (EXIT_FAILURE);
471	}	450	}
472		451
473	/----------------------------------------------------------------------/
474	bool
475	rxvt_term::init (int argc, const char const argv, stringvec *envv)
476	{
477	this->envv = envv;
478
479	SET_R (this);
480	set_locale ("");
481	set_environ (envv); // few things in X do not call setlocale :(
482
483	if (!init_vars ())
484	return false;
485
486	init_secondary ();
487
488	const char **cmd_argv = init_resources (argc, argv);
489
490	#ifdef KEYSYM_RESOURCE
491	keyboard->register_done ();
492	#endif
493
494	#ifdef HAVE_SCROLLBARS
495	if (option (Opt_scrollBar))
496	scrollBar.setIdle (); /* set existence for size calculations */
497	#endif
498
499	pty = ptytty::create ();
500
501	create_windows (argc, argv);
502
503	init_xlocale ();
504
505	scr_reset (); // initialize screen
506
507	#if 0
508	XSynchronize (dpy, True);
509	#endif
510
511	#ifdef HAVE_SCROLLBARS
512	if (option (Opt_scrollBar))
513	resize_scrollbar (); /* create and map scrollbar */
514	#endif
515	#ifdef HAVE_BG_PIXMAP
516	{
517	bgPixmap.set_target (this);
518
519	#ifdef ENABLE_TRANSPARENCY
520	if (option (Opt_transparent))
521	{
522	bgPixmap.set_transparent ();
523	#ifdef HAVE_AFTERIMAGE
524	if (rs [Rs_blurradius])
525	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526	#endif
527	if (ISSET_PIXCOLOR (Color_tint))
528	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529	if (rs [Rs_shade])
530	bgPixmap.set_shade (rs [Rs_shade]);
531
532	bgPixmap.set_root_pixmap ();
533	XSelectInput (dpy, display->root, PropertyChangeMask);
534	rootwin_ev.start (display, display->root);
535	}
536	#endif
537
538	#ifdef BG_IMAGE_FROM_FILE
539	if (rs[Rs_backgroundPixmap] != NULL)
540	{
541	const char *p = rs[Rs_backgroundPixmap];
542
543	if ((p = strchr (p, ';')) != NULL)
544	{
545	p++;
546	bgPixmap.set_geometry (p);
547	}
548	else
549	bgPixmap.set_defaultGeometry ();
550
551	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552	if (!bgPixmap.window_position_sensitive ())
553	update_background ();
554	}
555	#endif
556	}
557	#endif
558
559	#if ENABLE_PERL
560	rootwin_ev.start (display, display->root);
561	#endif
562
563	set_colorfgbg ();
564
565	init_command (cmd_argv);
566
567	free (cmd_argv);
568
569	if (pty->pty >= 0)
570	pty_ev.start (pty->pty, EVENT_READ);
571
572	check_ev.start ();
573
574	HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576	#if ENABLE_XEMBED
577	if (rs[Rs_embed])
578	{
579	long info[2] = { 0, XEMBED_MAPPED };
580
581	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582	32, PropModeReplace, (unsigned char *)&info, 2);
583	}
584	#endif
585
586	XMapWindow (dpy, vt);
587	XMapWindow (dpy, parent[0]);
588
589	return true;
590	}
591
592	static struct sig_handlers	452	static struct sig_handlers
593	{	453	{
594	sig_watcher sw_term, sw_int;	454	ev::sig sw_term, sw_int;
595		455
596	/*	456	/*
597	* Catch a fatal signal and tidy up before quitting	457	* Catch a fatal signal and tidy up before quitting
598	*/	458	*/
599	void	459	void sig_term (ev::sig &w, int revents);
600	sig_term (sig_watcher &w)	460
		461	sig_handlers ()
601	{	462	{
602	rxvt_emergency_cleanup ();	463	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603	signal (w.signum, SIG_DFL);
604	kill (getpid (), w.signum);
605	}
606
607	sig_handlers ()
608	: sw_term (this, &sig_handlers::sig_term),
609	sw_int (this, &sig_handlers::sig_term)	464	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610	{
611	}	465	}
612	} sig_handlers;	466	} sig_handlers;
613		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	}
		475
614	char **rxvt_environ; // startup environment	476	char **rxvt_environ; // startup environment
615		477
616	void	478	void
617	rxvt_init ()	479	rxvt_init ()
618	{	480	{
619	ptytty::init ();	481	ptytty::init ();
		482
		483	if (!ev_default_loop (0))
		484	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
620		485
621	rxvt_environ = environ;	486	rxvt_environ = environ;
622		487
623	signal (SIGHUP, SIG_IGN);	488	signal (SIGHUP, SIG_IGN);
624	signal (SIGPIPE, SIG_IGN);	489	signal (SIGPIPE, SIG_IGN);
625		490
626	sig_handlers.sw_term.start (SIGTERM);	491	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
627	sig_handlers.sw_int.start (SIGINT);	492	sig_handlers.sw_int.start (SIGINT); ev_unref ();
628		493
629	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	494	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
630	/* signal (SIGURG, SIG_DFL); */	495	/* signal (SIGURG, SIG_DFL); */
631		496
632	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	497	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
633	// TODO: handle this with exceptions and tolerate the memory loss	498	// TODO: handle this with exceptions and tolerate the memory loss
634	XSetIOErrorHandler (rxvt_xioerror_handler);	499	XSetIOErrorHandler (rxvt_xioerror_handler);
635		500
636	XrmInitialize ();	501	XrmInitialize ();
637	}
638
639	/* ------------------------------------------------------------------------- *
640	* MEMORY ALLOCATION WRAPPERS *
641	* ------------------------------------------------------------------------- */
642	void *
643	rxvt_malloc (size_t size)
644	{
645	void *p = malloc (size);
646
647	if (!p)
648	rxvt_fatal ("memory allocation failure. aborting.\n");
649
650	return p;
651	}
652
653	void *
654	rxvt_calloc (size_t number, size_t size)
655	{
656	void *p = calloc (number, size);
657
658	if (!p)
659	rxvt_fatal ("memory allocation failure. aborting.\n");
660
661	return p;
662	}
663
664	void *
665	rxvt_realloc (void *ptr, size_t size)
666	{
667	void *p = realloc (ptr, size);
668
669	if (!p)
670	rxvt_fatal ("memory allocation failure. aborting.\n");
671
672	return p;
673	}	502	}
674		503
675	/----------------------------------------------------------------------/	504	/----------------------------------------------------------------------/
676	/*	505	/*
677	* window size/position calculations for XSizeHint and other storage.	506	* window size/position calculations for XSizeHint and other storage.
…		…
679	*/	508	*/
680	void	509	void
681	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	510	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
682	{	511	{
683	short recalc_x, recalc_y;	512	short recalc_x, recalc_y;
684	int x, y, sb_w, flags;	513	int x, y, flags;
685	unsigned int w, h;	514	unsigned int w, h;
686	unsigned int max_width, max_height;	515	unsigned int max_width, max_height;
687		516
688	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	517	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
689	szHint.win_gravity = NorthWestGravity;	518	szHint.win_gravity = NorthWestGravity;
…		…
699	if (rs[Rs_geometry])	528	if (rs[Rs_geometry])
700	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	529	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
701		530
702	if (flags & WidthValue)	531	if (flags & WidthValue)
703	{	532	{
		533	if (!w)
		534	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		535
704	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	536	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
705	szHint.flags \|= USSize;	537	szHint.flags \|= USSize;
706	}	538	}
707		539
708	if (flags & HeightValue)	540	if (flags & HeightValue)
709	{	541	{
		542	if (!h)
		543	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		544
710	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	545	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
711	szHint.flags \|= USSize;	546	szHint.flags \|= USSize;
712	}	547	}
713		548
714	if (flags & XValue)	549	if (flags & XValue)
715	{	550	{
…		…
746	max_width = MAX_COLS * fwidth;	581	max_width = MAX_COLS * fwidth;
747	max_height = MAX_ROWS * fheight;	582	max_height = MAX_ROWS * fheight;
748		583
749	szHint.base_width = szHint.base_height = 2 * int_bwidth;	584	szHint.base_width = szHint.base_height = 2 * int_bwidth;
750		585
751	sb_w = 0;
752	window_vt_x = window_vt_y = int_bwidth;	586	window_vt_x = window_vt_y = int_bwidth;
753		587
754	if (scrollBar.state)	588	if (scrollBar.state)
755	{	589	{
756	sb_w = scrollbar_TotalWidth ();	590	int sb_w = scrollBar.total_width ();
757	szHint.base_width += sb_w;	591	szHint.base_width += sb_w;
758		592
759	if (!option (Opt_scrollBar_right))	593	if (!option (Opt_scrollBar_right))
760	window_vt_x += sb_w;	594	window_vt_x += sb_w;
761	}	595	}
…		…
785	{	619	{
786	min_it (height, max_height);	620	min_it (height, max_height);
787	szHint.height = szHint.base_height + height;	621	szHint.height = szHint.base_height + height;
788	}	622	}
789		623
790	if (scrollBar.state && option (Opt_scrollBar_right))
791	window_sb_x = szHint.width - sb_w;
792
793	if (recalc_x)	624	if (recalc_x)
794	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	625	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
795		626
796	if (recalc_y)	627	if (recalc_y)
797	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	628	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
798		629
799	ncol = width / fwidth;	630	ncol = width / fwidth;
800	nrow = height / fheight;	631	nrow = height / fheight;
801	}	632	}
802		633
803	/----------------------------------------------------------------------/	634	/----------------------------------------------------------------------/
804	/*	635	/*
…		…
818	ws.ws_xpixel = width;	649	ws.ws_xpixel = width;
819	ws.ws_ypixel = height;	650	ws.ws_ypixel = height;
820	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	651	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
821		652
822	#if 0	653	#if 0
823	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	654	// TIOCSWINSZ is supposed to do this automatically and correctly
824	if (cmd_pid) /* force through to the command */	655	if (cmd_pid) /* force through to the command */
825	kill (-cmd_pid, SIGWINCH);	656	kill (-cmd_pid, SIGWINCH);
826	#endif	657	#endif
827	}	658	}
828		659
…		…
955	void	786	void
956	rxvt_term::set_window_color (int idx, const char *color)	787	rxvt_term::set_window_color (int idx, const char *color)
957	{	788	{
958	#ifdef XTERM_COLOR_CHANGE	789	#ifdef XTERM_COLOR_CHANGE
959	rxvt_color xcol;	790	rxvt_color xcol;
960	int i;
961		791
962	if (color == NULL \|\| *color == '\0')	792	if (color == NULL \|\| *color == '\0')
963	return;	793	return;
964		794
965	color = strdup (color);	795	color = strdup (color);
…		…
967	rs[Rs_color + idx] = color;	797	rs[Rs_color + idx] = color;
968		798
969	/* handle color aliases */	799	/* handle color aliases */
970	if (isdigit (*color))	800	if (isdigit (*color))
971	{	801	{
972	i = atoi (color);	802	int i = atoi (color);
973		803
974	if (i >= 8 && i <= 15)	804	if (i >= 8 && i <= 15)
		805	{
975	{ /* bright colors */	806	/* bright colors */
976	i -= 8;
977	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	807	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
978	goto done;	808	goto done;
979	}	809	}
980		810
981	if (i >= 0 && i <= 7)	811	if (i >= 0 && i <= 7)
		812	{
982	{ /* normal colors */	813	/* normal colors */
983	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	814	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
984	goto done;	815	goto done;
985	}	816	}
986	}	817	}
987		818
…		…
992	* so just keep gobbling up the colormap	823	* so just keep gobbling up the colormap
993	*/	824	*/
994		825
995	pix_colors_focused[idx] = xcol;	826	pix_colors_focused[idx] = xcol;
996		827
997	/* XSetWindowAttributes attr; */
998	/* Cursor cursor; */
999	done:	828	done:
1000	/TODO: handle Color_BD, scrollbar background, etc. /	829	/TODO: handle Color_BD, scrollbar background, etc. /
1001		830
1002	update_fade_color (idx);	831	update_fade_color (idx);
1003	recolour_cursor ();	832	recolour_cursor ();
1004	scr_recolour ();	833	scr_recolour ();
1005	#endif /* XTERM_COLOR_CHANGE */	834	#endif /* XTERM_COLOR_CHANGE */
1006	}	835	}
1007		836
1008	void	837	void
1009	rxvt_term::recolour_cursor ()	838	rxvt_term::recolour_cursor ()
1010	{	839	{
…		…
1027	*/	856	*/
1028	void	857	void
1029	rxvt_term::set_colorfgbg ()	858	rxvt_term::set_colorfgbg ()
1030	{	859	{
1031	unsigned int i;	860	unsigned int i;
1032	const char *xpmb = "\0";	861	const char *xpmb = "";
1033	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	862	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1034		863
1035	strcpy (fstr, "default");	864	strcpy (fstr, "default");
1036	strcpy (bstr, "default");	865	strcpy (bstr, "default");
1037	for (i = Color_Black; i <= Color_White; i++)	866	for (i = Color_Black; i <= Color_White; i++)
…		…
1082	int old_width = szHint.width;	911	int old_width = szHint.width;
1083	int old_height = szHint.height;	912	int old_height = szHint.height;
1084		913
1085	window_calc (newwidth, newheight);	914	window_calc (newwidth, newheight);
1086		915
1087	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);
1088	XSetWMNormalHints (dpy, parent[0], &szHint);	922	XSetWMNormalHints (dpy, parent[0], &szHint);
		923	szHint.flags \|= PBaseSize \| PResizeInc;
		924	}
1089		925
1090	if (!ignoreparent)	926	if (!ignoreparent)
1091	{	927	{
1092	#ifdef SMART_RESIZE	928	#ifdef SMART_RESIZE
1093	/*	929	/*
…		…
1133	#else	969	#else
1134	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	970	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1135	#endif	971	#endif
1136	}	972	}
1137		973
		974	if (set_hint)
		975	XSetWMNormalHints (dpy, parent[0], &szHint);
		976
1138	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	977	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1139		978
1140	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	979	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1141	{	980	{
1142	if (scrollBar.state)	981	if (scrollBar.state)
1143	{	982	scrollBar.resize ();
1144	XMoveResizeWindow (dpy, scrollBar.win,
1145	window_sb_x, 0,
1146	scrollbar_TotalWidth (), szHint.height);
1147	resize_scrollbar ();
1148	}
1149		983
1150	XMoveResizeWindow (dpy, vt,	984	XMoveResizeWindow (dpy, vt,
1151	window_vt_x, window_vt_y,	985	window_vt_x, window_vt_y,
1152	width, height);	986	width, height);
1153		987
1154	#ifdef HAVE_BG_PIXMAP	988	#ifdef HAVE_BG_PIXMAP
1155	if (bgPixmap.window_size_sensitive ())	989	if (bgPixmap.window_size_sensitive ())
1156	update_background ();	990	update_background ();
1157	#endif	991	#endif
1158
1159	scr_clear ();
1160	}	992	}
1161		993
1162	if (fix_screen \|\| old_height == 0)	994	if (fix_screen \|\| old_height == 0)
1163	scr_reset ();	995	scr_reset ();
1164		996
…		…
1703	XFree (status_attr);	1535	XFree (status_attr);
1704	}	1536	}
1705		1537
1706	XFree (preedit_attr);	1538	XFree (preedit_attr);
1707	}	1539	}
1708	#endif /* USE_XIM */	1540	#endif /* USE_XIM */
1709		1541
1710	void	1542	void
1711	rxvt_term::get_window_origin (int &x, int &y)	1543	rxvt_term::get_window_origin (int &x, int &y)
1712	{	1544	{
1713	Window cr;	1545	Window cr;
1714	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1546	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1715	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1547	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1716	}	1548	}
1717		1549
1718	Pixmap	1550	Pixmap
1719	rxvt_term::get_pixmap_property (int prop_id)	1551	rxvt_term::get_pixmap_property (int prop_id)
1720	{	1552	{
…		…
1727	unsigned char *prop = NULL;	1559	unsigned char *prop = NULL;
1728	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1560	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1729	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1561	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1730	&nitems, &bytes_after, &prop);	1562	&nitems, &bytes_after, &prop);
1731	if (result == Success && prop && atype == XA_PIXMAP)	1563	if (result == Success && prop && atype == XA_PIXMAP)
1732	{
1733	return (Pixmap )prop;	1564	return (Pixmap )prop;
1734	}
1735	}	1565	}
		1566
1736	return None;	1567	return None;
1737	}	1568	}
1738		1569
1739	#ifdef HAVE_BG_PIXMAP	1570	#ifdef HAVE_BG_PIXMAP
1740	int	1571	# if TRACE_PIXMAPS
		1572	# undef update_background
		1573	void
		1574	rxvt_term::trace_update_background (const char *file, int line)
		1575	{
		1576	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1577	update_background ();
		1578	}
		1579	# endif
		1580
		1581	void
1741	rxvt_term::update_background ()	1582	rxvt_term::update_background ()
1742	{	1583	{
		1584	if (update_background_ev.is_active ())
		1585	return;
		1586
1743	bgPixmap.invalidate ();	1587	bgPixmap.invalidate ();
1744		1588
1745	/* no chance of real time refresh if we are blurring ! */	1589	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1746	if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1590
		1591	if (to_wait <= 0.)
1747	bgPixmap.render ();	1592	bgPixmap.render ();
1748	else	1593	else
1749	{	1594	update_background_ev.start (to_wait);
		1595	}
		1596
		1597	void
		1598	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1599	{
		1600	make_current ();
		1601
1750	update_background_ev.stop ();	1602	update_background_ev.stop ();
1751	if (!bgPixmap.need_client_side_rendering())
1752	update_background_ev.start (NOW + .05);
1753	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1754	update_background_ev.start (NOW + .2); /* very slow !!! */
1755	else
1756	update_background_ev.start (NOW + .07);
1757	}
1758	return 0;
1759	}
1760
1761	void
1762	rxvt_term::update_background_cb (time_watcher &w)
1763	{
1764	bgPixmap.render ();	1603	bgPixmap.render ();
		1604	refresh_check ();
1765	}	1605	}
1766		1606
1767	#endif /* HAVE_BG_PIXMAP */	1607	#endif /* HAVE_BG_PIXMAP */
1768		1608
1769	/----------------------- end-of-file (C source) -----------------------/	1609	/----------------------- 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.255 by ayin, Wed Oct 31 09:55:23 2007 UTC vs. Revision 1.315 by root, Wed Nov 5 12:29:26 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.255 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.315 by root, Wed Nov 5 12:29:26 2008 UTC