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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.261 by root, Mon Nov 19 15:33:34 2007 UTC vs.
Revision 1.322 by root, Tue Mar 30 23:00:35 2010 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 ();
		242	selection_clear (true);
237		243
238	#ifdef USE_XIM	244	#ifdef USE_XIM
239	im_destroy ();	245	im_destroy ();
240	#endif	246	#endif
241	#ifdef XTERM_SCROLLBAR	247	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);	248	if (gc) XFreeGC (dpy, gc);
266		249
267	delete drawable;	250	delete drawable;
268	// destroy all windows	251	// destroy all windows
269	if (parent[0])	252	if (parent[0])
…		…
277	pix_colors_unfocused [i].free (this);	260	pix_colors_unfocused [i].free (this);
278	#endif	261	#endif
279	}	262	}
280		263
281	clear ();	264	clear ();
282	}
283		265
284	delete [] pix_colors_focused;	266	display->flush (); /* ideally .put should do this */
285	#if OFF_FOCUS_FADING
286	delete [] pix_colors_unfocused;
287	#endif
288
289	bgPixmap.destroy ();
290	displays.put (display);	267	displays.put (display);
		268	}
291		269
292	scr_release ();	270	scr_release ();
293		271
294	/* clear all resources */	272	/* clear all resources */
295	for (int i = 0; i < allocated.size (); i++)	273	for (int i = 0; i < allocated.size (); i++)
296	free (allocated [i]);	274	free (allocated [i]);
297		275
298	free (selection.text);	276	free (selection.text);
		277	free (selection.clip_text);
299	// TODO: manage env vars in child only(!)	278	// TODO: manage env vars in child only(!)
300	free (env_display);	279	free (env_display);
301	free (env_term);	280	free (env_term);
302	free (locale);	281	free (locale);
303	free (v_buffer);	282	free (v_buffer);
…		…
307	delete argv;	286	delete argv;
308		287
309	#ifdef KEYSYM_RESOURCE	288	#ifdef KEYSYM_RESOURCE
310	delete keyboard;	289	delete keyboard;
311	#endif	290	#endif
		291	#ifndef NO_RESOURCES
		292	XrmDestroyDatabase (option_db);
		293	#endif
312	}	294	}
313		295
314	// child has exited, usually destroys	296	// child has exited, usually destroys
315	void	297	void
316	rxvt_term::child_cb (ev::child &w, int status)	298	rxvt_term::child_cb (ev::child &w, int status)
…		…
324	}	306	}
325		307
326	void	308	void
327	rxvt_term::destroy ()	309	rxvt_term::destroy ()
328	{	310	{
329	if (destroy_ev.active)	311	if (destroy_ev.is_active ())
330	return;	312	return;
331		313
332	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	314	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
333		315
334	#if ENABLE_OVERLAY	316	#if ENABLE_OVERLAY
…		…
338	if (display)	320	if (display)
339	{	321	{
340	#if USE_XIM	322	#if USE_XIM
341	im_ev.stop (display);	323	im_ev.stop (display);
342	#endif	324	#endif
343	#if HAVE_SCROLLBARS
344	scrollbar_ev.stop (display);	325	scrollbar_ev.stop (display);
345	#endif
346	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	326	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
347	rootwin_ev.stop (display);	327	rootwin_ev.stop (display);
348	#endif	328	#endif
349	incr_ev.stop ();	329	incr_ev.stop ();
350	termwin_ev.stop (display);	330	termwin_ev.stop (display);
351	vt_ev.stop (display);	331	vt_ev.stop (display);
352	}	332	}
353		333
354	prepare_ev.stop ();	334	flush_ev.stop ();
355	pty_ev.stop ();	335	pty_ev.stop ();
356	#ifdef CURSOR_BLINK	336	#ifdef CURSOR_BLINK
357	cursor_blink_ev.stop ();	337	cursor_blink_ev.stop ();
358	#endif	338	#endif
359	#ifdef TEXT_BLINK	339	#ifdef TEXT_BLINK
…		…
469	DisplayString (display));	449	DisplayString (display));
470	rxvt_emergency_cleanup ();	450	rxvt_emergency_cleanup ();
471	_exit (EXIT_FAILURE);	451	_exit (EXIT_FAILURE);
472	}	452	}
473		453
474	/----------------------------------------------------------------------/
475	bool
476	rxvt_term::init (int argc, const char const argv, stringvec *envv)
477	{
478	this->envv = envv;
479
480	SET_R (this);
481	set_locale ("");
482	set_environ (envv); // few things in X do not call setlocale :(
483
484	if (!init_vars ())
485	return false;
486
487	init_secondary ();
488
489	const char **cmd_argv = init_resources (argc, argv);
490
491	#ifdef KEYSYM_RESOURCE
492	keyboard->register_done ();
493	#endif
494
495	#ifdef HAVE_SCROLLBARS
496	if (option (Opt_scrollBar))
497	scrollBar.setIdle (); /* set existence for size calculations */
498	#endif
499
500	pty = ptytty::create ();
501
502	create_windows (argc, argv);
503
504	init_xlocale ();
505
506	scr_reset (); // initialize screen
507
508	#if 0
509	XSynchronize (dpy, True);
510	#endif
511
512	#ifdef HAVE_SCROLLBARS
513	if (option (Opt_scrollBar))
514	resize_scrollbar (); /* create and map scrollbar */
515	#endif
516	#ifdef HAVE_BG_PIXMAP
517	{
518	bgPixmap.set_target (this);
519
520	#ifdef ENABLE_TRANSPARENCY
521	if (option (Opt_transparent))
522	{
523	bgPixmap.set_transparent ();
524	#ifdef HAVE_AFTERIMAGE
525	if (rs [Rs_blurradius])
526	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527	#endif
528	if (ISSET_PIXCOLOR (Color_tint))
529	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530	if (rs [Rs_shade])
531	bgPixmap.set_shade (rs [Rs_shade]);
532
533	bgPixmap.set_root_pixmap ();
534	XSelectInput (dpy, display->root, PropertyChangeMask);
535	rootwin_ev.start (display, display->root);
536	}
537	#endif
538
539	#ifdef BG_IMAGE_FROM_FILE
540	if (rs[Rs_backgroundPixmap] != NULL)
541	{
542	const char *p = rs[Rs_backgroundPixmap];
543
544	if ((p = strchr (p, ';')) != NULL)
545	{
546	p++;
547	bgPixmap.set_geometry (p);
548	}
549	else
550	bgPixmap.set_defaultGeometry ();
551
552	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
553	if (!bgPixmap.window_position_sensitive ())
554	update_background ();
555	}
556	#endif
557	}
558	#endif
559
560	#if ENABLE_PERL
561	rootwin_ev.start (display, display->root);
562	#endif
563
564	set_colorfgbg ();
565
566	init_command (cmd_argv);
567
568	free (cmd_argv);
569
570	if (pty->pty >= 0)
571	pty_ev.start (pty->pty, ev::READ);
572
573	prepare_ev.start ();
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	return true;
591	}
592
593	static struct sig_handlers	454	static struct sig_handlers
594	{	455	{
595	ev::sig sw_term, sw_int;	456	ev::sig sw_term, sw_int;
596		457
597	/*	458	/*
598	* Catch a fatal signal and tidy up before quitting	459	* Catch a fatal signal and tidy up before quitting
599	*/	460	*/
600	void
601	sig_term (ev::sig &w, int revents)	461	void sig_term (ev::sig &w, int revents);
		462
		463	sig_handlers ()
602	{	464	{
603	rxvt_emergency_cleanup ();	465	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
604	w.stop ();
605	kill (getpid (), w.signum);
606	}
607
608	sig_handlers ()
609	: sw_term (this, &sig_handlers::sig_term),
610	sw_int (this, &sig_handlers::sig_term)	466	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
611	{
612	}	467	}
613	} sig_handlers;	468	} sig_handlers;
614		469
		470	void
		471	sig_handlers::sig_term (ev::sig &w, int revents)
		472	{
		473	rxvt_emergency_cleanup ();
		474	w.stop ();
		475	kill (getpid (), w.signum);
		476	}
		477
615	char **rxvt_environ; // startup environment	478	char **rxvt_environ; // startup environment
616		479
617	void	480	void
618	rxvt_init ()	481	rxvt_init ()
619	{	482	{
620	ptytty::init ();	483	ptytty::init ();
621		484
622	if (!ev::ev_default_loop (0))	485	if (!ev_default_loop (0))
623	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	486	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624		487
625	rxvt_environ = environ;	488	rxvt_environ = environ;
626		489
627	signal (SIGHUP, SIG_IGN);	490	signal (SIGHUP, SIG_IGN);
628	signal (SIGPIPE, SIG_IGN);	491	signal (SIGPIPE, SIG_IGN);
629		492
630	sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();	493	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
631	sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();	494	sig_handlers.sw_int.start (SIGINT); ev_unref ();
632		495
633	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	496	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
634	/* signal (SIGURG, SIG_DFL); */	497	/* signal (SIGURG, SIG_DFL); */
635		498
636	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	499	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
637	// TODO: handle this with exceptions and tolerate the memory loss	500	// TODO: handle this with exceptions and tolerate the memory loss
638	XSetIOErrorHandler (rxvt_xioerror_handler);	501	XSetIOErrorHandler (rxvt_xioerror_handler);
639		502
640	XrmInitialize ();	503	XrmInitialize ();
641	}
642
643	/* ------------------------------------------------------------------------- *
644	* MEMORY ALLOCATION WRAPPERS *
645	* ------------------------------------------------------------------------- */
646	void *
647	rxvt_malloc (size_t size)
648	{
649	void *p = malloc (size);
650
651	if (!p)
652	rxvt_fatal ("memory allocation failure. aborting.\n");
653
654	return p;
655	}
656
657	void *
658	rxvt_calloc (size_t number, size_t size)
659	{
660	void *p = calloc (number, size);
661
662	if (!p)
663	rxvt_fatal ("memory allocation failure. aborting.\n");
664
665	return p;
666	}
667
668	void *
669	rxvt_realloc (void *ptr, size_t size)
670	{
671	void *p = realloc (ptr, size);
672
673	if (!p)
674	rxvt_fatal ("memory allocation failure. aborting.\n");
675
676	return p;
677	}	504	}
678		505
679	/----------------------------------------------------------------------/	506	/----------------------------------------------------------------------/
680	/*	507	/*
681	* window size/position calculations for XSizeHint and other storage.	508	* window size/position calculations for XSizeHint and other storage.
…		…
683	*/	510	*/
684	void	511	void
685	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	512	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
686	{	513	{
687	short recalc_x, recalc_y;	514	short recalc_x, recalc_y;
688	int x, y, sb_w, flags;	515	int x, y, flags;
689	unsigned int w, h;	516	unsigned int w, h;
690	unsigned int max_width, max_height;	517	unsigned int max_width, max_height;
691		518
692	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	519	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
693	szHint.win_gravity = NorthWestGravity;	520	szHint.win_gravity = NorthWestGravity;
…		…
703	if (rs[Rs_geometry])	530	if (rs[Rs_geometry])
704	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	531	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
705		532
706	if (flags & WidthValue)	533	if (flags & WidthValue)
707	{	534	{
		535	if (!w)
		536	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		537
708	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	538	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
709	szHint.flags \|= USSize;	539	szHint.flags \|= USSize;
710	}	540	}
711		541
712	if (flags & HeightValue)	542	if (flags & HeightValue)
713	{	543	{
		544	if (!h)
		545	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		546
714	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	547	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
715	szHint.flags \|= USSize;	548	szHint.flags \|= USSize;
716	}	549	}
717		550
718	if (flags & XValue)	551	if (flags & XValue)
719	{	552	{
…		…
750	max_width = MAX_COLS * fwidth;	583	max_width = MAX_COLS * fwidth;
751	max_height = MAX_ROWS * fheight;	584	max_height = MAX_ROWS * fheight;
752		585
753	szHint.base_width = szHint.base_height = 2 * int_bwidth;	586	szHint.base_width = szHint.base_height = 2 * int_bwidth;
754		587
755	sb_w = 0;
756	window_vt_x = window_vt_y = int_bwidth;	588	window_vt_x = window_vt_y = int_bwidth;
757		589
758	if (scrollBar.state)	590	if (scrollBar.state)
759	{	591	{
760	sb_w = scrollbar_TotalWidth ();	592	int sb_w = scrollBar.total_width ();
761	szHint.base_width += sb_w;	593	szHint.base_width += sb_w;
762		594
763	if (!option (Opt_scrollBar_right))	595	if (!option (Opt_scrollBar_right))
764	window_vt_x += sb_w;	596	window_vt_x += sb_w;
765	}	597	}
…		…
789	{	621	{
790	min_it (height, max_height);	622	min_it (height, max_height);
791	szHint.height = szHint.base_height + height;	623	szHint.height = szHint.base_height + height;
792	}	624	}
793		625
794	if (scrollBar.state && option (Opt_scrollBar_right))
795	window_sb_x = szHint.width - sb_w;
796
797	if (recalc_x)	626	if (recalc_x)
798	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	627	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
799		628
800	if (recalc_y)	629	if (recalc_y)
801	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	630	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
802		631
803	ncol = width / fwidth;	632	ncol = width / fwidth;
804	nrow = height / fheight;	633	nrow = height / fheight;
805	}	634	}
806		635
807	/----------------------------------------------------------------------/	636	/----------------------------------------------------------------------/
808	/*	637	/*
…		…
819		648
820	ws.ws_col = ncol;	649	ws.ws_col = ncol;
821	ws.ws_row = nrow;	650	ws.ws_row = nrow;
822	ws.ws_xpixel = width;	651	ws.ws_xpixel = width;
823	ws.ws_ypixel = height;	652	ws.ws_ypixel = height;
824	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	653	ioctl (pty->pty, TIOCSWINSZ, &ws);
825		654
826	#if 0	655	#if 0
827	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	656	// TIOCSWINSZ is supposed to do this automatically and correctly
828	if (cmd_pid) /* force through to the command */	657	if (cmd_pid) /* force through to the command */
829	kill (-cmd_pid, SIGWINCH);	658	kill (-cmd_pid, SIGWINCH);
830	#endif	659	#endif
831	}	660	}
832		661
…		…
859	#endif	688	#endif
860		689
861	delete fontset[0];	690	delete fontset[0];
862	fontset[0] = fs;	691	fontset[0] = fs;
863		692
864	prop = (*fs)[1]->properties ();	693	prop = fs->get (0, 1)->properties ();
865	prop.height += lineSpace;	694	prop.height += lineSpace;
		695	prop.width += letterSpace;
866		696
867	fs->set_prop (prop, false);	697	fs->set_prop (prop, false);
868		698
869	fwidth = prop.width;	699	fwidth = prop.width;
870	fheight = prop.height;	700	fheight = prop.height;
…		…
959	void	789	void
960	rxvt_term::set_window_color (int idx, const char *color)	790	rxvt_term::set_window_color (int idx, const char *color)
961	{	791	{
962	#ifdef XTERM_COLOR_CHANGE	792	#ifdef XTERM_COLOR_CHANGE
963	rxvt_color xcol;	793	rxvt_color xcol;
964	int i;
965		794
966	if (color == NULL \|\| *color == '\0')	795	if (color == NULL \|\| *color == '\0')
967	return;	796	return;
968		797
969	color = strdup (color);	798	color = strdup (color);
…		…
971	rs[Rs_color + idx] = color;	800	rs[Rs_color + idx] = color;
972		801
973	/* handle color aliases */	802	/* handle color aliases */
974	if (isdigit (*color))	803	if (isdigit (*color))
975	{	804	{
976	i = atoi (color);	805	int i = atoi (color);
977		806
978	if (i >= 8 && i <= 15)	807	if (i >= 8 && i <= 15)
		808	{
979	{ /* bright colors */	809	/* bright colors */
980	i -= 8;
981	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	810	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
982	goto done;	811	goto done;
983	}	812	}
984		813
985	if (i >= 0 && i <= 7)	814	if (i >= 0 && i <= 7)
		815	{
986	{ /* normal colors */	816	/* normal colors */
987	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	817	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
988	goto done;	818	goto done;
989	}	819	}
990	}	820	}
991		821
…		…
996	* so just keep gobbling up the colormap	826	* so just keep gobbling up the colormap
997	*/	827	*/
998		828
999	pix_colors_focused[idx] = xcol;	829	pix_colors_focused[idx] = xcol;
1000		830
1001	/* XSetWindowAttributes attr; */
1002	/* Cursor cursor; */
1003	done:	831	done:
1004	/TODO: handle Color_BD, scrollbar background, etc. /	832	/TODO: handle Color_BD, scrollbar background, etc. /
1005		833
1006	update_fade_color (idx);	834	update_fade_color (idx);
1007	recolour_cursor ();	835	recolour_cursor ();
…		…
1031	*/	859	*/
1032	void	860	void
1033	rxvt_term::set_colorfgbg ()	861	rxvt_term::set_colorfgbg ()
1034	{	862	{
1035	unsigned int i;	863	unsigned int i;
1036	const char *xpmb = "\0";	864	const char *xpmb = "";
1037	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	865	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1038		866
1039	strcpy (fstr, "default");	867	strcpy (fstr, "default");
1040	strcpy (bstr, "default");	868	strcpy (bstr, "default");
1041	for (i = Color_Black; i <= Color_White; i++)	869	for (i = Color_Black; i <= Color_White; i++)
…		…
1086	int old_width = szHint.width;	914	int old_width = szHint.width;
1087	int old_height = szHint.height;	915	int old_height = szHint.height;
1088		916
1089	window_calc (newwidth, newheight);	917	window_calc (newwidth, newheight);
1090		918
1091	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	919	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		920
		921	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		922	if (set_hint)
		923	{
		924	szHint.flags &= ~(PBaseSize \| PResizeInc);
1092	XSetWMNormalHints (dpy, parent[0], &szHint);	925	XSetWMNormalHints (dpy, parent[0], &szHint);
		926	szHint.flags \|= PBaseSize \| PResizeInc;
		927	}
1093		928
1094	if (!ignoreparent)	929	if (!ignoreparent)
1095	{	930	{
1096	#ifdef SMART_RESIZE	931	#ifdef SMART_RESIZE
1097	/*	932	/*
…		…
1137	#else	972	#else
1138	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	973	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1139	#endif	974	#endif
1140	}	975	}
1141		976
		977	if (set_hint)
		978	XSetWMNormalHints (dpy, parent[0], &szHint);
		979
1142	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	980	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1143		981
1144	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	982	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1145	{	983	{
1146	if (scrollBar.state)	984	if (scrollBar.state)
1147	{	985	scrollBar.resize ();
1148	XMoveResizeWindow (dpy, scrollBar.win,
1149	window_sb_x, 0,
1150	scrollbar_TotalWidth (), szHint.height);
1151	resize_scrollbar ();
1152	}
1153		986
1154	XMoveResizeWindow (dpy, vt,	987	XMoveResizeWindow (dpy, vt,
1155	window_vt_x, window_vt_y,	988	window_vt_x, window_vt_y,
1156	width, height);	989	width, height);
1157		990
1158	#ifdef HAVE_BG_PIXMAP	991	#ifdef HAVE_BG_PIXMAP
1159	if (bgPixmap.window_size_sensitive ())	992	if (bgPixmap.window_size_sensitive ())
1160	update_background ();	993	update_background ();
1161	#endif	994	#endif
1162
1163	scr_clear ();
1164	}	995	}
1165		996
1166	if (fix_screen \|\| old_height == 0)	997	if (fix_screen \|\| old_height == 0)
1167	scr_reset ();	998	scr_reset ();
1168
1169	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1170	//scr_touch (false);
1171		999
1172	#ifdef HAVE_BG_PIXMAP	1000	#ifdef HAVE_BG_PIXMAP
1173	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?	1001	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1174	// if (bgPixmap.pixmap)	1002	// if (bgPixmap.pixmap)
1175	// scr_touch (false);	1003	// scr_touch (false);
…		…
1247		1075
1248	/* Checking whether input method is running. */	1076	/* Checking whether input method is running. */
1249	bool	1077	bool
1250	rxvt_term::IMisRunning ()	1078	rxvt_term::IMisRunning ()
1251	{	1079	{
1252	char *p;
1253	Atom atom;	1080	Atom atom;
1254	Window win;	1081	Window win;
1255	char server[IMBUFSIZ];	1082	char server[IMBUFSIZ];
1256		1083
1257	/* get current locale modifier */	1084	/* get current locale modifier */
1258	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1085	if (char *p = XSetLocaleModifiers (0))
1259	{	1086	{
1260	strcpy (server, "@server=");	1087	strcpy (server, "@server=");
1261	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1088	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1262		1089
1263	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1090	if (p = strchr (server + 1, '@')) /* first one only */
1264	*p = '\0';	1091	*p = '\0';
1265		1092
1266	atom = XInternAtom (dpy, server, False);	1093	atom = XInternAtom (dpy, server, False);
1267	win = XGetSelectionOwner (dpy, atom);	1094	win = XGetSelectionOwner (dpy, atom);
1268		1095
…		…
1335		1162
1336	term->make_current ();	1163	term->make_current ();
1337		1164
1338	if (text)	1165	if (text)
1339	{	1166	{
1340	void *str;	1167	wchar_t *str;
1341		1168
1342	if (!text->encoding_is_wchar && text->string.multi_byte)	1169	if (!text->encoding_is_wchar && text->string.multi_byte)
1343	{	1170	{
1344	// of course, X makes it ugly again	1171	// of course, X makes it ugly again
1345	if (term->rs[Rs_imLocale])	1172	if (term->rs[Rs_imLocale])
1346	SET_LOCALE (term->rs[Rs_imLocale]);	1173	SET_LOCALE (term->rs[Rs_imLocale]);
1347		1174
1348	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1175	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1349	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1176	mbstowcs (str, text->string.multi_byte, text->length + 1);
1350		1177
1351	if (term->rs[Rs_imLocale])	1178	if (term->rs[Rs_imLocale])
1352	SET_LOCALE (term->locale);	1179	SET_LOCALE (term->locale);
1353	}	1180	}
1354	else	1181	else
1355	str = (void *)text->string.wide_char;	1182	str = text->string.wide_char;
1356		1183
1357	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1184	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1358	DT_INT, call_data->caret,	1185	DT_INT, call_data->caret,
1359	DT_INT, call_data->chg_first,	1186	DT_INT, call_data->chg_first,
1360	DT_INT, call_data->chg_length,	1187	DT_INT, call_data->chg_length,
…		…
1714	void	1541	void
1715	rxvt_term::get_window_origin (int &x, int &y)	1542	rxvt_term::get_window_origin (int &x, int &y)
1716	{	1543	{
1717	Window cr;	1544	Window cr;
1718	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1545	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1719	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/	1546	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1720	}	1547	}
1721		1548
1722	Pixmap	1549	Pixmap
1723	rxvt_term::get_pixmap_property (int prop_id)	1550	rxvt_term::get_pixmap_property (int prop_id)
1724	{	1551	{
…		…
1731	unsigned char *prop = NULL;	1558	unsigned char *prop = NULL;
1732	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1559	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1733	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1560	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1734	&nitems, &bytes_after, &prop);	1561	&nitems, &bytes_after, &prop);
1735	if (result == Success && prop && atype == XA_PIXMAP)	1562	if (result == Success && prop && atype == XA_PIXMAP)
1736	{
1737	return (Pixmap )prop;	1563	return (Pixmap )prop;
1738	}
1739	}	1564	}
		1565
1740	return None;	1566	return None;
1741	}	1567	}
1742		1568
1743	#ifdef HAVE_BG_PIXMAP	1569	#ifdef HAVE_BG_PIXMAP
1744	# if TRACE_PIXMAPS	1570	# if TRACE_PIXMAPS
1745	# undef update_background	1571	# undef update_background
		1572	void
1746	int rxvt_term::trace_update_background (const char* file, int line)	1573	rxvt_term::trace_update_background (const char *file, int line)
1747	{	1574	{
1748	fprintf (stderr, "%s:%d:update_background()\n", file, line);	1575	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1749	update_background ();	1576	update_background ();
1750	}	1577	}
1751	# endif	1578	# endif
1752	int	1579
		1580	void
1753	rxvt_term::update_background ()	1581	rxvt_term::update_background ()
1754	{	1582	{
		1583	if (update_background_ev.is_active ())
		1584	return;
		1585
1755	bgPixmap.invalidate ();	1586	bgPixmap.invalidate ();
1756		1587
1757	/* no chance of real time refresh if we are blurring! */	1588	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1758	if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))	1589
		1590	if (to_wait <= 0.)
1759	bgPixmap.render ();	1591	bgPixmap.render ();
1760	else	1592	else
1761	{
1762	update_background_ev.stop ();
1763
1764	if (!bgPixmap.need_client_side_rendering())
1765	update_background_ev.start (.05);	1593	update_background_ev.start (to_wait);
1766	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1767	update_background_ev.start (.20); /* very slow !!! */
1768	else
1769	update_background_ev.start (.07);
1770	}
1771
1772	return 0;
1773	}	1594	}
1774		1595
1775	void	1596	void
1776	rxvt_term::update_background_cb (ev::timer &w, int revents)	1597	rxvt_term::update_background_cb (ev::timer &w, int revents)
1777	{	1598	{
		1599	make_current ();
		1600
		1601	update_background_ev.stop ();
1778	bgPixmap.render ();	1602	bgPixmap.render ();
		1603	refresh_check ();
1779	}	1604	}
1780		1605
1781	#endif /* HAVE_BG_PIXMAP */	1606	#endif /* HAVE_BG_PIXMAP */
1782		1607
1783	/----------------------- end-of-file (C source) -----------------------/	1608	/----------------------- 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.261 by root, Mon Nov 19 15:33:34 2007 UTC vs. Revision 1.322 by root, Tue Mar 30 23:00:35 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.261 by root, Mon Nov 19 15:33:34 2007 UTC vs.
Revision 1.322 by root, Tue Mar 30 23:00:35 2010 UTC