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.57 by root, Mon Feb 20 22:42:01 2006 UTC vs.
Revision 1.111 by sf-exg, Sat Dec 18 18:17:39 2010 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 ()
… …
262 visual = DefaultVisualOfScreen (screen); 263 visual = DefaultVisualOfScreen (screen);
263 cmap = DefaultColormapOfScreen (screen); 264 cmap = DefaultColormapOfScreen (screen);
264} 265}
265 266
266void 267void
267rxvt_screen::set (rxvt_display *disp, int bitdepth) 268rxvt_screen::select_visual (int bitdepth)
268{ 269{
269 set (disp);
270
271#if XFT 270#if XFT
272 XVisualInfo vinfo; 271 XVisualInfo vinfo;
273 272
274 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo)) 273 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
275 { 274 {
276 depth = bitdepth; 275 depth = bitdepth;
277 visual = vinfo.visual; 276 visual = vinfo.visual;
278 cmap = XCreateColormap (dpy, disp->root, visual, AllocNone); 277 cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
279 } 278 }
280#endif 279#endif
281} 280}
282 281
283void 282void
… …
297 296
298///////////////////////////////////////////////////////////////////////////// 297/////////////////////////////////////////////////////////////////////////////
299 298
300rxvt_display::rxvt_display (const char *id) 299rxvt_display::rxvt_display (const char *id)
301: refcounted (id) 300: refcounted (id)
302, x_ev (this, &rxvt_display::x_cb)
303, selection_owner (0) 301, selection_owner (0)
302, clipboard_owner (0)
304{ 303{
304 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
305 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
305} 306}
306 307
307XrmDatabase 308XrmDatabase
308rxvt_display::get_resources (bool refresh) 309rxvt_display::get_resources (bool refresh)
309{ 310{
310 char *homedir = (char *)getenv ("HOME"); 311 char *homedir = getenv ("HOME");
311 char fname[1024]; 312 char fname[1024];
312 313
313 /* 314 /*
314 * get resources using the X library function 315 * get resources using the X library function
315 */ 316 */
316 char *displayResource, *xe; 317 char *displayResource, *xe;
317 XrmDatabase rdb1, database = 0; 318 XrmDatabase rdb1, database = 0;
318 319
319 // 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
320 322
321 // 6. System wide per application default file. 323 // 6. System wide per application default file.
322 324
323 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 325 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
324 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 326 if ((xe = getenv ("XAPPLRESDIR")))
325 { 327 {
326 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 328 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
327 329
328 if ((rdb1 = XrmGetFileDatabase (fname))) 330 if ((rdb1 = XrmGetFileDatabase (fname)))
329 XrmMergeDatabases (rdb1, &database); 331 XrmMergeDatabases (rdb1, &database);
… …
331 333
332 // 5. User's per application default file. 334 // 5. User's per application default file.
333 // none 335 // none
334 336
335 // 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
336 /* Get any Xserver defaults */ 346 /* Get any Xserver defaults */
337 if (refresh) 347 if (refresh)
338 { 348 {
339 // fucking xlib keeps a copy of the rm string 349 // fucking xlib keeps a copy of the rm string
340 Atom actual_type; 350 Atom actual_type;
… …
352 XA_STRING, &actual_type, &actual_format, 362 XA_STRING, &actual_type, &actual_format,
353 &nitems, &nremaining, 363 &nitems, &nremaining,
354 (unsigned char **)&val) == Success 364 (unsigned char **)&val) == Success
355 && actual_type == XA_STRING 365 && actual_type == XA_STRING
356 && actual_format == 8) 366 && actual_format == 8)
357 displayResource = val; 367 displayResource = val;
358 else 368 else
359 { 369 {
360 displayResource = 0; 370 displayResource = 0;
371
361 if (val) 372 if (val)
362 XFree(val); 373 XFree (val);
363 } 374 }
364 375
365#if XLIB_ILLEGAL_ACCESS 376#if XLIB_ILLEGAL_ACCESS
366 dpy->xdefaults = displayResource; 377 dpy->xdefaults = displayResource;
367#endif 378#endif
368 } 379 }
… …
370 displayResource = XResourceManagerString (dpy); 381 displayResource = XResourceManagerString (dpy);
371 382
372 if (displayResource) 383 if (displayResource)
373 { 384 {
374 if ((rdb1 = XrmGetStringDatabase (displayResource))) 385 if ((rdb1 = XrmGetStringDatabase (displayResource)))
375 XrmMergeDatabases (rdb1, &database);
376 }
377 else if (homedir)
378 {
379 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
380
381 if ((rdb1 = XrmGetFileDatabase (fname)))
382 XrmMergeDatabases (rdb1, &database); 386 XrmMergeDatabases (rdb1, &database);
383 } 387 }
384 388
385#if !XLIB_ILLEGAL_ACCESS 389#if !XLIB_ILLEGAL_ACCESS
386 if (refresh && displayResource) 390 if (refresh && displayResource)
… …
399 XFree (displayResource); 403 XFree (displayResource);
400 } 404 }
401 405
402 // 3. User's per host defaults file 406 // 3. User's per host defaults file
403 /* Add in XENVIRONMENT file */ 407 /* Add in XENVIRONMENT file */
404 if ((xe = (char *)getenv ("XENVIRONMENT")) 408 if ((xe = getenv ("XENVIRONMENT"))
405 && (rdb1 = XrmGetFileDatabase (xe))) 409 && (rdb1 = XrmGetFileDatabase (xe)))
406 XrmMergeDatabases (rdb1, &database); 410 XrmMergeDatabases (rdb1, &database);
407 else if (homedir) 411 else if (homedir)
408 { 412 {
409 struct utsname un; 413 struct utsname un;
… …
423bool rxvt_display::ref_init () 427bool rxvt_display::ref_init ()
424{ 428{
425#ifdef LOCAL_X_IS_UNIX 429#ifdef LOCAL_X_IS_UNIX
426 if (id[0] == ':') 430 if (id[0] == ':')
427 { 431 {
428 val = rxvt_malloc (5 + strlen (id) + 1); 432 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
433 return false;
429 strcpy (val, "unix/"); 434 strcpy (val, "unix/");
430 strcat (val, id); 435 strcat (val, id);
431 dpy = XOpenDisplay (val); 436 dpy = XOpenDisplay (val);
432 free (val);
433 } 437 }
434 else 438 else
435#endif 439#endif
436 dpy = 0; 440 dpy = 0;
437 441
… …
442 return false; 446 return false;
443 447
444 screen = DefaultScreen (dpy); 448 screen = DefaultScreen (dpy);
445 root = DefaultRootWindow (dpy); 449 root = DefaultRootWindow (dpy);
446 450
447 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 451 assert (ARRAY_LENGTH(xa_names) == NUM_XA);
448 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 452 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
449 453
450 XrmSetDatabase (dpy, get_resources (false)); 454 XrmSetDatabase (dpy, get_resources (false));
451 455
452#ifdef POINTER_BLANK 456#ifdef POINTER_BLANK
… …
460 XUnloadFont (dpy, f); 464 XUnloadFont (dpy, f);
461#endif 465#endif
462 466
463 int fd = XConnectionNumber (dpy); 467 int fd = XConnectionNumber (dpy);
464 468
465 // try to detect wether we have a local connection. 469 // try to detect whether we have a local connection.
466 // assume unix domains socket == local, everything else not 470 // assume unix domain socket == local, everything else not
467 // TODO: might want to check for inet/127.0.0.1 471 // TODO: might want to check for inet/127.0.0.1
468 is_local = 0; 472 is_local = 0;
469 sockaddr_un sa; 473 sockaddr_un sa;
470 socklen_t sl = sizeof (sa); 474 socklen_t sl = sizeof (sa);
471 475
472 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 476 if (!getsockname (fd, (sockaddr *)&sa, &sl))
473 is_local = sa.sun_family == AF_LOCAL; 477 is_local = sa.sun_family == AF_UNIX;
474 478
479 flush_ev.start ();
475 x_ev.start (fd, EVENT_READ); 480 x_ev.start (fd, ev::READ);
476 fcntl (fd, F_SETFD, FD_CLOEXEC); 481 fcntl (fd, F_SETFD, FD_CLOEXEC);
477 482
478 XSelectInput (dpy, root, PropertyChangeMask); 483 XSelectInput (dpy, root, PropertyChangeMask);
479 484
480 flush (); 485 flush ();
… …
483} 488}
484 489
485void 490void
486rxvt_display::ref_next () 491rxvt_display::ref_next ()
487{ 492{
488 // TODO: somehow check wether the database files/resources changed 493 // TODO: somehow check whether the database files/resources changed
489 // before affording re-loading/parsing 494 // before affording re-loading/parsing
490 XrmDestroyDatabase (XrmGetDatabase (dpy)); 495 XrmDestroyDatabase (XrmGetDatabase (dpy));
491 XrmSetDatabase (dpy, get_resources (true)); 496 XrmSetDatabase (dpy, get_resources (true));
492} 497}
493 498
… …
498 503
499#ifdef POINTER_BLANK 504#ifdef POINTER_BLANK
500 XFreeCursor (dpy, blank_cursor); 505 XFreeCursor (dpy, blank_cursor);
501#endif 506#endif
502 x_ev.stop (); 507 x_ev.stop ();
508 flush_ev.stop ();
503#ifdef USE_XIM 509#ifdef USE_XIM
504 xims.clear (); 510 xims.clear ();
505#endif 511#endif
506 XCloseDisplay (dpy); 512 XCloseDisplay (dpy);
507} 513}
… …
522 unsigned long nitems, bytes_after; 528 unsigned long nitems, bytes_after;
523 529
524 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 530 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
525 False, XA_ATOM, &actual_type, &actual_format, 531 False, XA_ATOM, &actual_type, &actual_format,
526 &nitems, &bytes_after, (unsigned char **)&atoms) 532 &nitems, &bytes_after, (unsigned char **)&atoms)
527 != Success ) 533 != Success)
528 return; 534 return;
529 535
530 if (actual_type == XA_ATOM && actual_format == 32) 536 if (actual_type == XA_ATOM && actual_format == 32)
531 for (int i = 0; i < nitems; i++) 537 for (int i = 0; i < nitems; i++)
532 if (XGetSelectionOwner (dpy, atoms[i])) 538 if (XGetSelectionOwner (dpy, atoms[i]))
533 { 539 {
534 im_change_cb (); 540 im_change_cb ();
535 break; 541 break;
… …
537 543
538 XFree (atoms); 544 XFree (atoms);
539} 545}
540#endif 546#endif
541 547
542void rxvt_display::x_cb (io_watcher &w, short revents) 548void rxvt_display::x_cb (ev::io &w, int revents)
543{ 549{
550 flush_ev.start ();
551}
552
553void rxvt_display::flush_cb (ev::prepare &w, int revents)
554{
555 while (XEventsQueued (dpy, QueuedAfterFlush))
544 do 556 do
545 { 557 {
546 XEvent xev; 558 XEvent xev;
547 XNextEvent (dpy, &xev); 559 XNextEvent (dpy, &xev);
548 560
549#ifdef USE_XIM 561#ifdef USE_XIM
550 if (!XFilterEvent (&xev, None)) 562 if (!XFilterEvent (&xev, None))
551 { 563 {
552 if (xev.type == PropertyNotify 564 if (xev.type == PropertyNotify
553 && xev.xany.window == root 565 && xev.xany.window == root
554 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 566 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
555 im_change_check (); 567 im_change_check ();
556#endif 568#endif
569 if (xev.type == MappingNotify)
570 XRefreshKeyboardMapping (&xev.xmapping);
571
557 for (int i = xw.size (); i--; ) 572 for (int i = xw.size (); i--; )
558 { 573 {
559 if (!xw[i]) 574 if (!xw[i])
560 xw.erase_unordered (i); 575 xw.erase_unordered (i);
561 else if (xw[i]->window == xev.xany.window) 576 else if (xw[i]->window == xev.xany.window)
562 xw[i]->call (xev); 577 xw[i]->call (xev);
563 } 578 }
564#ifdef USE_XIM 579#ifdef USE_XIM
565 } 580 }
566#endif 581#endif
567 } 582 }
568 while (XEventsQueued (dpy, QueuedAlready)); 583 while (XEventsQueued (dpy, QueuedAlready));
569 584
570 XFlush (dpy); 585 w.stop ();
571}
572
573void rxvt_display::flush ()
574{
575 if (XEventsQueued (dpy, QueuedAlready))
576 x_cb (x_ev, EVENT_READ);
577
578 XFlush (dpy);
579} 586}
580 587
581void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
582{ 589{
590 if (!w->active)
591 {
583 xw.push_back (w); 592 xw.push_back (w);
584 w->active = xw.size (); 593 w->active = xw.size ();
594 }
585} 595}
586 596
587void rxvt_display::unreg (xevent_watcher *w) 597void rxvt_display::unreg (xevent_watcher *w)
588{ 598{
589 if (w->active) 599 if (w->active)
600 {
590 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
602 w->active = 0;
603 }
591} 604}
592 605
593void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
594{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
595 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
596 selection_owner->selection_clear (); 611 {
612 rxvt_term *term = cur_owner;
613 term->selection_clear (clipboard);
614 term->flush ();
615 }
597 616
598 selection_owner = owner; 617 cur_owner = owner;
599} 618}
600 619
601#ifdef USE_XIM 620#ifdef USE_XIM
602 621
603void rxvt_display::reg (im_watcher *w) 622void rxvt_display::reg (im_watcher *w)
… …
616 int l, m; 635 int l, m;
617 636
618 l = strlen (locale); 637 l = strlen (locale);
619 m = strlen (modifiers); 638 m = strlen (modifiers);
620 639
621 if (!(id = (char *)malloc (l + m + 2))) 640 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
622 return 0; 641 return 0;
623 642
624 memcpy (id, locale, l); id[l] = '\n'; 643 memcpy (id, locale, l); id[l] = '\n';
625 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 644 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
626 645
627 rxvt_xim *xim = xims.get (id); 646 rxvt_xim *xim = xims.get (id);
628
629 free (id);
630 647
631 return xim; 648 return xim;
632} 649}
633 650
634void rxvt_display::put_xim (rxvt_xim *xim) 651void rxvt_display::put_xim (rxvt_xim *xim)
… …
649 666
650template class refcache<rxvt_display>; 667template class refcache<rxvt_display>;
651refcache<rxvt_display> displays; 668refcache<rxvt_display> displays;
652 669
653///////////////////////////////////////////////////////////////////////////// 670/////////////////////////////////////////////////////////////////////////////
654 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
655bool 679bool
656rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 680rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
657{ 681{
682 //TODO: only supports 24 bit
683 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
684
658#if XFT 685#if XFT
659 XRenderPictFormat *format; 686 XRenderPictFormat *format;
660 687
661 // FUCKING Xft gets it wrong, of course, so work around it. 688 // FUCKING Xft gets it wrong, of course, so work around it.
662 // Transparency users should eat shit and die, and then 689 // Transparency users should eat shit and die, and then
… …
666 { 693 {
667 // the fun lies in doing everything manually... 694 // the fun lies in doing everything manually...
668 c.color.red = color.r; 695 c.color.red = color.r;
669 c.color.green = color.g; 696 c.color.green = color.g;
670 c.color.blue = color.b; 697 c.color.blue = color.b;
671 c.color.alpha = color.a; 698 c.color.alpha = alpha;
672 699
673 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 )
674 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 701 | insert_component (color.g, format->direct.greenMask, format->direct.green)
675 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 702 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
676 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 703 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
677 704
678 return true; 705 return true;
679 } 706 }
680 else 707 else
681 { 708 {
682 XRenderColor d; 709 XRenderColor d;
683 710
684 d.red = color.r; 711 d.red = color.r;
685 d.green = color.g; 712 d.green = color.g;
686 d.blue = color.b; 713 d.blue = color.b;
687 d.alpha = color.a; 714 d.alpha = alpha;
688 715
689 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 716 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
690 } 717 }
691#else 718#else
692 c.red = color.r; 719 c.red = color.r;
693 c.green = color.g; 720 c.green = color.g;
694 c.blue = color.b; 721 c.blue = color.b;
695 722
696 if (screen->visual->c_class == TrueColor) 723 if (screen->visual->c_class == TrueColor)
697 { 724 {
698 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 ))
699 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 726 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
700 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
701 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
702 | (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 ));
703 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
704 728
705 return true; 729 return true;
706 } 730 }
707 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 731 else if (XAllocColor (screen->dpy, screen->cmap, &c))
708 return true; 732 return true;
… …
720{ 744{
721 rgba c; 745 rgba c;
722 char eos; 746 char eos;
723 int skip; 747 int skip;
724 748
749 c.a = rgba::MAX_CC;
750
725 // parse the nonstandard "[alphapercent]" prefix 751 // parse the nonstandard "[alphapercent]" prefix
726 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 752 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
727 { 753 {
728 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);
729 name += skip; 755 name += skip;
730 } 756 }
731 else
732 c.a = rgba::MAX_CC;
733 757
734 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 758 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
735 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))
736 { 760 {
737 XColor xc, xc_exact; 761 XColor xc;
738 762
739 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 763 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
740 { 764 {
741 c.r = xc.red; 765 c.r = xc.red;
742 c.g = xc.green; 766 c.g = xc.green;
… …
769 { 793 {
770 XColor *colors = new XColor [screen->visual->map_entries]; 794 XColor *colors = new XColor [screen->visual->map_entries];
771 795
772 for (int i = 0; i < cmap_size; i++) 796 for (int i = 0; i < cmap_size; i++)
773 colors [i].pixel = i; 797 colors [i].pixel = i;
774 798
775 // many kilobytes transfer per colour, but pseudocolor isn't worth 799 // many kilobytes transfer per colour, but pseudocolor isn't worth
776 // many extra optimisations. 800 // many extra optimisations.
777 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 801 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
778 802
779 int diff = 0x7fffffffUL; 803 int diff = 0x7fffffffUL;
… …
792 } 816 }
793 } 817 }
794 818
795 //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",
796 // 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);
797 821
798 got = alloc (screen, rgba (best->red, best->green, best->blue)); 822 got = alloc (screen, rgba (best->red, best->green, best->blue));
799 823
800 delete colors; 824 delete [] colors;
801 } 825 }
802#endif 826#endif
803 827
804 return got; 828 return got;
805} 829}
… …
830 color.green = c.g; 854 color.green = c.g;
831 color.blue = c.b; 855 color.blue = c.b;
832 color.pixel = (Pixel)*this; 856 color.pixel = (Pixel)*this;
833} 857}
834 858
835void 859void
836rxvt_color::free (rxvt_screen *screen) 860rxvt_color::free (rxvt_screen *screen)
837{ 861{
838 if (screen->visual->c_class == TrueColor) 862 if (screen->visual->c_class == TrueColor)
839 return; // nothing to do 863 return; // nothing to do
840 864

Diff Legend

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