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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.232 by root, Tue May 1 21:30:01 2007 UTC vs.
Revision 1.305 by ayin, Sun Feb 17 11:37:21 2008 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef 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	{
153	#if TRANSPARENT \|\| ENABLE_PERL	156	#if HAVE_BG_PIXMAP
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
155	#endif
156	#ifdef HAVE_SCROLLBARS
157	scrollbar_ev (this, &rxvt_term::x_cb),
158	#endif	158	#endif
159	#ifdef CURSOR_BLINK	159	#ifdef CURSOR_BLINK
160	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161	#endif	161	#endif
162	#ifdef TEXT_BLINK	162	#ifdef TEXT_BLINK
163	text_blink_ev (this, &rxvt_term::text_blink_cb),	163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164	#endif	164	#endif
165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),	166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167	#endif	167	#endif
168	#ifdef SELECTION_SCROLLING	168	#ifdef SELECTION_SCROLLING
169	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),	169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170	#endif	170	#endif
171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),	172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
		174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
		175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
		176	#endif
		177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
		178	#ifdef USE_XIM
		179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
173	#endif	180	#endif
174	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
175	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
176	#endif	183	#endif
177	#ifdef USE_XIM
178	im_ev (this, &rxvt_term::im_cb),
179	#endif
180	#ifndef NO_BELL	184	#ifndef NO_BELL
181	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
182	#endif	186	#endif
183	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
184	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
185	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
186	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
187	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
188	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
190	incr_ev (this, &rxvt_term::incr_cb)	194
191	{
192	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
193		196
194	termlist.push_back (this);	197	termlist.push_back (this);
195		198
196	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
198	#endif	201	#endif
199	}	202	}
200		203
201	// clean up the most important stuff, do not call x or free mem etc.	204	// clean up the most important stuff, do not call x or free mem etc.
202	// for use before an emergency exit	205	// for use before an emergency exit
		206	void
203	void rxvt_term::emergency_cleanup ()	207	rxvt_term::emergency_cleanup ()
204	{	208	{
205	if (cmd_pid)	209	if (cmd_pid)
206	kill (-cmd_pid, SIGHUP);	210	kill (-cmd_pid, SIGHUP);
207		211
208	pty_ev.stop ();	212	pty_ev.stop ();
…		…
219	for (int i = RS_styleCount; --i; )	223	for (int i = RS_styleCount; --i; )
220	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
221	delete fontset[i];	225	delete fontset[i];
222	#endif	226	#endif
223	delete fontset[0];	227	delete fontset[0];
		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
224		232
225	if (display)	233	if (display)
226	{	234	{
227	selection_clear ();	235	selection_clear ();
228		236
…		…
268	pix_colors_unfocused [i].free (this);	276	pix_colors_unfocused [i].free (this);
269	#endif	277	#endif
270	}	278	}
271		279
272	clear ();	280	clear ();
273	}
274		281
275	delete [] pix_colors_focused;	282	display->flush (); /* ideally .put should do this */
276	#if OFF_FOCUS_FADING
277	delete [] pix_colors_unfocused;
278	#endif
279
280	displays.put (display);	283	displays.put (display);
		284	}
281		285
282	scr_release ();	286	scr_release ();
283		287
284	/* clear all resources */	288	/* clear all resources */
285	for (int i = 0; i < allocated.size (); i++)	289	for (int i = 0; i < allocated.size (); i++)
…		…
297	delete argv;	301	delete argv;
298		302
299	#ifdef KEYSYM_RESOURCE	303	#ifdef KEYSYM_RESOURCE
300	delete keyboard;	304	delete keyboard;
301	#endif	305	#endif
		306	#ifndef NO_RESOURCES
		307	XrmDestroyDatabase (option_db);
		308	#endif
302	}	309	}
303		310
304	// child has exited, usually destroys	311	// child has exited, usually destroys
305	void	312	void
306	rxvt_term::child_cb (child_watcher &w, int status)	313	rxvt_term::child_cb (ev::child &w, int status)
307	{	314	{
308	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	315	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309		316
310	cmd_pid = 0;	317	cmd_pid = 0;
311		318
…		…
314	}	321	}
315		322
316	void	323	void
317	rxvt_term::destroy ()	324	rxvt_term::destroy ()
318	{	325	{
319	if (destroy_ev.active)	326	if (destroy_ev.is_active ())
320	return;	327	return;
321		328
322	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	329	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323		330
324	#if ENABLE_OVERLAY	331	#if ENABLE_OVERLAY
…		…
328	if (display)	335	if (display)
329	{	336	{
330	#if USE_XIM	337	#if USE_XIM
331	im_ev.stop (display);	338	im_ev.stop (display);
332	#endif	339	#endif
333	#if HAVE_SCROLLBARS
334	scrollbar_ev.stop (display);	340	scrollbar_ev.stop (display);
335	#endif
336	#if TRANSPARENT \|\| ENABLE_PERL	341	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
337	rootwin_ev.stop (display);	342	rootwin_ev.stop (display);
338	#endif	343	#endif
339	incr_ev.stop ();	344	incr_ev.stop ();
340	termwin_ev.stop (display);	345	termwin_ev.stop (display);
341	vt_ev.stop (display);	346	vt_ev.stop (display);
342	}	347	}
343		348
344	check_ev.stop ();	349	flush_ev.stop ();
345	pty_ev.stop ();	350	pty_ev.stop ();
346	#ifdef CURSOR_BLINK	351	#ifdef CURSOR_BLINK
347	cursor_blink_ev.stop ();	352	cursor_blink_ev.stop ();
348	#endif	353	#endif
349	#ifdef TEXT_BLINK	354	#ifdef TEXT_BLINK
…		…
357	#endif	362	#endif
358	#ifdef POINTER_BLANK	363	#ifdef POINTER_BLANK
359	pointer_ev.stop ();	364	pointer_ev.stop ();
360	#endif	365	#endif
361		366
362	destroy_ev.start (0);	367	destroy_ev.start ();
363	}	368	}
364		369
365	void	370	void
366	rxvt_term::destroy_cb (time_watcher &w)	371	rxvt_term::destroy_cb (ev::idle &w, int revents)
367	{	372	{
368	make_current ();	373	make_current ();
369		374
370	delete this;	375	delete this;
371	}	376	}
…		…
425	else	430	else
426	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427	mesg, BUFSIZ);	432	mesg, BUFSIZ);
428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429	}	434	}
430	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431	mesg, BUFSIZ);	436	mesg, BUFSIZ);
432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433	}	438	}
434	#endif	439	#endif
435		440
…		…
459	DisplayString (display));	464	DisplayString (display));
460	rxvt_emergency_cleanup ();	465	rxvt_emergency_cleanup ();
461	_exit (EXIT_FAILURE);	466	_exit (EXIT_FAILURE);
462	}	467	}
463		468
464	/----------------------------------------------------------------------/
465	bool
466	rxvt_term::init (int argc, const char const argv, stringvec *envv)
467	{
468	this->envv = envv;
469
470	SET_R (this);
471	set_locale ("");
472	set_environ (envv); // few things in X do not call setlocale :(
473
474	if (!init_vars ())
475	return false;
476
477	init_secondary ();
478
479	const char **cmd_argv = init_resources (argc, argv);
480
481	#ifdef KEYSYM_RESOURCE
482	keyboard->register_done ();
483	#endif
484
485	#ifdef HAVE_SCROLLBARS
486	if (option (Opt_scrollBar))
487	scrollBar.setIdle (); /* set existence for size calculations */
488	#endif
489
490	pty = ptytty::create ();
491
492	create_windows (argc, argv);
493
494	init_xlocale ();
495
496	scr_reset (); // initialize screen
497
498	#if 0
499	XSynchronize (dpy, True);
500	#endif
501
502	#ifdef HAVE_SCROLLBARS
503	if (option (Opt_scrollBar))
504	resize_scrollbar (); /* create and map scrollbar */
505	#endif
506	#ifdef TRANSPARENT
507	if (option (Opt_transparent))
508	{
509	XSelectInput (dpy, display->root, PropertyChangeMask);
510	check_our_parents ();
511	rootwin_ev.start (display, display->root);
512	}
513	#endif
514	#if ENABLE_PERL
515	rootwin_ev.start (display, display->root);
516	#endif
517
518	set_colorfgbg ();
519
520	init_command (cmd_argv);
521
522	free (cmd_argv);
523
524	if (pty->pty >= 0)
525	pty_ev.start (pty->pty, EVENT_READ);
526
527	check_ev.start ();
528
529	HOOK_INVOKE ((this, HOOK_START, DT_END));
530
531	#if ENABLE_XEMBED
532	if (rs[Rs_embed])
533	{
534	long info[2] = { 0, XEMBED_MAPPED };
535
536	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
537	32, PropModeReplace, (unsigned char *)&info, 2);
538	}
539	#endif
540
541	XMapWindow (dpy, vt);
542	XMapWindow (dpy, parent[0]);
543
544	return true;
545	}
546
547	static struct sig_handlers	469	static struct sig_handlers
548	{	470	{
549	sig_watcher sw_term, sw_int;	471	ev::sig sw_term, sw_int;
550		472
551	/*	473	/*
552	* Catch a fatal signal and tidy up before quitting	474	* Catch a fatal signal and tidy up before quitting
553	*/	475	*/
554	void	476	void sig_term (ev::sig &w, int revents);
555	sig_term (sig_watcher &w)	477
		478	sig_handlers ()
556	{	479	{
557	rxvt_emergency_cleanup ();	480	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
558	signal (w.signum, SIG_DFL);
559	kill (getpid (), w.signum);
560	}
561
562	sig_handlers ()
563	: sw_term (this, &sig_handlers::sig_term),
564	sw_int (this, &sig_handlers::sig_term)	481	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
565	{
566	}	482	}
567	} sig_handlers;	483	} sig_handlers;
568		484
		485	void
		486	sig_handlers::sig_term (ev::sig &w, int revents)
		487	{
		488	rxvt_emergency_cleanup ();
		489	w.stop ();
		490	kill (getpid (), w.signum);
		491	}
		492
569	char **rxvt_environ; // startup environment	493	char **rxvt_environ; // startup environment
570		494
571	void	495	void
572	rxvt_init ()	496	rxvt_init ()
573	{	497	{
574	ptytty::init ();	498	ptytty::init ();
		499
		500	if (!ev_default_loop (0))
		501	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
575		502
576	rxvt_environ = environ;	503	rxvt_environ = environ;
577		504
578	signal (SIGHUP, SIG_IGN);	505	signal (SIGHUP, SIG_IGN);
579	signal (SIGPIPE, SIG_IGN);	506	signal (SIGPIPE, SIG_IGN);
580		507
581	sig_handlers.sw_term.start (SIGTERM);	508	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
582	sig_handlers.sw_int.start (SIGINT);	509	sig_handlers.sw_int.start (SIGINT); ev_unref ();
583		510
584	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	511	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
585	/* signal (SIGURG, SIG_DFL); */	512	/* signal (SIGURG, SIG_DFL); */
586		513
587	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	514	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
589	XSetIOErrorHandler (rxvt_xioerror_handler);	516	XSetIOErrorHandler (rxvt_xioerror_handler);
590		517
591	XrmInitialize ();	518	XrmInitialize ();
592	}	519	}
593		520
594	/* ------------------------------------------------------------------------- *
595	* MEMORY ALLOCATION WRAPPERS *
596	* ------------------------------------------------------------------------- */
597	void *
598	rxvt_malloc (size_t size)
599	{
600	void *p = malloc (size);
601
602	if (!p)
603	rxvt_fatal ("memory allocation failure. aborting.\n");
604
605	return p;
606	}
607
608	void *
609	rxvt_calloc (size_t number, size_t size)
610	{
611	void *p = calloc (number, size);
612
613	if (!p)
614	rxvt_fatal ("memory allocation failure. aborting.\n");
615
616	return p;
617	}
618
619	void *
620	rxvt_realloc (void *ptr, size_t size)
621	{
622	void *p = realloc (ptr, size);
623
624	if (!p)
625	rxvt_fatal ("memory allocation failure. aborting.\n");
626
627	return p;
628	}
629
630	/----------------------------------------------------------------------/	521	/----------------------------------------------------------------------/
631	/*	522	/*
632	* window size/position calculcations for XSizeHint and other storage.	523	* window size/position calculations for XSizeHint and other storage.
633	* if width/height are non-zero then override calculated width/height	524	* if width/height are non-zero then override calculated width/height
634	*/	525	*/
635	void	526	void
636	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	527	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637	{	528	{
…		…
706	sb_w = 0;	597	sb_w = 0;
707	window_vt_x = window_vt_y = int_bwidth;	598	window_vt_x = window_vt_y = int_bwidth;
708		599
709	if (scrollBar.state)	600	if (scrollBar.state)
710	{	601	{
711	sb_w = scrollbar_TotalWidth ();	602	sb_w = scrollBar.total_width ();
712	szHint.base_width += sb_w;	603	szHint.base_width += sb_w;
713		604
714	if (!option (Opt_scrollBar_right))	605	if (!option (Opt_scrollBar_right))
715	window_vt_x += sb_w;	606	window_vt_x += sb_w;
716	}	607	}
…		…
773	ws.ws_xpixel = width;	664	ws.ws_xpixel = width;
774	ws.ws_ypixel = height;	665	ws.ws_ypixel = height;
775	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	666	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
776		667
777	#if 0	668	#if 0
778	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	669	// TIOCSWINSZ is supposed to do this automatically and correctly
779	if (cmd_pid) /* force through to the command */	670	if (cmd_pid) /* force through to the command */
780	kill (-cmd_pid, SIGWINCH);	671	kill (-cmd_pid, SIGWINCH);
781	#endif	672	#endif
782	}	673	}
783		674
…		…
857	if (parent[0])	748	if (parent[0])
858	{	749	{
859	resize_all_windows (0, 0, 0);	750	resize_all_windows (0, 0, 0);
860	scr_remap_chars ();	751	scr_remap_chars ();
861	scr_touch (true);	752	scr_touch (true);
862	}	753	}
863		754
864	return true;	755	return true;
865	}	756	}
866		757
		758	void
867	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	759	rxvt_term::set_string_property (Atom prop, const char *str, int len)
868	{	760	{
869	XChangeProperty (dpy, parent[0],	761	XChangeProperty (dpy, parent[0],
870	prop, XA_STRING, 8, PropModeReplace,	762	prop, XA_STRING, 8, PropModeReplace,
871	(const unsigned char *)str, len >= 0 ? len : strlen (str));	763	(const unsigned char *)str, len >= 0 ? len : strlen (str));
872	}	764	}
873		765
		766	void
874	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	767	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
875	{	768	{
876	wchar_t *ws = rxvt_mbstowcs (str, len);	769	wchar_t *ws = rxvt_mbstowcs (str, len);
877	char *s = rxvt_wcstoutf8 (ws);	770	char *s = rxvt_wcstoutf8 (ws);
878		771
879	XChangeProperty (dpy, parent[0],	772	XChangeProperty (dpy, parent[0],
…		…
903	#if ENABLE_EWMH	796	#if ENABLE_EWMH
904	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	797	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
905	#endif	798	#endif
906	}	799	}
907		800
		801	void
		802	rxvt_term::set_window_color (int idx, const char *color)
		803	{
908	#ifdef XTERM_COLOR_CHANGE	804	#ifdef XTERM_COLOR_CHANGE
909	void
910	rxvt_term::set_window_color (int idx, const char *color)
911	{
912	rxvt_color xcol;	805	rxvt_color xcol;
913	int i;	806
914
915	if (color == NULL \|\| *color == '\0')	807	if (color == NULL \|\| *color == '\0')
916	return;	808	return;
917		809
918	color = strdup (color);	810	color = strdup (color);
919	allocated.push_back ((void *)color);	811	allocated.push_back ((void *)color);
920	rs[Rs_color + idx] = color;	812	rs[Rs_color + idx] = color;
921		813
922	/* handle color aliases */	814	/* handle color aliases */
923	if (isdigit (*color))	815	if (isdigit (*color))
924	{	816	{
925	i = atoi (color);	817	int i = atoi (color);
926		818
927	if (i >= 8 && i <= 15)	819	if (i >= 8 && i <= 15)
		820	{
928	{ /* bright colors */	821	/* bright colors */
929	i -= 8;
930	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	822	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
931	goto done;	823	goto done;
932	}	824	}
933		825
934	if (i >= 0 && i <= 7)	826	if (i >= 0 && i <= 7)
		827	{
935	{ /* normal colors */	828	/* normal colors */
936	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	829	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
937	goto done;	830	goto done;
938	}	831	}
939	}	832	}
940		833
…		…
945	* so just keep gobbling up the colormap	838	* so just keep gobbling up the colormap
946	*/	839	*/
947		840
948	pix_colors_focused[idx] = xcol;	841	pix_colors_focused[idx] = xcol;
949		842
950	/* XSetWindowAttributes attr; */
951	/* Cursor cursor; */
952	done:	843	done:
953	/TODO: handle Color_BD, scrollbar background, etc. /	844	/TODO: handle Color_BD, scrollbar background, etc. /
954		845
955	update_fade_color (idx);	846	update_fade_color (idx);
956	recolour_cursor ();	847	recolour_cursor ();
957	scr_recolour ();	848	scr_recolour ();
		849	#endif /* XTERM_COLOR_CHANGE */
958	}	850	}
959
960	#else
961	# define set_window_color (idx,color) ((void)0)
962	#endif /* XTERM_COLOR_CHANGE */
963		851
964	void	852	void
965	rxvt_term::recolour_cursor ()	853	rxvt_term::recolour_cursor ()
966	{	854	{
967	XColor fg, bg;	855	XColor fg, bg;
…		…
983	*/	871	*/
984	void	872	void
985	rxvt_term::set_colorfgbg ()	873	rxvt_term::set_colorfgbg ()
986	{	874	{
987	unsigned int i;	875	unsigned int i;
988	const char *xpmb = "\0";	876	const char *xpmb = "";
989	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	877	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
990		878
991	strcpy (fstr, "default");	879	strcpy (fstr, "default");
992	strcpy (bstr, "default");	880	strcpy (bstr, "default");
993	for (i = Color_Black; i <= Color_White; i++)	881	for (i = Color_Black; i <= Color_White; i++)
…		…
999		887
1000	for (i = Color_Black; i <= Color_White; i++)	888	for (i = Color_Black; i <= Color_White; i++)
1001	if (pix_colors[Color_bg] == pix_colors[i])	889	if (pix_colors[Color_bg] == pix_colors[i])
1002	{	890	{
1003	sprintf (bstr, "%d", (i - Color_Black));	891	sprintf (bstr, "%d", (i - Color_Black));
1004	#ifdef XPM_BACKGROUND	892	#ifdef BG_IMAGE_FROM_FILE
1005	xpmb = "default;";	893	xpmb = "default;";
1006	#endif	894	#endif
1007	break;	895	break;
1008	}	896	}
1009		897
…		…
1097	{	985	{
1098	if (scrollBar.state)	986	if (scrollBar.state)
1099	{	987	{
1100	XMoveResizeWindow (dpy, scrollBar.win,	988	XMoveResizeWindow (dpy, scrollBar.win,
1101	window_sb_x, 0,	989	window_sb_x, 0,
1102	scrollbar_TotalWidth (), szHint.height);	990	scrollBar.total_width (), szHint.height);
1103	resize_scrollbar ();	991	resize_scrollbar ();
1104	}	992	}
1105		993
1106	XMoveResizeWindow (dpy, vt,	994	XMoveResizeWindow (dpy, vt,
1107	window_vt_x, window_vt_y,	995	window_vt_x, window_vt_y,
1108	width, height);	996	width, height);
1109		997
		998	#ifdef HAVE_BG_PIXMAP
		999	if (bgPixmap.window_size_sensitive ())
		1000	update_background ();
		1001	#endif
		1002
1110	scr_clear ();	1003	scr_clear ();
1111	#ifdef XPM_BACKGROUND
1112	resize_pixmap ();
1113	#endif
1114	}	1004	}
1115		1005
1116	if (fix_screen \|\| old_height == 0)	1006	if (fix_screen \|\| old_height == 0)
1117	scr_reset ();	1007	scr_reset ();
1118		1008
1119	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1009	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1120	//scr_touch (false);	1010	//scr_touch (false);
1121		1011
1122	#ifdef XPM_BACKGROUND	1012	#ifdef HAVE_BG_PIXMAP
1123	if (pixmap)	1013	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		1014	// if (bgPixmap.pixmap)
1124	scr_touch (false);	1015	// scr_touch (false);
1125	#endif	1016	#endif
1126		1017
1127	#ifdef USE_XIM	1018	#ifdef USE_XIM
1128	IMSetPosition ();	1019	IMSetPosition ();
1129	#endif	1020	#endif
…		…
1300	if (term->rs[Rs_imLocale])	1191	if (term->rs[Rs_imLocale])
1301	SET_LOCALE (term->locale);	1192	SET_LOCALE (term->locale);
1302	}	1193	}
1303	else	1194	else
1304	str = (void *)text->string.wide_char;	1195	str = (void *)text->string.wide_char;
1305		1196
1306	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1197	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1307	DT_INT, call_data->caret,	1198	DT_INT, call_data->caret,
1308	DT_INT, call_data->chg_first,	1199	DT_INT, call_data->chg_first,
1309	DT_INT, call_data->chg_length,	1200	DT_INT, call_data->chg_length,
1310	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1201	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1629		1520
1630	if (input_style & XIMPreeditPosition)	1521	if (input_style & XIMPreeditPosition)
1631	{	1522	{
1632	im_set_size (preedit_rect);	1523	im_set_size (preedit_rect);
1633	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1524	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634		1525
1635	XSetICValues (Input_Context,	1526	XSetICValues (Input_Context,
1636	XNPreeditAttributes, preedit_attr, NULL);	1527	XNPreeditAttributes, preedit_attr, NULL);
1637	}	1528	}
1638	else	1529	else
1639	{	1530	{
…		…
1656	XFree (status_attr);	1547	XFree (status_attr);
1657	}	1548	}
1658		1549
1659	XFree (preedit_attr);	1550	XFree (preedit_attr);
1660	}	1551	}
1661	#endif /* USE_XIM */	1552	#endif /* USE_XIM */
		1553
		1554	void
		1555	rxvt_term::get_window_origin (int &x, int &y)
		1556	{
		1557	Window cr;
		1558	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1559	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1560	}
		1561
		1562	Pixmap
		1563	rxvt_term::get_pixmap_property (int prop_id)
		1564	{
		1565	if (prop_id > 0 && prop_id < NUM_XA)
		1566	if (xa[prop_id])
		1567	{
		1568	int aformat;
		1569	unsigned long nitems, bytes_after;
		1570	Atom atype;
		1571	unsigned char *prop = NULL;
		1572	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1573	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1574	&nitems, &bytes_after, &prop);
		1575	if (result == Success && prop && atype == XA_PIXMAP)
		1576	return (Pixmap )prop;
		1577	}
		1578
		1579	return None;
		1580	}
		1581
		1582	#ifdef HAVE_BG_PIXMAP
		1583	# if TRACE_PIXMAPS
		1584	# undef update_background
		1585	void
		1586	rxvt_term::trace_update_background (const char *file, int line)
		1587	{
		1588	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1589	update_background ();
		1590	}
		1591	# endif
		1592
		1593	void
		1594	rxvt_term::update_background ()
		1595	{
		1596	if (update_background_ev.is_active ())
		1597	return;
		1598
		1599	bgPixmap.invalidate ();
		1600
		1601	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1602
		1603	if (to_wait <= 0.)
		1604	bgPixmap.render ();
		1605	else
		1606	update_background_ev.start (to_wait);
		1607	}
		1608
		1609	void
		1610	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1611	{
		1612	make_current ();
		1613
		1614	update_background_ev.stop ();
		1615	bgPixmap.render ();
		1616	refresh_check ();
		1617	}
		1618
		1619	#endif /* HAVE_BG_PIXMAP */
1662		1620
1663	/----------------------- end-of-file (C source) -----------------------/	1621	/----------------------- 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.232 by root, Tue May 1 21:30:01 2007 UTC vs. Revision 1.305 by ayin, Sun Feb 17 11:37:21 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.232 by root, Tue May 1 21:30:01 2007 UTC vs.
Revision 1.305 by ayin, Sun Feb 17 11:37:21 2008 UTC