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

Diff Legend

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