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.51 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.110 by sf-exg, Tue Dec 14 08:01:51 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 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-2004 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.
… …
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> 30#include <sys/utsname.h>
31
32#ifndef NO_SLOW_LINK_SUPPORT
33# include <sys/socket.h> 31#include <sys/socket.h>
34# include <sys/un.h> 32#include <sys/un.h>
35#endif
36 33
37#if XFT 34#if XFT
38# include <X11/extensions/Xrender.h> 35# include <X11/extensions/Xrender.h>
39#endif 36#endif
40 37
41const char *const xa_names[] = 38static const char *const xa_names[] =
42{ 39{
43 "TEXT", 40 "TEXT",
44 "COMPOUND_TEXT", 41 "COMPOUND_TEXT",
45 "UTF8_STRING", 42 "UTF8_STRING",
46 "MULTIPLE", 43 "MULTIPLE",
… …
62#if ENABLE_EWMH 59#if ENABLE_EWMH
63 "_NET_WM_PID", 60 "_NET_WM_PID",
64 "_NET_WM_NAME", 61 "_NET_WM_NAME",
65 "_NET_WM_ICON_NAME", 62 "_NET_WM_ICON_NAME",
66 "_NET_WM_PING", 63 "_NET_WM_PING",
64 "_NET_WM_ICON",
67#endif 65#endif
68#if USE_XIM 66#if USE_XIM
69 "WM_LOCALE_NAME", 67 "WM_LOCALE_NAME",
70 "XIM_SERVERS", 68 "XIM_SERVERS",
71#endif 69#endif
72#ifdef TRANSPARENT 70#ifdef ENABLE_TRANSPARENCY
73 "_XROOTPMAP_ID", 71 "_XROOTPMAP_ID",
74 "ESETROOT_PMAP_ID", 72 "ESETROOT_PMAP_ID",
75#endif 73#endif
76#if ENABLE_XEMBED 74#if ENABLE_XEMBED
77 "_XEMBED", 75 "_XEMBED",
… …
186 184
187 XIMCallback ximcallback; 185 XIMCallback ximcallback;
188 ximcallback.client_data = (XPointer)this; 186 ximcallback.client_data = (XPointer)this;
189 ximcallback.callback = im_destroy_cb; 187 ximcallback.callback = im_destroy_cb;
190 188
191 XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0); 189 XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
192 190
193 return true; 191 return true;
194} 192}
195 193
196rxvt_xim::~rxvt_xim () 194rxvt_xim::~rxvt_xim ()
… …
265 visual = DefaultVisualOfScreen (screen); 263 visual = DefaultVisualOfScreen (screen);
266 cmap = DefaultColormapOfScreen (screen); 264 cmap = DefaultColormapOfScreen (screen);
267} 265}
268 266
269void 267void
270rxvt_screen::set (rxvt_display *disp, int bitdepth) 268rxvt_screen::select_visual (int bitdepth)
271{ 269{
272 set (disp);
273
274#if XFT 270#if XFT
275 XVisualInfo vinfo; 271 XVisualInfo vinfo;
276 272
277 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo)) 273 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
278 { 274 {
279 depth = bitdepth; 275 depth = bitdepth;
280 visual = vinfo.visual; 276 visual = vinfo.visual;
281 cmap = XCreateColormap (dpy, disp->root, visual, AllocNone); 277 cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
282 } 278 }
283#endif 279#endif
284} 280}
285 281
286void 282void
… …
300 296
301///////////////////////////////////////////////////////////////////////////// 297/////////////////////////////////////////////////////////////////////////////
302 298
303rxvt_display::rxvt_display (const char *id) 299rxvt_display::rxvt_display (const char *id)
304: refcounted (id) 300: refcounted (id)
305, x_ev (this, &rxvt_display::x_cb)
306, selection_owner (0) 301, selection_owner (0)
302, clipboard_owner (0)
307{ 303{
304 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
305 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
308} 306}
309 307
310XrmDatabase 308XrmDatabase
311rxvt_display::get_resources (bool refresh) 309rxvt_display::get_resources (bool refresh)
312{ 310{
313 char *homedir = (char *)getenv ("HOME"); 311 char *homedir = getenv ("HOME");
314 char fname[1024]; 312 char fname[1024];
315 313
316 /* 314 /*
317 * get resources using the X library function 315 * get resources using the X library function
318 */ 316 */
319 char *displayResource, *xe; 317 char *displayResource, *xe;
320 XrmDatabase rdb1, database = 0; 318 XrmDatabase rdb1, database = 0;
321 319
322 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 320 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
321 // as opposed to "standard practise", we always read in ~/.Xdefaults
323 322
324 // 6. System wide per application default file. 323 // 6. System wide per application default file.
325 324
326 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 325 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
327 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 326 if ((xe = getenv ("XAPPLRESDIR")))
328 { 327 {
329 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 328 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
330 329
331 if ((rdb1 = XrmGetFileDatabase (fname))) 330 if ((rdb1 = XrmGetFileDatabase (fname)))
332 XrmMergeDatabases (rdb1, &database); 331 XrmMergeDatabases (rdb1, &database);
… …
334 333
335 // 5. User's per application default file. 334 // 5. User's per application default file.
336 // none 335 // none
337 336
338 // 4. User's defaults file. 337 // 4. User's defaults file.
338 if (homedir)
339 {
340 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
341
342 if ((rdb1 = XrmGetFileDatabase (fname)))
343 XrmMergeDatabases (rdb1, &database);
344 }
345
339 /* Get any Xserver defaults */ 346 /* Get any Xserver defaults */
340 if (refresh) 347 if (refresh)
341 { 348 {
342 // fucking xlib keeps a copy of the rm string 349 // fucking xlib keeps a copy of the rm string
343 Atom actual_type; 350 Atom actual_type;
… …
348#if XLIB_ILLEGAL_ACCESS 355#if XLIB_ILLEGAL_ACCESS
349 if (dpy->xdefaults) 356 if (dpy->xdefaults)
350 XFree (dpy->xdefaults); 357 XFree (dpy->xdefaults);
351#endif 358#endif
352 359
353 if (XGetWindowProperty (dpy, root, XA_RESOURCE_MANAGER, 360 if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER,
354 0L, 100000000L, False, 361 0L, 100000000L, False,
355 XA_STRING, &actual_type, &actual_format, 362 XA_STRING, &actual_type, &actual_format,
356 &nitems, &nremaining, 363 &nitems, &nremaining,
357 (unsigned char **)&val) == Success 364 (unsigned char **)&val) == Success
358 && actual_type == XA_STRING 365 && actual_type == XA_STRING
359 && actual_format == 8) 366 && actual_format == 8)
360 displayResource = val; 367 displayResource = val;
361 else 368 else
362 { 369 {
363 displayResource = 0; 370 displayResource = 0;
371
364 if (val) 372 if (val)
365 XFree(val); 373 XFree (val);
366 } 374 }
367 375
368#if XLIB_ILLEGAL_ACCESS 376#if XLIB_ILLEGAL_ACCESS
369 dpy->xdefaults = displayResource; 377 dpy->xdefaults = displayResource;
370#endif 378#endif
371 } 379 }
… …
373 displayResource = XResourceManagerString (dpy); 381 displayResource = XResourceManagerString (dpy);
374 382
375 if (displayResource) 383 if (displayResource)
376 { 384 {
377 if ((rdb1 = XrmGetStringDatabase (displayResource))) 385 if ((rdb1 = XrmGetStringDatabase (displayResource)))
378 XrmMergeDatabases (rdb1, &database);
379 }
380 else if (homedir)
381 {
382 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
383
384 if ((rdb1 = XrmGetFileDatabase (fname)))
385 XrmMergeDatabases (rdb1, &database); 386 XrmMergeDatabases (rdb1, &database);
386 } 387 }
387 388
388#if !XLIB_ILLEGAL_ACCESS 389#if !XLIB_ILLEGAL_ACCESS
389 if (refresh && displayResource) 390 if (refresh && displayResource)
… …
402 XFree (displayResource); 403 XFree (displayResource);
403 } 404 }
404 405
405 // 3. User's per host defaults file 406 // 3. User's per host defaults file
406 /* Add in XENVIRONMENT file */ 407 /* Add in XENVIRONMENT file */
407 if ((xe = (char *)getenv ("XENVIRONMENT")) 408 if ((xe = getenv ("XENVIRONMENT"))
408 && (rdb1 = XrmGetFileDatabase (xe))) 409 && (rdb1 = XrmGetFileDatabase (xe)))
409 XrmMergeDatabases (rdb1, &database); 410 XrmMergeDatabases (rdb1, &database);
410 else if (homedir) 411 else if (homedir)
411 { 412 {
412 struct utsname un; 413 struct utsname un;
… …
426bool rxvt_display::ref_init () 427bool rxvt_display::ref_init ()
427{ 428{
428#ifdef LOCAL_X_IS_UNIX 429#ifdef LOCAL_X_IS_UNIX
429 if (id[0] == ':') 430 if (id[0] == ':')
430 { 431 {
431 val = rxvt_malloc (5 + strlen (id) + 1); 432 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
433 return false;
432 strcpy (val, "unix/"); 434 strcpy (val, "unix/");
433 strcat (val, id); 435 strcat (val, id);
434 dpy = XOpenDisplay (val); 436 dpy = XOpenDisplay (val);
435 free (val);
436 } 437 }
437 else 438 else
438#endif 439#endif
439 dpy = 0; 440 dpy = 0;
440 441
… …
463 XUnloadFont (dpy, f); 464 XUnloadFont (dpy, f);
464#endif 465#endif
465 466
466 int fd = XConnectionNumber (dpy); 467 int fd = XConnectionNumber (dpy);
467 468
468#ifndef NO_SLOW_LINK_SUPPORT
469 // try to detect wether we have a local connection. 469 // try to detect whether we have a local connection.
470 // assume unix domains socket == local, everything else not 470 // assume unix domain socket == local, everything else not
471 // TODO: might want to check for inet/127.0.0.1 471 // TODO: might want to check for inet/127.0.0.1
472 is_local = 0; 472 is_local = 0;
473 sockaddr_un sa; 473 sockaddr_un sa;
474 socklen_t sl = sizeof (sa); 474 socklen_t sl = sizeof (sa);
475 475
476 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 476 if (!getsockname (fd, (sockaddr *)&sa, &sl))
477 is_local = sa.sun_family == AF_LOCAL; 477 is_local = sa.sun_family == AF_UNIX;
478#endif
479 478
479 flush_ev.start ();
480 x_ev.start (fd, EVENT_READ); 480 x_ev.start (fd, ev::READ);
481 fcntl (fd, F_SETFD, FD_CLOEXEC); 481 fcntl (fd, F_SETFD, FD_CLOEXEC);
482 482
483 XSelectInput (dpy, root, PropertyChangeMask); 483 XSelectInput (dpy, root, PropertyChangeMask);
484 484
485 flush (); 485 flush ();
… …
488} 488}
489 489
490void 490void
491rxvt_display::ref_next () 491rxvt_display::ref_next ()
492{ 492{
493 // TODO: somehow check wether the database files/resources changed 493 // TODO: somehow check whether the database files/resources changed
494 // before affording re-loading/parsing 494 // before affording re-loading/parsing
495 XrmDestroyDatabase (XrmGetDatabase (dpy)); 495 XrmDestroyDatabase (XrmGetDatabase (dpy));
496 XrmSetDatabase (dpy, get_resources (true)); 496 XrmSetDatabase (dpy, get_resources (true));
497} 497}
498 498
… …
503 503
504#ifdef POINTER_BLANK 504#ifdef POINTER_BLANK
505 XFreeCursor (dpy, blank_cursor); 505 XFreeCursor (dpy, blank_cursor);
506#endif 506#endif
507 x_ev.stop (); 507 x_ev.stop ();
508 flush_ev.stop ();
508#ifdef USE_XIM 509#ifdef USE_XIM
509 xims.clear (); 510 xims.clear ();
510#endif 511#endif
511 XCloseDisplay (dpy); 512 XCloseDisplay (dpy);
512} 513}
… …
527 unsigned long nitems, bytes_after; 528 unsigned long nitems, bytes_after;
528 529
529 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 530 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
530 False, XA_ATOM, &actual_type, &actual_format, 531 False, XA_ATOM, &actual_type, &actual_format,
531 &nitems, &bytes_after, (unsigned char **)&atoms) 532 &nitems, &bytes_after, (unsigned char **)&atoms)
532 != Success ) 533 != Success)
533 return; 534 return;
534 535
535 if (actual_type == XA_ATOM && actual_format == 32) 536 if (actual_type == XA_ATOM && actual_format == 32)
536 for (int i = 0; i < nitems; i++) 537 for (int i = 0; i < nitems; i++)
537 if (XGetSelectionOwner (dpy, atoms[i])) 538 if (XGetSelectionOwner (dpy, atoms[i]))
538 { 539 {
539 im_change_cb (); 540 im_change_cb ();
540 break; 541 break;
… …
542 543
543 XFree (atoms); 544 XFree (atoms);
544} 545}
545#endif 546#endif
546 547
547void rxvt_display::x_cb (io_watcher &w, short revents) 548void rxvt_display::x_cb (ev::io &w, int revents)
548{ 549{
550 flush_ev.start ();
551}
552
553void rxvt_display::flush_cb (ev::prepare &w, int revents)
554{
555 while (XEventsQueued (dpy, QueuedAfterFlush))
549 do 556 do
550 { 557 {
551 XEvent xev; 558 XEvent xev;
552 XNextEvent (dpy, &xev); 559 XNextEvent (dpy, &xev);
553 560
554#ifdef USE_XIM 561#ifdef USE_XIM
555 if (!XFilterEvent (&xev, None)) 562 if (!XFilterEvent (&xev, None))
556 { 563 {
557 if (xev.type == PropertyNotify 564 if (xev.type == PropertyNotify
558 && xev.xany.window == root 565 && xev.xany.window == root
559 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 566 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
560 im_change_check (); 567 im_change_check ();
561#endif 568#endif
569 if (xev.type == MappingNotify)
570 XRefreshKeyboardMapping (&xev.xmapping);
571
562 for (int i = xw.size (); i--; ) 572 for (int i = xw.size (); i--; )
563 { 573 {
564 if (!xw[i]) 574 if (!xw[i])
565 xw.erase_unordered (i); 575 xw.erase_unordered (i);
566 else if (xw[i]->window == xev.xany.window) 576 else if (xw[i]->window == xev.xany.window)
567 xw[i]->call (xev); 577 xw[i]->call (xev);
568 } 578 }
569#ifdef USE_XIM 579#ifdef USE_XIM
570 } 580 }
571#endif 581#endif
572 } 582 }
573 while (XEventsQueued (dpy, QueuedAlready)); 583 while (XEventsQueued (dpy, QueuedAlready));
574 584
575 XFlush (dpy); 585 w.stop ();
576}
577
578void rxvt_display::flush ()
579{
580 if (XEventsQueued (dpy, QueuedAlready))
581 x_cb (x_ev, EVENT_READ);
582
583 XFlush (dpy);
584} 586}
585 587
586void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
587{ 589{
590 if (!w->active)
591 {
588 xw.push_back (w); 592 xw.push_back (w);
589 w->active = xw.size (); 593 w->active = xw.size ();
594 }
590} 595}
591 596
592void rxvt_display::unreg (xevent_watcher *w) 597void rxvt_display::unreg (xevent_watcher *w)
593{ 598{
594 if (w->active) 599 if (w->active)
600 {
595 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
602 w->active = 0;
603 }
596} 604}
597 605
598void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
599{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
600 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
601 selection_owner->selection_clear (); 611 {
612 rxvt_term *term = cur_owner;
613 term->selection_clear (clipboard);
614 term->flush ();
615 }
602 616
603 selection_owner = owner; 617 cur_owner = owner;
604} 618}
605 619
606#ifdef USE_XIM 620#ifdef USE_XIM
607 621
608void rxvt_display::reg (im_watcher *w) 622void rxvt_display::reg (im_watcher *w)
… …
621 int l, m; 635 int l, m;
622 636
623 l = strlen (locale); 637 l = strlen (locale);
624 m = strlen (modifiers); 638 m = strlen (modifiers);
625 639
626 if (!(id = (char *)malloc (l + m + 2))) 640 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
627 return 0; 641 return 0;
628 642
629 memcpy (id, locale, l); id[l] = '\n'; 643 memcpy (id, locale, l); id[l] = '\n';
630 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 644 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
631 645
632 rxvt_xim *xim = xims.get (id); 646 rxvt_xim *xim = xims.get (id);
633
634 free (id);
635 647
636 return xim; 648 return xim;
637} 649}
638 650
639void rxvt_display::put_xim (rxvt_xim *xim) 651void rxvt_display::put_xim (rxvt_xim *xim)
… …
654 666
655template class refcache<rxvt_display>; 667template class refcache<rxvt_display>;
656refcache<rxvt_display> displays; 668refcache<rxvt_display> displays;
657 669
658///////////////////////////////////////////////////////////////////////////// 670/////////////////////////////////////////////////////////////////////////////
659 671//
672
673static unsigned int
674insert_component (unsigned int value, unsigned int mask, unsigned int shift)
675{
676 return (value * (mask + 1) >> 16) << shift;
677}
678
660bool 679bool
661rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 680rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
662{ 681{
682 //TODO: only supports 24 bit
683 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
684
663#if XFT 685#if XFT
664 XRenderPictFormat *format; 686 XRenderPictFormat *format;
665 687
666 // FUCKING Xft gets it wrong, of course, so work around it. 688 // FUCKING Xft gets it wrong, of course, so work around it.
667 // Transparency users should eat shit and die, and then 689 // Transparency users should eat shit and die, and then
… …
671 { 693 {
672 // the fun lies in doing everything manually... 694 // the fun lies in doing everything manually...
673 c.color.red = color.r; 695 c.color.red = color.r;
674 c.color.green = color.g; 696 c.color.green = color.g;
675 c.color.blue = color.b; 697 c.color.blue = color.b;
676 c.color.alpha = color.a; 698 c.color.alpha = alpha;
677 699
678 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 700 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
679 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 701 | insert_component (color.g, format->direct.greenMask, format->direct.green)
680 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 702 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
681 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 703 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
682 704
683 return true; 705 return true;
684 } 706 }
685 else 707 else
686 { 708 {
687 XRenderColor d; 709 XRenderColor d;
688 710
689 d.red = color.r; 711 d.red = color.r;
690 d.green = color.g; 712 d.green = color.g;
691 d.blue = color.b; 713 d.blue = color.b;
692 d.alpha = color.a; 714 d.alpha = alpha;
693 715
694 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 716 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
695 } 717 }
696#else 718#else
697 c.red = color.r; 719 c.red = color.r;
698 c.green = color.g; 720 c.green = color.g;
699 c.blue = color.b; 721 c.blue = color.b;
700 722
701 if (screen->visual->c_class == TrueColor) 723 if (screen->visual->c_class == TrueColor)
702 { 724 {
703 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 725 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
704 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 726 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
705 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
706 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
707 | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask )) 727 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
708 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
709 728
710 return true; 729 return true;
711 } 730 }
712 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 731 else if (XAllocColor (screen->dpy, screen->cmap, &c))
713 return true; 732 return true;
… …
725{ 744{
726 rgba c; 745 rgba c;
727 char eos; 746 char eos;
728 int skip; 747 int skip;
729 748
749 c.a = rgba::MAX_CC;
750
730 // parse the nonstandard "[alphapercent]" prefix 751 // parse the nonstandard "[alphapercent]" prefix
731 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 752 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
732 { 753 {
733 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 754 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
734 name += skip; 755 name += skip;
735 } 756 }
736 else
737 c.a = rgba::MAX_CC;
738 757
739 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 758 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
740 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 759 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
741 { 760 {
742 XColor xc, xc_exact; 761 XColor xc;
743 762
744 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 763 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
745 { 764 {
746 c.r = xc.red; 765 c.r = xc.red;
747 c.g = xc.green; 766 c.g = xc.green;
… …
774 { 793 {
775 XColor *colors = new XColor [screen->visual->map_entries]; 794 XColor *colors = new XColor [screen->visual->map_entries];
776 795
777 for (int i = 0; i < cmap_size; i++) 796 for (int i = 0; i < cmap_size; i++)
778 colors [i].pixel = i; 797 colors [i].pixel = i;
779 798
780 // many kilobytes transfer per colour, but pseudocolor isn't worth 799 // many kilobytes transfer per colour, but pseudocolor isn't worth
781 // many extra optimisations. 800 // many extra optimisations.
782 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 801 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
783 802
784 int diff = 0x7fffffffUL; 803 int diff = 0x7fffffffUL;
… …
797 } 816 }
798 } 817 }
799 818
800 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 819 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
801 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 820 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
802 821
803 got = alloc (screen, rgba (best->red, best->green, best->blue)); 822 got = alloc (screen, rgba (best->red, best->green, best->blue));
804 823
805 delete colors; 824 delete [] colors;
806 } 825 }
807#endif 826#endif
808 827
809 return got; 828 return got;
810} 829}
… …
835 color.green = c.g; 854 color.green = c.g;
836 color.blue = c.b; 855 color.blue = c.b;
837 color.pixel = (Pixel)*this; 856 color.pixel = (Pixel)*this;
838} 857}
839 858
840void 859void
841rxvt_color::free (rxvt_screen *screen) 860rxvt_color::free (rxvt_screen *screen)
842{ 861{
862 if (screen->visual->c_class == TrueColor)
863 return; // nothing to do
864
843#if XFT 865#if XFT
844 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); 866 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
845#else 867#else
846 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); 868 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
847#endif 869#endif

Diff Legend

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