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.79 by root, Tue Dec 4 16:24:00 2007 UTC vs.
Revision 1.106 by sf-exg, Mon Feb 22 09:47:41 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.
… …
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);
305 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
303} 306}
304 307
305XrmDatabase 308XrmDatabase
306rxvt_display::get_resources (bool refresh) 309rxvt_display::get_resources (bool refresh)
307{ 310{
308 char *homedir = (char *)getenv ("HOME"); 311 char *homedir = getenv ("HOME");
309 char fname[1024]; 312 char fname[1024];
310 313
311 /* 314 /*
312 * get resources using the X library function 315 * get resources using the X library function
313 */ 316 */
… …
318 // as opposed to "standard practise", we always read in ~/.Xdefaults 321 // as opposed to "standard practise", we always read in ~/.Xdefaults
319 322
320 // 6. System wide per application default file. 323 // 6. System wide per application default file.
321 324
322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 325 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
323 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 326 if ((xe = getenv ("XAPPLRESDIR")))
324 { 327 {
325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 328 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
326 329
327 if ((rdb1 = XrmGetFileDatabase (fname))) 330 if ((rdb1 = XrmGetFileDatabase (fname)))
328 XrmMergeDatabases (rdb1, &database); 331 XrmMergeDatabases (rdb1, &database);
… …
400 XFree (displayResource); 403 XFree (displayResource);
401 } 404 }
402 405
403 // 3. User's per host defaults file 406 // 3. User's per host defaults file
404 /* Add in XENVIRONMENT file */ 407 /* Add in XENVIRONMENT file */
405 if ((xe = (char *)getenv ("XENVIRONMENT")) 408 if ((xe = getenv ("XENVIRONMENT"))
406 && (rdb1 = XrmGetFileDatabase (xe))) 409 && (rdb1 = XrmGetFileDatabase (xe)))
407 XrmMergeDatabases (rdb1, &database); 410 XrmMergeDatabases (rdb1, &database);
408 else if (homedir) 411 else if (homedir)
409 { 412 {
410 struct utsname un; 413 struct utsname un;
… …
424bool rxvt_display::ref_init () 427bool rxvt_display::ref_init ()
425{ 428{
426#ifdef LOCAL_X_IS_UNIX 429#ifdef LOCAL_X_IS_UNIX
427 if (id[0] == ':') 430 if (id[0] == ':')
428 { 431 {
429 val = rxvt_malloc (5 + strlen (id) + 1); 432 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
433 return false;
430 strcpy (val, "unix/"); 434 strcpy (val, "unix/");
431 strcat (val, id); 435 strcat (val, id);
432 dpy = XOpenDisplay (val); 436 dpy = XOpenDisplay (val);
433 free (val);
434 } 437 }
435 else 438 else
436#endif 439#endif
437 dpy = 0; 440 dpy = 0;
438 441
… …
471 socklen_t sl = sizeof (sa); 474 socklen_t sl = sizeof (sa);
472 475
473 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 476 if (!getsockname (fd, (sockaddr *)&sa, &sl))
474 is_local = sa.sun_family == AF_UNIX; 477 is_local = sa.sun_family == AF_UNIX;
475 478
479 flush_ev.start ();
476 x_ev.start (fd, ev::READ); 480 x_ev.start (fd, ev::READ);
477 fcntl (fd, F_SETFD, FD_CLOEXEC); 481 fcntl (fd, F_SETFD, FD_CLOEXEC);
478 482
479 XSelectInput (dpy, root, PropertyChangeMask); 483 XSelectInput (dpy, root, PropertyChangeMask);
480 484
… …
499 503
500#ifdef POINTER_BLANK 504#ifdef POINTER_BLANK
501 XFreeCursor (dpy, blank_cursor); 505 XFreeCursor (dpy, blank_cursor);
502#endif 506#endif
503 x_ev.stop (); 507 x_ev.stop ();
508 flush_ev.stop ();
504#ifdef USE_XIM 509#ifdef USE_XIM
505 xims.clear (); 510 xims.clear ();
506#endif 511#endif
507 XCloseDisplay (dpy); 512 XCloseDisplay (dpy);
508} 513}
… …
540} 545}
541#endif 546#endif
542 547
543void rxvt_display::x_cb (ev::io &w, int revents) 548void rxvt_display::x_cb (ev::io &w, int revents)
544{ 549{
550 flush_ev.start ();
551}
552
553void rxvt_display::flush_cb (ev::prepare &w, int revents)
554{
545 while (XEventsQueued (dpy, QueuedAfterReading)) 555 while (XEventsQueued (dpy, QueuedAfterFlush))
556 do
546 { 557 {
547 XEvent xev; 558 XEvent xev;
548 XNextEvent (dpy, &xev); 559 XNextEvent (dpy, &xev);
549 560
550#ifdef USE_XIM 561#ifdef USE_XIM
551 if (!XFilterEvent (&xev, None)) 562 if (!XFilterEvent (&xev, None))
552 { 563 {
553 if (xev.type == PropertyNotify 564 if (xev.type == PropertyNotify
554 && xev.xany.window == root 565 && xev.xany.window == root
555 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 566 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
556 im_change_check (); 567 im_change_check ();
557#endif 568#endif
558 if (xev.type == MappingNotify) 569 if (xev.type == MappingNotify)
559 XRefreshKeyboardMapping (&xev.xmapping); 570 XRefreshKeyboardMapping (&xev.xmapping);
560 571
561 for (int i = xw.size (); i--; ) 572 for (int i = xw.size (); i--; )
562 { 573 {
563 if (!xw[i]) 574 if (!xw[i])
564 xw.erase_unordered (i); 575 xw.erase_unordered (i);
565 else if (xw[i]->window == xev.xany.window) 576 else if (xw[i]->window == xev.xany.window)
566 xw[i]->call (xev); 577 xw[i]->call (xev);
567 } 578 }
568#ifdef USE_XIM 579#ifdef USE_XIM
569 } 580 }
570#endif 581#endif
571 } 582 }
583 while (XEventsQueued (dpy, QueuedAlready));
572 584
573 XFlush (dpy); 585 w.stop ();
574}
575
576void rxvt_display::flush ()
577{
578 x_cb (x_ev, ev::READ);
579} 586}
580 587
581void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
582{ 589{
583 if (!w->active) 590 if (!w->active)
… …
594 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
595 w->active = 0; 602 w->active = 0;
596 } 603 }
597} 604}
598 605
599void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
600{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
601 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
602 selection_owner->selection_clear (); 611 {
612 rxvt_term *term = cur_owner;
613 term->selection_clear (clipboard);
614 term->flush ();
615 }
603 616
604 selection_owner = owner; 617 cur_owner = owner;
605} 618}
606 619
607#ifdef USE_XIM 620#ifdef USE_XIM
608 621
609void rxvt_display::reg (im_watcher *w) 622void rxvt_display::reg (im_watcher *w)
… …
622 int l, m; 635 int l, m;
623 636
624 l = strlen (locale); 637 l = strlen (locale);
625 m = strlen (modifiers); 638 m = strlen (modifiers);
626 639
627 if (!(id = (char *)malloc (l + m + 2))) 640 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
628 return 0; 641 return 0;
629 642
630 memcpy (id, locale, l); id[l] = '\n'; 643 memcpy (id, locale, l); id[l] = '\n';
631 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 644 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
632 645
633 rxvt_xim *xim = xims.get (id); 646 rxvt_xim *xim = xims.get (id);
634
635 free (id);
636 647
637 return xim; 648 return xim;
638} 649}
639 650
640void rxvt_display::put_xim (rxvt_xim *xim) 651void rxvt_display::put_xim (rxvt_xim *xim)
… …
666} 677}
667 678
668bool 679bool
669rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 680rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
670{ 681{
682 //TODO: only supports 24 bit
683 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
684
671#if XFT 685#if XFT
672 XRenderPictFormat *format; 686 XRenderPictFormat *format;
673 687
674 // FUCKING Xft gets it wrong, of course, so work around it. 688 // FUCKING Xft gets it wrong, of course, so work around it.
675 // Transparency users should eat shit and die, and then 689 // Transparency users should eat shit and die, and then
… …
679 { 693 {
680 // the fun lies in doing everything manually... 694 // the fun lies in doing everything manually...
681 c.color.red = color.r; 695 c.color.red = color.r;
682 c.color.green = color.g; 696 c.color.green = color.g;
683 c.color.blue = color.b; 697 c.color.blue = color.b;
684 c.color.alpha = color.a; 698 c.color.alpha = alpha;
685 699
686 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 )
687 | insert_component (color.g, format->direct.greenMask, format->direct.green) 701 | insert_component (color.g, format->direct.greenMask, format->direct.green)
688 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 702 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
689 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 703 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
690 704
691 return true; 705 return true;
692 } 706 }
693 else 707 else
694 { 708 {
695 XRenderColor d; 709 XRenderColor d;
696 710
697 d.red = color.r; 711 d.red = color.r;
698 d.green = color.g; 712 d.green = color.g;
699 d.blue = color.b; 713 d.blue = color.b;
700 d.alpha = color.a; 714 d.alpha = alpha;
701 715
702 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 716 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
703 } 717 }
704#else 718#else
705 c.red = color.r; 719 c.red = color.r;
706 c.green = color.g; 720 c.green = color.g;
707 c.blue = color.b; 721 c.blue = color.b;
708 722
709 if (screen->visual->c_class == TrueColor) 723 if (screen->visual->c_class == TrueColor)
710 { 724 {
711 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 ))
712 | (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))
713 | (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 ));
714 728
715 return true; 729 return true;
716 } 730 }
717 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 731 else if (XAllocColor (screen->dpy, screen->cmap, &c))
718 return true; 732 return true;
… …
730{ 744{
731 rgba c; 745 rgba c;
732 char eos; 746 char eos;
733 int skip; 747 int skip;
734 748
749 c.a = rgba::MAX_CC;
750
735 // parse the nonstandard "[alphapercent]" prefix 751 // parse the nonstandard "[alphapercent]" prefix
736 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 752 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
737 { 753 {
738 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);
739 name += skip; 755 name += skip;
740 } 756 }
741 else
742 c.a = rgba::MAX_CC;
743 757
744 // parse the non-standard "#aarrggbb" format
745 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))
746 {
747 if (c.r)
748 c.r = (c.r << 8) | 0x0ff;
749 if (c.g)
750 c.g = (c.g << 8) | 0x0ff;
751 if (c.b)
752 c.b = (c.b << 8) | 0x0ff;
753 if (c.a)
754 c.a = (c.a << 8) | 0x0ff;
755 }
756 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 758 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
757 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))
758 { 760 {
759 XColor xc; 761 XColor xc;
760 762
761 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 763 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
762 { 764 {

Diff Legend

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