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.82 by root, Fri Dec 14 05:25:26 2007 UTC vs.
Revision 1.110 by sf-exg, Tue Dec 14 08:01:51 2010 UTC

… …
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
… …
296///////////////////////////////////////////////////////////////////////////// 297/////////////////////////////////////////////////////////////////////////////
297 298
298rxvt_display::rxvt_display (const char *id) 299rxvt_display::rxvt_display (const char *id)
299: refcounted (id) 300: refcounted (id)
300, selection_owner (0) 301, selection_owner (0)
302, clipboard_owner (0)
301{ 303{
302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this); 304 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this); 305 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
304} 306}
305 307
… …
360 XA_STRING, &actual_type, &actual_format, 362 XA_STRING, &actual_type, &actual_format,
361 &nitems, &nremaining, 363 &nitems, &nremaining,
362 (unsigned char **)&val) == Success 364 (unsigned char **)&val) == Success
363 && actual_type == XA_STRING 365 && actual_type == XA_STRING
364 && actual_format == 8) 366 && actual_format == 8)
365 displayResource = val; 367 displayResource = val;
366 else 368 else
367 { 369 {
368 displayResource = 0; 370 displayResource = 0;
369 371
370 if (val) 372 if (val)
371 XFree(val); 373 XFree (val);
372 } 374 }
373 375
374#if XLIB_ILLEGAL_ACCESS 376#if XLIB_ILLEGAL_ACCESS
375 dpy->xdefaults = displayResource; 377 dpy->xdefaults = displayResource;
376#endif 378#endif
377 } 379 }
… …
425bool rxvt_display::ref_init () 427bool rxvt_display::ref_init ()
426{ 428{
427#ifdef LOCAL_X_IS_UNIX 429#ifdef LOCAL_X_IS_UNIX
428 if (id[0] == ':') 430 if (id[0] == ':')
429 { 431 {
430 val = rxvt_malloc (5 + strlen (id) + 1); 432 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
433 return false;
431 strcpy (val, "unix/"); 434 strcpy (val, "unix/");
432 strcat (val, id); 435 strcat (val, id);
433 dpy = XOpenDisplay (val); 436 dpy = XOpenDisplay (val);
434 free (val);
435 } 437 }
436 else 438 else
437#endif 439#endif
438 dpy = 0; 440 dpy = 0;
439 441
… …
462 XUnloadFont (dpy, f); 464 XUnloadFont (dpy, f);
463#endif 465#endif
464 466
465 int fd = XConnectionNumber (dpy); 467 int fd = XConnectionNumber (dpy);
466 468
467 // try to detect wether we have a local connection. 469 // try to detect whether we have a local connection.
468 // assume unix domain socket == local, everything else not 470 // assume unix domain socket == local, everything else not
469 // TODO: might want to check for inet/127.0.0.1 471 // TODO: might want to check for inet/127.0.0.1
470 is_local = 0; 472 is_local = 0;
471 sockaddr_un sa; 473 sockaddr_un sa;
472 socklen_t sl = sizeof (sa); 474 socklen_t sl = sizeof (sa);
… …
486} 488}
487 489
488void 490void
489rxvt_display::ref_next () 491rxvt_display::ref_next ()
490{ 492{
491 // TODO: somehow check wether the database files/resources changed 493 // TODO: somehow check whether the database files/resources changed
492 // before affording re-loading/parsing 494 // before affording re-loading/parsing
493 XrmDestroyDatabase (XrmGetDatabase (dpy)); 495 XrmDestroyDatabase (XrmGetDatabase (dpy));
494 XrmSetDatabase (dpy, get_resources (true)); 496 XrmSetDatabase (dpy, get_resources (true));
495} 497}
496 498
… …
501 503
502#ifdef POINTER_BLANK 504#ifdef POINTER_BLANK
503 XFreeCursor (dpy, blank_cursor); 505 XFreeCursor (dpy, blank_cursor);
504#endif 506#endif
505 x_ev.stop (); 507 x_ev.stop ();
508 flush_ev.stop ();
506#ifdef USE_XIM 509#ifdef USE_XIM
507 xims.clear (); 510 xims.clear ();
508#endif 511#endif
509 XCloseDisplay (dpy); 512 XCloseDisplay (dpy);
510} 513}
… …
525 unsigned long nitems, bytes_after; 528 unsigned long nitems, bytes_after;
526 529
527 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 530 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
528 False, XA_ATOM, &actual_type, &actual_format, 531 False, XA_ATOM, &actual_type, &actual_format,
529 &nitems, &bytes_after, (unsigned char **)&atoms) 532 &nitems, &bytes_after, (unsigned char **)&atoms)
530 != Success ) 533 != Success)
531 return; 534 return;
532 535
533 if (actual_type == XA_ATOM && actual_format == 32) 536 if (actual_type == XA_ATOM && actual_format == 32)
534 for (int i = 0; i < nitems; i++) 537 for (int i = 0; i < nitems; i++)
535 if (XGetSelectionOwner (dpy, atoms[i])) 538 if (XGetSelectionOwner (dpy, atoms[i]))
536 { 539 {
537 im_change_cb (); 540 im_change_cb ();
538 break; 541 break;
… …
542} 545}
543#endif 546#endif
544 547
545void rxvt_display::x_cb (ev::io &w, int revents) 548void rxvt_display::x_cb (ev::io &w, int revents)
546{ 549{
550 flush_ev.start ();
551}
552
553void rxvt_display::flush_cb (ev::prepare &w, int revents)
554{
547 while (XEventsQueued (dpy, QueuedAfterReading)) 555 while (XEventsQueued (dpy, QueuedAfterFlush))
556 do
548 { 557 {
549 XEvent xev; 558 XEvent xev;
550 XNextEvent (dpy, &xev); 559 XNextEvent (dpy, &xev);
551 560
552#ifdef USE_XIM 561#ifdef USE_XIM
553 if (!XFilterEvent (&xev, None)) 562 if (!XFilterEvent (&xev, None))
554 { 563 {
555 if (xev.type == PropertyNotify 564 if (xev.type == PropertyNotify
556 && xev.xany.window == root 565 && xev.xany.window == root
557 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 566 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
558 im_change_check (); 567 im_change_check ();
559#endif 568#endif
560 if (xev.type == MappingNotify) 569 if (xev.type == MappingNotify)
561 XRefreshKeyboardMapping (&xev.xmapping); 570 XRefreshKeyboardMapping (&xev.xmapping);
562 571
563 for (int i = xw.size (); i--; ) 572 for (int i = xw.size (); i--; )
564 { 573 {
565 if (!xw[i]) 574 if (!xw[i])
566 xw.erase_unordered (i); 575 xw.erase_unordered (i);
567 else if (xw[i]->window == xev.xany.window) 576 else if (xw[i]->window == xev.xany.window)
568 xw[i]->call (xev); 577 xw[i]->call (xev);
569 } 578 }
570#ifdef USE_XIM 579#ifdef USE_XIM
571 } 580 }
572#endif 581#endif
573 } 582 }
574} 583 while (XEventsQueued (dpy, QueuedAlready));
575 584
576void rxvt_display::flush () 585 w.stop ();
577{
578 XFlush (dpy);
579}
580
581void rxvt_display::flush_cb (ev::prepare &w, int revents)
582{
583 flush ();
584} 586}
585 587
586void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
587{ 589{
588 if (!w->active) 590 if (!w->active)
… …
599 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
600 w->active = 0; 602 w->active = 0;
601 } 603 }
602} 604}
603 605
604void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
605{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
606 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
607 selection_owner->selection_clear (); 611 {
612 rxvt_term *term = cur_owner;
613 term->selection_clear (clipboard);
614 term->flush ();
615 }
608 616
609 selection_owner = owner; 617 cur_owner = owner;
610} 618}
611 619
612#ifdef USE_XIM 620#ifdef USE_XIM
613 621
614void rxvt_display::reg (im_watcher *w) 622void rxvt_display::reg (im_watcher *w)
… …
627 int l, m; 635 int l, m;
628 636
629 l = strlen (locale); 637 l = strlen (locale);
630 m = strlen (modifiers); 638 m = strlen (modifiers);
631 639
632 if (!(id = (char *)malloc (l + m + 2))) 640 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
633 return 0; 641 return 0;
634 642
635 memcpy (id, locale, l); id[l] = '\n'; 643 memcpy (id, locale, l); id[l] = '\n';
636 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 644 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
637 645
638 rxvt_xim *xim = xims.get (id); 646 rxvt_xim *xim = xims.get (id);
639
640 free (id);
641 647
642 return xim; 648 return xim;
643} 649}
644 650
645void rxvt_display::put_xim (rxvt_xim *xim) 651void rxvt_display::put_xim (rxvt_xim *xim)
… …
671} 677}
672 678
673bool 679bool
674rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 680rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
675{ 681{
682 //TODO: only supports 24 bit
683 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
684
676#if XFT 685#if XFT
677 XRenderPictFormat *format; 686 XRenderPictFormat *format;
678 687
679 // FUCKING Xft gets it wrong, of course, so work around it. 688 // FUCKING Xft gets it wrong, of course, so work around it.
680 // Transparency users should eat shit and die, and then 689 // Transparency users should eat shit and die, and then
… …
684 { 693 {
685 // the fun lies in doing everything manually... 694 // the fun lies in doing everything manually...
686 c.color.red = color.r; 695 c.color.red = color.r;
687 c.color.green = color.g; 696 c.color.green = color.g;
688 c.color.blue = color.b; 697 c.color.blue = color.b;
689 c.color.alpha = color.a; 698 c.color.alpha = alpha;
690 699
691 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 700 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
692 | insert_component (color.g, format->direct.greenMask, format->direct.green) 701 | insert_component (color.g, format->direct.greenMask, format->direct.green)
693 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 702 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
694 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 703 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
695 704
696 return true; 705 return true;
697 } 706 }
698 else 707 else
699 { 708 {
700 XRenderColor d; 709 XRenderColor d;
701 710
702 d.red = color.r; 711 d.red = color.r;
703 d.green = color.g; 712 d.green = color.g;
704 d.blue = color.b; 713 d.blue = color.b;
705 d.alpha = color.a; 714 d.alpha = alpha;
706 715
707 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 716 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
708 } 717 }
709#else 718#else
710 c.red = color.r; 719 c.red = color.r;
711 c.green = color.g; 720 c.green = color.g;
712 c.blue = color.b; 721 c.blue = color.b;
713 722
714 if (screen->visual->c_class == TrueColor) 723 if (screen->visual->c_class == TrueColor)
715 { 724 {
716 c.pixel = (color.r >> (16 - popcount (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 ))
717 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask)) 726 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
718 | (color.b >> (16 - popcount (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 ));
719 728
720 return true; 729 return true;
721 } 730 }
722 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 731 else if (XAllocColor (screen->dpy, screen->cmap, &c))
723 return true; 732 return true;
… …
735{ 744{
736 rgba c; 745 rgba c;
737 char eos; 746 char eos;
738 int skip; 747 int skip;
739 748
749 c.a = rgba::MAX_CC;
750
740 // parse the nonstandard "[alphapercent]" prefix 751 // parse the nonstandard "[alphapercent]" prefix
741 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 752 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
742 { 753 {
743 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);
744 name += skip; 755 name += skip;
745 } 756 }
746 else
747 c.a = rgba::MAX_CC;
748 757
749 // parse the non-standard "#aarrggbb" format
750 if (name[0] == '#' && strlen (name) == 1+2+2+2+2 && 4 == sscanf (name+1, "%2hx%2hx%2hx%2hx%c", &c.a, &c.r, &c.g, &c.b, &eos))
751 {
752 if (c.r)
753 c.r = (c.r << 8) | 0x0ff;
754 if (c.g)
755 c.g = (c.g << 8) | 0x0ff;
756 if (c.b)
757 c.b = (c.b << 8) | 0x0ff;
758 if (c.a)
759 c.a = (c.a << 8) | 0x0ff;
760 }
761 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 758 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
762 else 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))
763 { 760 {
764 XColor xc; 761 XColor xc;
765 762
766 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 763 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
767 { 764 {
… …
887 lerp (c.a, to.a, percent) 884 lerp (c.a, to.a, percent)
888 ) 885 )
889 ); 886 );
890} 887}
891 888
892#if TRACE_PIXMAPS
893# undef XCreatePixmap
894# undef XFreePixmap
895Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
896{
897 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
898 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
899 return res;
900}
901
902void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
903{
904 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
905 XFreePixmap (dpy,p);
906}
907#endif

Diff Legend

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