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

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

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.233 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.302 by root, Fri Jan 25 16:04:57 2008 UTC