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.12 by root, Mon Jan 17 00:59:24 2005 UTC vs.
Revision 1.43 by root, Tue Jan 31 18:36:35 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 {
… …
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);
156 cmap = DefaultColormap (display, screen);
157 depth = DefaultDepth (display, screen);
158 355
159 int fd = XConnectionNumber (display); 356 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
357 XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa);
160 358
161#ifndef NO_SLOW_LINK_SUPPORT 359 XrmSetDatabase (display, get_resources ());
162 // try to detetc wether we have a local connection.
163 // assume unix domains socket == local, everything else not
164 // TODO: might want to check for inet/127.0.0.1
165 is_local = 0;
166 sockaddr_un sa;
167 socklen_t sl = sizeof (sa);
168
169 if (!getsockname (fd, (sockaddr *)&sa, &sl))
170 is_local = sa.sun_family == AF_LOCAL;
171#endif
172 360
173#ifdef POINTER_BLANK 361#ifdef POINTER_BLANK
174 XColor blackcolour; 362 XColor blackcolour;
175 blackcolour.red = 0; 363 blackcolour.red = 0;
176 blackcolour.green = 0; 364 blackcolour.green = 0;
… …
179 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', 367 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ',
180 &blackcolour, &blackcolour); 368 &blackcolour, &blackcolour);
181 XUnloadFont (display, f); 369 XUnloadFont (display, f);
182#endif 370#endif
183 371
184#ifdef PREFER_24BIT 372 int fd = XConnectionNumber (display);
185 /*
186 * If depth is not 24, look for a 24bit visual.
187 */
188 if (depth != 24)
189 {
190 XVisualInfo vinfo;
191 373
192 if (XMatchVisualInfo (display, screen, 24, TrueColor, &vinfo)) 374#ifndef NO_SLOW_LINK_SUPPORT
193 { 375 // try to detect wether we have a local connection.
194 depth = 24; 376 // assume unix domains socket == local, everything else not
195 visual = vinfo.visual; 377 // TODO: might want to check for inet/127.0.0.1
196 cmap = XCreateColormap (display, 378 is_local = 0;
197 RootWindow (display, screen), 379 sockaddr_un sa;
198 visual, AllocNone); 380 socklen_t sl = sizeof (sa);
199 } 381
200 } 382 if (!getsockname (fd, (sockaddr *)&sa, &sl))
383 is_local = sa.sun_family == AF_LOCAL;
201#endif 384#endif
202 385
203 x_ev.start (fd, EVENT_READ); 386 x_ev.start (fd, EVENT_READ);
204 fcntl (fd, F_SETFD, FD_CLOEXEC); 387 fcntl (fd, F_SETFD, FD_CLOEXEC);
205 388
206 XSelectInput (display, root, PropertyChangeMask); 389 XSelectInput (display, root, PropertyChangeMask);
207#ifdef USE_XIM
208 xa_xim_servers = XInternAtom (display, "XIM_SERVERS", 0);
209#endif
210 390
211 flush (); 391 flush ();
212 392
213 return true; 393 return true;
214} 394}
215 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
216rxvt_display::~rxvt_display () 405rxvt_display::~rxvt_display ()
217{ 406{
407 if (!display)
408 return;
409
410#ifdef POINTER_BLANK
411 XFreeCursor (display, blank_cursor);
412#endif
218 x_ev.stop (); 413 x_ev.stop ();
219#ifdef USE_XIM 414#ifdef USE_XIM
220 xims.clear (); 415 xims.clear ();
221#endif 416#endif
222
223 if (display)
224 XCloseDisplay (display); 417 XCloseDisplay (display);
225} 418}
226 419
227#ifdef USE_XIM 420#ifdef USE_XIM
228void rxvt_display::im_change_cb () 421void rxvt_display::im_change_cb ()
229{ 422{
… …
231 (*i)->call (); 424 (*i)->call ();
232} 425}
233 426
234void rxvt_display::im_change_check () 427void rxvt_display::im_change_check ()
235{ 428{
236 // 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
237 // registers, as xlib crashes due to a race otherwise. 430 // registers, as xlib crashes due to a race otherwise.
238 Atom actual_type, *atoms; 431 Atom actual_type, *atoms;
239 int actual_format; 432 int actual_format;
240 unsigned long nitems, bytes_after; 433 unsigned long nitems, bytes_after;
241 434
242 if (XGetWindowProperty (display, root, xa_xim_servers, 0L, 1000000L, 435 if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
243 False, XA_ATOM, &actual_type, &actual_format, 436 False, XA_ATOM, &actual_type, &actual_format,
244 &nitems, &bytes_after, (unsigned char **)&atoms) 437 &nitems, &bytes_after, (unsigned char **)&atoms)
245 != Success ) 438 != Success )
246 return; 439 return;
247 440
… …
265 XNextEvent (display, &xev); 458 XNextEvent (display, &xev);
266 459
267#ifdef USE_XIM 460#ifdef USE_XIM
268 if (!XFilterEvent (&xev, None)) 461 if (!XFilterEvent (&xev, None))
269 { 462 {
270
271 if (xev.type == PropertyNotify 463 if (xev.type == PropertyNotify
272 && xev.xany.window == root 464 && xev.xany.window == root
273 && xev.xproperty.atom == xa_xim_servers) 465 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
274 im_change_check (); 466 im_change_check ();
275#endif 467#endif
276 for (int i = xw.size (); i--; ) 468 for (int i = xw.size (); i--; )
277 { 469 {
278 if (!xw[i]) 470 if (!xw[i])
… …
366 558
367template class refcache<rxvt_display>; 559template class refcache<rxvt_display>;
368refcache<rxvt_display> displays; 560refcache<rxvt_display> displays;
369 561
370///////////////////////////////////////////////////////////////////////////// 562/////////////////////////////////////////////////////////////////////////////
371 563
372bool 564bool
373rxvt_color::set (rxvt_display *display, Pixel p) 565rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
374{ 566{
375#if XFT 567#if XFT
376 XColor xc; 568 XRenderPictFormat *format;
377 569
378 xc.pixel = p; 570 // FUCKING Xft gets it wrong, of course, so work around it
379 if (!XQueryColor (display->display, display->cmap, &xc)) 571 // transparency users should eat shit and die, and then
380 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;
381 581
582 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red )
583 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green)
584 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue )
585 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha);
586
587 return true;
588 }
589 else
590 {
382 XRenderColor d; 591 XRenderColor d;
383 592
384 d.red = xc.red; 593 d.red = color.r;
385 d.green = xc.green; 594 d.green = color.g;
386 d.blue = xc.blue; 595 d.blue = color.b;
387 d.alpha = 0xffff; 596 d.alpha = color.a;
388 597
389 return 598 return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c);
390 XftColorAllocValue (display->display, 599 }
391 display->visual,
392 display->cmap,
393 &d, &c);
394#else 600#else
395 this->p = p; 601 if (screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor)
396#endif 602 {
603 c.red = color.g;
604 c.green = color.g;
605 c.blue = color.g;
606 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask ))
607 / rgba::MAX_CC) << ctz (screen->visual->red_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 ))
611 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
397 612
613 return true;
614 }
615 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))
398 return true; 622 return true;
623 else
624 c.pixel = (color.r + color.g + color.b) > 128*3
625 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp))
626 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp));
627 }
628#endif
629
630 return false;
399} 631}
400 632
401bool 633bool
402rxvt_color::set (rxvt_display *display, const char *name) 634rxvt_color::set (rxvt_screen *screen, const char *name)
635{
636 rgba c;
637 char eos;
638 int skip;
639
640 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
641 {
642 printf ("X %d\n", c.a);
643 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
644 name += skip;
645 printf ("y %04x\n", c.a);
646 }
647 else
648 c.a = 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 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 // many kilobytes transfer per colour, but pseudocolor isn't worth
692 // many extra optimisations.
693 XQueryColors (screen->xdisp, screen->cmap, colors, cmap_size);
694
695 int diff = 0x7fffffffUL;
696 XColor *best = colors;
697
698 for (int i = 0; i < cmap_size; i++)
699 {
700 int d = (squared_diff<int> (color.r >> 2, colors [i].red >> 2))
701 + (squared_diff<int> (color.g >> 2, colors [i].green >> 2))
702 + (squared_diff<int> (color.b >> 2, colors [i].blue >> 2));
703
704 if (d < diff)
705 {
706 diff = d;
707 best = colors + i;
708 }
709 }
710
711 //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);
713
714 got = alloc (screen, rgba (best->red, best->green, best->blue));
715
716 delete colors;
717 }
718#endif
719
720 return got;
721}
722
723void
724rxvt_color::get (rxvt_screen *screen, rgba &color)
403{ 725{
404#if XFT 726#if XFT
405 return XftColorAllocName (display->display, display->visual, display->cmap, 727 color.r = c.color.red;
406 name, &c); 728 color.g = c.color.green;
729 color.b = c.color.blue;
730 color.a = c.color.alpha;
407#else 731#else
408 XColor xc; 732 color.r = c.red;
409 733 color.g = c.green;
410 if (XParseColor (display->display, display->cmap, name, &xc)) 734 color.b = c.blue;
411 return set (display, xc.red, xc.green, xc.blue); 735 color.a = rgba::MAX_CC;
412
413 return false;
414#endif 736#endif
415}
416
417bool
418rxvt_color::set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb)
419{
420 XColor xc;
421
422 xc.red = cr;
423 xc.green = cg;
424 xc.blue = cb;
425 xc.flags = DoRed | DoGreen | DoBlue;
426
427 if (XAllocColor (display->display, display->cmap, &xc))
428 return set (display, xc.pixel);
429
430 return false;
431} 737}
432 738
433void 739void
434rxvt_color::get (rxvt_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb) 740rxvt_color::free (rxvt_screen *screen)
435{ 741{
436#if XFT 742#if XFT
437 cr = c.color.red; 743 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c);
438 cg = c.color.green;
439 cb = c.color.blue;
440#else 744#else
441 XColor c; 745 XFreeColors (screen->xdisp, screen->cmap, &c.pixel, 1, AllPlanes);
442
443 c.pixel = p;
444 XQueryColor (display->display, display->cmap, &c);
445
446 cr = c.red;
447 cg = c.green;
448 cb = c.blue;
449#endif 746#endif
450} 747}
451 748
452void 749void
453rxvt_color::free (rxvt_display *display) 750rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)
454{ 751{
455#if XFT 752 rgba c;
456 XftColorFree (display->display, display->visual, display->cmap, &c); 753 get (screen, c);
457#else
458 XFreeColors (display->display, display->cmap, &p, 1, AllPlanes);
459#endif
460}
461 754
462rxvt_color 755 result.set (
463rxvt_color::fade (rxvt_display *display, int percent) 756 screen,
464{ 757 rgba (
465 unsigned short cr, cg, cb; 758 lerp (c.r, to.r, percent),
466 rxvt_color faded; 759 lerp (c.g, to.g, percent),
467 760 lerp (c.b, to.b, percent),
468 get (display, cr, cg, cb); 761 lerp (c.a, to.a, percent)
469 faded.set (display, 762 )
470 cr * percent / 100, 763 );
471 cg * percent / 100,
472 cb * percent / 100);
473
474 return faded;
475} 764}
476 765

Diff Legend

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