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

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

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.260 by root, Sun Nov 18 02:45:26 2007 UTC vs.
Revision 1.320 by sf-exg, Sat Jan 30 20:43:56 2010 UTC