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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.242 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2007 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 TTY_GID_SUPPORT
44	# include <grp.h>
45	#endif
46
47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	43	#include <termios.h>
		44
		45	#ifdef HAVE_XSETLOCALE
		46	# define X_LOCALE
		47	# include <X11/Xlocale.h>
		48	#else
		49	# ifdef HAVE_SETLOCALE
		50	# include <clocale>
		51	# endif
49	#endif	52	#endif
50		53
51	vector<rxvt_term *> rxvt_term::termlist;	54	vector<rxvt_term *> rxvt_term::termlist;
52		55
53	// used to tell global functions which terminal instance is "active"	56	// used to tell global functions which terminal instance is "active"
…		…
88	class rxvt_composite_vec rxvt_composite;	91	class rxvt_composite_vec rxvt_composite;
89		92
90	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91	{	94	{
92	compose_char *cc;	95	compose_char *cc;
93		96
94	// break compose chains, as stupid readline really likes to duplicate	97	// break compose chains, as stupid readline really likes to duplicate
95	// composing characters for some reason near the end of a line.	98	// composing characters for some reason near the end of a line.
96	cc = (*this)[c1];	99	cc = (*this)[c1];
97	while (cc)	100	while (cc)
98	{	101	{
…		…
147		150
148	}	151	}
149	#endif	152	#endif
150		153
151	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
152	:	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
153	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155	#endif
156	#if ENABLE_TRANSPARENCY
157	check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
158	#endif	176	#endif
159	#ifdef HAVE_SCROLLBARS	177	#ifdef HAVE_SCROLLBARS
160	scrollbar_ev (this, &rxvt_term::x_cb),	178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
161	#endif	179	#endif
162	#ifdef CURSOR_BLINK	180	#ifdef USE_XIM
163	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	181	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164	#endif
165	#ifdef TEXT_BLINK
166	text_blink_ev (this, &rxvt_term::text_blink_cb),
167	#endif
168	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170	#endif
171	#ifdef SELECTION_SCROLLING
172	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173	#endif
174	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176	#endif	182	#endif
177	#ifdef POINTER_BLANK	183	#ifdef POINTER_BLANK
178	pointer_ev (this, &rxvt_term::pointer_cb),	184	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179	#endif	185	#endif
180	#ifdef USE_XIM
181	im_ev (this, &rxvt_term::im_cb),
182	#endif
183	#ifndef NO_BELL	186	#ifndef NO_BELL
184	bell_ev (this, &rxvt_term::bell_cb),	187	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185	#endif	188	#endif
186	termwin_ev (this, &rxvt_term::x_cb),	189	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187	vt_ev (this, &rxvt_term::x_cb),	190	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188	child_ev (this, &rxvt_term::child_cb),	191	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189	check_ev (this, &rxvt_term::check_cb),	192	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190	flush_ev (this, &rxvt_term::flush_cb),	193	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191	destroy_ev (this, &rxvt_term::destroy_cb),	194	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192	pty_ev (this, &rxvt_term::pty_cb),	195	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	incr_ev (this, &rxvt_term::incr_cb)	196
194	{
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	197	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		198
197	termlist.push_back (this);	199	termlist.push_back (this);
198		200
199	#ifdef KEYSYM_RESOURCE	201	#ifdef KEYSYM_RESOURCE
…		…
201	#endif	203	#endif
202	}	204	}
203		205
204	// clean up the most important stuff, do not call x or free mem etc.	206	// clean up the most important stuff, do not call x or free mem etc.
205	// for use before an emergency exit	207	// for use before an emergency exit
		208	void
206	void rxvt_term::emergency_cleanup ()	209	rxvt_term::emergency_cleanup ()
207	{	210	{
208	if (cmd_pid)	211	if (cmd_pid)
209	kill (-cmd_pid, SIGHUP);	212	kill (-cmd_pid, SIGHUP);
210		213
211	pty_ev.stop ();	214	pty_ev.stop ();
…		…
273	}	276	}
274		277
275	clear ();	278	clear ();
276	}	279	}
277		280
278	delete [] pix_colors_focused;	281	#ifdef HAVE_BG_PIXMAP
279	#if OFF_FOCUS_FADING	282	bgPixmap.destroy ();
280	delete [] pix_colors_unfocused;
281	#endif	283	#endif
282		284	display->flush (); /* ideally .put should do this */
283	displays.put (display);	285	displays.put (display);
284		286
285	scr_release ();	287	scr_release ();
286		288
287	/* clear all resources */	289	/* clear all resources */
…		…
300	delete argv;	302	delete argv;
301		303
302	#ifdef KEYSYM_RESOURCE	304	#ifdef KEYSYM_RESOURCE
303	delete keyboard;	305	delete keyboard;
304	#endif	306	#endif
		307	#ifndef NO_RESOURCES
		308	XrmDestroyDatabase (option_db);
		309	#endif
305	}	310	}
306		311
307	// child has exited, usually destroys	312	// child has exited, usually destroys
308	void	313	void
309	rxvt_term::child_cb (child_watcher &w, int status)	314	rxvt_term::child_cb (ev::child &w, int status)
310	{	315	{
311	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	316	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312		317
313	cmd_pid = 0;	318	cmd_pid = 0;
314		319
…		…
317	}	322	}
318		323
319	void	324	void
320	rxvt_term::destroy ()	325	rxvt_term::destroy ()
321	{	326	{
322	if (destroy_ev.active)	327	if (destroy_ev.is_active ())
323	return;	328	return;
324		329
325	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	330	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326		331
327	#if ENABLE_OVERLAY	332	#if ENABLE_OVERLAY
…		…
342	incr_ev.stop ();	347	incr_ev.stop ();
343	termwin_ev.stop (display);	348	termwin_ev.stop (display);
344	vt_ev.stop (display);	349	vt_ev.stop (display);
345	}	350	}
346		351
347	check_ev.stop ();	352	flush_ev.stop ();
348	pty_ev.stop ();	353	pty_ev.stop ();
349	#ifdef CURSOR_BLINK	354	#ifdef CURSOR_BLINK
350	cursor_blink_ev.stop ();	355	cursor_blink_ev.stop ();
351	#endif	356	#endif
352	#ifdef TEXT_BLINK	357	#ifdef TEXT_BLINK
…		…
360	#endif	365	#endif
361	#ifdef POINTER_BLANK	366	#ifdef POINTER_BLANK
362	pointer_ev.stop ();	367	pointer_ev.stop ();
363	#endif	368	#endif
364		369
365	destroy_ev.start (0);	370	destroy_ev.start ();
366	}	371	}
367		372
368	void	373	void
369	rxvt_term::destroy_cb (time_watcher &w)	374	rxvt_term::destroy_cb (ev::idle &w, int revents)
370	{	375	{
371	make_current ();	376	make_current ();
372		377
373	delete this;	378	delete this;
374	}	379	}
…		…
428	else	433	else
429	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	434	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430	mesg, BUFSIZ);	435	mesg, BUFSIZ);
431	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	436	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432	}	437	}
433	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	438	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434	mesg, BUFSIZ);	439	mesg, BUFSIZ);
435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	440	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436	}	441	}
437	#endif	442	#endif
438		443
…		…
463	rxvt_emergency_cleanup ();	468	rxvt_emergency_cleanup ();
464	_exit (EXIT_FAILURE);	469	_exit (EXIT_FAILURE);
465	}	470	}
466		471
467	/----------------------------------------------------------------------/	472	/----------------------------------------------------------------------/
468	bool	473	void
469	rxvt_term::init (int argc, const char const argv, stringvec *envv)	474	rxvt_term::init (int argc, const char const argv, stringvec *envv)
470	{	475	{
471	this->envv = envv;	476	this->envv = envv;
472		477
473	SET_R (this);	478	SET_R (this);
474	set_locale ("");	479	set_locale ("");
475	set_environ (envv); // few things in X do not call setlocale :(	480	set_environ (envv); // few things in X do not call setlocale :(
476		481
477	if (!init_vars ())	482	init_vars ();
478	return false;
479		483
480	init_secondary ();	484	init_secondary ();
481		485
482	const char **cmd_argv = init_resources (argc, argv);	486	const char **cmd_argv = init_resources (argc, argv);
483		487
…		…
506	if (option (Opt_scrollBar))	510	if (option (Opt_scrollBar))
507	resize_scrollbar (); /* create and map scrollbar */	511	resize_scrollbar (); /* create and map scrollbar */
508	#endif	512	#endif
509	#ifdef HAVE_BG_PIXMAP	513	#ifdef HAVE_BG_PIXMAP
510	{	514	{
511	bool changed = false;
512	bgPixmap.set_target (this);	515	bgPixmap.set_target (this);
		516	bgPixmap.invalidate ();
513		517
514	#ifdef ENABLE_TRANSPARENCY	518	#ifdef ENABLE_TRANSPARENCY
515	if (option (Opt_transparent))	519	if (option (Opt_transparent))
516	{	520	{
517	bgPixmap.set_transparent ();	521	bgPixmap.set_transparent ();
		522
518	#ifdef HAVE_AFTERIMAGE	523	#ifdef HAVE_AFTERIMAGE
519	if (rs [Rs_blurradius])	524	if (rs [Rs_blurradius])
520	bgPixmap.set_blur_radius (rs [Rs_blurradius]);	525	bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521	#endif	526	#endif
522	if (ISSET_PIXCOLOR (Color_tint))	527	if (ISSET_PIXCOLOR (Color_tint))
523	bgPixmap.set_tint (pix_colors_focused [Color_tint]);	528	bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		529
524	if (rs [Rs_shade])	530	if (rs [Rs_shade])
525	bgPixmap.set_shade (rs [Rs_shade]);	531	bgPixmap.set_shade (rs [Rs_shade]);
526	changed = true;
527		532
528	bgPixmap.set_root_pixmap ();	533	bgPixmap.set_root_pixmap ();
529	XSelectInput (dpy, display->root, PropertyChangeMask);	534	XSelectInput (dpy, display->root, PropertyChangeMask);
530	rootwin_ev.start (display, display->root);	535	rootwin_ev.start (display, display->root);
531	}	536	}
532	#endif	537	#endif
533		538
534	#ifdef XPM_BACKGROUND	539	#ifdef BG_IMAGE_FROM_FILE
535	if (rs[Rs_backgroundPixmap] != NULL)	540	if (rs[Rs_backgroundPixmap])
536	{	541	{
537	const char *p = rs[Rs_backgroundPixmap];	542	const char *p = rs[Rs_backgroundPixmap];
538		543
539	if ((p = strchr (p, ';')) != NULL)	544	if ((p = strchr (p, ';')) != 0)
540	{	545	{
541	p++;	546	p++;
542	bgPixmap.set_geometry (p);	547	bgPixmap.set_geometry (p);
543	}	548	}
544	else	549	else
545	bgPixmap.set_defaultGeometry ();	550	bgPixmap.set_defaultGeometry ();
546		551
547	changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]);	552	if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
		553	if (!bgPixmap.window_position_sensitive ())
		554	update_background ();
548	}	555	}
549	#endif	556	#endif
550	if (changed)
551	{
552	bgPixmap.render ();
553	scr_touch (true);
554	}
555	}	557	}
556	#endif	558	#endif
557		559
558	#if ENABLE_PERL	560	#if ENABLE_PERL
559	rootwin_ev.start (display, display->root);	561	rootwin_ev.start (display, display->root);
…		…
564	init_command (cmd_argv);	566	init_command (cmd_argv);
565		567
566	free (cmd_argv);	568	free (cmd_argv);
567		569
568	if (pty->pty >= 0)	570	if (pty->pty >= 0)
569	pty_ev.start (pty->pty, EVENT_READ);	571	pty_ev.start (pty->pty, ev::READ);
570
571	check_ev.start ();
572		572
573	HOOK_INVOKE ((this, HOOK_START, DT_END));	573	HOOK_INVOKE ((this, HOOK_START, DT_END));
574		574
575	#if ENABLE_XEMBED	575	#if ENABLE_XEMBED
576	if (rs[Rs_embed])	576	if (rs[Rs_embed])
…		…
583	#endif	583	#endif
584		584
585	XMapWindow (dpy, vt);	585	XMapWindow (dpy, vt);
586	XMapWindow (dpy, parent[0]);	586	XMapWindow (dpy, parent[0]);
587		587
588	return true;	588	refresh_check ();
589	}	589	}
590		590
591	static struct sig_handlers	591	static struct sig_handlers
592	{	592	{
593	sig_watcher sw_term, sw_int;	593	ev::sig sw_term, sw_int;
594		594
595	/*	595	/*
596	* Catch a fatal signal and tidy up before quitting	596	* Catch a fatal signal and tidy up before quitting
597	*/	597	*/
598	void	598	void sig_term (ev::sig &w, int revents);
599	sig_term (sig_watcher &w)	599
		600	sig_handlers ()
600	{	601	{
601	rxvt_emergency_cleanup ();	602	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
602	signal (w.signum, SIG_DFL);
603	kill (getpid (), w.signum);
604	}
605
606	sig_handlers ()
607	: sw_term (this, &sig_handlers::sig_term),
608	sw_int (this, &sig_handlers::sig_term)	603	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
609	{
610	}	604	}
611	} sig_handlers;	605	} sig_handlers;
612		606
		607	void
		608	sig_handlers::sig_term (ev::sig &w, int revents)
		609	{
		610	rxvt_emergency_cleanup ();
		611	w.stop ();
		612	kill (getpid (), w.signum);
		613	}
		614
613	char **rxvt_environ; // startup environment	615	char **rxvt_environ; // startup environment
614		616
615	void	617	void
616	rxvt_init ()	618	rxvt_init ()
617	{	619	{
618	ptytty::init ();	620	ptytty::init ();
		621
		622	if (!ev_default_loop (0))
		623	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
619		624
620	rxvt_environ = environ;	625	rxvt_environ = environ;
621		626
622	signal (SIGHUP, SIG_IGN);	627	signal (SIGHUP, SIG_IGN);
623	signal (SIGPIPE, SIG_IGN);	628	signal (SIGPIPE, SIG_IGN);
624		629
625	sig_handlers.sw_term.start (SIGTERM);	630	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
626	sig_handlers.sw_int.start (SIGINT);	631	sig_handlers.sw_int.start (SIGINT); ev_unref ();
627		632
628	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	633	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
629	/* signal (SIGURG, SIG_DFL); */	634	/* signal (SIGURG, SIG_DFL); */
630		635
631	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	636	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
632	// TODO: handle this with exceptions and tolerate the memory loss	637	// TODO: handle this with exceptions and tolerate the memory loss
633	XSetIOErrorHandler (rxvt_xioerror_handler);	638	XSetIOErrorHandler (rxvt_xioerror_handler);
634		639
635	XrmInitialize ();	640	XrmInitialize ();
636	}
637
638	/* ------------------------------------------------------------------------- *
639	* MEMORY ALLOCATION WRAPPERS *
640	* ------------------------------------------------------------------------- */
641	void *
642	rxvt_malloc (size_t size)
643	{
644	void *p = malloc (size);
645
646	if (!p)
647	rxvt_fatal ("memory allocation failure. aborting.\n");
648
649	return p;
650	}
651
652	void *
653	rxvt_calloc (size_t number, size_t size)
654	{
655	void *p = calloc (number, size);
656
657	if (!p)
658	rxvt_fatal ("memory allocation failure. aborting.\n");
659
660	return p;
661	}
662
663	void *
664	rxvt_realloc (void *ptr, size_t size)
665	{
666	void *p = realloc (ptr, size);
667
668	if (!p)
669	rxvt_fatal ("memory allocation failure. aborting.\n");
670
671	return p;
672	}	641	}
673		642
674	/----------------------------------------------------------------------/	643	/----------------------------------------------------------------------/
675	/*	644	/*
676	* window size/position calculations for XSizeHint and other storage.	645	* window size/position calculations for XSizeHint and other storage.
…		…
817	ws.ws_xpixel = width;	786	ws.ws_xpixel = width;
818	ws.ws_ypixel = height;	787	ws.ws_ypixel = height;
819	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	788	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
820		789
821	#if 0	790	#if 0
822	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	791	// TIOCSWINSZ is supposed to do this automatically and correctly
823	if (cmd_pid) /* force through to the command */	792	if (cmd_pid) /* force through to the command */
824	kill (-cmd_pid, SIGWINCH);	793	kill (-cmd_pid, SIGWINCH);
825	#endif	794	#endif
826	}	795	}
827		796
…		…
901	if (parent[0])	870	if (parent[0])
902	{	871	{
903	resize_all_windows (0, 0, 0);	872	resize_all_windows (0, 0, 0);
904	scr_remap_chars ();	873	scr_remap_chars ();
905	scr_touch (true);	874	scr_touch (true);
906	}	875	}
907		876
908	return true;	877	return true;
909	}	878	}
910		879
		880	void
911	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	881	rxvt_term::set_string_property (Atom prop, const char *str, int len)
912	{	882	{
913	XChangeProperty (dpy, parent[0],	883	XChangeProperty (dpy, parent[0],
914	prop, XA_STRING, 8, PropModeReplace,	884	prop, XA_STRING, 8, PropModeReplace,
915	(const unsigned char *)str, len >= 0 ? len : strlen (str));	885	(const unsigned char *)str, len >= 0 ? len : strlen (str));
916	}	886	}
917		887
		888	void
918	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	889	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
919	{	890	{
920	wchar_t *ws = rxvt_mbstowcs (str, len);	891	wchar_t *ws = rxvt_mbstowcs (str, len);
921	char *s = rxvt_wcstoutf8 (ws);	892	char *s = rxvt_wcstoutf8 (ws);
922		893
923	XChangeProperty (dpy, parent[0],	894	XChangeProperty (dpy, parent[0],
…		…
947	#if ENABLE_EWMH	918	#if ENABLE_EWMH
948	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	919	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
949	#endif	920	#endif
950	}	921	}
951		922
		923	void
		924	rxvt_term::set_window_color (int idx, const char *color)
		925	{
952	#ifdef XTERM_COLOR_CHANGE	926	#ifdef XTERM_COLOR_CHANGE
953	void
954	rxvt_term::set_window_color (int idx, const char *color)
955	{
956	rxvt_color xcol;	927	rxvt_color xcol;
957	int i;	928	int i;
958		929
959	if (color == NULL \|\| *color == '\0')	930	if (color == NULL \|\| *color == '\0')
960	return;	931	return;
961		932
962	color = strdup (color);	933	color = strdup (color);
963	allocated.push_back ((void *)color);	934	allocated.push_back ((void *)color);
…		…
967	if (isdigit (*color))	938	if (isdigit (*color))
968	{	939	{
969	i = atoi (color);	940	i = atoi (color);
970		941
971	if (i >= 8 && i <= 15)	942	if (i >= 8 && i <= 15)
		943	{
972	{ /* bright colors */	944	/* bright colors */
973	i -= 8;
974	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	945	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
975	goto done;	946	goto done;
976	}	947	}
977		948
978	if (i >= 0 && i <= 7)	949	if (i >= 0 && i <= 7)
		950	{
979	{ /* normal colors */	951	/* normal colors */
980	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	952	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
981	goto done;	953	goto done;
982	}	954	}
983	}	955	}
984		956
…		…
989	* so just keep gobbling up the colormap	961	* so just keep gobbling up the colormap
990	*/	962	*/
991		963
992	pix_colors_focused[idx] = xcol;	964	pix_colors_focused[idx] = xcol;
993		965
994	/* XSetWindowAttributes attr; */
995	/* Cursor cursor; */
996	done:	966	done:
997	/TODO: handle Color_BD, scrollbar background, etc. /	967	/TODO: handle Color_BD, scrollbar background, etc. /
998		968
999	update_fade_color (idx);	969	update_fade_color (idx);
1000	recolour_cursor ();	970	recolour_cursor ();
1001	scr_recolour ();	971	scr_recolour ();
		972	#endif /* XTERM_COLOR_CHANGE */
1002	}	973	}
1003
1004	#else
1005	# define set_window_color (idx,color) ((void)0)
1006	#endif /* XTERM_COLOR_CHANGE */
1007		974
1008	void	975	void
1009	rxvt_term::recolour_cursor ()	976	rxvt_term::recolour_cursor ()
1010	{	977	{
1011	XColor fg, bg;	978	XColor fg, bg;
…		…
1027	*/	994	*/
1028	void	995	void
1029	rxvt_term::set_colorfgbg ()	996	rxvt_term::set_colorfgbg ()
1030	{	997	{
1031	unsigned int i;	998	unsigned int i;
1032	const char *xpmb = "\0";	999	const char *xpmb = "";
1033	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1000	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1034		1001
1035	strcpy (fstr, "default");	1002	strcpy (fstr, "default");
1036	strcpy (bstr, "default");	1003	strcpy (bstr, "default");
1037	for (i = Color_Black; i <= Color_White; i++)	1004	for (i = Color_Black; i <= Color_White; i++)
…		…
1043		1010
1044	for (i = Color_Black; i <= Color_White; i++)	1011	for (i = Color_Black; i <= Color_White; i++)
1045	if (pix_colors[Color_bg] == pix_colors[i])	1012	if (pix_colors[Color_bg] == pix_colors[i])
1046	{	1013	{
1047	sprintf (bstr, "%d", (i - Color_Black));	1014	sprintf (bstr, "%d", (i - Color_Black));
1048	#ifdef XPM_BACKGROUND	1015	#ifdef BG_IMAGE_FROM_FILE
1049	xpmb = "default;";	1016	xpmb = "default;";
1050	#endif	1017	#endif
1051	break;	1018	break;
1052	}	1019	}
1053		1020
…		…
1149		1116
1150	XMoveResizeWindow (dpy, vt,	1117	XMoveResizeWindow (dpy, vt,
1151	window_vt_x, window_vt_y,	1118	window_vt_x, window_vt_y,
1152	width, height);	1119	width, height);
1153		1120
1154	#ifdef XPM_BACKGROUND	1121	#ifdef HAVE_BG_PIXMAP
1155	/* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1156	if (bgPixmap.window_size_sensitive ())	1122	if (bgPixmap.window_size_sensitive ())
1157	bgPixmap.render ();	1123	update_background ();
1158	#endif	1124	#endif
1159		1125
1160	scr_clear ();	1126	scr_clear ();
1161	}	1127	}
1162		1128
…		…
1348	if (term->rs[Rs_imLocale])	1314	if (term->rs[Rs_imLocale])
1349	SET_LOCALE (term->locale);	1315	SET_LOCALE (term->locale);
1350	}	1316	}
1351	else	1317	else
1352	str = (void *)text->string.wide_char;	1318	str = (void *)text->string.wide_char;
1353		1319
1354	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1320	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1355	DT_INT, call_data->caret,	1321	DT_INT, call_data->caret,
1356	DT_INT, call_data->chg_first,	1322	DT_INT, call_data->chg_first,
1357	DT_INT, call_data->chg_length,	1323	DT_INT, call_data->chg_length,
1358	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1324	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1677		1643
1678	if (input_style & XIMPreeditPosition)	1644	if (input_style & XIMPreeditPosition)
1679	{	1645	{
1680	im_set_size (preedit_rect);	1646	im_set_size (preedit_rect);
1681	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1647	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1682		1648
1683	XSetICValues (Input_Context,	1649	XSetICValues (Input_Context,
1684	XNPreeditAttributes, preedit_attr, NULL);	1650	XNPreeditAttributes, preedit_attr, NULL);
1685	}	1651	}
1686	else	1652	else
1687	{	1653	{
…		…
1704	XFree (status_attr);	1670	XFree (status_attr);
1705	}	1671	}
1706		1672
1707	XFree (preedit_attr);	1673	XFree (preedit_attr);
1708	}	1674	}
1709	#endif /* USE_XIM */	1675	#endif /* USE_XIM */
		1676
		1677	void
		1678	rxvt_term::get_window_origin (int &x, int &y)
		1679	{
		1680	Window cr;
		1681	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1682	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1683	}
		1684
		1685	Pixmap
		1686	rxvt_term::get_pixmap_property (int prop_id)
		1687	{
		1688	if (prop_id > 0 && prop_id < NUM_XA)
		1689	if (xa[prop_id])
		1690	{
		1691	int aformat;
		1692	unsigned long nitems, bytes_after;
		1693	Atom atype;
		1694	unsigned char *prop = NULL;
		1695	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1696	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1697	&nitems, &bytes_after, &prop);
		1698	if (result == Success && prop && atype == XA_PIXMAP)
		1699	return (Pixmap )prop;
		1700	}
		1701
		1702	return None;
		1703	}
		1704
		1705	#ifdef HAVE_BG_PIXMAP
		1706	# if TRACE_PIXMAPS
		1707	# undef update_background
		1708	void
		1709	rxvt_term::trace_update_background (const char *file, int line)
		1710	{
		1711	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1712	update_background ();
		1713	}
		1714	# endif
		1715
		1716	void
		1717	rxvt_term::update_background ()
		1718	{
		1719	if (update_background_ev.is_active ())
		1720	return;
		1721
		1722	bgPixmap.invalidate ();
		1723
		1724	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1725
		1726	if (to_wait <= 0.)
		1727	bgPixmap.render ();
		1728	else
		1729	update_background_ev.start (to_wait);
		1730	}
		1731
		1732	void
		1733	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1734	{
		1735	make_current ();
		1736
		1737	update_background_ev.stop ();
		1738	bgPixmap.render ();
		1739	refresh_check ();
		1740	}
		1741
		1742	#endif /* HAVE_BG_PIXMAP */
1710		1743
1711	/----------------------- end-of-file (C source) -----------------------/	1744	/----------------------- 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.242 by sasha, Wed Aug 15 22:41:52 2007 UTC vs. Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.242 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.299 by sasha, Tue Jan 15 23:21:18 2008 UTC