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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.263 by ayin, Thu Nov 22 15:07:10 2007 UTC vs.
Revision 1.318 by root, Sat May 30 08:51:23 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.
…		…
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	prepare_ev (this, &rxvt_term::prepare_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	#ifdef HAVE_BG_PIXMAP
290	bgPixmap.destroy ();
291	#endif
292	displays.put (display);	266	displays.put (display);
		267	}
293		268
294	scr_release ();	269	scr_release ();
295		270
296	/* clear all resources */	271	/* clear all resources */
297	for (int i = 0; i < allocated.size (); i++)	272	for (int i = 0; i < allocated.size (); i++)
…		…
329	}	304	}
330		305
331	void	306	void
332	rxvt_term::destroy ()	307	rxvt_term::destroy ()
333	{	308	{
334	if (destroy_ev.active)	309	if (destroy_ev.is_active ())
335	return;	310	return;
336		311
337	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	312	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338		313
339	#if ENABLE_OVERLAY	314	#if ENABLE_OVERLAY
…		…
343	if (display)	318	if (display)
344	{	319	{
345	#if USE_XIM	320	#if USE_XIM
346	im_ev.stop (display);	321	im_ev.stop (display);
347	#endif	322	#endif
348	#if HAVE_SCROLLBARS
349	scrollbar_ev.stop (display);	323	scrollbar_ev.stop (display);
350	#endif
351	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	324	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
352	rootwin_ev.stop (display);	325	rootwin_ev.stop (display);
353	#endif	326	#endif
354	incr_ev.stop ();	327	incr_ev.stop ();
355	termwin_ev.stop (display);	328	termwin_ev.stop (display);
356	vt_ev.stop (display);	329	vt_ev.stop (display);
357	}	330	}
358		331
359	prepare_ev.stop ();	332	flush_ev.stop ();
360	pty_ev.stop ();	333	pty_ev.stop ();
361	#ifdef CURSOR_BLINK	334	#ifdef CURSOR_BLINK
362	cursor_blink_ev.stop ();	335	cursor_blink_ev.stop ();
363	#endif	336	#endif
364	#ifdef TEXT_BLINK	337	#ifdef TEXT_BLINK
…		…
474	DisplayString (display));	447	DisplayString (display));
475	rxvt_emergency_cleanup ();	448	rxvt_emergency_cleanup ();
476	_exit (EXIT_FAILURE);	449	_exit (EXIT_FAILURE);
477	}	450	}
478		451
479	/----------------------------------------------------------------------/
480	bool
481	rxvt_term::init (int argc, const char const argv, stringvec *envv)
482	{
483	this->envv = envv;
484
485	SET_R (this);
486	set_locale ("");
487	set_environ (envv); // few things in X do not call setlocale :(
488
489	if (!init_vars ())
490	return false;
491
492	init_secondary ();
493
494	const char **cmd_argv = init_resources (argc, argv);
495
496	#ifdef KEYSYM_RESOURCE
497	keyboard->register_done ();
498	#endif
499
500	#ifdef HAVE_SCROLLBARS
501	if (option (Opt_scrollBar))
502	scrollBar.setIdle (); /* set existence for size calculations */
503	#endif
504
505	pty = ptytty::create ();
506
507	create_windows (argc, argv);
508
509	init_xlocale ();
510
511	scr_reset (); // initialize screen
512
513	#if 0
514	XSynchronize (dpy, True);
515	#endif
516
517	#ifdef HAVE_SCROLLBARS
518	if (option (Opt_scrollBar))
519	resize_scrollbar (); /* create and map scrollbar */
520	#endif
521	#ifdef HAVE_BG_PIXMAP
522	{
523	bgPixmap.set_target (this);
524
525	#ifdef ENABLE_TRANSPARENCY
526	if (option (Opt_transparent))
527	{
528	bgPixmap.set_transparent ();
529	#ifdef HAVE_AFTERIMAGE
530	if (rs [Rs_blurradius])
531	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532	#endif
533	if (ISSET_PIXCOLOR (Color_tint))
534	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
535	if (rs [Rs_shade])
536	bgPixmap.set_shade (rs [Rs_shade]);
537
538	bgPixmap.set_root_pixmap ();
539	XSelectInput (dpy, display->root, PropertyChangeMask);
540	rootwin_ev.start (display, display->root);
541	}
542	#endif
543
544	#ifdef BG_IMAGE_FROM_FILE
545	if (rs[Rs_backgroundPixmap] != NULL)
546	{
547	const char *p = rs[Rs_backgroundPixmap];
548
549	if ((p = strchr (p, ';')) != NULL)
550	{
551	p++;
552	bgPixmap.set_geometry (p);
553	}
554	else
555	bgPixmap.set_defaultGeometry ();
556
557	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
558	if (!bgPixmap.window_position_sensitive ())
559	update_background ();
560	}
561	#endif
562	}
563	#endif
564
565	#if ENABLE_PERL
566	rootwin_ev.start (display, display->root);
567	#endif
568
569	set_colorfgbg ();
570
571	init_command (cmd_argv);
572
573	free (cmd_argv);
574
575	if (pty->pty >= 0)
576	pty_ev.start (pty->pty, ev::READ);
577
578	prepare_ev.start ();
579
580	HOOK_INVOKE ((this, HOOK_START, DT_END));
581
582	#if ENABLE_XEMBED
583	if (rs[Rs_embed])
584	{
585	long info[2] = { 0, XEMBED_MAPPED };
586
587	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
588	32, PropModeReplace, (unsigned char *)&info, 2);
589	}
590	#endif
591
592	XMapWindow (dpy, vt);
593	XMapWindow (dpy, parent[0]);
594
595	return true;
596	}
597
598	static struct sig_handlers	452	static struct sig_handlers
599	{	453	{
600	ev::sig sw_term, sw_int;	454	ev::sig sw_term, sw_int;
601		455
602	/*	456	/*
603	* Catch a fatal signal and tidy up before quitting	457	* Catch a fatal signal and tidy up before quitting
604	*/	458	*/
605	void
606	sig_term (ev::sig &w, int revents)	459	void sig_term (ev::sig &w, int revents);
		460
		461	sig_handlers ()
607	{	462	{
608	rxvt_emergency_cleanup ();	463	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
609	w.stop ();
610	kill (getpid (), w.signum);
611	}
612
613	sig_handlers ()
614	: sw_term (this, &sig_handlers::sig_term),
615	sw_int (this, &sig_handlers::sig_term)	464	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
616	{
617	}	465	}
618	} sig_handlers;	466	} sig_handlers;
619		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
620	char **rxvt_environ; // startup environment	476	char **rxvt_environ; // startup environment
621		477
622	void	478	void
623	rxvt_init ()	479	rxvt_init ()
624	{	480	{
625	ptytty::init ();	481	ptytty::init ();
626		482
627	if (!ev::ev_default_loop (0))	483	if (!ev_default_loop (0))
628	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	484	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629		485
630	rxvt_environ = environ;	486	rxvt_environ = environ;
631		487
632	signal (SIGHUP, SIG_IGN);	488	signal (SIGHUP, SIG_IGN);
633	signal (SIGPIPE, SIG_IGN);	489	signal (SIGPIPE, SIG_IGN);
634		490
635	sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();	491	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
636	sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();	492	sig_handlers.sw_int.start (SIGINT); ev_unref ();
637		493
638	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	494	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
639	/* signal (SIGURG, SIG_DFL); */	495	/* signal (SIGURG, SIG_DFL); */
640		496
641	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	497	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
642	// TODO: handle this with exceptions and tolerate the memory loss	498	// TODO: handle this with exceptions and tolerate the memory loss
643	XSetIOErrorHandler (rxvt_xioerror_handler);	499	XSetIOErrorHandler (rxvt_xioerror_handler);
644		500
645	XrmInitialize ();	501	XrmInitialize ();
646	}
647
648	/* ------------------------------------------------------------------------- *
649	* MEMORY ALLOCATION WRAPPERS *
650	* ------------------------------------------------------------------------- */
651	void *
652	rxvt_malloc (size_t size)
653	{
654	void *p = malloc (size);
655
656	if (!p)
657	rxvt_fatal ("memory allocation failure. aborting.\n");
658
659	return p;
660	}
661
662	void *
663	rxvt_calloc (size_t number, size_t size)
664	{
665	void *p = calloc (number, size);
666
667	if (!p)
668	rxvt_fatal ("memory allocation failure. aborting.\n");
669
670	return p;
671	}
672
673	void *
674	rxvt_realloc (void *ptr, size_t size)
675	{
676	void *p = realloc (ptr, size);
677
678	if (!p)
679	rxvt_fatal ("memory allocation failure. aborting.\n");
680
681	return p;
682	}	502	}
683		503
684	/----------------------------------------------------------------------/	504	/----------------------------------------------------------------------/
685	/*	505	/*
686	* window size/position calculations for XSizeHint and other storage.	506	* window size/position calculations for XSizeHint and other storage.
…		…
688	*/	508	*/
689	void	509	void
690	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	510	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
691	{	511	{
692	short recalc_x, recalc_y;	512	short recalc_x, recalc_y;
693	int x, y, sb_w, flags;	513	int x, y, flags;
694	unsigned int w, h;	514	unsigned int w, h;
695	unsigned int max_width, max_height;	515	unsigned int max_width, max_height;
696		516
697	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	517	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
698	szHint.win_gravity = NorthWestGravity;	518	szHint.win_gravity = NorthWestGravity;
…		…
708	if (rs[Rs_geometry])	528	if (rs[Rs_geometry])
709	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	529	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
710		530
711	if (flags & WidthValue)	531	if (flags & WidthValue)
712	{	532	{
		533	if (!w)
		534	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		535
713	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	536	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
714	szHint.flags \|= USSize;	537	szHint.flags \|= USSize;
715	}	538	}
716		539
717	if (flags & HeightValue)	540	if (flags & HeightValue)
718	{	541	{
		542	if (!h)
		543	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		544
719	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	545	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
720	szHint.flags \|= USSize;	546	szHint.flags \|= USSize;
721	}	547	}
722		548
723	if (flags & XValue)	549	if (flags & XValue)
724	{	550	{
…		…
755	max_width = MAX_COLS * fwidth;	581	max_width = MAX_COLS * fwidth;
756	max_height = MAX_ROWS * fheight;	582	max_height = MAX_ROWS * fheight;
757		583
758	szHint.base_width = szHint.base_height = 2 * int_bwidth;	584	szHint.base_width = szHint.base_height = 2 * int_bwidth;
759		585
760	sb_w = 0;
761	window_vt_x = window_vt_y = int_bwidth;	586	window_vt_x = window_vt_y = int_bwidth;
762		587
763	if (scrollBar.state)	588	if (scrollBar.state)
764	{	589	{
765	sb_w = scrollbar_TotalWidth ();	590	int sb_w = scrollBar.total_width ();
766	szHint.base_width += sb_w;	591	szHint.base_width += sb_w;
767		592
768	if (!option (Opt_scrollBar_right))	593	if (!option (Opt_scrollBar_right))
769	window_vt_x += sb_w;	594	window_vt_x += sb_w;
770	}	595	}
…		…
794	{	619	{
795	min_it (height, max_height);	620	min_it (height, max_height);
796	szHint.height = szHint.base_height + height;	621	szHint.height = szHint.base_height + height;
797	}	622	}
798		623
799	if (scrollBar.state && option (Opt_scrollBar_right))
800	window_sb_x = szHint.width - sb_w;
801
802	if (recalc_x)	624	if (recalc_x)
803	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	625	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804		626
805	if (recalc_y)	627	if (recalc_y)
806	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	628	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
807		629
808	ncol = width / fwidth;	630	ncol = width / fwidth;
809	nrow = height / fheight;	631	nrow = height / fheight;
810	}	632	}
811		633
812	/----------------------------------------------------------------------/	634	/----------------------------------------------------------------------/
813	/*	635	/*
…		…
824		646
825	ws.ws_col = ncol;	647	ws.ws_col = ncol;
826	ws.ws_row = nrow;	648	ws.ws_row = nrow;
827	ws.ws_xpixel = width;	649	ws.ws_xpixel = width;
828	ws.ws_ypixel = height;	650	ws.ws_ypixel = height;
829	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	651	ioctl (pty->pty, TIOCSWINSZ, &ws);
830		652
831	#if 0	653	#if 0
832	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	654	// TIOCSWINSZ is supposed to do this automatically and correctly
833	if (cmd_pid) /* force through to the command */	655	if (cmd_pid) /* force through to the command */
834	kill (-cmd_pid, SIGWINCH);	656	kill (-cmd_pid, SIGWINCH);
835	#endif	657	#endif
836	}	658	}
837		659
…		…
866	delete fontset[0];	688	delete fontset[0];
867	fontset[0] = fs;	689	fontset[0] = fs;
868		690
869	prop = (*fs)[1]->properties ();	691	prop = (*fs)[1]->properties ();
870	prop.height += lineSpace;	692	prop.height += lineSpace;
		693	prop.width += letterSpace;
871		694
872	fs->set_prop (prop, false);	695	fs->set_prop (prop, false);
873		696
874	fwidth = prop.width;	697	fwidth = prop.width;
875	fheight = prop.height;	698	fheight = prop.height;
…		…
964	void	787	void
965	rxvt_term::set_window_color (int idx, const char *color)	788	rxvt_term::set_window_color (int idx, const char *color)
966	{	789	{
967	#ifdef XTERM_COLOR_CHANGE	790	#ifdef XTERM_COLOR_CHANGE
968	rxvt_color xcol;	791	rxvt_color xcol;
969	int i;
970		792
971	if (color == NULL \|\| *color == '\0')	793	if (color == NULL \|\| *color == '\0')
972	return;	794	return;
973		795
974	color = strdup (color);	796	color = strdup (color);
…		…
976	rs[Rs_color + idx] = color;	798	rs[Rs_color + idx] = color;
977		799
978	/* handle color aliases */	800	/* handle color aliases */
979	if (isdigit (*color))	801	if (isdigit (*color))
980	{	802	{
981	i = atoi (color);	803	int i = atoi (color);
982		804
983	if (i >= 8 && i <= 15)	805	if (i >= 8 && i <= 15)
		806	{
984	{ /* bright colors */	807	/* bright colors */
985	i -= 8;
986	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	808	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
987	goto done;	809	goto done;
988	}	810	}
989		811
990	if (i >= 0 && i <= 7)	812	if (i >= 0 && i <= 7)
		813	{
991	{ /* normal colors */	814	/* normal colors */
992	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	815	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
993	goto done;	816	goto done;
994	}	817	}
995	}	818	}
996		819
…		…
1001	* so just keep gobbling up the colormap	824	* so just keep gobbling up the colormap
1002	*/	825	*/
1003		826
1004	pix_colors_focused[idx] = xcol;	827	pix_colors_focused[idx] = xcol;
1005		828
1006	/* XSetWindowAttributes attr; */
1007	/* Cursor cursor; */
1008	done:	829	done:
1009	/TODO: handle Color_BD, scrollbar background, etc. /	830	/TODO: handle Color_BD, scrollbar background, etc. /
1010		831
1011	update_fade_color (idx);	832	update_fade_color (idx);
1012	recolour_cursor ();	833	recolour_cursor ();
…		…
1036	*/	857	*/
1037	void	858	void
1038	rxvt_term::set_colorfgbg ()	859	rxvt_term::set_colorfgbg ()
1039	{	860	{
1040	unsigned int i;	861	unsigned int i;
1041	const char *xpmb = "\0";	862	const char *xpmb = "";
1042	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	863	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1043		864
1044	strcpy (fstr, "default");	865	strcpy (fstr, "default");
1045	strcpy (bstr, "default");	866	strcpy (bstr, "default");
1046	for (i = Color_Black; i <= Color_White; i++)	867	for (i = Color_Black; i <= Color_White; i++)
…		…
1091	int old_width = szHint.width;	912	int old_width = szHint.width;
1092	int old_height = szHint.height;	913	int old_height = szHint.height;
1093		914
1094	window_calc (newwidth, newheight);	915	window_calc (newwidth, newheight);
1095		916
1096	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	917	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		918
		919	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		920	if (set_hint)
		921	{
		922	szHint.flags &= ~(PBaseSize \| PResizeInc);
1097	XSetWMNormalHints (dpy, parent[0], &szHint);	923	XSetWMNormalHints (dpy, parent[0], &szHint);
		924	szHint.flags \|= PBaseSize \| PResizeInc;
		925	}
1098		926
1099	if (!ignoreparent)	927	if (!ignoreparent)
1100	{	928	{
1101	#ifdef SMART_RESIZE	929	#ifdef SMART_RESIZE
1102	/*	930	/*
…		…
1142	#else	970	#else
1143	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	971	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1144	#endif	972	#endif
1145	}	973	}
1146		974
		975	if (set_hint)
		976	XSetWMNormalHints (dpy, parent[0], &szHint);
		977
1147	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	978	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1148		979
1149	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	980	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1150	{	981	{
1151	if (scrollBar.state)	982	if (scrollBar.state)
1152	{	983	scrollBar.resize ();
1153	XMoveResizeWindow (dpy, scrollBar.win,
1154	window_sb_x, 0,
1155	scrollbar_TotalWidth (), szHint.height);
1156	resize_scrollbar ();
1157	}
1158		984
1159	XMoveResizeWindow (dpy, vt,	985	XMoveResizeWindow (dpy, vt,
1160	window_vt_x, window_vt_y,	986	window_vt_x, window_vt_y,
1161	width, height);	987	width, height);
1162		988
1163	#ifdef HAVE_BG_PIXMAP	989	#ifdef HAVE_BG_PIXMAP
1164	if (bgPixmap.window_size_sensitive ())	990	if (bgPixmap.window_size_sensitive ())
1165	update_background ();	991	update_background ();
1166	#endif	992	#endif
1167
1168	scr_clear ();
1169	}	993	}
1170		994
1171	if (fix_screen \|\| old_height == 0)	995	if (fix_screen \|\| old_height == 0)
1172	scr_reset ();	996	scr_reset ();
1173		997
…		…
1252		1076
1253	/* Checking whether input method is running. */	1077	/* Checking whether input method is running. */
1254	bool	1078	bool
1255	rxvt_term::IMisRunning ()	1079	rxvt_term::IMisRunning ()
1256	{	1080	{
1257	char *p;
1258	Atom atom;	1081	Atom atom;
1259	Window win;	1082	Window win;
1260	char server[IMBUFSIZ];	1083	char server[IMBUFSIZ];
1261		1084
1262	/* get current locale modifier */	1085	/* get current locale modifier */
1263	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1086	if (char *p = XSetLocaleModifiers (0))
1264	{	1087	{
1265	strcpy (server, "@server=");	1088	strcpy (server, "@server=");
1266	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1089	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1267		1090
1268	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1091	if (p = strchr (server + 1, '@')) /* first one only */
1269	*p = '\0';	1092	*p = '\0';
1270		1093
1271	atom = XInternAtom (dpy, server, False);	1094	atom = XInternAtom (dpy, server, False);
1272	win = XGetSelectionOwner (dpy, atom);	1095	win = XGetSelectionOwner (dpy, atom);
1273		1096
…		…
1719	void	1542	void
1720	rxvt_term::get_window_origin (int &x, int &y)	1543	rxvt_term::get_window_origin (int &x, int &y)
1721	{	1544	{
1722	Window cr;	1545	Window cr;
1723	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1546	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1547	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1725	}	1548	}
1726		1549
1727	Pixmap	1550	Pixmap
1728	rxvt_term::get_pixmap_property (int prop_id)	1551	rxvt_term::get_pixmap_property (int prop_id)
1729	{	1552	{
…		…
1736	unsigned char *prop = NULL;	1559	unsigned char *prop = NULL;
1737	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1560	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1561	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739	&nitems, &bytes_after, &prop);	1562	&nitems, &bytes_after, &prop);
1740	if (result == Success && prop && atype == XA_PIXMAP)	1563	if (result == Success && prop && atype == XA_PIXMAP)
1741	{
1742	return (Pixmap )prop;	1564	return (Pixmap )prop;
1743	}
1744	}	1565	}
		1566
1745	return None;	1567	return None;
1746	}	1568	}
1747		1569
1748	#ifdef HAVE_BG_PIXMAP	1570	#ifdef HAVE_BG_PIXMAP
1749	# if TRACE_PIXMAPS	1571	# if TRACE_PIXMAPS
1750	# undef update_background	1572	# undef update_background
		1573	void
1751	int rxvt_term::trace_update_background (const char* file, int line)	1574	rxvt_term::trace_update_background (const char *file, int line)
1752	{	1575	{
1753	fprintf (stderr, "%s:%d:update_background()\n", file, line);	1576	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754	update_background ();	1577	update_background ();
1755	}	1578	}
1756	# endif	1579	# endif
1757	int	1580
		1581	void
1758	rxvt_term::update_background ()	1582	rxvt_term::update_background ()
1759	{	1583	{
		1584	if (update_background_ev.is_active ())
		1585	return;
		1586
1760	bgPixmap.invalidate ();	1587	bgPixmap.invalidate ();
1761		1588
1762	/* no chance of real time refresh if we are blurring! */	1589	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1763	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1590
		1591	if (to_wait <= 0.)
1764	bgPixmap.render ();	1592	bgPixmap.render ();
1765	else	1593	else
1766	{
1767	update_background_ev.stop ();
1768
1769	if (!bgPixmap.need_client_side_rendering())
1770	update_background_ev.start (.05);	1594	update_background_ev.start (to_wait);
1771	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772	update_background_ev.start (.20); /* very slow !!! */
1773	else
1774	update_background_ev.start (.07);
1775	}
1776
1777	return 0;
1778	}	1595	}
1779		1596
1780	void	1597	void
1781	rxvt_term::update_background_cb (ev::timer &w, int revents)	1598	rxvt_term::update_background_cb (ev::timer &w, int revents)
1782	{	1599	{
		1600	make_current ();
		1601
		1602	update_background_ev.stop ();
1783	bgPixmap.render ();	1603	bgPixmap.render ();
		1604	refresh_check ();
1784	}	1605	}
1785		1606
1786	#endif /* HAVE_BG_PIXMAP */	1607	#endif /* HAVE_BG_PIXMAP */
1787		1608
1788	/----------------------- 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.263 by ayin, Thu Nov 22 15:07:10 2007 UTC vs. Revision 1.318 by root, Sat May 30 08:51:23 2009 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.263 by ayin, Thu Nov 22 15:07:10 2007 UTC vs.
Revision 1.318 by root, Sat May 30 08:51:23 2009 UTC