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.67 by ayin, Mon Jun 25 23:27:18 2007 UTC vs.
Revision 1.113 by sf-exg, Fri Jan 14 11:09:54 2011 UTC

1/*----------------------------------------------------------------------* 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-2006 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.
… …
33 33
34#if XFT 34#if XFT
35# include <X11/extensions/Xrender.h> 35# include <X11/extensions/Xrender.h>
36#endif 36#endif
37 37
38const char *const xa_names[] = 38static const char *const xa_names[] =
39{ 39{
40 "TEXT", 40 "TEXT",
41 "COMPOUND_TEXT", 41 "COMPOUND_TEXT",
42 "UTF8_STRING", 42 "UTF8_STRING",
43 "MULTIPLE", 43 "MULTIPLE",
… …
59#if ENABLE_EWMH 59#if ENABLE_EWMH
60 "_NET_WM_PID", 60 "_NET_WM_PID",
61 "_NET_WM_NAME", 61 "_NET_WM_NAME",
62 "_NET_WM_ICON_NAME", 62 "_NET_WM_ICON_NAME",
63 "_NET_WM_PING", 63 "_NET_WM_PING",
64 "_NET_WM_ICON",
64#endif 65#endif
65#if USE_XIM 66#if USE_XIM
66 "WM_LOCALE_NAME", 67 "WM_LOCALE_NAME",
67 "XIM_SERVERS", 68 "XIM_SERVERS",
68#endif 69#endif
69#ifdef TRANSPARENT 70#ifdef ENABLE_TRANSPARENCY
70 "_XROOTPMAP_ID", 71 "_XROOTPMAP_ID",
71 "ESETROOT_PMAP_ID", 72 "ESETROOT_PMAP_ID",
72#endif 73#endif
73#if ENABLE_XEMBED 74#if ENABLE_XEMBED
74 "_XEMBED", 75 "_XEMBED",
… …
183 184
184 XIMCallback ximcallback; 185 XIMCallback ximcallback;
185 ximcallback.client_data = (XPointer)this; 186 ximcallback.client_data = (XPointer)this;
186 ximcallback.callback = im_destroy_cb; 187 ximcallback.callback = im_destroy_cb;
187 188
188 XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0); 189 XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
189 190
190 return true; 191 return true;
191} 192}
192 193
193rxvt_xim::~rxvt_xim () 194rxvt_xim::~rxvt_xim ()
… …
226{ 227{
227} 228}
228 229
229rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h) 230rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h)
230{ 231{
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*/) 232 if (!scratch_area || w > scratch_w || h > scratch_h)
235 { 233 {
236 if (scratch_area) 234 if (scratch_area)
237 { 235 {
238 XFreePixmap (dpy, scratch_area->drawable); 236 XFreePixmap (dpy, scratch_area->drawable);
239 delete scratch_area; 237 delete scratch_area;
… …
295 293
296///////////////////////////////////////////////////////////////////////////// 294/////////////////////////////////////////////////////////////////////////////
297 295
298rxvt_display::rxvt_display (const char *id) 296rxvt_display::rxvt_display (const char *id)
299: refcounted (id) 297: refcounted (id)
300, x_ev (this, &rxvt_display::x_cb)
301, selection_owner (0) 298, selection_owner (0)
299, clipboard_owner (0)
302{ 300{
301 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
302 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
303} 303}
304 304
305XrmDatabase 305XrmDatabase
306rxvt_display::get_resources (bool refresh) 306rxvt_display::get_resources (bool refresh)
307{ 307{
308 char *homedir = (char *)getenv ("HOME"); 308 char *homedir = getenv ("HOME");
309 char fname[1024]; 309 char fname[1024];
310 310
311 /* 311 /*
312 * get resources using the X library function 312 * get resources using the X library function
313 */ 313 */
… …
318 // as opposed to "standard practise", we always read in ~/.Xdefaults 318 // as opposed to "standard practise", we always read in ~/.Xdefaults
319 319
320 // 6. System wide per application default file. 320 // 6. System wide per application default file.
321 321
322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
323 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 323 if ((xe = getenv ("XAPPLRESDIR")))
324 { 324 {
325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
326 326
327 if ((rdb1 = XrmGetFileDatabase (fname))) 327 if ((rdb1 = XrmGetFileDatabase (fname)))
328 XrmMergeDatabases (rdb1, &database); 328 XrmMergeDatabases (rdb1, &database);
… …
359 XA_STRING, &actual_type, &actual_format, 359 XA_STRING, &actual_type, &actual_format,
360 &nitems, &nremaining, 360 &nitems, &nremaining,
361 (unsigned char **)&val) == Success 361 (unsigned char **)&val) == Success
362 && actual_type == XA_STRING 362 && actual_type == XA_STRING
363 && actual_format == 8) 363 && actual_format == 8)
364 displayResource = val; 364 displayResource = val;
365 else 365 else
366 { 366 {
367 displayResource = 0; 367 displayResource = 0;
368 368
369 if (val) 369 if (val)
370 XFree(val); 370 XFree (val);
371 } 371 }
372 372
373#if XLIB_ILLEGAL_ACCESS 373#if XLIB_ILLEGAL_ACCESS
374 dpy->xdefaults = displayResource; 374 dpy->xdefaults = displayResource;
375#endif 375#endif
376 } 376 }
… …
400 XFree (displayResource); 400 XFree (displayResource);
401 } 401 }
402 402
403 // 3. User's per host defaults file 403 // 3. User's per host defaults file
404 /* Add in XENVIRONMENT file */ 404 /* Add in XENVIRONMENT file */
405 if ((xe = (char *)getenv ("XENVIRONMENT")) 405 if ((xe = getenv ("XENVIRONMENT"))
406 && (rdb1 = XrmGetFileDatabase (xe))) 406 && (rdb1 = XrmGetFileDatabase (xe)))
407 XrmMergeDatabases (rdb1, &database); 407 XrmMergeDatabases (rdb1, &database);
408 else if (homedir) 408 else if (homedir)
409 { 409 {
410 struct utsname un; 410 struct utsname un;
… …
424bool rxvt_display::ref_init () 424bool rxvt_display::ref_init ()
425{ 425{
426#ifdef LOCAL_X_IS_UNIX 426#ifdef LOCAL_X_IS_UNIX
427 if (id[0] == ':') 427 if (id[0] == ':')
428 { 428 {
429 val = rxvt_malloc (5 + strlen (id) + 1); 429 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
430 return false;
430 strcpy (val, "unix/"); 431 strcpy (val, "unix/");
431 strcat (val, id); 432 strcat (val, id);
432 dpy = XOpenDisplay (val); 433 dpy = XOpenDisplay (val);
433 free (val);
434 } 434 }
435 else 435 else
436#endif 436#endif
437 dpy = 0; 437 dpy = 0;
438 438
… …
443 return false; 443 return false;
444 444
445 screen = DefaultScreen (dpy); 445 screen = DefaultScreen (dpy);
446 root = DefaultRootWindow (dpy); 446 root = DefaultRootWindow (dpy);
447 447
448#ifdef HAVE_AFTERIMAGE 448 assert (ARRAY_LENGTH(xa_names) == NUM_XA);
449 ::dpy = dpy; /* init global var from libAfter... */
450 asv = create_asvisual_for_id (dpy, screen, DefaultDepth (dpy,screen),
451 XVisualIDFromVisual (DefaultVisual (dpy, screen)), None, NULL);
452#endif
453
454 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
455 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 449 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
456 450
457 XrmSetDatabase (dpy, get_resources (false)); 451 XrmSetDatabase (dpy, get_resources (false));
458 452
459#ifdef POINTER_BLANK 453#ifdef POINTER_BLANK
… …
467 XUnloadFont (dpy, f); 461 XUnloadFont (dpy, f);
468#endif 462#endif
469 463
470 int fd = XConnectionNumber (dpy); 464 int fd = XConnectionNumber (dpy);
471 465
472 // try to detect wether we have a local connection. 466 // try to detect whether we have a local connection.
473 // assume unix domains socket == local, everything else not 467 // assume unix domain socket == local, everything else not
474 // TODO: might want to check for inet/127.0.0.1 468 // TODO: might want to check for inet/127.0.0.1
475 is_local = 0; 469 is_local = 0;
476 sockaddr_un sa; 470 sockaddr_un sa;
477 socklen_t sl = sizeof (sa); 471 socklen_t sl = sizeof (sa);
478 472
479 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 473 if (!getsockname (fd, (sockaddr *)&sa, &sl))
480 is_local = sa.sun_family == AF_UNIX; 474 is_local = sa.sun_family == AF_UNIX;
481 475
476 flush_ev.start ();
482 x_ev.start (fd, EVENT_READ); 477 x_ev.start (fd, ev::READ);
483 fcntl (fd, F_SETFD, FD_CLOEXEC); 478 fcntl (fd, F_SETFD, FD_CLOEXEC);
484 479
485 XSelectInput (dpy, root, PropertyChangeMask); 480 XSelectInput (dpy, root, PropertyChangeMask);
486 481
487 flush (); 482 flush ();
… …
490} 485}
491 486
492void 487void
493rxvt_display::ref_next () 488rxvt_display::ref_next ()
494{ 489{
495 // TODO: somehow check wether the database files/resources changed 490 // TODO: somehow check whether the database files/resources changed
496 // before affording re-loading/parsing 491 // before affording re-loading/parsing
497 XrmDestroyDatabase (XrmGetDatabase (dpy)); 492 XrmDestroyDatabase (XrmGetDatabase (dpy));
498 XrmSetDatabase (dpy, get_resources (true)); 493 XrmSetDatabase (dpy, get_resources (true));
499} 494}
500 495
… …
505 500
506#ifdef POINTER_BLANK 501#ifdef POINTER_BLANK
507 XFreeCursor (dpy, blank_cursor); 502 XFreeCursor (dpy, blank_cursor);
508#endif 503#endif
509 x_ev.stop (); 504 x_ev.stop ();
505 flush_ev.stop ();
510#ifdef USE_XIM 506#ifdef USE_XIM
511 xims.clear (); 507 xims.clear ();
512#endif 508#endif
509 XrmDestroyDatabase (XrmGetDatabase (dpy));
513 XCloseDisplay (dpy); 510 XCloseDisplay (dpy);
514} 511}
515 512
516#ifdef USE_XIM 513#ifdef USE_XIM
517void rxvt_display::im_change_cb () 514void rxvt_display::im_change_cb ()
… …
529 unsigned long nitems, bytes_after; 526 unsigned long nitems, bytes_after;
530 527
531 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 528 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
532 False, XA_ATOM, &actual_type, &actual_format, 529 False, XA_ATOM, &actual_type, &actual_format,
533 &nitems, &bytes_after, (unsigned char **)&atoms) 530 &nitems, &bytes_after, (unsigned char **)&atoms)
534 != Success ) 531 != Success)
535 return; 532 return;
536 533
537 if (actual_type == XA_ATOM && actual_format == 32) 534 if (actual_type == XA_ATOM && actual_format == 32)
538 for (int i = 0; i < nitems; i++) 535 for (int i = 0; i < nitems; i++)
539 if (XGetSelectionOwner (dpy, atoms[i])) 536 if (XGetSelectionOwner (dpy, atoms[i]))
540 { 537 {
541 im_change_cb (); 538 im_change_cb ();
542 break; 539 break;
… …
544 541
545 XFree (atoms); 542 XFree (atoms);
546} 543}
547#endif 544#endif
548 545
549void rxvt_display::x_cb (io_watcher &w, short revents) 546void rxvt_display::x_cb (ev::io &w, int revents)
550{ 547{
548 flush_ev.start ();
549}
550
551void rxvt_display::flush_cb (ev::prepare &w, int revents)
552{
553 while (XEventsQueued (dpy, QueuedAfterFlush))
551 do 554 do
552 { 555 {
553 XEvent xev; 556 XEvent xev;
554 XNextEvent (dpy, &xev); 557 XNextEvent (dpy, &xev);
555 558
556#ifdef USE_XIM 559#ifdef USE_XIM
557 if (!XFilterEvent (&xev, None)) 560 if (!XFilterEvent (&xev, None))
558 { 561 {
559 if (xev.type == PropertyNotify 562 if (xev.type == PropertyNotify
560 && xev.xany.window == root 563 && xev.xany.window == root
561 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 564 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
562 im_change_check (); 565 im_change_check ();
563#endif 566#endif
567 if (xev.type == MappingNotify)
568 XRefreshKeyboardMapping (&xev.xmapping);
569
564 for (int i = xw.size (); i--; ) 570 for (int i = xw.size (); i--; )
565 { 571 {
566 if (!xw[i]) 572 if (!xw[i])
567 xw.erase_unordered (i); 573 xw.erase_unordered (i);
568 else if (xw[i]->window == xev.xany.window) 574 else if (xw[i]->window == xev.xany.window)
569 xw[i]->call (xev); 575 xw[i]->call (xev);
570 } 576 }
571#ifdef USE_XIM 577#ifdef USE_XIM
572 } 578 }
573#endif 579#endif
574 } 580 }
575 while (XEventsQueued (dpy, QueuedAlready)); 581 while (XEventsQueued (dpy, QueuedAlready));
576 582
577 XFlush (dpy); 583 w.stop ();
578}
579
580void rxvt_display::flush ()
581{
582 if (XEventsQueued (dpy, QueuedAlready))
583 x_cb (x_ev, EVENT_READ);
584
585 XFlush (dpy);
586} 584}
587 585
588void rxvt_display::reg (xevent_watcher *w) 586void rxvt_display::reg (xevent_watcher *w)
589{ 587{
590 if (!w->active) 588 if (!w->active)
… …
601 xw[w->active - 1] = 0; 599 xw[w->active - 1] = 0;
602 w->active = 0; 600 w->active = 0;
603 } 601 }
604} 602}
605 603
606void rxvt_display::set_selection_owner (rxvt_term *owner) 604void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
607{ 605{
606 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
607
608 if (selection_owner && selection_owner != owner) 608 if (cur_owner && cur_owner != owner)
609 selection_owner->selection_clear (); 609 {
610 rxvt_term *term = cur_owner;
611 term->selection_clear (clipboard);
612 term->flush ();
613 }
610 614
611 selection_owner = owner; 615 cur_owner = owner;
612} 616}
613 617
614#ifdef USE_XIM 618#ifdef USE_XIM
615 619
616void rxvt_display::reg (im_watcher *w) 620void rxvt_display::reg (im_watcher *w)
… …
629 int l, m; 633 int l, m;
630 634
631 l = strlen (locale); 635 l = strlen (locale);
632 m = strlen (modifiers); 636 m = strlen (modifiers);
633 637
634 if (!(id = (char *)malloc (l + m + 2))) 638 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
635 return 0; 639 return 0;
636 640
637 memcpy (id, locale, l); id[l] = '\n'; 641 memcpy (id, locale, l); id[l] = '\n';
638 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 642 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
639 643
640 rxvt_xim *xim = xims.get (id); 644 rxvt_xim *xim = xims.get (id);
641
642 free (id);
643 645
644 return xim; 646 return xim;
645} 647}
646 648
647void rxvt_display::put_xim (rxvt_xim *xim) 649void rxvt_display::put_xim (rxvt_xim *xim)
… …
669static unsigned int 671static unsigned int
670insert_component (unsigned int value, unsigned int mask, unsigned int shift) 672insert_component (unsigned int value, unsigned int mask, unsigned int shift)
671{ 673{
672 return (value * (mask + 1) >> 16) << shift; 674 return (value * (mask + 1) >> 16) << shift;
673} 675}
674 676
675bool 677bool
676rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 678rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
677{ 679{
680 //TODO: only supports 24 bit
681 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
682
678#if XFT 683#if XFT
679 XRenderPictFormat *format; 684 XRenderPictFormat *format;
680 685
681 // FUCKING Xft gets it wrong, of course, so work around it. 686 // FUCKING Xft gets it wrong, of course, so work around it.
682 // Transparency users should eat shit and die, and then 687 // Transparency users should eat shit and die, and then
… …
686 { 691 {
687 // the fun lies in doing everything manually... 692 // the fun lies in doing everything manually...
688 c.color.red = color.r; 693 c.color.red = color.r;
689 c.color.green = color.g; 694 c.color.green = color.g;
690 c.color.blue = color.b; 695 c.color.blue = color.b;
691 c.color.alpha = color.a; 696 c.color.alpha = alpha;
692 697
693 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 698 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
694 | insert_component (color.g, format->direct.greenMask, format->direct.green) 699 | insert_component (color.g, format->direct.greenMask, format->direct.green)
695 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 700 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
696 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 701 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
697 702
698 return true; 703 return true;
699 } 704 }
700 else 705 else
701 { 706 {
702 XRenderColor d; 707 XRenderColor d;
703 708
704 d.red = color.r; 709 d.red = color.r;
705 d.green = color.g; 710 d.green = color.g;
706 d.blue = color.b; 711 d.blue = color.b;
707 d.alpha = color.a; 712 d.alpha = alpha;
708 713
709 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 714 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
710 } 715 }
711#else 716#else
712 c.red = color.r; 717 c.red = color.r;
713 c.green = color.g; 718 c.green = color.g;
714 c.blue = color.b; 719 c.blue = color.b;
715 720
716 if (screen->visual->c_class == TrueColor) 721 if (screen->visual->c_class == TrueColor)
717 { 722 {
718 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask )) 723 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
719 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask)) 724 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
720 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask )); 725 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
721 726
722 return true; 727 return true;
723 } 728 }
724 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 729 else if (XAllocColor (screen->dpy, screen->cmap, &c))
725 return true; 730 return true;
… …
737{ 742{
738 rgba c; 743 rgba c;
739 char eos; 744 char eos;
740 int skip; 745 int skip;
741 746
747 c.a = rgba::MAX_CC;
748
742 // parse the nonstandard "[alphapercent]" prefix 749 // parse the nonstandard "[alphapercent]" prefix
743 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 750 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
744 { 751 {
745 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 752 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
746 name += skip; 753 name += skip;
747 } 754 }
748 else
749 c.a = rgba::MAX_CC;
750 755
751 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 756 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
752 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 757 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
753 { 758 {
754 XColor xc, xc_exact; 759 XColor xc;
755 760
756 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 761 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
757 { 762 {
758 c.r = xc.red; 763 c.r = xc.red;
759 c.g = xc.green; 764 c.g = xc.green;
… …
786 { 791 {
787 XColor *colors = new XColor [screen->visual->map_entries]; 792 XColor *colors = new XColor [screen->visual->map_entries];
788 793
789 for (int i = 0; i < cmap_size; i++) 794 for (int i = 0; i < cmap_size; i++)
790 colors [i].pixel = i; 795 colors [i].pixel = i;
791 796
792 // many kilobytes transfer per colour, but pseudocolor isn't worth 797 // many kilobytes transfer per colour, but pseudocolor isn't worth
793 // many extra optimisations. 798 // many extra optimisations.
794 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 799 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
795 800
796 int diff = 0x7fffffffUL; 801 int diff = 0x7fffffffUL;
… …
809 } 814 }
810 } 815 }
811 816
812 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 817 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
813 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 818 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
814 819
815 got = alloc (screen, rgba (best->red, best->green, best->blue)); 820 got = alloc (screen, rgba (best->red, best->green, best->blue));
816 821
817 delete [] colors; 822 delete [] colors;
818 } 823 }
819#endif 824#endif
… …
847 color.green = c.g; 852 color.green = c.g;
848 color.blue = c.b; 853 color.blue = c.b;
849 color.pixel = (Pixel)*this; 854 color.pixel = (Pixel)*this;
850} 855}
851 856
852void 857void
853rxvt_color::free (rxvt_screen *screen) 858rxvt_color::free (rxvt_screen *screen)
854{ 859{
855 if (screen->visual->c_class == TrueColor) 860 if (screen->visual->c_class == TrueColor)
856 return; // nothing to do 861 return; // nothing to do
857 862

Diff Legend

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