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.86 by root, Mon Dec 24 08:00:18 2007 UTC vs.
Revision 1.114 by root, Thu Jan 27 02:03:30 2011 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
… …
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;
… …
296///////////////////////////////////////////////////////////////////////////// 294/////////////////////////////////////////////////////////////////////////////
297 295
298rxvt_display::rxvt_display (const char *id) 296rxvt_display::rxvt_display (const char *id)
299: refcounted (id) 297: refcounted (id)
300, selection_owner (0) 298, selection_owner (0)
299, clipboard_owner (0)
301{ 300{
302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this); 301 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this); 302 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
304} 303}
305 304
… …
312 /* 311 /*
313 * get resources using the X library function 312 * get resources using the X library function
314 */ 313 */
315 char *displayResource, *xe; 314 char *displayResource, *xe;
316 XrmDatabase rdb1, database = 0; 315 XrmDatabase rdb1, database = 0;
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
317 321
318 // 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
319 // as opposed to "standard practise", we always read in ~/.Xdefaults 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.
… …
360 XA_STRING, &actual_type, &actual_format, 364 XA_STRING, &actual_type, &actual_format,
361 &nitems, &nremaining, 365 &nitems, &nremaining,
362 (unsigned char **)&val) == Success 366 (unsigned char **)&val) == Success
363 && actual_type == XA_STRING 367 && actual_type == XA_STRING
364 && actual_format == 8) 368 && actual_format == 8)
365 displayResource = val; 369 displayResource = val;
366 else 370 else
367 { 371 {
368 displayResource = 0; 372 displayResource = 0;
369 373
370 if (val) 374 if (val)
371 XFree(val); 375 XFree (val);
372 } 376 }
373 377
374#if XLIB_ILLEGAL_ACCESS 378#if XLIB_ILLEGAL_ACCESS
375 dpy->xdefaults = displayResource; 379 dpy->xdefaults = displayResource;
376#endif 380#endif
377 } 381 }
… …
425bool rxvt_display::ref_init () 429bool rxvt_display::ref_init ()
426{ 430{
427#ifdef LOCAL_X_IS_UNIX 431#ifdef LOCAL_X_IS_UNIX
428 if (id[0] == ':') 432 if (id[0] == ':')
429 { 433 {
430 val = rxvt_malloc (5 + strlen (id) + 1); 434 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
435 return false;
431 strcpy (val, "unix/"); 436 strcpy (val, "unix/");
432 strcat (val, id); 437 strcat (val, id);
433 dpy = XOpenDisplay (val); 438 dpy = XOpenDisplay (val);
434 free (val);
435 } 439 }
436 else 440 else
437#endif 441#endif
438 dpy = 0; 442 dpy = 0;
439 443
… …
444 return false; 448 return false;
445 449
446 screen = DefaultScreen (dpy); 450 screen = DefaultScreen (dpy);
447 root = DefaultRootWindow (dpy); 451 root = DefaultRootWindow (dpy);
448 452
449 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 453 assert (ARRAY_LENGTH(xa_names) == NUM_XA);
450 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 454 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
451 455
452 XrmSetDatabase (dpy, get_resources (false)); 456 XrmSetDatabase (dpy, get_resources (false));
453 457
454#ifdef POINTER_BLANK 458#ifdef POINTER_BLANK
… …
462 XUnloadFont (dpy, f); 466 XUnloadFont (dpy, f);
463#endif 467#endif
464 468
465 int fd = XConnectionNumber (dpy); 469 int fd = XConnectionNumber (dpy);
466 470
467 // try to detect wether we have a local connection. 471 // try to detect whether we have a local connection.
468 // assume unix domain socket == local, everything else not 472 // assume unix domain socket == local, everything else not
469 // TODO: might want to check for inet/127.0.0.1 473 // TODO: might want to check for inet/127.0.0.1
470 is_local = 0; 474 is_local = 0;
471 sockaddr_un sa; 475 sockaddr_un sa;
472 socklen_t sl = sizeof (sa); 476 socklen_t sl = sizeof (sa);
… …
486} 490}
487 491
488void 492void
489rxvt_display::ref_next () 493rxvt_display::ref_next ()
490{ 494{
491 // TODO: somehow check wether the database files/resources changed 495 // TODO: somehow check whether the database files/resources changed
492 // before affording re-loading/parsing 496 // before affording re-loading/parsing
493 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
494 XrmSetDatabase (dpy, get_resources (true)); 502 XrmSetDatabase (dpy, get_resources (true));
495} 503}
496 504
497rxvt_display::~rxvt_display () 505rxvt_display::~rxvt_display ()
498{ 506{
… …
505 x_ev.stop (); 513 x_ev.stop ();
506 flush_ev.stop (); 514 flush_ev.stop ();
507#ifdef USE_XIM 515#ifdef USE_XIM
508 xims.clear (); 516 xims.clear ();
509#endif 517#endif
518 XrmDestroyDatabase (XrmGetDatabase (dpy));
510 XCloseDisplay (dpy); 519 XCloseDisplay (dpy);
511} 520}
512 521
513#ifdef USE_XIM 522#ifdef USE_XIM
514void rxvt_display::im_change_cb () 523void rxvt_display::im_change_cb ()
… …
526 unsigned long nitems, bytes_after; 535 unsigned long nitems, bytes_after;
527 536
528 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 537 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
529 False, XA_ATOM, &actual_type, &actual_format, 538 False, XA_ATOM, &actual_type, &actual_format,
530 &nitems, &bytes_after, (unsigned char **)&atoms) 539 &nitems, &bytes_after, (unsigned char **)&atoms)
531 != Success ) 540 != Success)
532 return; 541 return;
533 542
534 if (actual_type == XA_ATOM && actual_format == 32) 543 if (actual_type == XA_ATOM && actual_format == 32)
535 for (int i = 0; i < nitems; i++) 544 for (int i = 0; i < nitems; i++)
536 if (XGetSelectionOwner (dpy, atoms[i])) 545 if (XGetSelectionOwner (dpy, atoms[i]))
537 { 546 {
538 im_change_cb (); 547 im_change_cb ();
539 break; 548 break;
… …
543} 552}
544#endif 553#endif
545 554
546void rxvt_display::x_cb (ev::io &w, int revents) 555void rxvt_display::x_cb (ev::io &w, int revents)
547{ 556{
557 flush_ev.start ();
558}
559
560void rxvt_display::flush_cb (ev::prepare &w, int revents)
561{
548 while (XEventsQueued (dpy, QueuedAfterReading)) 562 while (XEventsQueued (dpy, QueuedAfterFlush))
563 do
549 { 564 {
550 XEvent xev; 565 XEvent xev;
551 XNextEvent (dpy, &xev); 566 XNextEvent (dpy, &xev);
552 567
553#ifdef USE_XIM 568#ifdef USE_XIM
554 if (!XFilterEvent (&xev, None)) 569 if (!XFilterEvent (&xev, None))
555 { 570 {
556 if (xev.type == PropertyNotify 571 if (xev.type == PropertyNotify
557 && xev.xany.window == root 572 && xev.xany.window == root
558 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 573 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
559 im_change_check (); 574 im_change_check ();
560#endif 575#endif
561 if (xev.type == MappingNotify) 576 if (xev.type == MappingNotify)
562 XRefreshKeyboardMapping (&xev.xmapping); 577 XRefreshKeyboardMapping (&xev.xmapping);
563 578
564 for (int i = xw.size (); i--; ) 579 for (int i = xw.size (); i--; )
565 { 580 {
566 if (!xw[i]) 581 if (!xw[i])
567 xw.erase_unordered (i); 582 xw.erase_unordered (i);
568 else if (xw[i]->window == xev.xany.window) 583 else if (xw[i]->window == xev.xany.window)
569 xw[i]->call (xev); 584 xw[i]->call (xev);
570 } 585 }
571#ifdef USE_XIM 586#ifdef USE_XIM
572 } 587 }
573#endif 588#endif
574 } 589 }
575} 590 while (XEventsQueued (dpy, QueuedAlready));
576 591
577void rxvt_display::flush_cb (ev::prepare &w, int revents)
578{
579 w.stop (); 592 w.stop ();
580 XFlush (dpy);
581} 593}
582 594
583void rxvt_display::reg (xevent_watcher *w) 595void rxvt_display::reg (xevent_watcher *w)
584{ 596{
585 if (!w->active) 597 if (!w->active)
… …
596 xw[w->active - 1] = 0; 608 xw[w->active - 1] = 0;
597 w->active = 0; 609 w->active = 0;
598 } 610 }
599} 611}
600 612
601void rxvt_display::set_selection_owner (rxvt_term *owner) 613void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
602{ 614{
615 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
616
603 if (selection_owner && selection_owner != owner) 617 if (cur_owner && cur_owner != owner)
604 { 618 {
605 selection_owner->selection_clear (); 619 rxvt_term *term = cur_owner;
620 term->selection_clear (clipboard);
606 flush (); 621 term->flush ();
607 } 622 }
608 623
609 selection_owner = owner; 624 cur_owner = owner;
610} 625}
611 626
612#ifdef USE_XIM 627#ifdef USE_XIM
613 628
614void rxvt_display::reg (im_watcher *w) 629void rxvt_display::reg (im_watcher *w)
… …
627 int l, m; 642 int l, m;
628 643
629 l = strlen (locale); 644 l = strlen (locale);
630 m = strlen (modifiers); 645 m = strlen (modifiers);
631 646
632 if (!(id = (char *)malloc (l + m + 2))) 647 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
633 return 0; 648 return 0;
634 649
635 memcpy (id, locale, l); id[l] = '\n'; 650 memcpy (id, locale, l); id[l] = '\n';
636 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 651 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
637 652
638 rxvt_xim *xim = xims.get (id); 653 rxvt_xim *xim = xims.get (id);
639
640 free (id);
641 654
642 return xim; 655 return xim;
643} 656}
644 657
645void rxvt_display::put_xim (rxvt_xim *xim) 658void rxvt_display::put_xim (rxvt_xim *xim)
… …
671} 684}
672 685
673bool 686bool
674rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 687rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
675{ 688{
689 //TODO: only supports 24 bit
690 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
691
676#if XFT 692#if XFT
677 XRenderPictFormat *format; 693 XRenderPictFormat *format;
678 694
679 // FUCKING Xft gets it wrong, of course, so work around it. 695 // FUCKING Xft gets it wrong, of course, so work around it.
680 // Transparency users should eat shit and die, and then 696 // Transparency users should eat shit and die, and then
… …
684 { 700 {
685 // the fun lies in doing everything manually... 701 // the fun lies in doing everything manually...
686 c.color.red = color.r; 702 c.color.red = color.r;
687 c.color.green = color.g; 703 c.color.green = color.g;
688 c.color.blue = color.b; 704 c.color.blue = color.b;
689 c.color.alpha = color.a; 705 c.color.alpha = alpha;
690 706
691 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 707 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
692 | insert_component (color.g, format->direct.greenMask, format->direct.green) 708 | insert_component (color.g, format->direct.greenMask, format->direct.green)
693 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 709 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
694 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 710 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
695 711
696 return true; 712 return true;
697 } 713 }
698 else 714 else
699 { 715 {
700 XRenderColor d; 716 XRenderColor d;
701 717
702 d.red = color.r; 718 d.red = color.r;
703 d.green = color.g; 719 d.green = color.g;
704 d.blue = color.b; 720 d.blue = color.b;
705 d.alpha = color.a; 721 d.alpha = alpha;
706 722
707 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 723 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
708 } 724 }
709#else 725#else
710 c.red = color.r; 726 c.red = color.r;
711 c.green = color.g; 727 c.green = color.g;
712 c.blue = color.b; 728 c.blue = color.b;
713 729
714 if (screen->visual->c_class == TrueColor) 730 if (screen->visual->c_class == TrueColor)
715 { 731 {
716 c.pixel = (color.r >> (16 - popcount (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 ))
717 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask)) 733 | (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 )); 734 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
719 735
720 return true; 736 return true;
721 } 737 }
722 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 738 else if (XAllocColor (screen->dpy, screen->cmap, &c))
723 return true; 739 return true;
… …
735{ 751{
736 rgba c; 752 rgba c;
737 char eos; 753 char eos;
738 int skip; 754 int skip;
739 755
756 c.a = rgba::MAX_CC;
757
740 // parse the nonstandard "[alphapercent]" prefix 758 // parse the nonstandard "[alphapercent]" prefix
741 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 759 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
742 { 760 {
743 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);
744 name += skip; 762 name += skip;
745 } 763 }
746 else
747 c.a = rgba::MAX_CC;
748 764
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 765 // 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)) 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))
763 { 767 {
764 XColor xc; 768 XColor xc;
765 769
766 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 770 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
767 { 771 {
… …
887 lerp (c.a, to.a, percent) 891 lerp (c.a, to.a, percent)
888 ) 892 )
889 ); 893 );
890} 894}
891 895
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