ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvttoolkit.C
(Generate patch)

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.8 by root, Wed Dec 15 05:30:40 2004 UTC vs.
Revision 1.41 by root, Tue Jan 31 16:43:55 2006 UTC

… …
25#include <rxvttoolkit.h> 25#include <rxvttoolkit.h>
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>
31
30#ifndef NO_SLOW_LINK_SUPPORT 32#ifndef NO_SLOW_LINK_SUPPORT
31# include <sys/socket.h> 33# include <sys/socket.h>
32# include <sys/un.h> 34# include <sys/un.h>
33#endif 35#endif
34 36
37#if XFT
38# include <X11/extensions/Xrender.h>
39#endif
40
41const char *const xa_names[] =
42{
43 "TEXT",
44 "COMPOUND_TEXT",
45 "UTF8_STRING",
46 "MULTIPLE",
47 "TARGETS",
48 "TIMESTAMP",
49 "VT_SELECTION",
50 "INCR",
51 "WM_PROTOCOLS",
52 "WM_DELETE_WINDOW",
53 "CLIPBOARD",
54 "AVERAGE_WIDTH",
55 "WEIGHT_NAME",
56 "SLANT",
57 "CHARSET_REGISTRY",
58 "CHARSET_ENCODING",
59#if ENABLE_FRILLS
60 "_MOTIF_WM_HINTS",
61#endif
62#if ENABLE_EWMH
63 "_NET_WM_PID",
64 "_NET_WM_NAME",
65 "_NET_WM_ICON_NAME",
66 "_NET_WM_PING",
67#endif
68#if USE_XIM
69 "WM_LOCALE_NAME",
70 "XIM_SERVERS",
71#endif
72#ifdef TRANSPARENT
73 "_XROOTPMAP_ID",
74 "ESETROOT_PMAP_ID",
75#endif
76#if ENABLE_XEMBED
77 "_XEMBED",
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",
93# endif
94#endif
95};
96
97/////////////////////////////////////////////////////////////////////////////
98
35refcounted::refcounted (const char *id) 99refcounted::refcounted (const char *id)
36{ 100{
37 this->id = strdup (id); 101 this->id = strdup (id);
38} 102}
39 103
… …
47{ 111{
48 for (T **i = this->begin (); i < this->end (); ++i) 112 for (T **i = this->begin (); i < this->end (); ++i)
49 { 113 {
50 if (!strcmp (id, (*i)->id)) 114 if (!strcmp (id, (*i)->id))
51 { 115 {
52 (*i)->referenced++; 116 ++(*i)->referenced;
117 (*i)->ref_next ();
53 return *i; 118 return *i;
54 } 119 }
55 } 120 }
56 121
57 T *obj = new T (id); 122 T *obj = new T (id);
58 123
59 obj->referenced = 1;
60
61 if (obj && obj->init ()) 124 if (obj && obj->ref_init ())
62 { 125 {
126 obj->referenced = 1;
63 this->push_back (obj); 127 this->push_back (obj);
64 return obj; 128 return obj;
65 } 129 }
66 else 130 else
67 { 131 {
… …
82 delete obj; 146 delete obj;
83 } 147 }
84} 148}
85 149
86template<class T> 150template<class T>
87refcache<T>::~refcache () 151void refcache<T>::clear ()
88{ 152{
89 while (this->size ()) 153 while (this->size ())
90 put (*this->begin ()); 154 put (*this->begin ());
91} 155}
92 156
93///////////////////////////////////////////////////////////////////////////// 157/////////////////////////////////////////////////////////////////////////////
94 158
95#ifdef USE_XIM 159#ifdef USE_XIM
160
96static void 161static void
97#if XIMCB_PROTO_BROKEN 162#if XIMCB_PROTO_BROKEN
98im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3) 163im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3)
99#else 164#else
100im_destroy_cb (XIM unused1, XPointer client_data, XPointer unused3) 165im_destroy_cb (XIM unused1, XPointer client_data, XPointer unused3)
… …
107 172
108 display->xims.erase (find (display->xims.begin (), display->xims.end (), xim)); 173 display->xims.erase (find (display->xims.begin (), display->xims.end (), xim));
109 display->im_change_cb (); 174 display->im_change_cb ();
110} 175}
111 176
177bool
112bool rxvt_xim::init () 178rxvt_xim::ref_init ()
113{ 179{
114 display = GET_R->display; //HACK: TODO 180 display = GET_R->display; //HACK: TODO
115 181
116 xim = XOpenIM (display->display, NULL, NULL, NULL); 182 xim = XOpenIM (display->display, NULL, NULL, NULL);
117 183
… …
130rxvt_xim::~rxvt_xim () 196rxvt_xim::~rxvt_xim ()
131{ 197{
132 if (xim) 198 if (xim)
133 XCloseIM (xim); 199 XCloseIM (xim);
134} 200}
201
135#endif 202#endif
203
204/////////////////////////////////////////////////////////////////////////////
205
206void
207rxvt_screen::set (rxvt_display *disp)
208{
209 display = disp;
210 xdisp = disp->display;
211
212 Screen *screen = ScreenOfDisplay (xdisp, disp->screen);
213
214 depth = DefaultDepthOfScreen (screen);
215 visual = DefaultVisualOfScreen (screen);
216 cmap = DefaultColormapOfScreen (screen);
217}
218
219void
220rxvt_screen::set (rxvt_display *disp, int bitdepth)
221{
222 set (disp);
223
224#if XFT
225 XVisualInfo vinfo;
226
227 if (XMatchVisualInfo (xdisp, display->screen, bitdepth, TrueColor, &vinfo))
228 {
229 depth = bitdepth;
230 visual = vinfo.visual;
231 cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone);
232 }
233#endif
234}
235
236void
237rxvt_screen::clear ()
238{
239 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (xdisp, display->screen)))
240 XFreeColormap (xdisp, cmap);
241}
136 242
137///////////////////////////////////////////////////////////////////////////// 243/////////////////////////////////////////////////////////////////////////////
138 244
139rxvt_display::rxvt_display (const char *id) 245rxvt_display::rxvt_display (const char *id)
140: refcounted (id) 246: refcounted (id)
141, x_ev (this, &rxvt_display::x_cb) 247, x_ev (this, &rxvt_display::x_cb)
142, selection_owner (0) 248, selection_owner (0)
143{ 249{
144} 250}
145 251
252XrmDatabase
253rxvt_display::get_resources ()
254{
255 char *homedir = (char *)getenv ("HOME");
256 char fname[1024];
257
258 /*
259 * get resources using the X library function
260 */
261 char *displayResource, *xe;
262 XrmDatabase database, rdb1;
263
264 database = NULL;
265
266 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
267
268 // 6. System wide per application default file.
269
270 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
271 if ((xe = (char *)getenv ("XAPPLRESDIR")))
272 {
273 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
274
275 if ((rdb1 = XrmGetFileDatabase (fname)))
276 XrmMergeDatabases (rdb1, &database);
277 }
278
279 // 5. User's per application default file.
280 // none
281
282 // 4. User's defaults file.
283 /* Get any Xserver defaults */
284 displayResource = XResourceManagerString (display);
285
286 if (displayResource != NULL)
287 {
288 if ((rdb1 = XrmGetStringDatabase (displayResource)))
289 XrmMergeDatabases (rdb1, &database);
290 }
291 else if (homedir)
292 {
293 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
294
295 if ((rdb1 = XrmGetFileDatabase (fname)))
296 XrmMergeDatabases (rdb1, &database);
297 }
298
299 /* Get screen specific resources */
300 displayResource = XScreenResourceString (ScreenOfDisplay (display, screen));
301
302 if (displayResource != NULL)
303 {
304 if ((rdb1 = XrmGetStringDatabase (displayResource)))
305 /* Merge with screen-independent resources */
306 XrmMergeDatabases (rdb1, &database);
307
308 XFree (displayResource);
309 }
310
311 // 3. User's per host defaults file
312 /* Add in XENVIRONMENT file */
313 if ((xe = (char *)getenv ("XENVIRONMENT"))
314 && (rdb1 = XrmGetFileDatabase (xe)))
315 XrmMergeDatabases (rdb1, &database);
316 else if (homedir)
317 {
318 struct utsname un;
319
320 if (!uname (&un))
321 {
322 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
323
324 if ((rdb1 = XrmGetFileDatabase (fname)))
325 XrmMergeDatabases (rdb1, &database);
326 }
327 }
328
329 return database;
330}
331
146bool rxvt_display::init () 332bool rxvt_display::ref_init ()
147{ 333{
334#ifdef LOCAL_X_IS_UNIX
335 if (id[0] == ':')
336 {
337 val = rxvt_malloc (5 + strlen (id) + 1);
338 strcpy (val, "unix/");
339 strcat (val, id);
340 display = XOpenDisplay (val);
341 free (val);
342 }
343 else
344#endif
345 display = 0;
346
347 if (!display)
148 display = XOpenDisplay (id); 348 display = XOpenDisplay (id);
149 349
150 if (!display) 350 if (!display)
151 return false; 351 return false;
152 352
153 screen = DefaultScreen (display); 353 screen = DefaultScreen (display);
154 root = DefaultRootWindow (display); 354 root = DefaultRootWindow (display);
155 visual = DefaultVisual (display, screen); 355
156 cmap = DefaultColormap (display, screen); 356 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
157 depth = DefaultDepth (display, screen); 357 XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa);
358
359 XrmSetDatabase (display, get_resources ());
360
361#ifdef POINTER_BLANK
362 XColor blackcolour;
363 blackcolour.red = 0;
364 blackcolour.green = 0;
365 blackcolour.blue = 0;
366 Font f = XLoadFont (display, "fixed");
367 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ',
368 &blackcolour, &blackcolour);
369 XUnloadFont (display, f);
370#endif
158 371
159 int fd = XConnectionNumber (display); 372 int fd = XConnectionNumber (display);
160 373
161#ifndef NO_SLOW_LINK_SUPPORT 374#ifndef NO_SLOW_LINK_SUPPORT
162 // try to detetc wether we have a local connection. 375 // try to detect wether we have a local connection.
163 // assume unix domains socket == local, everything else not 376 // assume unix domains socket == local, everything else not
164 // TODO: might want to check for inet/127.0.0.1 377 // TODO: might want to check for inet/127.0.0.1
165 is_local = 0; 378 is_local = 0;
166 sockaddr_un sa; 379 sockaddr_un sa;
167 socklen_t sl = sizeof (sa); 380 socklen_t sl = sizeof (sa);
168 381
169 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 382 if (!getsockname (fd, (sockaddr *)&sa, &sl))
170 is_local = sa.sun_family == AF_LOCAL; 383 is_local = sa.sun_family == AF_LOCAL;
171#endif 384#endif
172 385
173#ifdef PREFER_24BIT
174 /*
175 * If depth is not 24, look for a 24bit visual.
176 */
177 if (depth != 24)
178 {
179 XVisualInfo vinfo;
180
181 if (XMatchVisualInfo (display, screen, 24, TrueColor, &vinfo))
182 {
183 depth = 24;
184 visual = vinfo.visual;
185 cmap = XCreateColormap (display,
186 RootWindow (display, screen),
187 visual, AllocNone);
188 }
189 }
190#endif
191
192 x_ev.start (fd, EVENT_READ); 386 x_ev.start (fd, EVENT_READ);
193 fcntl (fd, F_SETFD, FD_CLOEXEC); 387 fcntl (fd, F_SETFD, FD_CLOEXEC);
194 388
195 XSelectInput (display, root, PropertyChangeMask); 389 XSelectInput (display, root, PropertyChangeMask);
390
391 flush ();
392
393 return true;
394}
395
396void
397rxvt_display::ref_next ()
398{
399 // TODO: somehow check wether the database files/resources changed
400 // before re-loading/parsing
401 XrmDestroyDatabase (XrmGetDatabase (display));
402 XrmSetDatabase (display, get_resources ());
403}
404
405rxvt_display::~rxvt_display ()
406{
407 if (!display)
408 return;
409
410#ifdef POINTER_BLANK
411 XFreeCursor (display, blank_cursor);
412#endif
413 x_ev.stop ();
196#ifdef USE_XIM 414#ifdef USE_XIM
197 xa_xim_servers = XInternAtom (display, "XIM_SERVERS", 0); 415 xims.clear ();
198#endif 416#endif
199
200 flush ();
201
202 return true;
203}
204
205rxvt_display::~rxvt_display ()
206{
207 x_ev.stop ();
208
209 if (display)
210 XCloseDisplay (display); 417 XCloseDisplay (display);
211} 418}
212 419
213#ifdef USE_XIM 420#ifdef USE_XIM
214void rxvt_display::im_change_cb () 421void rxvt_display::im_change_cb ()
215{ 422{
… …
217 (*i)->call (); 424 (*i)->call ();
218} 425}
219 426
220void rxvt_display::im_change_check () 427void rxvt_display::im_change_check ()
221{ 428{
222 // make sure we only call im_change_cb when a new input method 429 // try to only call im_change_cb when a new input method
223 // registers, as xlib crashes due to a race otherwise. 430 // registers, as xlib crashes due to a race otherwise.
224 Atom actual_type, *atoms; 431 Atom actual_type, *atoms;
225 int actual_format; 432 int actual_format;
226 unsigned long nitems, bytes_after; 433 unsigned long nitems, bytes_after;
227 434
228 if (XGetWindowProperty (display, root, xa_xim_servers, 0L, 1000000L, 435 if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
229 False, XA_ATOM, &actual_type, &actual_format, 436 False, XA_ATOM, &actual_type, &actual_format,
230 &nitems, &bytes_after, (unsigned char **)&atoms) 437 &nitems, &bytes_after, (unsigned char **)&atoms)
231 != Success ) 438 != Success )
232 return; 439 return;
233 440
… …
251 XNextEvent (display, &xev); 458 XNextEvent (display, &xev);
252 459
253#ifdef USE_XIM 460#ifdef USE_XIM
254 if (!XFilterEvent (&xev, None)) 461 if (!XFilterEvent (&xev, None))
255 { 462 {
256
257 if (xev.type == PropertyNotify 463 if (xev.type == PropertyNotify
258 && xev.xany.window == root 464 && xev.xany.window == root
259 && xev.xproperty.atom == xa_xim_servers) 465 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
260 im_change_check (); 466 im_change_check ();
261#endif 467#endif
262 for (int i = xw.size (); i--; ) 468 for (int i = xw.size (); i--; )
263 { 469 {
264 if (!xw[i]) 470 if (!xw[i])
… …
270 } 476 }
271#endif 477#endif
272 } 478 }
273 while (XEventsQueued (display, QueuedAlready)); 479 while (XEventsQueued (display, QueuedAlready));
274 480
275 flush (); 481 XFlush (display);
276} 482}
277 483
278void rxvt_display::flush () 484void rxvt_display::flush ()
279{ 485{
486 if (XEventsQueued (display, QueuedAlready))
487 x_cb (x_ev, EVENT_READ);
488
280 XFlush (display); 489 XFlush (display);
281} 490}
282 491
283void rxvt_display::reg (xevent_watcher *w) 492void rxvt_display::reg (xevent_watcher *w)
284{ 493{
… …
332 return xim; 541 return xim;
333} 542}
334 543
335void rxvt_display::put_xim (rxvt_xim *xim) 544void rxvt_display::put_xim (rxvt_xim *xim)
336{ 545{
546#if XLIB_IS_RACEFREE
337 xims.put (xim); 547 xims.put (xim);
548#endif
338} 549}
339#endif 550#endif
340 551
341Atom rxvt_display::atom (const char *name) 552Atom rxvt_display::atom (const char *name)
342{ 553{
… …
347 558
348template class refcache<rxvt_display>; 559template class refcache<rxvt_display>;
349refcache<rxvt_display> displays; 560refcache<rxvt_display> displays;
350 561
351///////////////////////////////////////////////////////////////////////////// 562/////////////////////////////////////////////////////////////////////////////
352 563
353bool 564bool
354rxvt_color::set (rxvt_display *display, Pixel p) 565rxvt_color::alloc (rxvt_screen *screen, const rxvt_rgba &color)
355{ 566{
356#if XFT 567#if XFT
357 XColor xc; 568 XRenderPictFormat *format;
358 569
359 xc.pixel = p; 570 // FUCKING Xft gets it wrong, of course, so work around it
360 if (!XQueryColor (display->display, display->cmap, &xc)) 571 // transparency users should eat shit and die, and then
361 return false; 572 // XRenderQueryPictIndexValues themselves plenty.
573 if ((screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor)
574 && (format = XRenderFindVisualFormat (screen->xdisp, screen->visual)))
575 {
576 // the fun lies in doing everything manually...
577 c.color.red = color.r;
578 c.color.green = color.g;
579 c.color.blue = color.b;
580 c.color.alpha = color.a;
362 581
582 c.pixel = ((color.r * format->direct.redMask / rxvt_rgba::MAX_CC) << format->direct.red )
583 | ((color.g * format->direct.greenMask / rxvt_rgba::MAX_CC) << format->direct.green)
584 | ((color.b * format->direct.blueMask / rxvt_rgba::MAX_CC) << format->direct.blue )
585 | ((color.a * format->direct.alphaMask / rxvt_rgba::MAX_CC) << format->direct.alpha);
586
587 return true;
588 }
589 else
590 {
363 XRenderColor d; 591 XRenderColor d;
364 592
365 d.red = xc.red; 593 d.red = color.r;
366 d.green = xc.green; 594 d.green = color.g;
367 d.blue = xc.blue; 595 d.blue = color.b;
368 d.alpha = 0xffff; 596 d.alpha = color.a;
369 597
370 return 598 return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c);
371 XftColorAllocValue (display->display, 599 }
372 display->visual,
373 display->cmap,
374 &d, &c);
375#else 600#else
376 this->p = p; 601 if (screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor)
377#endif 602 {
603 p = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask ))
604 / rxvt_rgba::MAX_CC) << ctz (screen->visual->red_mask )
605 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
606 / rxvt_rgba::MAX_CC) << ctz (screen->visual->green_mask)
607 | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask ))
608 / rxvt_rgba::MAX_CC) << ctz (screen->visual->blue_mask );
378 609
610 return true;
611 }
612 else
613 {
614 XColor xc;
615
616 xc.red = color.r;
617 xc.green = color.g;
618 xc.blue = color.b;
619
620 if (XAllocColor (screen->xdisp, screen->cmap, &xc))
621 {
622 p = xc.pixel;
379 return true; 623 return true;
624 }
625 else
626 p = (color.r + color.g + color.b) > 128*3
627 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp))
628 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp));
629 }
630#endif
631
632 return false;
380} 633}
381 634
382bool 635bool
383rxvt_color::set (rxvt_display *display, const char *name) 636rxvt_color::set (rxvt_screen *screen, const char *name)
637{
638 rxvt_rgba c;
639 char eos;
640 int skip;
641
642 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
643 {
644 c.a = lerp<int, int, int> (0, rxvt_rgba::MAX_CC, c.a);
645 name += skip;
646 }
647 else
648 c.a = rxvt_rgba::MAX_CC;
649
650 // parse the non-standard rgba 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))
652 {
653 XColor xc, xc_exact;
654
655 if (XParseColor (screen->xdisp, screen->cmap, name, &xc))
656 {
657 c.r = xc.red;
658 c.g = xc.green;
659 c.b = xc.blue;
660 }
661 else
662 {
663 c.r = 0xffff;
664 c.g = 0x6969;
665 c.b = 0xb4b4;
666
667 rxvt_warn ("unable to parse color '%s', using pink instead.\n", name);
668 }
669 }
670
671 return set (screen, c);
672}
673
674bool
675rxvt_color::set (rxvt_screen *screen, const rxvt_rgba &color)
676{
677 bool got = alloc (screen, color);
678
679#if !ENABLE_MINIMAL
680 int cmap_size = screen->visual->map_entries;
681
682 if (!got
683 && screen->visual->c_class == PseudoColor
684 && cmap_size < 4096)
685 {
686 XColor *colors = new XColor [screen->visual->map_entries];
687
688 for (int i = 0; i < cmap_size; i++)
689 colors [i].pixel = i;
690
691 XQueryColors (screen->xdisp, screen->cmap, colors, cmap_size);
692
693 int diff = 0x7fffffffUL;
694 XColor *best = colors;
695
696 for (int i = 0; i < cmap_size; i++)
697 {
698 int d = (squared_diff<int> (color.r >> 2, colors [i].red >> 2))
699 + (squared_diff<int> (color.g >> 2, colors [i].green >> 2))
700 + (squared_diff<int> (color.b >> 2, colors [i].blue >> 2));
701
702 if (d < diff)
703 {
704 diff = d;
705 best = colors + i;
706 }
707 }
708
709 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
710 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
711
712 got = alloc (screen, rxvt_rgba (best->red, best->green, best->blue));
713
714 delete colors;
715 }
716#endif
717
718 return got;
719}
720
721void
722rxvt_color::get (rxvt_screen *screen, rxvt_rgba &color)
384{ 723{
385#if XFT 724#if XFT
386 return XftColorAllocName (display->display, display->visual, display->cmap,
387 name, &c);
388#else
389 XColor xc;
390
391 if (XParseColor (display->display, display->cmap, name, &xc))
392 return set (display, xc.red, xc.green, xc.blue);
393
394 return false;
395#endif
396}
397
398bool
399rxvt_color::set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb)
400{
401 XColor xc;
402
403 xc.red = cr;
404 xc.green = cg;
405 xc.blue = cb;
406 xc.flags = DoRed | DoGreen | DoBlue;
407
408 if (XAllocColor (display->display, display->cmap, &xc))
409 return set (display, xc.pixel);
410
411 return false;
412}
413
414void
415rxvt_color::get (rxvt_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb)
416{
417#if XFT
418 cr = c.color.red; 725 color.r = c.color.red;
419 cg = c.color.green; 726 color.g = c.color.green;
420 cb = c.color.blue; 727 color.b = c.color.blue;
728 color.a = c.color.alpha;
421#else 729#else
422 XColor c; 730 XColor c;
423 731
424 c.pixel = p; 732 c.pixel = p;
425 XQueryColor (display->display, display->cmap, &c); 733 XQueryColor (screen->xdisp, screen->cmap, &c);
426 734
427 cr = c.red; 735 color.r = c.red;
428 cg = c.green; 736 color.g = c.green;
429 cb = c.blue; 737 color.b = c.blue;
738 color.a = rxvt_rgba::MAX_CC;
430#endif 739#endif
431} 740}
432 741
433void 742void
434rxvt_color::free (rxvt_display *display) 743rxvt_color::free (rxvt_screen *screen)
435{ 744{
436#if XFT 745#if XFT
437 XftColorFree (display->display, display->visual, display->cmap, &c); 746 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c);
438#else 747#else
439 XFreeColors (display->display, display->cmap, &p, 1, AllPlanes); 748 XFreeColors (screen->xdisp, screen->cmap, &p, 1, AllPlanes);
440#endif 749#endif
441} 750}
442 751
443rxvt_color 752rxvt_color
444rxvt_color::fade (rxvt_display *display, int percent) 753rxvt_color::fade (rxvt_screen *screen, int percent, const rxvt_rgba &to)
445{ 754{
446 unsigned short cr, cg, cb; 755 rxvt_rgba c;
756 get (screen, c);
757
447 rxvt_color faded; 758 rxvt_color faded;
448
449 get (display, cr, cg, cb);
450 faded.set (display, 759 faded.set (
451 cr * percent / 100, 760 screen,
452 cg * percent / 100, 761 rxvt_rgba (
453 cb * percent / 100); 762 lerp (to.r, c.r, percent),
763 lerp (to.g, c.g, percent),
764 lerp (to.b, c.b, percent),
765 lerp (to.a, c.a, percent)
766 )
767 );
454 768
455 return faded; 769 return faded;
456} 770}
457 771

Diff Legend

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