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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.238 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.301 by ayin, Sat Jan 19 13:00:10 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 ();
…		…
222	for (int i = RS_styleCount; --i; )	225	for (int i = RS_styleCount; --i; )
223	if (fontset[i] != fontset[0])	226	if (fontset[i] != fontset[0])
224	delete fontset[i];	227	delete fontset[i];
225	#endif	228	#endif
226	delete fontset[0];	229	delete fontset[0];
		230
		231	#ifdef HAVE_BG_PIXMAP
		232	bgPixmap.destroy ();
		233	#endif
227		234
228	if (display)	235	if (display)
229	{	236	{
230	selection_clear ();	237	selection_clear ();
231		238
…		…
271	pix_colors_unfocused [i].free (this);	278	pix_colors_unfocused [i].free (this);
272	#endif	279	#endif
273	}	280	}
274		281
275	clear ();	282	clear ();
276	}
277		283
278	delete [] pix_colors_focused;	284	display->flush (); /* ideally .put should do this */
279	#if OFF_FOCUS_FADING
280	delete [] pix_colors_unfocused;
281	#endif
282
283	displays.put (display);	285	displays.put (display);
		286	}
284		287
285	scr_release ();	288	scr_release ();
286		289
287	/* clear all resources */	290	/* clear all resources */
288	for (int i = 0; i < allocated.size (); i++)	291	for (int i = 0; i < allocated.size (); i++)
…		…
300	delete argv;	303	delete argv;
301		304
302	#ifdef KEYSYM_RESOURCE	305	#ifdef KEYSYM_RESOURCE
303	delete keyboard;	306	delete keyboard;
304	#endif	307	#endif
		308	#ifndef NO_RESOURCES
		309	XrmDestroyDatabase (option_db);
		310	#endif
305	}	311	}
306		312
307	// child has exited, usually destroys	313	// child has exited, usually destroys
308	void	314	void
309	rxvt_term::child_cb (child_watcher &w, int status)	315	rxvt_term::child_cb (ev::child &w, int status)
310	{	316	{
311	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	317	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312		318
313	cmd_pid = 0;	319	cmd_pid = 0;
314		320
…		…
317	}	323	}
318		324
319	void	325	void
320	rxvt_term::destroy ()	326	rxvt_term::destroy ()
321	{	327	{
322	if (destroy_ev.active)	328	if (destroy_ev.is_active ())
323	return;	329	return;
324		330
325	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	331	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326		332
327	#if ENABLE_OVERLAY	333	#if ENABLE_OVERLAY
…		…
342	incr_ev.stop ();	348	incr_ev.stop ();
343	termwin_ev.stop (display);	349	termwin_ev.stop (display);
344	vt_ev.stop (display);	350	vt_ev.stop (display);
345	}	351	}
346		352
347	check_ev.stop ();	353	flush_ev.stop ();
348	pty_ev.stop ();	354	pty_ev.stop ();
349	#ifdef CURSOR_BLINK	355	#ifdef CURSOR_BLINK
350	cursor_blink_ev.stop ();	356	cursor_blink_ev.stop ();
351	#endif	357	#endif
352	#ifdef TEXT_BLINK	358	#ifdef TEXT_BLINK
…		…
360	#endif	366	#endif
361	#ifdef POINTER_BLANK	367	#ifdef POINTER_BLANK
362	pointer_ev.stop ();	368	pointer_ev.stop ();
363	#endif	369	#endif
364		370
365	destroy_ev.start (0);	371	destroy_ev.start ();
366	}	372	}
367		373
368	void	374	void
369	rxvt_term::destroy_cb (time_watcher &w)	375	rxvt_term::destroy_cb (ev::idle &w, int revents)
370	{	376	{
371	make_current ();	377	make_current ();
372		378
373	delete this;	379	delete this;
374	}	380	}
…		…
428	else	434	else
429	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	435	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430	mesg, BUFSIZ);	436	mesg, BUFSIZ);
431	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432	}	438	}
433	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	439	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434	mesg, BUFSIZ);	440	mesg, BUFSIZ);
435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	441	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436	}	442	}
437	#endif	443	#endif
438		444
…		…
462	DisplayString (display));	468	DisplayString (display));
463	rxvt_emergency_cleanup ();	469	rxvt_emergency_cleanup ();
464	_exit (EXIT_FAILURE);	470	_exit (EXIT_FAILURE);
465	}	471	}
466		472
467	/----------------------------------------------------------------------/
468	bool
469	rxvt_term::init (int argc, const char const argv, stringvec *envv)
470	{
471	this->envv = envv;
472
473	SET_R (this);
474	set_locale ("");
475	set_environ (envv); // few things in X do not call setlocale :(
476
477	if (!init_vars ())
478	return false;
479
480	init_secondary ();
481
482	const char **cmd_argv = init_resources (argc, argv);
483
484	#ifdef KEYSYM_RESOURCE
485	keyboard->register_done ();
486	#endif
487
488	#ifdef HAVE_SCROLLBARS
489	if (option (Opt_scrollBar))
490	scrollBar.setIdle (); /* set existence for size calculations */
491	#endif
492
493	pty = ptytty::create ();
494
495	create_windows (argc, argv);
496
497	init_xlocale ();
498
499	scr_reset (); // initialize screen
500
501	#if 0
502	XSynchronize (dpy, True);
503	#endif
504
505	#ifdef HAVE_SCROLLBARS
506	if (option (Opt_scrollBar))
507	resize_scrollbar (); /* create and map scrollbar */
508	#endif
509	#ifdef ENABLE_TRANSPARENCY
510	if (option (Opt_transparent))
511	{
512	XSelectInput (dpy, display->root, PropertyChangeMask);
513	check_our_parents ();
514	rootwin_ev.start (display, display->root);
515	}
516	#endif
517	#if ENABLE_PERL
518	rootwin_ev.start (display, display->root);
519	#endif
520
521	set_colorfgbg ();
522
523	init_command (cmd_argv);
524
525	free (cmd_argv);
526
527	if (pty->pty >= 0)
528	pty_ev.start (pty->pty, EVENT_READ);
529
530	check_ev.start ();
531
532	HOOK_INVOKE ((this, HOOK_START, DT_END));
533
534	#if ENABLE_XEMBED
535	if (rs[Rs_embed])
536	{
537	long info[2] = { 0, XEMBED_MAPPED };
538
539	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
540	32, PropModeReplace, (unsigned char *)&info, 2);
541	}
542	#endif
543
544	XMapWindow (dpy, vt);
545	XMapWindow (dpy, parent[0]);
546
547	return true;
548	}
549
550	static struct sig_handlers	473	static struct sig_handlers
551	{	474	{
552	sig_watcher sw_term, sw_int;	475	ev::sig sw_term, sw_int;
553		476
554	/*	477	/*
555	* Catch a fatal signal and tidy up before quitting	478	* Catch a fatal signal and tidy up before quitting
556	*/	479	*/
557	void	480	void sig_term (ev::sig &w, int revents);
558	sig_term (sig_watcher &w)	481
		482	sig_handlers ()
559	{	483	{
560	rxvt_emergency_cleanup ();	484	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
561	signal (w.signum, SIG_DFL);
562	kill (getpid (), w.signum);
563	}
564
565	sig_handlers ()
566	: sw_term (this, &sig_handlers::sig_term),
567	sw_int (this, &sig_handlers::sig_term)	485	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
568	{
569	}	486	}
570	} sig_handlers;	487	} sig_handlers;
571		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
572	char **rxvt_environ; // startup environment	497	char **rxvt_environ; // startup environment
573		498
574	void	499	void
575	rxvt_init ()	500	rxvt_init ()
576	{	501	{
577	ptytty::init ();	502	ptytty::init ();
		503
		504	if (!ev_default_loop (0))
		505	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
578		506
579	rxvt_environ = environ;	507	rxvt_environ = environ;
580		508
581	signal (SIGHUP, SIG_IGN);	509	signal (SIGHUP, SIG_IGN);
582	signal (SIGPIPE, SIG_IGN);	510	signal (SIGPIPE, SIG_IGN);
583		511
584	sig_handlers.sw_term.start (SIGTERM);	512	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
585	sig_handlers.sw_int.start (SIGINT);	513	sig_handlers.sw_int.start (SIGINT); ev_unref ();
586		514
587	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	515	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
588	/* signal (SIGURG, SIG_DFL); */	516	/* signal (SIGURG, SIG_DFL); */
589		517
590	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	518	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
591	// TODO: handle this with exceptions and tolerate the memory loss	519	// TODO: handle this with exceptions and tolerate the memory loss
592	XSetIOErrorHandler (rxvt_xioerror_handler);	520	XSetIOErrorHandler (rxvt_xioerror_handler);
593		521
594	XrmInitialize ();	522	XrmInitialize ();
595	}
596
597	/* ------------------------------------------------------------------------- *
598	* MEMORY ALLOCATION WRAPPERS *
599	* ------------------------------------------------------------------------- */
600	void *
601	rxvt_malloc (size_t size)
602	{
603	void *p = malloc (size);
604
605	if (!p)
606	rxvt_fatal ("memory allocation failure. aborting.\n");
607
608	return p;
609	}
610
611	void *
612	rxvt_calloc (size_t number, size_t size)
613	{
614	void *p = calloc (number, size);
615
616	if (!p)
617	rxvt_fatal ("memory allocation failure. aborting.\n");
618
619	return p;
620	}
621
622	void *
623	rxvt_realloc (void *ptr, size_t size)
624	{
625	void *p = realloc (ptr, size);
626
627	if (!p)
628	rxvt_fatal ("memory allocation failure. aborting.\n");
629
630	return p;
631	}	523	}
632		524
633	/----------------------------------------------------------------------/	525	/----------------------------------------------------------------------/
634	/*	526	/*
635	* window size/position calculations for XSizeHint and other storage.	527	* window size/position calculations for XSizeHint and other storage.
…		…
776	ws.ws_xpixel = width;	668	ws.ws_xpixel = width;
777	ws.ws_ypixel = height;	669	ws.ws_ypixel = height;
778	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	670	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
779		671
780	#if 0	672	#if 0
781	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	673	// TIOCSWINSZ is supposed to do this automatically and correctly
782	if (cmd_pid) /* force through to the command */	674	if (cmd_pid) /* force through to the command */
783	kill (-cmd_pid, SIGWINCH);	675	kill (-cmd_pid, SIGWINCH);
784	#endif	676	#endif
785	}	677	}
786		678
…		…
860	if (parent[0])	752	if (parent[0])
861	{	753	{
862	resize_all_windows (0, 0, 0);	754	resize_all_windows (0, 0, 0);
863	scr_remap_chars ();	755	scr_remap_chars ();
864	scr_touch (true);	756	scr_touch (true);
865	}	757	}
866		758
867	return true;	759	return true;
868	}	760	}
869		761
		762	void
870	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)
871	{	764	{
872	XChangeProperty (dpy, parent[0],	765	XChangeProperty (dpy, parent[0],
873	prop, XA_STRING, 8, PropModeReplace,	766	prop, XA_STRING, 8, PropModeReplace,
874	(const unsigned char *)str, len >= 0 ? len : strlen (str));	767	(const unsigned char *)str, len >= 0 ? len : strlen (str));
875	}	768	}
876		769
		770	void
877	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)
878	{	772	{
879	wchar_t *ws = rxvt_mbstowcs (str, len);	773	wchar_t *ws = rxvt_mbstowcs (str, len);
880	char *s = rxvt_wcstoutf8 (ws);	774	char *s = rxvt_wcstoutf8 (ws);
881		775
882	XChangeProperty (dpy, parent[0],	776	XChangeProperty (dpy, parent[0],
…		…
906	#if ENABLE_EWMH	800	#if ENABLE_EWMH
907	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	801	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
908	#endif	802	#endif
909	}	803	}
910		804
		805	void
		806	rxvt_term::set_window_color (int idx, const char *color)
		807	{
911	#ifdef XTERM_COLOR_CHANGE	808	#ifdef XTERM_COLOR_CHANGE
912	void
913	rxvt_term::set_window_color (int idx, const char *color)
914	{
915	rxvt_color xcol;	809	rxvt_color xcol;
916	int i;	810	int i;
917		811
918	if (color == NULL \|\| *color == '\0')	812	if (color == NULL \|\| *color == '\0')
919	return;	813	return;
920		814
921	color = strdup (color);	815	color = strdup (color);
922	allocated.push_back ((void *)color);	816	allocated.push_back ((void *)color);
…		…
926	if (isdigit (*color))	820	if (isdigit (*color))
927	{	821	{
928	i = atoi (color);	822	i = atoi (color);
929		823
930	if (i >= 8 && i <= 15)	824	if (i >= 8 && i <= 15)
		825	{
931	{ /* bright colors */	826	/* bright colors */
932	i -= 8;
933	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	827	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
934	goto done;	828	goto done;
935	}	829	}
936		830
937	if (i >= 0 && i <= 7)	831	if (i >= 0 && i <= 7)
		832	{
938	{ /* normal colors */	833	/* normal colors */
939	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	834	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
940	goto done;	835	goto done;
941	}	836	}
942	}	837	}
943		838
…		…
948	* so just keep gobbling up the colormap	843	* so just keep gobbling up the colormap
949	*/	844	*/
950		845
951	pix_colors_focused[idx] = xcol;	846	pix_colors_focused[idx] = xcol;
952		847
953	/* XSetWindowAttributes attr; */
954	/* Cursor cursor; */
955	done:	848	done:
956	/TODO: handle Color_BD, scrollbar background, etc. /	849	/TODO: handle Color_BD, scrollbar background, etc. /
957		850
958	update_fade_color (idx);	851	update_fade_color (idx);
959	recolour_cursor ();	852	recolour_cursor ();
960	scr_recolour ();	853	scr_recolour ();
		854	#endif /* XTERM_COLOR_CHANGE */
961	}	855	}
962
963	#else
964	# define set_window_color (idx,color) ((void)0)
965	#endif /* XTERM_COLOR_CHANGE */
966		856
967	void	857	void
968	rxvt_term::recolour_cursor ()	858	rxvt_term::recolour_cursor ()
969	{	859	{
970	XColor fg, bg;	860	XColor fg, bg;
…		…
986	*/	876	*/
987	void	877	void
988	rxvt_term::set_colorfgbg ()	878	rxvt_term::set_colorfgbg ()
989	{	879	{
990	unsigned int i;	880	unsigned int i;
991	const char *xpmb = "\0";	881	const char *xpmb = "";
992	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	882	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
993		883
994	strcpy (fstr, "default");	884	strcpy (fstr, "default");
995	strcpy (bstr, "default");	885	strcpy (bstr, "default");
996	for (i = Color_Black; i <= Color_White; i++)	886	for (i = Color_Black; i <= Color_White; i++)
…		…
1002		892
1003	for (i = Color_Black; i <= Color_White; i++)	893	for (i = Color_Black; i <= Color_White; i++)
1004	if (pix_colors[Color_bg] == pix_colors[i])	894	if (pix_colors[Color_bg] == pix_colors[i])
1005	{	895	{
1006	sprintf (bstr, "%d", (i - Color_Black));	896	sprintf (bstr, "%d", (i - Color_Black));
1007	#ifdef XPM_BACKGROUND	897	#ifdef BG_IMAGE_FROM_FILE
1008	xpmb = "default;";	898	xpmb = "default;";
1009	#endif	899	#endif
1010	break;	900	break;
1011	}	901	}
1012		902
…		…
1108		998
1109	XMoveResizeWindow (dpy, vt,	999	XMoveResizeWindow (dpy, vt,
1110	window_vt_x, window_vt_y,	1000	window_vt_x, window_vt_y,
1111	width, height);	1001	width, height);
1112		1002
		1003	#ifdef HAVE_BG_PIXMAP
		1004	if (bgPixmap.window_size_sensitive ())
		1005	update_background ();
		1006	#endif
		1007
1113	scr_clear ();	1008	scr_clear ();
1114	#ifdef XPM_BACKGROUND
1115	resize_pixmap ();
1116	#endif
1117	}	1009	}
1118		1010
1119	if (fix_screen \|\| old_height == 0)	1011	if (fix_screen \|\| old_height == 0)
1120	scr_reset ();	1012	scr_reset ();
1121		1013
1122	// 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
1123	//scr_touch (false);	1015	//scr_touch (false);
1124		1016
1125	#if defined(XPM_BACKGROUND) \|\| defined(ENABLE_TRANSPARENCY)	1017	#ifdef HAVE_BG_PIXMAP
		1018	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1126	if (bgPixmap.pixmap)	1019	// if (bgPixmap.pixmap)
1127	scr_touch (false);	1020	// scr_touch (false);
1128	#endif	1021	#endif
1129		1022
1130	#ifdef USE_XIM	1023	#ifdef USE_XIM
1131	IMSetPosition ();	1024	IMSetPosition ();
1132	#endif	1025	#endif
…		…
1303	if (term->rs[Rs_imLocale])	1196	if (term->rs[Rs_imLocale])
1304	SET_LOCALE (term->locale);	1197	SET_LOCALE (term->locale);
1305	}	1198	}
1306	else	1199	else
1307	str = (void *)text->string.wide_char;	1200	str = (void *)text->string.wide_char;
1308		1201
1309	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1202	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310	DT_INT, call_data->caret,	1203	DT_INT, call_data->caret,
1311	DT_INT, call_data->chg_first,	1204	DT_INT, call_data->chg_first,
1312	DT_INT, call_data->chg_length,	1205	DT_INT, call_data->chg_length,
1313	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,
…		…
1632		1525
1633	if (input_style & XIMPreeditPosition)	1526	if (input_style & XIMPreeditPosition)
1634	{	1527	{
1635	im_set_size (preedit_rect);	1528	im_set_size (preedit_rect);
1636	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1529	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1637		1530
1638	XSetICValues (Input_Context,	1531	XSetICValues (Input_Context,
1639	XNPreeditAttributes, preedit_attr, NULL);	1532	XNPreeditAttributes, preedit_attr, NULL);
1640	}	1533	}
1641	else	1534	else
1642	{	1535	{
…		…
1659	XFree (status_attr);	1552	XFree (status_attr);
1660	}	1553	}
1661		1554
1662	XFree (preedit_attr);	1555	XFree (preedit_attr);
1663	}	1556	}
1664	#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 */
1665		1625
1666	/----------------------- 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.238 by sasha, Fri Aug 3 05:33:04 2007 UTC vs. Revision 1.301 by ayin, Sat Jan 19 13:00:10 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.238 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.301 by ayin, Sat Jan 19 13:00:10 2008 UTC