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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.44 by root, Tue Jan 31 19:53:31 2006 UTC vs.
Revision 1.91 by root, Sat Jan 26 10:03:35 2008 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: rxvttoolkit.C	2	* File: rxvttoolkit.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
26		26
27	#include <unistd.h>	27	#include <unistd.h>
28	#include <fcntl.h>	28	#include <fcntl.h>
29		29
30	#include <sys/utsname.h>	30	#include <sys/utsname.h>
31
32	#ifndef NO_SLOW_LINK_SUPPORT
33	# include <sys/socket.h>	31	#include <sys/socket.h>
34	# include <sys/un.h>	32	#include <sys/un.h>
35	#endif
36		33
37	#if XFT	34	#if XFT
38	# include <X11/extensions/Xrender.h>	35	# include <X11/extensions/Xrender.h>
39	#endif	36	#endif
40		37
…		…
67	#endif	64	#endif
68	#if USE_XIM	65	#if USE_XIM
69	"WM_LOCALE_NAME",	66	"WM_LOCALE_NAME",
70	"XIM_SERVERS",	67	"XIM_SERVERS",
71	#endif	68	#endif
72	#ifdef TRANSPARENT	69	#ifdef ENABLE_TRANSPARENCY
73	"_XROOTPMAP_ID",	70	"_XROOTPMAP_ID",
74	"ESETROOT_PMAP_ID",	71	"ESETROOT_PMAP_ID",
75	#endif	72	#endif
76	#if ENABLE_XEMBED	73	#if ENABLE_XEMBED
77	"_XEMBED",	74	"_XEMBED",
…		…
177	bool	174	bool
178	rxvt_xim::ref_init ()	175	rxvt_xim::ref_init ()
179	{	176	{
180	display = GET_R->display; //HACK: TODO	177	display = GET_R->display; //HACK: TODO
181		178
182	xim = XOpenIM (display->display, NULL, NULL, NULL);	179	xim = XOpenIM (display->dpy, 0, 0, 0);
183		180
184	if (!xim)	181	if (!xim)
185	return false;	182	return false;
186		183
187	XIMCallback ximcallback;	184	XIMCallback ximcallback;
188	ximcallback.client_data = (XPointer)this;	185	ximcallback.client_data = (XPointer)this;
189	ximcallback.callback = im_destroy_cb;	186	ximcallback.callback = im_destroy_cb;
190		187
191	XSetIMValues (xim, XNDestroyCallback, &ximcallback, NULL);	188	XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
192		189
193	return true;	190	return true;
194	}	191	}
195		192
196	rxvt_xim::~rxvt_xim ()	193	rxvt_xim::~rxvt_xim ()
…		…
201		198
202	#endif	199	#endif
203		200
204	/////////////////////////////////////////////////////////////////////////////	201	/////////////////////////////////////////////////////////////////////////////
205		202
		203	#if XFT
		204	rxvt_drawable::~rxvt_drawable ()
		205	{
		206	if (xftdrawable)
		207	XftDrawDestroy (xftdrawable);
		208	}
		209
		210	rxvt_drawable::operator XftDraw *()
		211	{
		212	if (!xftdrawable)
		213	xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap);
		214
		215	return xftdrawable;
		216	}
		217	#endif
		218
		219	/////////////////////////////////////////////////////////////////////////////
		220
		221	#if XFT
		222
		223	// not strictly necessary as it is only used with superclass of zero_initialised
		224	rxvt_screen::rxvt_screen ()
		225	: scratch_area (0)
		226	{
		227	}
		228
		229	rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h)
		230	{
		231	// it's actually faster to re-allocate every time. don't ask me
		232	// why, but its likely no big deal there are no roundtrips
		233	// (I think/hope).
		234	if (!scratch_area \|\| w > scratch_w \|\| h > scratch_h \|\| 1/D/)
		235	{
		236	if (scratch_area)
		237	{
		238	XFreePixmap (dpy, scratch_area->drawable);
		239	delete scratch_area;
		240	}
		241
		242	Pixmap pm = XCreatePixmap (dpy, RootWindowOfScreen (ScreenOfDisplay (dpy, display->screen)),
		243	scratch_w = w, scratch_h = h, depth);
		244
		245	scratch_area = new rxvt_drawable (this, pm);
		246	}
		247
		248	return *scratch_area;
		249	}
		250
		251	#endif
		252
206	void	253	void
207	rxvt_screen::set (rxvt_display *disp)	254	rxvt_screen::set (rxvt_display *disp)
208	{	255	{
209	display = disp;	256	display = disp;
210	xdisp = disp->display;	257	dpy = disp->dpy;
211		258
212	Screen *screen = ScreenOfDisplay (xdisp, disp->screen);	259	Screen *screen = ScreenOfDisplay (dpy, disp->screen);
213		260
214	depth = DefaultDepthOfScreen (screen);	261	depth = DefaultDepthOfScreen (screen);
215	visual = DefaultVisualOfScreen (screen);	262	visual = DefaultVisualOfScreen (screen);
216	cmap = DefaultColormapOfScreen (screen);	263	cmap = DefaultColormapOfScreen (screen);
217	}	264	}
218		265
219	void	266	void
220	rxvt_screen::set (rxvt_display *disp, int bitdepth)	267	rxvt_screen::select_visual (int bitdepth)
221	{	268	{
222	set (disp);
223
224	#if XFT	269	#if XFT
225	XVisualInfo vinfo;	270	XVisualInfo vinfo;
226		271
227	if (XMatchVisualInfo (xdisp, display->screen, bitdepth, TrueColor, &vinfo))	272	if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
228	{	273	{
229	depth = bitdepth;	274	depth = bitdepth;
230	visual = vinfo.visual;	275	visual = vinfo.visual;
231	cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone);	276	cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
232	}	277	}
233	#endif	278	#endif
234	}	279	}
235		280
236	void	281	void
237	rxvt_screen::clear ()	282	rxvt_screen::clear ()
238	{	283	{
		284	#if XFT
		285	if (scratch_area)
		286	{
		287	XFreePixmap (dpy, scratch_area->drawable);
		288	delete scratch_area;
		289	}
		290	#endif
		291
239	if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (xdisp, display->screen)))	292	if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
240	XFreeColormap (xdisp, cmap);	293	XFreeColormap (dpy, cmap);
241	}	294	}
242		295
243	/////////////////////////////////////////////////////////////////////////////	296	/////////////////////////////////////////////////////////////////////////////
244		297
245	rxvt_display::rxvt_display (const char *id)	298	rxvt_display::rxvt_display (const char *id)
246	: refcounted (id)	299	: refcounted (id)
247	, x_ev (this, &rxvt_display::x_cb)
248	, selection_owner (0)	300	, selection_owner (0)
249	{	301	{
		302	x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
		303	flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
250	}	304	}
251		305
252	XrmDatabase	306	XrmDatabase
253	rxvt_display::get_resources ()	307	rxvt_display::get_resources (bool refresh)
254	{	308	{
255	char homedir = (char )getenv ("HOME");	309	char *homedir = getenv ("HOME");
256	char fname[1024];	310	char fname[1024];
257		311
258	/*	312	/*
259	* get resources using the X library function	313	* get resources using the X library function
260	*/	314	*/
261	char displayResource, xe;	315	char displayResource, xe;
262	XrmDatabase database, rdb1;	316	XrmDatabase rdb1, database = 0;
263
264	database = NULL;
265		317
266	// for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20	318	// for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
		319	// as opposed to "standard practise", we always read in ~/.Xdefaults
267		320
268	// 6. System wide per application default file.	321	// 6. System wide per application default file.
269		322
270	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */	323	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
271	if ((xe = (char *)getenv ("XAPPLRESDIR")))	324	if ((xe = getenv ("XAPPLRESDIR")))
272	{	325	{
273	snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);	326	snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
274		327
275	if ((rdb1 = XrmGetFileDatabase (fname)))	328	if ((rdb1 = XrmGetFileDatabase (fname)))
276	XrmMergeDatabases (rdb1, &database);	329	XrmMergeDatabases (rdb1, &database);
…		…
278		331
279	// 5. User's per application default file.	332	// 5. User's per application default file.
280	// none	333	// none
281		334
282	// 4. User's defaults file.	335	// 4. User's defaults file.
		336	if (homedir)
		337	{
		338	snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
		339
		340	if ((rdb1 = XrmGetFileDatabase (fname)))
		341	XrmMergeDatabases (rdb1, &database);
		342	}
		343
283	/* Get any Xserver defaults */	344	/* Get any Xserver defaults */
		345	if (refresh)
		346	{
		347	// fucking xlib keeps a copy of the rm string
		348	Atom actual_type;
		349	int actual_format;
		350	unsigned long nitems, nremaining;
		351	char *val = 0;
		352
		353	#if XLIB_ILLEGAL_ACCESS
		354	if (dpy->xdefaults)
		355	XFree (dpy->xdefaults);
		356	#endif
		357
		358	if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER,
		359	0L, 100000000L, False,
		360	XA_STRING, &actual_type, &actual_format,
		361	&nitems, &nremaining,
		362	(unsigned char **)&val) == Success
		363	&& actual_type == XA_STRING
		364	&& actual_format == 8)
		365	displayResource = val;
		366	else
		367	{
		368	displayResource = 0;
		369
		370	if (val)
		371	XFree(val);
		372	}
		373
		374	#if XLIB_ILLEGAL_ACCESS
		375	dpy->xdefaults = displayResource;
		376	#endif
		377	}
		378	else
284	displayResource = XResourceManagerString (display);	379	displayResource = XResourceManagerString (dpy);
285		380
286	if (displayResource != NULL)	381	if (displayResource)
287	{	382	{
288	if ((rdb1 = XrmGetStringDatabase (displayResource)))	383	if ((rdb1 = XrmGetStringDatabase (displayResource)))
289	XrmMergeDatabases (rdb1, &database);	384	XrmMergeDatabases (rdb1, &database);
290	}	385	}
291	else if (homedir)
292	{
293	snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
294		386
295	if ((rdb1 = XrmGetFileDatabase (fname)))	387	#if !XLIB_ILLEGAL_ACCESS
296	XrmMergeDatabases (rdb1, &database);	388	if (refresh && displayResource)
297	}	389	XFree (displayResource);
		390	#endif
298		391
299	/* Get screen specific resources */	392	/* Get screen specific resources */
300	displayResource = XScreenResourceString (ScreenOfDisplay (display, screen));	393	displayResource = XScreenResourceString (ScreenOfDisplay (dpy, screen));
301		394
302	if (displayResource != NULL)	395	if (displayResource)
303	{	396	{
304	if ((rdb1 = XrmGetStringDatabase (displayResource)))	397	if ((rdb1 = XrmGetStringDatabase (displayResource)))
305	/* Merge with screen-independent resources */	398	/* Merge with screen-independent resources */
306	XrmMergeDatabases (rdb1, &database);	399	XrmMergeDatabases (rdb1, &database);
307		400
308	XFree (displayResource);	401	XFree (displayResource);
309	}	402	}
310		403
311	// 3. User's per host defaults file	404	// 3. User's per host defaults file
312	/* Add in XENVIRONMENT file */	405	/* Add in XENVIRONMENT file */
313	if ((xe = (char *)getenv ("XENVIRONMENT"))	406	if ((xe = getenv ("XENVIRONMENT"))
314	&& (rdb1 = XrmGetFileDatabase (xe)))	407	&& (rdb1 = XrmGetFileDatabase (xe)))
315	XrmMergeDatabases (rdb1, &database);	408	XrmMergeDatabases (rdb1, &database);
316	else if (homedir)	409	else if (homedir)
317	{	410	{
318	struct utsname un;	411	struct utsname un;
…		…
335	if (id[0] == ':')	428	if (id[0] == ':')
336	{	429	{
337	val = rxvt_malloc (5 + strlen (id) + 1);	430	val = rxvt_malloc (5 + strlen (id) + 1);
338	strcpy (val, "unix/");	431	strcpy (val, "unix/");
339	strcat (val, id);	432	strcat (val, id);
340	display = XOpenDisplay (val);	433	dpy = XOpenDisplay (val);
341	free (val);	434	free (val);
342	}	435	}
343	else	436	else
344	#endif	437	#endif
345	display = 0;	438	dpy = 0;
346		439
347	if (!display)	440	if (!dpy)
348	display = XOpenDisplay (id);	441	dpy = XOpenDisplay (id);
349		442
350	if (!display)	443	if (!dpy)
351	return false;	444	return false;
352		445
353	screen = DefaultScreen (display);	446	screen = DefaultScreen (dpy);
354	root = DefaultRootWindow (display);	447	root = DefaultRootWindow (dpy);
355		448
356	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);	449	assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
357	XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa);	450	XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
358		451
359	XrmSetDatabase (display, get_resources ());	452	XrmSetDatabase (dpy, get_resources (false));
360		453
361	#ifdef POINTER_BLANK	454	#ifdef POINTER_BLANK
362	XColor blackcolour;	455	XColor blackcolour;
363	blackcolour.red = 0;	456	blackcolour.red = 0;
364	blackcolour.green = 0;	457	blackcolour.green = 0;
365	blackcolour.blue = 0;	458	blackcolour.blue = 0;
366	Font f = XLoadFont (display, "fixed");	459	Font f = XLoadFont (dpy, "fixed");
367	blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ',	460	blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ',
368	&blackcolour, &blackcolour);	461	&blackcolour, &blackcolour);
369	XUnloadFont (display, f);	462	XUnloadFont (dpy, f);
370	#endif	463	#endif
371		464
372	int fd = XConnectionNumber (display);	465	int fd = XConnectionNumber (dpy);
373		466
374	#ifndef NO_SLOW_LINK_SUPPORT
375	// try to detect wether we have a local connection.	467	// try to detect wether we have a local connection.
376	// assume unix domains socket == local, everything else not	468	// assume unix domain socket == local, everything else not
377	// TODO: might want to check for inet/127.0.0.1	469	// TODO: might want to check for inet/127.0.0.1
378	is_local = 0;	470	is_local = 0;
379	sockaddr_un sa;	471	sockaddr_un sa;
380	socklen_t sl = sizeof (sa);	472	socklen_t sl = sizeof (sa);
381		473
382	if (!getsockname (fd, (sockaddr *)&sa, &sl))	474	if (!getsockname (fd, (sockaddr *)&sa, &sl))
383	is_local = sa.sun_family == AF_LOCAL;	475	is_local = sa.sun_family == AF_UNIX;
384	#endif
385		476
		477	flush_ev.start ();
386	x_ev.start (fd, EVENT_READ);	478	x_ev.start (fd, ev::READ);
387	fcntl (fd, F_SETFD, FD_CLOEXEC);	479	fcntl (fd, F_SETFD, FD_CLOEXEC);
388		480
389	XSelectInput (display, root, PropertyChangeMask);	481	XSelectInput (dpy, root, PropertyChangeMask);
390		482
391	flush ();	483	flush ();
392		484
393	return true;	485	return true;
394	}	486	}
395		487
396	void	488	void
397	rxvt_display::ref_next ()	489	rxvt_display::ref_next ()
398	{	490	{
399	// TODO: somehow check wether the database files/resources changed	491	// TODO: somehow check wether the database files/resources changed
400	// before re-loading/parsing	492	// before affording re-loading/parsing
401	XrmDestroyDatabase (XrmGetDatabase (display));	493	XrmDestroyDatabase (XrmGetDatabase (dpy));
402	XrmSetDatabase (display, get_resources ());	494	XrmSetDatabase (dpy, get_resources (true));
403	}	495	}
404		496
405	rxvt_display::~rxvt_display ()	497	rxvt_display::~rxvt_display ()
406	{	498	{
407	if (!display)	499	if (!dpy)
408	return;	500	return;
409		501
410	#ifdef POINTER_BLANK	502	#ifdef POINTER_BLANK
411	XFreeCursor (display, blank_cursor);	503	XFreeCursor (dpy, blank_cursor);
412	#endif	504	#endif
413	x_ev.stop ();	505	x_ev.stop ();
		506	flush_ev.stop ();
414	#ifdef USE_XIM	507	#ifdef USE_XIM
415	xims.clear ();	508	xims.clear ();
416	#endif	509	#endif
417	XCloseDisplay (display);	510	XCloseDisplay (dpy);
418	}	511	}
419		512
420	#ifdef USE_XIM	513	#ifdef USE_XIM
421	void rxvt_display::im_change_cb ()	514	void rxvt_display::im_change_cb ()
422	{	515	{
…		…
430	// registers, as xlib crashes due to a race otherwise.	523	// registers, as xlib crashes due to a race otherwise.
431	Atom actual_type, *atoms;	524	Atom actual_type, *atoms;
432	int actual_format;	525	int actual_format;
433	unsigned long nitems, bytes_after;	526	unsigned long nitems, bytes_after;
434		527
435	if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L,	528	if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
436	False, XA_ATOM, &actual_type, &actual_format,	529	False, XA_ATOM, &actual_type, &actual_format,
437	&nitems, &bytes_after, (unsigned char **)&atoms)	530	&nitems, &bytes_after, (unsigned char **)&atoms)
438	!= Success )	531	!= Success )
439	return;	532	return;
440		533
441	if (actual_type == XA_ATOM && actual_format == 32)	534	if (actual_type == XA_ATOM && actual_format == 32)
442	for (int i = 0; i < nitems; i++)	535	for (int i = 0; i < nitems; i++)
443	if (XGetSelectionOwner (display, atoms[i]))	536	if (XGetSelectionOwner (dpy, atoms[i]))
444	{	537	{
445	im_change_cb ();	538	im_change_cb ();
446	break;	539	break;
447	}	540	}
448		541
449	XFree (atoms);	542	XFree (atoms);
450	}	543	}
451	#endif	544	#endif
452		545
453	void rxvt_display::x_cb (io_watcher &w, short revents)	546	void rxvt_display::x_cb (ev::io &w, int revents)
454	{	547	{
455	do	548	while (XEventsQueued (dpy, QueuedAfterReading))
456	{	549	{
457	XEvent xev;	550	XEvent xev;
458	XNextEvent (display, &xev);	551	XNextEvent (dpy, &xev);
		552
		553	flush_ev.start ();
459		554
460	#ifdef USE_XIM	555	#ifdef USE_XIM
461	if (!XFilterEvent (&xev, None))	556	if (!XFilterEvent (&xev, None))
		557	#endif
462	{	558	{
463	if (xev.type == PropertyNotify	559	if (xev.type == PropertyNotify
464	&& xev.xany.window == root	560	&& xev.xany.window == root
465	&& xev.xproperty.atom == xa[XA_XIM_SERVERS])	561	&& xev.xproperty.atom == xa[XA_XIM_SERVERS])
466	im_change_check ();	562	im_change_check ();
467	#endif	563	if (xev.type == MappingNotify)
		564	XRefreshKeyboardMapping (&xev.xmapping);
		565
468	for (int i = xw.size (); i--; )	566	for (int i = xw.size (); i--; )
469	{	567	{
470	if (!xw[i])	568	if (!xw[i])
471	xw.erase_unordered (i);	569	xw.erase_unordered (i);
472	else if (xw[i]->window == xev.xany.window)	570	else if (xw[i]->window == xev.xany.window)
473	xw[i]->call (xev);	571	xw[i]->call (xev);
474	}	572	}
		573	}
		574	}
		575	}
		576
		577	void rxvt_display::flush_cb (ev::prepare &w, int revents)
		578	{
		579	w.stop ();
		580	XFlush (dpy);
		581	}
		582
		583	void rxvt_display::reg (xevent_watcher *w)
		584	{
		585	if (!w->active)
		586	{
		587	xw.push_back (w);
		588	w->active = xw.size ();
		589	}
		590	}
		591
		592	void rxvt_display::unreg (xevent_watcher *w)
		593	{
		594	if (w->active)
		595	{
		596	xw[w->active - 1] = 0;
		597	w->active = 0;
		598	}
		599	}
		600
		601	void rxvt_display::set_selection_owner (rxvt_term *owner)
		602	{
		603	if (selection_owner && selection_owner != owner)
		604	{
		605	rxvt_term *owner = selection_owner;
		606
		607	owner->selection_clear ();
		608	owner->flush ();
		609	}
		610
		611	selection_owner = owner;
		612	}
		613
475	#ifdef USE_XIM	614	#ifdef USE_XIM
476	}
477	#endif
478	}
479	while (XEventsQueued (display, QueuedAlready));
480		615
481	XFlush (display);
482	}
483
484	void rxvt_display::flush ()
485	{
486	if (XEventsQueued (display, QueuedAlready))
487	x_cb (x_ev, EVENT_READ);
488
489	XFlush (display);
490	}
491
492	void rxvt_display::reg (xevent_watcher *w)
493	{
494	xw.push_back (w);
495	w->active = xw.size ();
496	}
497
498	void rxvt_display::unreg (xevent_watcher *w)
499	{
500	if (w->active)
501	xw[w->active - 1] = 0;
502	}
503
504	void rxvt_display::set_selection_owner (rxvt_term *owner)
505	{
506	if (selection_owner && selection_owner != owner)
507	selection_owner->selection_clear ();
508
509	selection_owner = owner;
510	}
511
512	#ifdef USE_XIM
513	void rxvt_display::reg (im_watcher *w)	616	void rxvt_display::reg (im_watcher *w)
514	{	617	{
515	imw.push_back (w);	618	imw.push_back (w);
516	}	619	}
517		620
…		…
541	return xim;	644	return xim;
542	}	645	}
543		646
544	void rxvt_display::put_xim (rxvt_xim *xim)	647	void rxvt_display::put_xim (rxvt_xim *xim)
545	{	648	{
546	#if XLIB_IS_RACEFREE	649	# if XLIB_IS_RACEFREE
547	xims.put (xim);	650	xims.put (xim);
548	#endif	651	# endif
549	}	652	}
		653
550	#endif	654	#endif
551		655
552	Atom rxvt_display::atom (const char *name)	656	Atom rxvt_display::atom (const char *name)
553	{	657	{
554	return XInternAtom (display, name, False);	658	return XInternAtom (dpy, name, False);
555	}	659	}
556		660
557	/////////////////////////////////////////////////////////////////////////////	661	/////////////////////////////////////////////////////////////////////////////
558		662
559	template class refcache<rxvt_display>;	663	template class refcache<rxvt_display>;
560	refcache<rxvt_display> displays;	664	refcache<rxvt_display> displays;
561		665
562	/////////////////////////////////////////////////////////////////////////////	666	/////////////////////////////////////////////////////////////////////////////
563		667	//
		668
		669	static unsigned int
		670	insert_component (unsigned int value, unsigned int mask, unsigned int shift)
		671	{
		672	return (value * (mask + 1) >> 16) << shift;
		673	}
		674
564	bool	675	bool
565	rxvt_color::alloc (rxvt_screen *screen, const rgba &color)	676	rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
566	{	677	{
		678	//TODO: only supports 24 bit
		679	int alpha = color.a >= 0xff00 ? 0xffff : color.a;
		680
567	#if XFT	681	#if XFT
568	XRenderPictFormat *format;	682	XRenderPictFormat *format;
569		683
570	// FUCKING Xft gets it wrong, of course, so work around it	684	// FUCKING Xft gets it wrong, of course, so work around it.
571	// transparency users should eat shit and die, and then	685	// Transparency users should eat shit and die, and then
572	// XRenderQueryPictIndexValues themselves plenty.	686	// XRenderQueryPictIndexValues themselves plenty.
573	if ((screen->visual->c_class == TrueColor \|\| screen->visual->c_class == DirectColor)	687	if ((screen->visual->c_class == TrueColor)
574	&& (format = XRenderFindVisualFormat (screen->xdisp, screen->visual)))	688	&& (format = XRenderFindVisualFormat (screen->dpy, screen->visual)))
575	{	689	{
576	// the fun lies in doing everything manually...	690	// the fun lies in doing everything manually...
577	c.color.red = color.r;	691	c.color.red = color.r;
578	c.color.green = color.g;	692	c.color.green = color.g;
579	c.color.blue = color.b;	693	c.color.blue = color.b;
580	c.color.alpha = color.a;	694	c.color.alpha = alpha;
581		695
582	c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red )	696	c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
583	\| ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green)	697	\| insert_component (color.g, format->direct.greenMask, format->direct.green)
584	\| ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue )	698	\| insert_component (color.b, format->direct.blueMask , format->direct.blue )
585	\| ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha);	699	\| insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
586		700
587	return true;	701	return true;
588	}	702	}
589	else	703	else
590	{	704	{
591	XRenderColor d;	705	XRenderColor d;
592		706
593	d.red = color.r;	707	d.red = color.r;
594	d.green = color.g;	708	d.green = color.g;
595	d.blue = color.b;	709	d.blue = color.b;
596	d.alpha = color.a;	710	d.alpha = alpha;
597		711
598	return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c);	712	return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
599	}	713	}
600	#else	714	#else
601	if (screen->visual->c_class == TrueColor \|\| screen->visual->c_class == DirectColor)
602	{
603	c.red = color.g;	715	c.red = color.r;
604	c.green = color.g;	716	c.green = color.g;
605	c.blue = color.g;	717	c.blue = color.b;
		718
		719	if (screen->visual->c_class == TrueColor)
		720	{
606	c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask ))	721	c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask ))
607	/ rgba::MAX_CC) << ctz (screen->visual->red_mask )	722	\| (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
608	\| (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
609	/ rgba::MAX_CC) << ctz (screen->visual->green_mask)
610	\| (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask ))	723	\| (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
611	/ rgba::MAX_CC) << ctz (screen->visual->blue_mask );
612		724
613	return true;	725	return true;
614	}	726	}
		727	else if (XAllocColor (screen->dpy, screen->cmap, &c))
		728	return true;
615	else	729	else
616	{
617	c.red = color.r;
618	c.green = color.g;
619	c.blue = color.b;
620
621	if (XAllocColor (screen->xdisp, screen->cmap, &c))
622	return true;
623	else
624	c.pixel = (color.r + color.g + color.b) > 128*3	730	c.pixel = (color.r + color.g + color.b) > 128*3
625	? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp))	731	? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
626	: BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp));	732	: BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
627	}
628	#endif	733	#endif
629		734
630	return false;	735	return false;
631	}	736	}
632		737
…		…
635	{	740	{
636	rgba c;	741	rgba c;
637	char eos;	742	char eos;
638	int skip;	743	int skip;
639		744
		745	c.a = rgba::MAX_CC;
		746
		747	// parse the nonstandard "[alphapercent]" prefix
640	if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))	748	if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
641	{	749	{
642	printf ("X %d\n", c.a);
643	c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);	750	c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
644	name += skip;	751	name += skip;
645	printf ("y %04x\n", c.a);
646	}	752	}
647	else
648	c.a = rgba::MAX_CC;
649		753
650	// parse the non-standard rgba format	754	// parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
651	if (strlen (name) != 4+5*4 \|\| 4 != sscanf (name, "rgba:%hx/%hx/%hx/%hx%c", &c.r, &c.g, &c.b, &c.a, &eos))	755	if (strlen (name) != 4+5*4 \|\| 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
652	{	756	{
653	XColor xc, xc_exact;	757	XColor xc;
654		758
655	if (XParseColor (screen->xdisp, screen->cmap, name, &xc))	759	if (XParseColor (screen->dpy, screen->cmap, name, &xc))
656	{	760	{
657	c.r = xc.red;	761	c.r = xc.red;
658	c.g = xc.green;	762	c.g = xc.green;
659	c.b = xc.blue;	763	c.b = xc.blue;
660	}	764	}
…		…
685	{	789	{
686	XColor *colors = new XColor [screen->visual->map_entries];	790	XColor *colors = new XColor [screen->visual->map_entries];
687		791
688	for (int i = 0; i < cmap_size; i++)	792	for (int i = 0; i < cmap_size; i++)
689	colors [i].pixel = i;	793	colors [i].pixel = i;
690		794
691	// many kilobytes transfer per colour, but pseudocolor isn't worth	795	// many kilobytes transfer per colour, but pseudocolor isn't worth
692	// many extra optimisations.	796	// many extra optimisations.
693	XQueryColors (screen->xdisp, screen->cmap, colors, cmap_size);	797	XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
694		798
695	int diff = 0x7fffffffUL;	799	int diff = 0x7fffffffUL;
696	XColor *best = colors;	800	XColor *best = colors;
697		801
698	for (int i = 0; i < cmap_size; i++)	802	for (int i = 0; i < cmap_size; i++)
…		…
708	}	812	}
709	}	813	}
710		814
711	//rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",	815	//rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
712	// color.r, color.g, color.b, best->red, best->green, best->blue, diff);	816	// color.r, color.g, color.b, best->red, best->green, best->blue, diff);
713		817
714	got = alloc (screen, rgba (best->red, best->green, best->blue));	818	got = alloc (screen, rgba (best->red, best->green, best->blue));
715		819
716	delete colors;	820	delete [] colors;
717	}	821	}
718	#endif	822	#endif
719		823
720	return got;	824	return got;
721	}	825	}
…		…
734	color.b = c.blue;	838	color.b = c.blue;
735	color.a = rgba::MAX_CC;	839	color.a = rgba::MAX_CC;
736	#endif	840	#endif
737	}	841	}
738		842
739	void	843	void
		844	rxvt_color::get (XColor &color)
		845	{
		846	rgba c;
		847	get (c);
		848
		849	color.red = c.r;
		850	color.green = c.g;
		851	color.blue = c.b;
		852	color.pixel = (Pixel)*this;
		853	}
		854
		855	void
740	rxvt_color::free (rxvt_screen *screen)	856	rxvt_color::free (rxvt_screen *screen)
741	{	857	{
		858	if (screen->visual->c_class == TrueColor)
		859	return; // nothing to do
		860
742	#if XFT	861	#if XFT
743	XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c);	862	XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
744	#else	863	#else
745	XFreeColors (screen->xdisp, screen->cmap, &c.pixel, 1, AllPlanes);	864	XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
746	#endif	865	#endif
747	}	866	}
748		867
749	void	868	void
750	rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)	869	rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)
…		…
761	lerp (c.a, to.a, percent)	880	lerp (c.a, to.a, percent)
762	)	881	)
763	);	882	);
764	}	883	}
765		884
		885	#if TRACE_PIXMAPS
		886	# undef XCreatePixmap
		887	# undef XFreePixmap
		888	Pixmap trace_XCreatePixmap (const char file, int line, Display dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
		889	{
		890	Pixmap res = XCreatePixmap (dpy, r, w, h, d);
		891	fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
		892	return res;
		893	}
		894
		895	void trace_XFreePixmap (const char file, int line, Display dpy, Pixmap p)
		896	{
		897	fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
		898	XFreePixmap (dpy,p);
		899	}
		900	#endif

Diff Legend

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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents): Revision 1.44 by root, Tue Jan 31 19:53:31 2006 UTC vs. Revision 1.91 by root, Sat Jan 26 10:03:35 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.44 by root, Tue Jan 31 19:53:31 2006 UTC vs.
Revision 1.91 by root, Sat Jan 26 10:03:35 2008 UTC