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.71 by sasha, Fri Aug 17 22:01:33 2007 UTC vs.
Revision 1.105 by sf-exg, Sat Jan 30 20:26:04 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
… …
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 ()
… …
295 296
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, x_ev (this, &rxvt_display::x_cb)
301, selection_owner (0) 301, selection_owner (0)
302, clipboard_owner (0)
302{ 303{
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
… …
462#endif 465#endif
463 466
464 int fd = XConnectionNumber (dpy); 467 int fd = XConnectionNumber (dpy);
465 468
466 // try to detect wether we have a local connection. 469 // try to detect wether we have a local connection.
467 // assume unix domains socket == local, everything else not 470 // assume unix domain socket == local, everything else not
468 // TODO: might want to check for inet/127.0.0.1 471 // TODO: might want to check for inet/127.0.0.1
469 is_local = 0; 472 is_local = 0;
470 sockaddr_un sa; 473 sockaddr_un sa;
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, EVENT_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
481 flush (); 485 flush ();
… …
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}
… …
538 543
539 XFree (atoms); 544 XFree (atoms);
540} 545}
541#endif 546#endif
542 547
543void rxvt_display::x_cb (io_watcher &w, short 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{
555 while (XEventsQueued (dpy, QueuedAfterFlush))
545 do 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 }
572 while (XEventsQueued (dpy, QueuedAlready)); 583 while (XEventsQueued (dpy, QueuedAlready));
573 584
574 XFlush (dpy); 585 w.stop ();
575}
576
577void rxvt_display::flush ()
578{
579 if (XEventsQueued (dpy, QueuedAlready))
580 x_cb (x_ev, EVENT_READ);
581
582 XFlush (dpy);
583} 586}
584 587
585void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
586{ 589{
587 if (!w->active) 590 if (!w->active)
… …
598 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
599 w->active = 0; 602 w->active = 0;
600 } 603 }
601} 604}
602 605
603void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
604{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
605 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
611 {
606 selection_owner->selection_clear (); 612 cur_owner->selection_clear (clipboard);
613 cur_owner->flush ();
614 }
607 615
608 selection_owner = owner; 616 cur_owner = owner;
609} 617}
610 618
611#ifdef USE_XIM 619#ifdef USE_XIM
612 620
613void rxvt_display::reg (im_watcher *w) 621void rxvt_display::reg (im_watcher *w)
… …
626 int l, m; 634 int l, m;
627 635
628 l = strlen (locale); 636 l = strlen (locale);
629 m = strlen (modifiers); 637 m = strlen (modifiers);
630 638
631 if (!(id = (char *)malloc (l + m + 2))) 639 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
632 return 0; 640 return 0;
633 641
634 memcpy (id, locale, l); id[l] = '\n'; 642 memcpy (id, locale, l); id[l] = '\n';
635 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 643 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
636 644
637 rxvt_xim *xim = xims.get (id); 645 rxvt_xim *xim = xims.get (id);
638
639 free (id);
640 646
641 return xim; 647 return xim;
642} 648}
643 649
644void rxvt_display::put_xim (rxvt_xim *xim) 650void rxvt_display::put_xim (rxvt_xim *xim)
… …
666static unsigned int 672static unsigned int
667insert_component (unsigned int value, unsigned int mask, unsigned int shift) 673insert_component (unsigned int value, unsigned int mask, unsigned int shift)
668{ 674{
669 return (value * (mask + 1) >> 16) << shift; 675 return (value * (mask + 1) >> 16) << shift;
670} 676}
671 677
672bool 678bool
673rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 679rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
674{ 680{
681 //TODO: only supports 24 bit
682 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
683
675#if XFT 684#if XFT
676 XRenderPictFormat *format; 685 XRenderPictFormat *format;
677 686
678 // FUCKING Xft gets it wrong, of course, so work around it. 687 // FUCKING Xft gets it wrong, of course, so work around it.
679 // Transparency users should eat shit and die, and then 688 // Transparency users should eat shit and die, and then
… …
683 { 692 {
684 // the fun lies in doing everything manually... 693 // the fun lies in doing everything manually...
685 c.color.red = color.r; 694 c.color.red = color.r;
686 c.color.green = color.g; 695 c.color.green = color.g;
687 c.color.blue = color.b; 696 c.color.blue = color.b;
688 c.color.alpha = color.a; 697 c.color.alpha = alpha;
689 698
690 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 699 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
691 | insert_component (color.g, format->direct.greenMask, format->direct.green) 700 | insert_component (color.g, format->direct.greenMask, format->direct.green)
692 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 701 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
693 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 702 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
694 703
695 return true; 704 return true;
696 } 705 }
697 else 706 else
698 { 707 {
699 XRenderColor d; 708 XRenderColor d;
700 709
701 d.red = color.r; 710 d.red = color.r;
702 d.green = color.g; 711 d.green = color.g;
703 d.blue = color.b; 712 d.blue = color.b;
704 d.alpha = color.a; 713 d.alpha = alpha;
705 714
706 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 715 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
707 } 716 }
708#else 717#else
709 c.red = color.r; 718 c.red = color.r;
710 c.green = color.g; 719 c.green = color.g;
711 c.blue = color.b; 720 c.blue = color.b;
712 721
713 if (screen->visual->c_class == TrueColor) 722 if (screen->visual->c_class == TrueColor)
714 { 723 {
715 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask )) 724 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
716 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask)) 725 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
717 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask )); 726 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
718 727
719 return true; 728 return true;
720 } 729 }
721 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 730 else if (XAllocColor (screen->dpy, screen->cmap, &c))
722 return true; 731 return true;
… …
734{ 743{
735 rgba c; 744 rgba c;
736 char eos; 745 char eos;
737 int skip; 746 int skip;
738 747
748 c.a = rgba::MAX_CC;
749
739 // parse the nonstandard "[alphapercent]" prefix 750 // parse the nonstandard "[alphapercent]" prefix
740 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 751 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
741 { 752 {
742 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 753 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
743 name += skip; 754 name += skip;
744 } 755 }
745 else
746 c.a = rgba::MAX_CC;
747 756
748 // parse the non-standard "#aarrggbb" format
749 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))
750 {
751 if (c.r)
752 c.r = (c.r << 8) | 0x0ff;
753 if (c.g)
754 c.g = (c.g << 8) | 0x0ff;
755 if (c.b)
756 c.b = (c.b << 8) | 0x0ff;
757 if (c.a)
758 c.a = (c.a << 8) | 0x0ff;
759 }
760 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 757 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
761 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)) 758 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
762 { 759 {
763 XColor xc, xc_exact; 760 XColor xc;
764 761
765 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 762 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
766 { 763 {
767 c.r = xc.red; 764 c.r = xc.red;
768 c.g = xc.green; 765 c.g = xc.green;
… …
795 { 792 {
796 XColor *colors = new XColor [screen->visual->map_entries]; 793 XColor *colors = new XColor [screen->visual->map_entries];
797 794
798 for (int i = 0; i < cmap_size; i++) 795 for (int i = 0; i < cmap_size; i++)
799 colors [i].pixel = i; 796 colors [i].pixel = i;
800 797
801 // many kilobytes transfer per colour, but pseudocolor isn't worth 798 // many kilobytes transfer per colour, but pseudocolor isn't worth
802 // many extra optimisations. 799 // many extra optimisations.
803 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 800 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
804 801
805 int diff = 0x7fffffffUL; 802 int diff = 0x7fffffffUL;
… …
818 } 815 }
819 } 816 }
820 817
821 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 818 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
822 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 819 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
823 820
824 got = alloc (screen, rgba (best->red, best->green, best->blue)); 821 got = alloc (screen, rgba (best->red, best->green, best->blue));
825 822
826 delete [] colors; 823 delete [] colors;
827 } 824 }
828#endif 825#endif
… …
856 color.green = c.g; 853 color.green = c.g;
857 color.blue = c.b; 854 color.blue = c.b;
858 color.pixel = (Pixel)*this; 855 color.pixel = (Pixel)*this;
859} 856}
860 857
861void 858void
862rxvt_color::free (rxvt_screen *screen) 859rxvt_color::free (rxvt_screen *screen)
863{ 860{
864 if (screen->visual->c_class == TrueColor) 861 if (screen->visual->c_class == TrueColor)
865 return; // nothing to do 862 return; // nothing to do
866 863
… …
886 lerp (c.a, to.a, percent) 883 lerp (c.a, to.a, percent)
887 ) 884 )
888 ); 885 );
889} 886}
890 887
888#if TRACE_PIXMAPS
889# undef XCreatePixmap
890# undef XFreePixmap
891Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
892{
893 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
894 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
895 return res;
896}
897
898void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
899{
900 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
901 XFreePixmap (dpy,p);
902}
903#endif

Diff Legend

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