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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.26 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.50 by root, Thu Feb 2 18:04:46 2006 UTC

…		…
32	#ifndef NO_SLOW_LINK_SUPPORT	32	#ifndef NO_SLOW_LINK_SUPPORT
33	# include <sys/socket.h>	33	# include <sys/socket.h>
34	# include <sys/un.h>	34	# include <sys/un.h>
35	#endif	35	#endif
36		36
		37	#if XFT
		38	# include <X11/extensions/Xrender.h>
		39	#endif
		40
37	const char *const xa_names[] =	41	const char *const xa_names[] =
38	{	42	{
39	"TEXT",	43	"TEXT",
40	"COMPOUND_TEXT",	44	"COMPOUND_TEXT",
41	"UTF8_STRING",	45	"UTF8_STRING",
42	"MULTIPLE",	46	"MULTIPLE",
43	"TARGETS",	47	"TARGETS",
44	"TIMESTAMP",	48	"TIMESTAMP",
45	"VT_SELECTION",	49	"VT_SELECTION",
46	"INCR",	50	"INCR",
47	"WM_PROTOCOLS",	51	"WM_PROTOCOLS",
48	"WM_DELETE_WINDOW",	52	"WM_DELETE_WINDOW",
49	"CLIPBOARD",	53	"CLIPBOARD",
		54	"AVERAGE_WIDTH",
		55	"WEIGHT_NAME",
		56	"SLANT",
		57	"CHARSET_REGISTRY",
		58	"CHARSET_ENCODING",
50	#if ENABLE_FRILLS	59	#if ENABLE_FRILLS
51	"_MOTIF_WM_HINTS",	60	"_MOTIF_WM_HINTS",
52	#endif	61	#endif
53	#if ENABLE_EWMH	62	#if ENABLE_EWMH
54	"_NET_WM_PID",	63	"_NET_WM_PID",
55	"_NET_WM_NAME",	64	"_NET_WM_NAME",
56	"_NET_WM_ICON_NAME",	65	"_NET_WM_ICON_NAME",
57	"_NET_WM_PING",	66	"_NET_WM_PING",
58	#endif	67	#endif
59	#if USE_XIM	68	#if USE_XIM
60	"WM_LOCALE_NAME",	69	"WM_LOCALE_NAME",
61	"XIM_SERVERS",	70	"XIM_SERVERS",
62	#endif	71	#endif
63	#ifdef TRANSPARENT	72	#ifdef TRANSPARENT
64	"_XROOTPMAP_ID",	73	"_XROOTPMAP_ID",
65	"ESETROOT_PMAP_ID",	74	"ESETROOT_PMAP_ID",
66	#endif	75	#endif
67	#if ENABLE_XEMBED	76	#if ENABLE_XEMBED
68	"_XEMBED",	77	"_XEMBED",
69	"_XEMBED_INFO",	78	"_XEMBED_INFO",
		79	#endif
		80	#if !ENABLE_MINIMAL
		81	"SCREEN_RESOURCES",
		82	"XDCCC_LINEAR_RGB_CORRECTION",
		83	"XDCCC_LINEAR_RGB_MATRICES",
		84	"WM_COLORMAP_WINDOWS",
		85	"WM_STATE",
		86	"cursor",
		87	# if USE_XIM
		88	"TRANSPORT",
		89	"LOCALES",
		90	"_XIM_PROTOCOL",
		91	"_XIM_XCONNECT",
		92	"_XIM_MOREDATA",
70	#endif	93	# endif
71	};	94	#endif
		95	};
72		96
73	/////////////////////////////////////////////////////////////////////////////	97	/////////////////////////////////////////////////////////////////////////////
74		98
75	refcounted::refcounted (const char *id)	99	refcounted::refcounted (const char *id)
76	{	100	{
…		…
153	bool	177	bool
154	rxvt_xim::ref_init ()	178	rxvt_xim::ref_init ()
155	{	179	{
156	display = GET_R->display; //HACK: TODO	180	display = GET_R->display; //HACK: TODO
157		181
158	xim = XOpenIM (display->display, NULL, NULL, NULL);	182	xim = XOpenIM (display->dpy, 0, 0, 0);
159		183
160	if (!xim)	184	if (!xim)
161	return false;	185	return false;
162		186
163	XIMCallback ximcallback;	187	XIMCallback ximcallback;
164	ximcallback.client_data = (XPointer)this;	188	ximcallback.client_data = (XPointer)this;
165	ximcallback.callback = im_destroy_cb;	189	ximcallback.callback = im_destroy_cb;
166		190
167	XSetIMValues (xim, XNDestroyCallback, &ximcallback, NULL);	191	XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0);
168		192
169	return true;	193	return true;
170	}	194	}
171		195
172	rxvt_xim::~rxvt_xim ()	196	rxvt_xim::~rxvt_xim ()
…		…
181		205
182	void	206	void
183	rxvt_screen::set (rxvt_display *disp)	207	rxvt_screen::set (rxvt_display *disp)
184	{	208	{
185	display = disp;	209	display = disp;
186
187	xdisp = disp->display;	210	dpy = disp->dpy;
188		211
189	Screen *screen = ScreenOfDisplay (xdisp, disp->screen);	212	Screen *screen = ScreenOfDisplay (dpy, disp->screen);
190		213
191	depth = DefaultDepthOfScreen (screen);	214	depth = DefaultDepthOfScreen (screen);
192	visual = DefaultVisualOfScreen (screen);	215	visual = DefaultVisualOfScreen (screen);
193	cmap = DefaultColormapOfScreen (screen);	216	cmap = DefaultColormapOfScreen (screen);
194	}	217	}
195		218
196	void	219	void
197	rxvt_screen::set (rxvt_display *disp, int depth)	220	rxvt_screen::set (rxvt_display *disp, int bitdepth)
198	{	221	{
199	set (disp);	222	set (disp);
200		223
		224	#if XFT
201	XVisualInfo vinfo;	225	XVisualInfo vinfo;
202		226
203	if (XMatchVisualInfo (xdisp, display->screen, depth, TrueColor, &vinfo))	227	if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
204	{	228	{
205	this->depth = depth;	229	depth = bitdepth;
206	this->visual = vinfo.visual;	230	visual = vinfo.visual;
207	this->cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone);	231	cmap = XCreateColormap (dpy, disp->root, visual, AllocNone);
208	}	232	}
		233	#endif
209	}	234	}
210		235
211	void	236	void
212	rxvt_screen::clear ()	237	rxvt_screen::clear ()
213	{	238	{
214	if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (xdisp, display->screen)))	239	if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
215	XFreeColormap (xdisp, cmap);	240	XFreeColormap (dpy, cmap);
216	}	241	}
217		242
218	/////////////////////////////////////////////////////////////////////////////	243	/////////////////////////////////////////////////////////////////////////////
219		244
220	rxvt_display::rxvt_display (const char *id)	245	rxvt_display::rxvt_display (const char *id)
…		…
223	, selection_owner (0)	248	, selection_owner (0)
224	{	249	{
225	}	250	}
226		251
227	XrmDatabase	252	XrmDatabase
228	rxvt_display::get_resources ()	253	rxvt_display::get_resources (bool refresh)
229	{	254	{
230	char homedir = (char )getenv ("HOME");	255	char homedir = (char )getenv ("HOME");
231	char fname[1024];	256	char fname[1024];
232		257
233	/*	258	/*
234	* get resources using the X library function	259	* get resources using the X library function
235	*/	260	*/
236	char displayResource, xe;	261	char displayResource, xe;
237	XrmDatabase database, rdb1;	262	XrmDatabase rdb1, database = 0;
238
239	database = NULL;
240		263
241	// for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20	264	// for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
242		265
243	// 6. System wide per application default file.	266	// 6. System wide per application default file.
244		267
…		…
254	// 5. User's per application default file.	277	// 5. User's per application default file.
255	// none	278	// none
256		279
257	// 4. User's defaults file.	280	// 4. User's defaults file.
258	/* Get any Xserver defaults */	281	/* Get any Xserver defaults */
		282	if (refresh)
		283	{
		284	// fucking xlib keeps a copy of the rm string
		285	Atom actual_type;
		286	int actual_format;
		287	unsigned long nitems, nremaining;
		288	char *val = 0;
		289
		290	#if XLIB_ILLEGAL_ACCESS
		291	if (dpy->xdefaults)
		292	XFree (dpy->xdefaults);
		293	#endif
		294
		295	if (XGetWindowProperty (dpy, root, XA_RESOURCE_MANAGER,
		296	0L, 100000000L, False,
		297	XA_STRING, &actual_type, &actual_format,
		298	&nitems, &nremaining,
		299	(unsigned char **)&val) == Success
		300	&& actual_type == XA_STRING
		301	&& actual_format == 8)
		302	displayResource = val;
		303	else
		304	{
		305	displayResource = 0;
		306	if (val)
		307	XFree(val);
		308	}
		309
		310	#if XLIB_ILLEGAL_ACCESS
		311	dpy->xdefaults = displayResource;
		312	#endif
		313	}
		314	else
259	displayResource = XResourceManagerString (display);	315	displayResource = XResourceManagerString (dpy);
260		316
261	if (displayResource != NULL)	317	if (displayResource)
262	{	318	{
263	if ((rdb1 = XrmGetStringDatabase (displayResource)))	319	if ((rdb1 = XrmGetStringDatabase (displayResource)))
264	XrmMergeDatabases (rdb1, &database);	320	XrmMergeDatabases (rdb1, &database);
265	}	321	}
266	else if (homedir)	322	else if (homedir)
…		…
269		325
270	if ((rdb1 = XrmGetFileDatabase (fname)))	326	if ((rdb1 = XrmGetFileDatabase (fname)))
271	XrmMergeDatabases (rdb1, &database);	327	XrmMergeDatabases (rdb1, &database);
272	}	328	}
273		329
		330	#if !XLIB_ILLEGAL_ACCESS
		331	if (refresh && displayResource)
		332	XFree (displayResource);
		333	#endif
		334
274	/* Get screen specific resources */	335	/* Get screen specific resources */
275	displayResource = XScreenResourceString (ScreenOfDisplay (display, screen));	336	displayResource = XScreenResourceString (ScreenOfDisplay (dpy, screen));
276		337
277	if (displayResource != NULL)	338	if (displayResource)
278	{	339	{
279	if ((rdb1 = XrmGetStringDatabase (displayResource)))	340	if ((rdb1 = XrmGetStringDatabase (displayResource)))
280	/* Merge with screen-independent resources */	341	/* Merge with screen-independent resources */
281	XrmMergeDatabases (rdb1, &database);	342	XrmMergeDatabases (rdb1, &database);
282		343
…		…
310	if (id[0] == ':')	371	if (id[0] == ':')
311	{	372	{
312	val = rxvt_malloc (5 + strlen (id) + 1);	373	val = rxvt_malloc (5 + strlen (id) + 1);
313	strcpy (val, "unix/");	374	strcpy (val, "unix/");
314	strcat (val, id);	375	strcat (val, id);
315	display = XOpenDisplay (val);	376	dpy = XOpenDisplay (val);
316	free (val);	377	free (val);
317	}	378	}
318	else	379	else
319	#endif	380	#endif
320	display = 0;	381	dpy = 0;
321		382
322	if (!display)	383	if (!dpy)
323	display = XOpenDisplay (id);	384	dpy = XOpenDisplay (id);
324		385
325	if (!display)	386	if (!dpy)
326	return false;	387	return false;
327		388
328	screen = DefaultScreen (display);	389	screen = DefaultScreen (dpy);
329	root = DefaultRootWindow (display);	390	root = DefaultRootWindow (dpy);
330		391
331	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	392	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
332	XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa);	393	XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
333		394
334	XrmSetDatabase (display, get_resources ());	395	XrmSetDatabase (dpy, get_resources (false));
335		396
336	#ifdef POINTER_BLANK	397	#ifdef POINTER_BLANK
337	XColor blackcolour;	398	XColor blackcolour;
338	blackcolour.red = 0;	399	blackcolour.red = 0;
339	blackcolour.green = 0;	400	blackcolour.green = 0;
340	blackcolour.blue = 0;	401	blackcolour.blue = 0;
341	Font f = XLoadFont (display, "fixed");	402	Font f = XLoadFont (dpy, "fixed");
342	blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ',	403	blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ',
343	&blackcolour, &blackcolour);	404	&blackcolour, &blackcolour);
344	XUnloadFont (display, f);	405	XUnloadFont (dpy, f);
345	#endif	406	#endif
346		407
347	int fd = XConnectionNumber (display);	408	int fd = XConnectionNumber (dpy);
348		409
349	#ifndef NO_SLOW_LINK_SUPPORT	410	#ifndef NO_SLOW_LINK_SUPPORT
350	// try to detect wether we have a local connection.	411	// try to detect wether we have a local connection.
351	// assume unix domains socket == local, everything else not	412	// assume unix domains socket == local, everything else not
352	// TODO: might want to check for inet/127.0.0.1	413	// TODO: might want to check for inet/127.0.0.1
…		…
359	#endif	420	#endif
360		421
361	x_ev.start (fd, EVENT_READ);	422	x_ev.start (fd, EVENT_READ);
362	fcntl (fd, F_SETFD, FD_CLOEXEC);	423	fcntl (fd, F_SETFD, FD_CLOEXEC);
363		424
364	XSelectInput (display, root, PropertyChangeMask);	425	XSelectInput (dpy, root, PropertyChangeMask);
365		426
366	flush ();	427	flush ();
367		428
368	return true;	429	return true;
369	}	430	}
370		431
371	void	432	void
372	rxvt_display::ref_next ()	433	rxvt_display::ref_next ()
373	{	434	{
374	// TODO: somehow check wether the database files/resources changed	435	// TODO: somehow check wether the database files/resources changed
375	// before re-loading/parsing	436	// before affording re-loading/parsing
376	XrmDestroyDatabase (XrmGetDatabase (display));	437	XrmDestroyDatabase (XrmGetDatabase (dpy));
377	XrmSetDatabase (display, get_resources ());	438	XrmSetDatabase (dpy, get_resources (true));
378	}	439	}
379		440
380	rxvt_display::~rxvt_display ()	441	rxvt_display::~rxvt_display ()
381	{	442	{
382	if (!display)	443	if (!dpy)
383	return;	444	return;
384		445
385	#ifdef POINTER_BLANK	446	#ifdef POINTER_BLANK
386	XFreeCursor (display, blank_cursor);	447	XFreeCursor (dpy, blank_cursor);
387	#endif	448	#endif
388	x_ev.stop ();	449	x_ev.stop ();
389	#ifdef USE_XIM	450	#ifdef USE_XIM
390	xims.clear ();	451	xims.clear ();
391	#endif	452	#endif
392	XCloseDisplay (display);	453	XCloseDisplay (dpy);
393	}	454	}
394		455
395	#ifdef USE_XIM	456	#ifdef USE_XIM
396	void rxvt_display::im_change_cb ()	457	void rxvt_display::im_change_cb ()
397	{	458	{
…		…
405	// registers, as xlib crashes due to a race otherwise.	466	// registers, as xlib crashes due to a race otherwise.
406	Atom actual_type, *atoms;	467	Atom actual_type, *atoms;
407	int actual_format;	468	int actual_format;
408	unsigned long nitems, bytes_after;	469	unsigned long nitems, bytes_after;
409		470
410	if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L,	471	if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
411	False, XA_ATOM, &actual_type, &actual_format,	472	False, XA_ATOM, &actual_type, &actual_format,
412	&nitems, &bytes_after, (unsigned char **)&atoms)	473	&nitems, &bytes_after, (unsigned char **)&atoms)
413	!= Success )	474	!= Success )
414	return;	475	return;
415		476
416	if (actual_type == XA_ATOM && actual_format == 32)	477	if (actual_type == XA_ATOM && actual_format == 32)
417	for (int i = 0; i < nitems; i++)	478	for (int i = 0; i < nitems; i++)
418	if (XGetSelectionOwner (display, atoms[i]))	479	if (XGetSelectionOwner (dpy, atoms[i]))
419	{	480	{
420	im_change_cb ();	481	im_change_cb ();
421	break;	482	break;
422	}	483	}
423		484
…		…
428	void rxvt_display::x_cb (io_watcher &w, short revents)	489	void rxvt_display::x_cb (io_watcher &w, short revents)
429	{	490	{
430	do	491	do
431	{	492	{
432	XEvent xev;	493	XEvent xev;
433	XNextEvent (display, &xev);	494	XNextEvent (dpy, &xev);
434		495
435	#ifdef USE_XIM	496	#ifdef USE_XIM
436	if (!XFilterEvent (&xev, None))	497	if (!XFilterEvent (&xev, None))
437	{	498	{
438	if (xev.type == PropertyNotify	499	if (xev.type == PropertyNotify
…		…
449	}	510	}
450	#ifdef USE_XIM	511	#ifdef USE_XIM
451	}	512	}
452	#endif	513	#endif
453	}	514	}
454	while (XEventsQueued (display, QueuedAlready));	515	while (XEventsQueued (dpy, QueuedAlready));
455		516
456	XFlush (display);	517	XFlush (dpy);
457	}	518	}
458		519
459	void rxvt_display::flush ()	520	void rxvt_display::flush ()
460	{	521	{
461	if (XEventsQueued (display, QueuedAlready))	522	if (XEventsQueued (dpy, QueuedAlready))
462	x_cb (x_ev, EVENT_READ);	523	x_cb (x_ev, EVENT_READ);
463		524
464	XFlush (display);	525	XFlush (dpy);
465	}	526	}
466		527
467	void rxvt_display::reg (xevent_watcher *w)	528	void rxvt_display::reg (xevent_watcher *w)
468	{	529	{
469	xw.push_back (w);	530	xw.push_back (w);
…		…
483		544
484	selection_owner = owner;	545	selection_owner = owner;
485	}	546	}
486		547
487	#ifdef USE_XIM	548	#ifdef USE_XIM
		549
488	void rxvt_display::reg (im_watcher *w)	550	void rxvt_display::reg (im_watcher *w)
489	{	551	{
490	imw.push_back (w);	552	imw.push_back (w);
491	}	553	}
492		554
…		…
516	return xim;	578	return xim;
517	}	579	}
518		580
519	void rxvt_display::put_xim (rxvt_xim *xim)	581	void rxvt_display::put_xim (rxvt_xim *xim)
520	{	582	{
521	#if XLIB_IS_RACEFREE	583	# if XLIB_IS_RACEFREE
522	xims.put (xim);	584	xims.put (xim);
523	#endif	585	# endif
524	}	586	}
		587
525	#endif	588	#endif
526		589
527	Atom rxvt_display::atom (const char *name)	590	Atom rxvt_display::atom (const char *name)
528	{	591	{
529	return XInternAtom (display, name, False);	592	return XInternAtom (dpy, name, False);
530	}	593	}
531		594
532	/////////////////////////////////////////////////////////////////////////////	595	/////////////////////////////////////////////////////////////////////////////
533		596
534	template class refcache<rxvt_display>;	597	template class refcache<rxvt_display>;
535	refcache<rxvt_display> displays;	598	refcache<rxvt_display> displays;
536		599
537	/////////////////////////////////////////////////////////////////////////////	600	/////////////////////////////////////////////////////////////////////////////
538		601
539	bool	602	bool
540	rxvt_color::set (rxvt_screen *screen, Pixel p)	603	rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
541	{	604	{
542	#if XFT	605	#if XFT
543	XColor xc;	606	XRenderPictFormat *format;
544		607
545	xc.pixel = p;	608	// FUCKING Xft gets it wrong, of course, so work around it.
546	if (!XQueryColor (screen->xdisp, screen->cmap, &xc))	609	// Transparency users should eat shit and die, and then
547	return false;	610	// XRenderQueryPictIndexValues themselves plenty.
		611	if ((screen->visual->c_class == TrueColor)
		612	&& (format = XRenderFindVisualFormat (screen->dpy, screen->visual)))
		613	{
		614	// the fun lies in doing everything manually...
		615	c.color.red = color.r;
		616	c.color.green = color.g;
		617	c.color.blue = color.b;
		618	c.color.alpha = color.a;
548		619
		620	c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red )
		621	\| ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green)
		622	\| ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue )
		623	\| ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha);
		624
		625	return true;
		626	}
		627	else
		628	{
549	XRenderColor d;	629	XRenderColor d;
550		630
551	d.red = xc.red;	631	d.red = color.r;
552	d.green = xc.green;	632	d.green = color.g;
553	d.blue = xc.blue;	633	d.blue = color.b;
554	d.alpha = 0xffff;	634	d.alpha = color.a;
555		635
556	return	636	return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
557	XftColorAllocValue (screen->xdisp,	637	}
558	screen->visual,
559	screen->cmap,
560	&d, &c);
561	#else	638	#else
562	this->p = p;	639	c.red = color.r;
563	#endif	640	c.green = color.g;
		641	c.blue = color.b;
564		642
		643	if (screen->visual->c_class == TrueColor)
		644	{
		645	c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask ))
		646	/ rgba::MAX_CC) << ctz (screen->visual->red_mask )
		647	\| (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
		648	/ rgba::MAX_CC) << ctz (screen->visual->green_mask)
		649	\| (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask ))
		650	/ rgba::MAX_CC) << ctz (screen->visual->blue_mask );
		651
		652	return true;
		653	}
		654	else if (XAllocColor (screen->dpy, screen->cmap, &c))
565	return true;	655	return true;
		656	else
		657	c.pixel = (color.r + color.g + color.b) > 128*3
		658	? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
		659	: BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
		660	#endif
		661
		662	return false;
566	}	663	}
567		664
568	bool	665	bool
569	rxvt_color::set (rxvt_screen screen, const char name)	666	rxvt_color::set (rxvt_screen screen, const char name)
570	{	667	{
		668	rgba c;
		669	char eos;
		670	int skip;
		671
		672	// parse the nonstandard "[alphapercent]" prefix
		673	if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
		674	{
		675	c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
		676	name += skip;
		677	}
		678	else
		679	c.a = rgba::MAX_CC;
		680
		681	// parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
		682	if (strlen (name) != 4+5*4 \|\| 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
		683	{
		684	XColor xc, xc_exact;
		685
		686	if (XParseColor (screen->dpy, screen->cmap, name, &xc))
		687	{
		688	c.r = xc.red;
		689	c.g = xc.green;
		690	c.b = xc.blue;
		691	}
		692	else
		693	{
		694	c.r = 0xffff;
		695	c.g = 0x6969;
		696	c.b = 0xb4b4;
		697
		698	rxvt_warn ("unable to parse color '%s', using pink instead.\n", name);
		699	}
		700	}
		701
		702	return set (screen, c);
		703	}
		704
		705	bool
		706	rxvt_color::set (rxvt_screen *screen, const rgba &color)
		707	{
		708	bool got = alloc (screen, color);
		709
		710	#if !ENABLE_MINIMAL
		711	int cmap_size = screen->visual->map_entries;
		712
		713	if (!got
		714	&& screen->visual->c_class == PseudoColor
		715	&& cmap_size < 4096)
		716	{
		717	XColor *colors = new XColor [screen->visual->map_entries];
		718
		719	for (int i = 0; i < cmap_size; i++)
		720	colors [i].pixel = i;
		721
		722	// many kilobytes transfer per colour, but pseudocolor isn't worth
		723	// many extra optimisations.
		724	XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
		725
		726	int diff = 0x7fffffffUL;
		727	XColor *best = colors;
		728
		729	for (int i = 0; i < cmap_size; i++)
		730	{
		731	int d = (squared_diff<int> (color.r >> 2, colors [i].red >> 2))
		732	+ (squared_diff<int> (color.g >> 2, colors [i].green >> 2))
		733	+ (squared_diff<int> (color.b >> 2, colors [i].blue >> 2));
		734
		735	if (d < diff)
		736	{
		737	diff = d;
		738	best = colors + i;
		739	}
		740	}
		741
		742	//rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
		743	// color.r, color.g, color.b, best->red, best->green, best->blue, diff);
		744
		745	got = alloc (screen, rgba (best->red, best->green, best->blue));
		746
		747	delete colors;
		748	}
		749	#endif
		750
		751	return got;
		752	}
		753
		754	void
		755	rxvt_color::get (rgba &color)
		756	{
571	#if XFT	757	#if XFT
572	return XftColorAllocName (screen->xdisp, screen->visual, screen->cmap, name, &c);	758	color.r = c.color.red;
		759	color.g = c.color.green;
		760	color.b = c.color.blue;
		761	color.a = c.color.alpha;
573	#else	762	#else
574	XColor xc;	763	color.r = c.red;
575		764	color.g = c.green;
576	if (XParseColor (screen->xdisp, screen->cmap, name, &xc))	765	color.b = c.blue;
577	return set (screen, xc.red, xc.green, xc.blue);	766	color.a = rgba::MAX_CC;
578
579	return false;
580	#endif	767	#endif
581	}	768	}
582		769
583	bool
584	rxvt_color::set (rxvt_screen *screen, unsigned short cr, unsigned short cg, unsigned short cb)
585	{
586	XColor xc;
587
588	xc.red = cr;
589	xc.green = cg;
590	xc.blue = cb;
591	xc.flags = DoRed \| DoGreen \| DoBlue;
592
593	if (XAllocColor (screen->xdisp, screen->cmap, &xc))
594	return set (screen, xc.pixel);
595
596	return false;
597	}
598
599	void	770	void
600	rxvt_color::get (rxvt_screen *screen, unsigned short &cr, unsigned short &cg, unsigned short &cb)	771	rxvt_color::get (XColor &color)
601	{	772	{
602	#if XFT	773	rgba c;
603	cr = c.color.red;	774	get (c);
604	cg = c.color.green;
605	cb = c.color.blue;
606	#else
607	XColor c;
608		775
609	c.pixel = p;	776	color.red = c.r;
610	XQueryColor (screen->xdisp, screen->cmap, &c);	777	color.green = c.g;
611		778	color.blue = c.b;
612	cr = c.red;	779	color.pixel = (Pixel)*this;
613	cg = c.green;
614	cb = c.blue;
615	#endif
616	}	780	}
617		781
618	void	782	void
619	rxvt_color::free (rxvt_screen *screen)	783	rxvt_color::free (rxvt_screen *screen)
620	{	784	{
621	#if XFT	785	#if XFT
622	XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c);	786	XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
623	#else	787	#else
624	XFreeColors (screen->xdisp, screen->cmap, &p, 1, AllPlanes);	788	XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
625	#endif	789	#endif
626	}	790	}
627		791
628	rxvt_color	792	void
629	rxvt_color::fade (rxvt_screen *screen, int percent)	793	rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)
630	{	794	{
631	percent = 100 - percent;	795	rgba c;
		796	get (c);
632		797
633	unsigned short cr, cg, cb;	798	result.set (
634	rxvt_color faded;
635
636	get (screen, cr, cg, cb);
637
638	faded.set (
639	screen,	799	screen,
640	cr * percent / 100,	800	rgba (
641	cg * percent / 100,	801	lerp (c.r, to.r, percent),
642	cb * percent / 100	802	lerp (c.g, to.g, percent),
		803	lerp (c.b, to.b, percent),
		804	lerp (c.a, to.a, percent)
		805	)
643	);	806	);
644
645	return faded;
646	}	807	}
647		808
648	#define LERP(a,b,p) (a * p + b * (100 - p)) / 100
649
650	rxvt_color
651	rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &fadeto)
652	{
653	percent = 100 - percent;
654
655	unsigned short cr, cg, cb;
656	unsigned short fcr, fcg, fcb;
657	rxvt_color faded;
658
659	get (screen, cr, cg, cb);
660	fadeto.get (screen, fcr, fcg, fcb);
661
662	faded.set (
663	screen,
664	LERP (cr, fcr, percent),
665	LERP (cg, fcg, percent),
666	LERP (cb, fcb, percent)
667	);
668
669	return faded;
670	}
671

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents): Revision 1.26 by root, Wed Jan 25 21:03:04 2006 UTC vs. Revision 1.50 by root, Thu Feb 2 18:04:46 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.26 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.50 by root, Thu Feb 2 18:04:46 2006 UTC