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.24 by root, Wed Jan 25 00:42:21 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
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
37refcounted::refcounted (const char *id) 99refcounted::refcounted (const char *id)
38{ 100{
39 this->id = strdup (id); 101 this->id = strdup (id);
40} 102}
41 103
… …
115bool 177bool
116rxvt_xim::ref_init () 178rxvt_xim::ref_init ()
117{ 179{
118 display = GET_R->display; //HACK: TODO 180 display = GET_R->display; //HACK: TODO
119 181
120 xim = XOpenIM (display->display, NULL, NULL, NULL); 182 xim = XOpenIM (display->dpy, 0, 0, 0);
121 183
122 if (!xim) 184 if (!xim)
123 return false; 185 return false;
124 186
125 XIMCallback ximcallback; 187 XIMCallback ximcallback;
126 ximcallback.client_data = (XPointer)this; 188 ximcallback.client_data = (XPointer)this;
127 ximcallback.callback = im_destroy_cb; 189 ximcallback.callback = im_destroy_cb;
128 190
129 XSetIMValues (xim, XNDestroyCallback, &ximcallback, NULL); 191 XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0);
130 192
131 return true; 193 return true;
132} 194}
133 195
134rxvt_xim::~rxvt_xim () 196rxvt_xim::~rxvt_xim ()
… …
136 if (xim) 198 if (xim)
137 XCloseIM (xim); 199 XCloseIM (xim);
138} 200}
139 201
140#endif 202#endif
203
204/////////////////////////////////////////////////////////////////////////////
205
206void
207rxvt_screen::set (rxvt_display *disp)
208{
209 display = disp;
210 dpy = disp->dpy;
211
212 Screen *screen = ScreenOfDisplay (dpy, 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 (dpy, display->screen, bitdepth, TrueColor, &vinfo))
228 {
229 depth = bitdepth;
230 visual = vinfo.visual;
231 cmap = XCreateColormap (dpy, disp->root, visual, AllocNone);
232 }
233#endif
234}
235
236void
237rxvt_screen::clear ()
238{
239 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
240 XFreeColormap (dpy, cmap);
241}
141 242
142///////////////////////////////////////////////////////////////////////////// 243/////////////////////////////////////////////////////////////////////////////
143 244
144rxvt_display::rxvt_display (const char *id) 245rxvt_display::rxvt_display (const char *id)
145: refcounted (id) 246: refcounted (id)
… …
147, selection_owner (0) 248, selection_owner (0)
148{ 249{
149} 250}
150 251
151XrmDatabase 252XrmDatabase
152rxvt_display::get_resources () 253rxvt_display::get_resources (bool refresh)
153{ 254{
154 char *homedir = (char *)getenv ("HOME"); 255 char *homedir = (char *)getenv ("HOME");
155 char fname[1024]; 256 char fname[1024];
156 257
157 /* 258 /*
158 * get resources using the X library function 259 * get resources using the X library function
159 */ 260 */
160 char *displayResource, *xe; 261 char *displayResource, *xe;
161 XrmDatabase database, rdb1; 262 XrmDatabase rdb1, database = 0;
162
163 database = NULL;
164 263
165 // 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
166 265
167 // 6. System wide per application default file. 266 // 6. System wide per application default file.
168 267
… …
178 // 5. User's per application default file. 277 // 5. User's per application default file.
179 // none 278 // none
180 279
181 // 4. User's defaults file. 280 // 4. User's defaults file.
182 /* 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
183 displayResource = XResourceManagerString (display); 315 displayResource = XResourceManagerString (dpy);
184 316
185 if (displayResource != NULL) 317 if (displayResource)
186 { 318 {
187 if ((rdb1 = XrmGetStringDatabase (displayResource))) 319 if ((rdb1 = XrmGetStringDatabase (displayResource)))
188 XrmMergeDatabases (rdb1, &database); 320 XrmMergeDatabases (rdb1, &database);
189 } 321 }
190 else if (homedir) 322 else if (homedir)
… …
193 325
194 if ((rdb1 = XrmGetFileDatabase (fname))) 326 if ((rdb1 = XrmGetFileDatabase (fname)))
195 XrmMergeDatabases (rdb1, &database); 327 XrmMergeDatabases (rdb1, &database);
196 } 328 }
197 329
330#if !XLIB_ILLEGAL_ACCESS
331 if (refresh && displayResource)
332 XFree (displayResource);
333#endif
334
198 /* Get screen specific resources */ 335 /* Get screen specific resources */
199 displayResource = XScreenResourceString (ScreenOfDisplay (display, screen)); 336 displayResource = XScreenResourceString (ScreenOfDisplay (dpy, screen));
200 337
201 if (displayResource != NULL) 338 if (displayResource)
202 { 339 {
203 if ((rdb1 = XrmGetStringDatabase (displayResource))) 340 if ((rdb1 = XrmGetStringDatabase (displayResource)))
204 /* Merge with screen-independent resources */ 341 /* Merge with screen-independent resources */
205 XrmMergeDatabases (rdb1, &database); 342 XrmMergeDatabases (rdb1, &database);
206 343
… …
234 if (id[0] == ':') 371 if (id[0] == ':')
235 { 372 {
236 val = rxvt_malloc (5 + strlen (id) + 1); 373 val = rxvt_malloc (5 + strlen (id) + 1);
237 strcpy (val, "unix/"); 374 strcpy (val, "unix/");
238 strcat (val, id); 375 strcat (val, id);
239 display = XOpenDisplay (val); 376 dpy = XOpenDisplay (val);
240 free (val); 377 free (val);
241 } 378 }
242 else 379 else
243#endif 380#endif
244 display = 0; 381 dpy = 0;
245 382
246 if (!display) 383 if (!dpy)
247 display = XOpenDisplay (id); 384 dpy = XOpenDisplay (id);
248 385
249 if (!display) 386 if (!dpy)
250 return false; 387 return false;
251 388
252 screen = DefaultScreen (display); 389 screen = DefaultScreen (dpy);
253 root = DefaultRootWindow (display); 390 root = DefaultRootWindow (dpy);
254 visual = DefaultVisual (display, screen);
255 cmap = DefaultColormap (display, screen);
256 depth = DefaultDepth (display, screen);
257 391
392 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
393 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
394
258 XrmSetDatabase (display, get_resources ()); 395 XrmSetDatabase (dpy, get_resources (false));
259 396
260#ifdef POINTER_BLANK 397#ifdef POINTER_BLANK
261 XColor blackcolour; 398 XColor blackcolour;
262 blackcolour.red = 0; 399 blackcolour.red = 0;
263 blackcolour.green = 0; 400 blackcolour.green = 0;
264 blackcolour.blue = 0; 401 blackcolour.blue = 0;
265 Font f = XLoadFont (display, "fixed"); 402 Font f = XLoadFont (dpy, "fixed");
266 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', 403 blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ',
267 &blackcolour, &blackcolour); 404 &blackcolour, &blackcolour);
268 XUnloadFont (display, f); 405 XUnloadFont (dpy, f);
269#endif 406#endif
270 407
271#ifdef PREFER_24BIT
272 /*
273 * If depth is not 24, look for a 24bit visual.
274 */
275 if (depth != 24)
276 {
277 XVisualInfo vinfo;
278
279 if (XMatchVisualInfo (display, screen, 24, TrueColor, &vinfo))
280 {
281 depth = 24;
282 visual = vinfo.visual;
283 cmap = XCreateColormap (display,
284 RootWindow (display, screen),
285 visual, AllocNone);
286 }
287 }
288#endif
289
290 int fd = XConnectionNumber (display); 408 int fd = XConnectionNumber (dpy);
291 409
292#ifndef NO_SLOW_LINK_SUPPORT 410#ifndef NO_SLOW_LINK_SUPPORT
293 // try to detect wether we have a local connection. 411 // try to detect wether we have a local connection.
294 // assume unix domains socket == local, everything else not 412 // assume unix domains socket == local, everything else not
295 // TODO: might want to check for inet/127.0.0.1 413 // TODO: might want to check for inet/127.0.0.1
… …
302#endif 420#endif
303 421
304 x_ev.start (fd, EVENT_READ); 422 x_ev.start (fd, EVENT_READ);
305 fcntl (fd, F_SETFD, FD_CLOEXEC); 423 fcntl (fd, F_SETFD, FD_CLOEXEC);
306 424
307 XSelectInput (display, root, PropertyChangeMask); 425 XSelectInput (dpy, root, PropertyChangeMask);
308#ifdef USE_XIM
309 xa_xim_servers = XInternAtom (display, "XIM_SERVERS", 0);
310#endif
311 426
312 flush (); 427 flush ();
313 428
314 return true; 429 return true;
315} 430}
316 431
317void 432void
318rxvt_display::ref_next () 433rxvt_display::ref_next ()
319{ 434{
320 // TODO: somehow check wether the database files/resources changed 435 // TODO: somehow check wether the database files/resources changed
321 // before re-loading/parsing 436 // before affording re-loading/parsing
322 XrmDestroyDatabase (XrmGetDatabase (display)); 437 XrmDestroyDatabase (XrmGetDatabase (dpy));
323 XrmSetDatabase (display, get_resources ()); 438 XrmSetDatabase (dpy, get_resources (true));
324} 439}
325 440
326rxvt_display::~rxvt_display () 441rxvt_display::~rxvt_display ()
327{ 442{
328 if (!display) 443 if (!dpy)
329 return; 444 return;
330 445
331#ifdef POINTER_BLANK 446#ifdef POINTER_BLANK
332 XFreeCursor (display, blank_cursor); 447 XFreeCursor (dpy, blank_cursor);
333#endif 448#endif
334 x_ev.stop (); 449 x_ev.stop ();
335#ifdef USE_XIM 450#ifdef USE_XIM
336 xims.clear (); 451 xims.clear ();
337#endif 452#endif
338 XCloseDisplay (display); 453 XCloseDisplay (dpy);
339} 454}
340 455
341#ifdef USE_XIM 456#ifdef USE_XIM
342void rxvt_display::im_change_cb () 457void rxvt_display::im_change_cb ()
343{ 458{
… …
351 // registers, as xlib crashes due to a race otherwise. 466 // registers, as xlib crashes due to a race otherwise.
352 Atom actual_type, *atoms; 467 Atom actual_type, *atoms;
353 int actual_format; 468 int actual_format;
354 unsigned long nitems, bytes_after; 469 unsigned long nitems, bytes_after;
355 470
356 if (XGetWindowProperty (display, root, xa_xim_servers, 0L, 1000000L, 471 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
357 False, XA_ATOM, &actual_type, &actual_format, 472 False, XA_ATOM, &actual_type, &actual_format,
358 &nitems, &bytes_after, (unsigned char **)&atoms) 473 &nitems, &bytes_after, (unsigned char **)&atoms)
359 != Success ) 474 != Success )
360 return; 475 return;
361 476
362 if (actual_type == XA_ATOM && actual_format == 32) 477 if (actual_type == XA_ATOM && actual_format == 32)
363 for (int i = 0; i < nitems; i++) 478 for (int i = 0; i < nitems; i++)
364 if (XGetSelectionOwner (display, atoms[i])) 479 if (XGetSelectionOwner (dpy, atoms[i]))
365 { 480 {
366 im_change_cb (); 481 im_change_cb ();
367 break; 482 break;
368 } 483 }
369 484
… …
374void rxvt_display::x_cb (io_watcher &w, short revents) 489void rxvt_display::x_cb (io_watcher &w, short revents)
375{ 490{
376 do 491 do
377 { 492 {
378 XEvent xev; 493 XEvent xev;
379 XNextEvent (display, &xev); 494 XNextEvent (dpy, &xev);
380 495
381#ifdef USE_XIM 496#ifdef USE_XIM
382 if (!XFilterEvent (&xev, None)) 497 if (!XFilterEvent (&xev, None))
383 { 498 {
384 if (xev.type == PropertyNotify 499 if (xev.type == PropertyNotify
385 && xev.xany.window == root 500 && xev.xany.window == root
386 && xev.xproperty.atom == xa_xim_servers) 501 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
387 im_change_check (); 502 im_change_check ();
388#endif 503#endif
389 for (int i = xw.size (); i--; ) 504 for (int i = xw.size (); i--; )
390 { 505 {
391 if (!xw[i]) 506 if (!xw[i])
… …
395 } 510 }
396#ifdef USE_XIM 511#ifdef USE_XIM
397 } 512 }
398#endif 513#endif
399 } 514 }
400 while (XEventsQueued (display, QueuedAlready)); 515 while (XEventsQueued (dpy, QueuedAlready));
401 516
402 XFlush (display); 517 XFlush (dpy);
403} 518}
404 519
405void rxvt_display::flush () 520void rxvt_display::flush ()
406{ 521{
407 if (XEventsQueued (display, QueuedAlready)) 522 if (XEventsQueued (dpy, QueuedAlready))
408 x_cb (x_ev, EVENT_READ); 523 x_cb (x_ev, EVENT_READ);
409 524
410 XFlush (display); 525 XFlush (dpy);
411} 526}
412 527
413void rxvt_display::reg (xevent_watcher *w) 528void rxvt_display::reg (xevent_watcher *w)
414{ 529{
415 xw.push_back (w); 530 xw.push_back (w);
… …
429 544
430 selection_owner = owner; 545 selection_owner = owner;
431} 546}
432 547
433#ifdef USE_XIM 548#ifdef USE_XIM
549
434void rxvt_display::reg (im_watcher *w) 550void rxvt_display::reg (im_watcher *w)
435{ 551{
436 imw.push_back (w); 552 imw.push_back (w);
437} 553}
438 554
… …
462 return xim; 578 return xim;
463} 579}
464 580
465void rxvt_display::put_xim (rxvt_xim *xim) 581void rxvt_display::put_xim (rxvt_xim *xim)
466{ 582{
467#if XLIB_IS_RACEFREE 583# if XLIB_IS_RACEFREE
468 xims.put (xim); 584 xims.put (xim);
469#endif 585# endif
470} 586}
587
471#endif 588#endif
472 589
473Atom rxvt_display::atom (const char *name) 590Atom rxvt_display::atom (const char *name)
474{ 591{
475 return XInternAtom (display, name, False); 592 return XInternAtom (dpy, name, False);
476} 593}
477 594
478///////////////////////////////////////////////////////////////////////////// 595/////////////////////////////////////////////////////////////////////////////
479 596
480template class refcache<rxvt_display>; 597template class refcache<rxvt_display>;
481refcache<rxvt_display> displays; 598refcache<rxvt_display> displays;
482 599
483///////////////////////////////////////////////////////////////////////////// 600/////////////////////////////////////////////////////////////////////////////
484 601
485bool 602bool
486rxvt_color::set (rxvt_display *display, Pixel p) 603rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
487{ 604{
488#if XFT 605#if XFT
489 XColor xc; 606 XRenderPictFormat *format;
490 607
491 xc.pixel = p; 608 // FUCKING Xft gets it wrong, of course, so work around it.
492 if (!XQueryColor (display->display, display->cmap, &xc)) 609 // Transparency users should eat shit and die, and then
493 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;
494 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 {
495 XRenderColor d; 629 XRenderColor d;
496 630
497 d.red = xc.red; 631 d.red = color.r;
498 d.green = xc.green; 632 d.green = color.g;
499 d.blue = xc.blue; 633 d.blue = color.b;
500 d.alpha = 0xffff; 634 d.alpha = color.a;
501 635
502 return 636 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
503 XftColorAllocValue (display->display, 637 }
504 display->visual,
505 display->cmap,
506 &d, &c);
507#else 638#else
508 this->p = p; 639 c.red = color.r;
509#endif 640 c.green = color.g;
641 c.blue = color.b;
510 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))
511 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;
512} 663}
513 664
514bool 665bool
515rxvt_color::set (rxvt_display *display, const char *name) 666rxvt_color::set (rxvt_screen *screen, const char *name)
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
705bool
706rxvt_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
754void
755rxvt_color::get (rgba &color)
516{ 756{
517#if XFT 757#if XFT
518 return XftColorAllocName (display->display, display->visual, display->cmap, 758 color.r = c.color.red;
519 name, &c); 759 color.g = c.color.green;
760 color.b = c.color.blue;
761 color.a = c.color.alpha;
520#else 762#else
521 XColor xc; 763 color.r = c.red;
522 764 color.g = c.green;
523 if (XParseColor (display->display, display->cmap, name, &xc)) 765 color.b = c.blue;
524 return set (display, xc.red, xc.green, xc.blue); 766 color.a = rgba::MAX_CC;
525
526 return false;
527#endif 767#endif
528} 768}
529 769
530bool 770void
531rxvt_color::set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb) 771rxvt_color::get (XColor &color)
532{ 772{
533 XColor xc; 773 rgba c;
774 get (c);
534 775
535 xc.red = cr; 776 color.red = c.r;
536 xc.green = cg; 777 color.green = c.g;
537 xc.blue = cb; 778 color.blue = c.b;
538 xc.flags = DoRed | DoGreen | DoBlue; 779 color.pixel = (Pixel)*this;
539
540 if (XAllocColor (display->display, display->cmap, &xc))
541 return set (display, xc.pixel);
542
543 return false;
544} 780}
545 781
546void 782void
547rxvt_color::get (rxvt_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb) 783rxvt_color::free (rxvt_screen *screen)
548{ 784{
549#if XFT 785#if XFT
550 cr = c.color.red; 786 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
551 cg = c.color.green;
552 cb = c.color.blue;
553#else 787#else
554 XColor c; 788 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
555
556 c.pixel = p;
557 XQueryColor (display->display, display->cmap, &c);
558
559 cr = c.red;
560 cg = c.green;
561 cb = c.blue;
562#endif 789#endif
563} 790}
564 791
565void 792void
566rxvt_color::free (rxvt_display *display) 793rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)
567{ 794{
568#if XFT 795 rgba c;
569 XftColorFree (display->display, display->visual, display->cmap, &c); 796 get (c);
570#else
571 XFreeColors (display->display, display->cmap, &p, 1, AllPlanes);
572#endif
573}
574 797
575rxvt_color 798 result.set (
576rxvt_color::fade (rxvt_display *display, int percent) 799 screen,
577{ 800 rgba (
578 percent = 100 - percent; 801 lerp (c.r, to.r, percent),
579 802 lerp (c.g, to.g, percent),
580 unsigned short cr, cg, cb; 803 lerp (c.b, to.b, percent),
581 rxvt_color faded; 804 lerp (c.a, to.a, percent)
582 805 )
583 get (display, cr, cg, cb);
584
585 faded.set (
586 display,
587 cr * percent / 100,
588 cg * percent / 100,
589 cb * percent / 100
590 ); 806 );
591
592 return faded;
593} 807}
594 808
595#define LERP(a,b,p) (a * p + b * (100 - p)) / 100
596
597rxvt_color
598rxvt_color::fade (rxvt_display *display, int percent, rxvt_color &fadeto)
599{
600 percent = 100 - percent;
601
602 unsigned short cr, cg, cb;
603 unsigned short fcr, fcg, fcb;
604 rxvt_color faded;
605
606 get (display, cr, cg, cb);
607 fadeto.get(display, fcr, fcg, fcb);
608
609 faded.set (
610 display,
611 LERP (cr, fcr, percent),
612 LERP (cg, fcg, percent),
613 LERP (cb, fcb, percent)
614 );
615
616 return faded;
617}
618

Diff Legend

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