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

Diff Legend

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