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.61 by root, Mon Aug 7 15:12:48 2006 UTC vs.
Revision 1.114 by root, Thu Jan 27 02:03:30 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 */
314 char *displayResource, *xe; 314 char *displayResource, *xe;
315 XrmDatabase rdb1, database = 0; 315 XrmDatabase rdb1, database = 0;
316 316
317#if !XLIB_ILLEGAL_ACCESS
318 /* work around a bug in XrmSetDatabase where it frees the db, see ref_next */
319 database = XrmGetStringDatabase ("");
320#endif
321
317 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 322 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
318 // as opposed to "standard practise", we always read in ~/.Xdefaults 323 // as opposed to "standard practise", we always read in ~/.Xdefaults
319 324
320 // 6. System wide per application default file. 325 // 6. System wide per application default file.
321 326
322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 327 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
323 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 328 if ((xe = getenv ("XAPPLRESDIR")))
324 { 329 {
325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 330 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
326 331
327 if ((rdb1 = XrmGetFileDatabase (fname))) 332 if ((rdb1 = XrmGetFileDatabase (fname)))
328 XrmMergeDatabases (rdb1, &database); 333 XrmMergeDatabases (rdb1, &database);
… …
359 XA_STRING, &actual_type, &actual_format, 364 XA_STRING, &actual_type, &actual_format,
360 &nitems, &nremaining, 365 &nitems, &nremaining,
361 (unsigned char **)&val) == Success 366 (unsigned char **)&val) == Success
362 && actual_type == XA_STRING 367 && actual_type == XA_STRING
363 && actual_format == 8) 368 && actual_format == 8)
364 displayResource = val; 369 displayResource = val;
365 else 370 else
366 { 371 {
367 displayResource = 0; 372 displayResource = 0;
368 373
369 if (val) 374 if (val)
370 XFree(val); 375 XFree (val);
371 } 376 }
372 377
373#if XLIB_ILLEGAL_ACCESS 378#if XLIB_ILLEGAL_ACCESS
374 dpy->xdefaults = displayResource; 379 dpy->xdefaults = displayResource;
375#endif 380#endif
376 } 381 }
… …
400 XFree (displayResource); 405 XFree (displayResource);
401 } 406 }
402 407
403 // 3. User's per host defaults file 408 // 3. User's per host defaults file
404 /* Add in XENVIRONMENT file */ 409 /* Add in XENVIRONMENT file */
405 if ((xe = (char *)getenv ("XENVIRONMENT")) 410 if ((xe = getenv ("XENVIRONMENT"))
406 && (rdb1 = XrmGetFileDatabase (xe))) 411 && (rdb1 = XrmGetFileDatabase (xe)))
407 XrmMergeDatabases (rdb1, &database); 412 XrmMergeDatabases (rdb1, &database);
408 else if (homedir) 413 else if (homedir)
409 { 414 {
410 struct utsname un; 415 struct utsname un;
… …
424bool rxvt_display::ref_init () 429bool rxvt_display::ref_init ()
425{ 430{
426#ifdef LOCAL_X_IS_UNIX 431#ifdef LOCAL_X_IS_UNIX
427 if (id[0] == ':') 432 if (id[0] == ':')
428 { 433 {
429 val = rxvt_malloc (5 + strlen (id) + 1); 434 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
435 return false;
430 strcpy (val, "unix/"); 436 strcpy (val, "unix/");
431 strcat (val, id); 437 strcat (val, id);
432 dpy = XOpenDisplay (val); 438 dpy = XOpenDisplay (val);
433 free (val);
434 } 439 }
435 else 440 else
436#endif 441#endif
437 dpy = 0; 442 dpy = 0;
438 443
… …
443 return false; 448 return false;
444 449
445 screen = DefaultScreen (dpy); 450 screen = DefaultScreen (dpy);
446 root = DefaultRootWindow (dpy); 451 root = DefaultRootWindow (dpy);
447 452
448 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 453 assert (ARRAY_LENGTH(xa_names) == NUM_XA);
449 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 454 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
450 455
451 XrmSetDatabase (dpy, get_resources (false)); 456 XrmSetDatabase (dpy, get_resources (false));
452 457
453#ifdef POINTER_BLANK 458#ifdef POINTER_BLANK
… …
461 XUnloadFont (dpy, f); 466 XUnloadFont (dpy, f);
462#endif 467#endif
463 468
464 int fd = XConnectionNumber (dpy); 469 int fd = XConnectionNumber (dpy);
465 470
466 // try to detect wether we have a local connection. 471 // try to detect whether we have a local connection.
467 // assume unix domains socket == local, everything else not 472 // assume unix domain socket == local, everything else not
468 // TODO: might want to check for inet/127.0.0.1 473 // TODO: might want to check for inet/127.0.0.1
469 is_local = 0; 474 is_local = 0;
470 sockaddr_un sa; 475 sockaddr_un sa;
471 socklen_t sl = sizeof (sa); 476 socklen_t sl = sizeof (sa);
472 477
473 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 478 if (!getsockname (fd, (sockaddr *)&sa, &sl))
474 is_local = sa.sun_family == AF_LOCAL; 479 is_local = sa.sun_family == AF_UNIX;
475 480
481 flush_ev.start ();
476 x_ev.start (fd, EVENT_READ); 482 x_ev.start (fd, ev::READ);
477 fcntl (fd, F_SETFD, FD_CLOEXEC); 483 fcntl (fd, F_SETFD, FD_CLOEXEC);
478 484
479 XSelectInput (dpy, root, PropertyChangeMask); 485 XSelectInput (dpy, root, PropertyChangeMask);
480 486
481 flush (); 487 flush ();
… …
484} 490}
485 491
486void 492void
487rxvt_display::ref_next () 493rxvt_display::ref_next ()
488{ 494{
489 // TODO: somehow check wether the database files/resources changed 495 // TODO: somehow check whether the database files/resources changed
490 // before affording re-loading/parsing 496 // before affording re-loading/parsing
491 XrmDestroyDatabase (XrmGetDatabase (dpy)); 497 XrmDestroyDatabase (XrmGetDatabase (dpy));
498#if XLIB_ILLEGAL_ACCESS
499 /* work around a bug in XrmSetDatabase where it frees the db */
500 dpy->db = 0;
501#endif
492 XrmSetDatabase (dpy, get_resources (true)); 502 XrmSetDatabase (dpy, get_resources (true));
493} 503}
494 504
495rxvt_display::~rxvt_display () 505rxvt_display::~rxvt_display ()
496{ 506{
… …
499 509
500#ifdef POINTER_BLANK 510#ifdef POINTER_BLANK
501 XFreeCursor (dpy, blank_cursor); 511 XFreeCursor (dpy, blank_cursor);
502#endif 512#endif
503 x_ev.stop (); 513 x_ev.stop ();
514 flush_ev.stop ();
504#ifdef USE_XIM 515#ifdef USE_XIM
505 xims.clear (); 516 xims.clear ();
506#endif 517#endif
518 XrmDestroyDatabase (XrmGetDatabase (dpy));
507 XCloseDisplay (dpy); 519 XCloseDisplay (dpy);
508} 520}
509 521
510#ifdef USE_XIM 522#ifdef USE_XIM
511void rxvt_display::im_change_cb () 523void rxvt_display::im_change_cb ()
… …
523 unsigned long nitems, bytes_after; 535 unsigned long nitems, bytes_after;
524 536
525 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 537 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
526 False, XA_ATOM, &actual_type, &actual_format, 538 False, XA_ATOM, &actual_type, &actual_format,
527 &nitems, &bytes_after, (unsigned char **)&atoms) 539 &nitems, &bytes_after, (unsigned char **)&atoms)
528 != Success ) 540 != Success)
529 return; 541 return;
530 542
531 if (actual_type == XA_ATOM && actual_format == 32) 543 if (actual_type == XA_ATOM && actual_format == 32)
532 for (int i = 0; i < nitems; i++) 544 for (int i = 0; i < nitems; i++)
533 if (XGetSelectionOwner (dpy, atoms[i])) 545 if (XGetSelectionOwner (dpy, atoms[i]))
534 { 546 {
535 im_change_cb (); 547 im_change_cb ();
536 break; 548 break;
… …
538 550
539 XFree (atoms); 551 XFree (atoms);
540} 552}
541#endif 553#endif
542 554
543void rxvt_display::x_cb (io_watcher &w, short revents) 555void rxvt_display::x_cb (ev::io &w, int revents)
544{ 556{
557 flush_ev.start ();
558}
559
560void rxvt_display::flush_cb (ev::prepare &w, int revents)
561{
562 while (XEventsQueued (dpy, QueuedAfterFlush))
545 do 563 do
546 { 564 {
547 XEvent xev; 565 XEvent xev;
548 XNextEvent (dpy, &xev); 566 XNextEvent (dpy, &xev);
549 567
550#ifdef USE_XIM 568#ifdef USE_XIM
551 if (!XFilterEvent (&xev, None)) 569 if (!XFilterEvent (&xev, None))
552 { 570 {
553 if (xev.type == PropertyNotify 571 if (xev.type == PropertyNotify
554 && xev.xany.window == root 572 && xev.xany.window == root
555 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 573 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
556 im_change_check (); 574 im_change_check ();
557#endif 575#endif
576 if (xev.type == MappingNotify)
577 XRefreshKeyboardMapping (&xev.xmapping);
578
558 for (int i = xw.size (); i--; ) 579 for (int i = xw.size (); i--; )
559 { 580 {
560 if (!xw[i]) 581 if (!xw[i])
561 xw.erase_unordered (i); 582 xw.erase_unordered (i);
562 else if (xw[i]->window == xev.xany.window) 583 else if (xw[i]->window == xev.xany.window)
563 xw[i]->call (xev); 584 xw[i]->call (xev);
564 } 585 }
565#ifdef USE_XIM 586#ifdef USE_XIM
566 } 587 }
567#endif 588#endif
568 } 589 }
569 while (XEventsQueued (dpy, QueuedAlready)); 590 while (XEventsQueued (dpy, QueuedAlready));
570 591
571 XFlush (dpy); 592 w.stop ();
572}
573
574void rxvt_display::flush ()
575{
576 if (XEventsQueued (dpy, QueuedAlready))
577 x_cb (x_ev, EVENT_READ);
578
579 XFlush (dpy);
580} 593}
581 594
582void rxvt_display::reg (xevent_watcher *w) 595void rxvt_display::reg (xevent_watcher *w)
583{ 596{
584 if (!w.active) 597 if (!w->active)
585 { 598 {
586 xw.push_back (w); 599 xw.push_back (w);
587 w->active = xw.size (); 600 w->active = xw.size ();
588 } 601 }
589} 602}
… …
595 xw[w->active - 1] = 0; 608 xw[w->active - 1] = 0;
596 w->active = 0; 609 w->active = 0;
597 } 610 }
598} 611}
599 612
600void rxvt_display::set_selection_owner (rxvt_term *owner) 613void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
601{ 614{
615 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
616
602 if (selection_owner && selection_owner != owner) 617 if (cur_owner && cur_owner != owner)
603 selection_owner->selection_clear (); 618 {
619 rxvt_term *term = cur_owner;
620 term->selection_clear (clipboard);
621 term->flush ();
622 }
604 623
605 selection_owner = owner; 624 cur_owner = owner;
606} 625}
607 626
608#ifdef USE_XIM 627#ifdef USE_XIM
609 628
610void rxvt_display::reg (im_watcher *w) 629void rxvt_display::reg (im_watcher *w)
… …
623 int l, m; 642 int l, m;
624 643
625 l = strlen (locale); 644 l = strlen (locale);
626 m = strlen (modifiers); 645 m = strlen (modifiers);
627 646
628 if (!(id = (char *)malloc (l + m + 2))) 647 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
629 return 0; 648 return 0;
630 649
631 memcpy (id, locale, l); id[l] = '\n'; 650 memcpy (id, locale, l); id[l] = '\n';
632 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 651 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
633 652
634 rxvt_xim *xim = xims.get (id); 653 rxvt_xim *xim = xims.get (id);
635
636 free (id);
637 654
638 return xim; 655 return xim;
639} 656}
640 657
641void rxvt_display::put_xim (rxvt_xim *xim) 658void rxvt_display::put_xim (rxvt_xim *xim)
… …
663static unsigned int 680static unsigned int
664insert_component (unsigned int value, unsigned int mask, unsigned int shift) 681insert_component (unsigned int value, unsigned int mask, unsigned int shift)
665{ 682{
666 return (value * (mask + 1) >> 16) << shift; 683 return (value * (mask + 1) >> 16) << shift;
667} 684}
668 685
669bool 686bool
670rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 687rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
671{ 688{
689 //TODO: only supports 24 bit
690 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
691
672#if XFT 692#if XFT
673 XRenderPictFormat *format; 693 XRenderPictFormat *format;
674 694
675 // FUCKING Xft gets it wrong, of course, so work around it. 695 // FUCKING Xft gets it wrong, of course, so work around it.
676 // Transparency users should eat shit and die, and then 696 // Transparency users should eat shit and die, and then
… …
680 { 700 {
681 // the fun lies in doing everything manually... 701 // the fun lies in doing everything manually...
682 c.color.red = color.r; 702 c.color.red = color.r;
683 c.color.green = color.g; 703 c.color.green = color.g;
684 c.color.blue = color.b; 704 c.color.blue = color.b;
685 c.color.alpha = color.a; 705 c.color.alpha = alpha;
686 706
687 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 707 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
688 | insert_component (color.g, format->direct.greenMask, format->direct.green) 708 | insert_component (color.g, format->direct.greenMask, format->direct.green)
689 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 709 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
690 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 710 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
691 711
692 return true; 712 return true;
693 } 713 }
694 else 714 else
695 { 715 {
696 XRenderColor d; 716 XRenderColor d;
697 717
698 d.red = color.r; 718 d.red = color.r;
699 d.green = color.g; 719 d.green = color.g;
700 d.blue = color.b; 720 d.blue = color.b;
701 d.alpha = color.a; 721 d.alpha = alpha;
702 722
703 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 723 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
704 } 724 }
705#else 725#else
706 c.red = color.r; 726 c.red = color.r;
707 c.green = color.g; 727 c.green = color.g;
708 c.blue = color.b; 728 c.blue = color.b;
709 729
710 if (screen->visual->c_class == TrueColor) 730 if (screen->visual->c_class == TrueColor)
711 { 731 {
712 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 732 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
713 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 733 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
714 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
715 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
716 | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask )) 734 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
717 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
718 735
719 return true; 736 return true;
720 } 737 }
721 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 738 else if (XAllocColor (screen->dpy, screen->cmap, &c))
722 return true; 739 return true;
… …
734{ 751{
735 rgba c; 752 rgba c;
736 char eos; 753 char eos;
737 int skip; 754 int skip;
738 755
756 c.a = rgba::MAX_CC;
757
739 // parse the nonstandard "[alphapercent]" prefix 758 // parse the nonstandard "[alphapercent]" prefix
740 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 759 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
741 { 760 {
742 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 761 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
743 name += skip; 762 name += skip;
744 } 763 }
745 else
746 c.a = rgba::MAX_CC;
747 764
748 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 765 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
749 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 766 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
750 { 767 {
751 XColor xc, xc_exact; 768 XColor xc;
752 769
753 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 770 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
754 { 771 {
755 c.r = xc.red; 772 c.r = xc.red;
756 c.g = xc.green; 773 c.g = xc.green;
… …
783 { 800 {
784 XColor *colors = new XColor [screen->visual->map_entries]; 801 XColor *colors = new XColor [screen->visual->map_entries];
785 802
786 for (int i = 0; i < cmap_size; i++) 803 for (int i = 0; i < cmap_size; i++)
787 colors [i].pixel = i; 804 colors [i].pixel = i;
788 805
789 // many kilobytes transfer per colour, but pseudocolor isn't worth 806 // many kilobytes transfer per colour, but pseudocolor isn't worth
790 // many extra optimisations. 807 // many extra optimisations.
791 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 808 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
792 809
793 int diff = 0x7fffffffUL; 810 int diff = 0x7fffffffUL;
… …
806 } 823 }
807 } 824 }
808 825
809 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 826 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
810 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 827 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
811 828
812 got = alloc (screen, rgba (best->red, best->green, best->blue)); 829 got = alloc (screen, rgba (best->red, best->green, best->blue));
813 830
814 delete colors; 831 delete [] colors;
815 } 832 }
816#endif 833#endif
817 834
818 return got; 835 return got;
819} 836}
… …
844 color.green = c.g; 861 color.green = c.g;
845 color.blue = c.b; 862 color.blue = c.b;
846 color.pixel = (Pixel)*this; 863 color.pixel = (Pixel)*this;
847} 864}
848 865
849void 866void
850rxvt_color::free (rxvt_screen *screen) 867rxvt_color::free (rxvt_screen *screen)
851{ 868{
852 if (screen->visual->c_class == TrueColor) 869 if (screen->visual->c_class == TrueColor)
853 return; // nothing to do 870 return; // nothing to do
854 871

Diff Legend

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