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.69 by root, Sat Jun 30 18:10:41 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
… …
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
… …
442 if (!dpy) 445 if (!dpy)
443 return false; 446 return false;
444 447
445 screen = DefaultScreen (dpy); 448 screen = DefaultScreen (dpy);
446 root = DefaultRootWindow (dpy); 449 root = DefaultRootWindow (dpy);
447
448#ifdef HAVE_AFTERIMAGE
449 ::dpy = dpy; /* init global var from libAfter... */
450 asv = create_asvisual_for_id (dpy, screen, DefaultDepth (dpy,screen),
451 XVisualIDFromVisual (DefaultVisual (dpy, screen)), None, NULL);
452#endif
453 450
454 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 451 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
455 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 452 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
456 453
457 XrmSetDatabase (dpy, get_resources (false)); 454 XrmSetDatabase (dpy, get_resources (false));
… …
468#endif 465#endif
469 466
470 int fd = XConnectionNumber (dpy); 467 int fd = XConnectionNumber (dpy);
471 468
472 // try to detect wether we have a local connection. 469 // try to detect wether we have a local connection.
473 // assume unix domains socket == local, everything else not 470 // assume unix domain socket == local, everything else not
474 // TODO: might want to check for inet/127.0.0.1 471 // TODO: might want to check for inet/127.0.0.1
475 is_local = 0; 472 is_local = 0;
476 sockaddr_un sa; 473 sockaddr_un sa;
477 socklen_t sl = sizeof (sa); 474 socklen_t sl = sizeof (sa);
478 475
479 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 476 if (!getsockname (fd, (sockaddr *)&sa, &sl))
480 is_local = sa.sun_family == AF_UNIX; 477 is_local = sa.sun_family == AF_UNIX;
481 478
479 flush_ev.start ();
482 x_ev.start (fd, EVENT_READ); 480 x_ev.start (fd, ev::READ);
483 fcntl (fd, F_SETFD, FD_CLOEXEC); 481 fcntl (fd, F_SETFD, FD_CLOEXEC);
484 482
485 XSelectInput (dpy, root, PropertyChangeMask); 483 XSelectInput (dpy, root, PropertyChangeMask);
486 484
487 flush (); 485 flush ();
… …
505 503
506#ifdef POINTER_BLANK 504#ifdef POINTER_BLANK
507 XFreeCursor (dpy, blank_cursor); 505 XFreeCursor (dpy, blank_cursor);
508#endif 506#endif
509 x_ev.stop (); 507 x_ev.stop ();
508 flush_ev.stop ();
510#ifdef USE_XIM 509#ifdef USE_XIM
511 xims.clear (); 510 xims.clear ();
512#endif 511#endif
513 XCloseDisplay (dpy); 512 XCloseDisplay (dpy);
514} 513}
… …
544 543
545 XFree (atoms); 544 XFree (atoms);
546} 545}
547#endif 546#endif
548 547
549void rxvt_display::x_cb (io_watcher &w, short revents) 548void rxvt_display::x_cb (ev::io &w, int revents)
550{ 549{
550 flush_ev.start ();
551}
552
553void rxvt_display::flush_cb (ev::prepare &w, int revents)
554{
555 while (XEventsQueued (dpy, QueuedAfterFlush))
551 do 556 do
552 { 557 {
553 XEvent xev; 558 XEvent xev;
554 XNextEvent (dpy, &xev); 559 XNextEvent (dpy, &xev);
555 560
556#ifdef USE_XIM 561#ifdef USE_XIM
557 if (!XFilterEvent (&xev, None)) 562 if (!XFilterEvent (&xev, None))
558 { 563 {
559 if (xev.type == PropertyNotify 564 if (xev.type == PropertyNotify
560 && xev.xany.window == root 565 && xev.xany.window == root
561 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 566 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
562 im_change_check (); 567 im_change_check ();
563#endif 568#endif
564 if (xev.type == MappingNotify) 569 if (xev.type == MappingNotify)
565 XRefreshKeyboardMapping (&xev.xmapping); 570 XRefreshKeyboardMapping (&xev.xmapping);
566 571
567 for (int i = xw.size (); i--; ) 572 for (int i = xw.size (); i--; )
568 { 573 {
569 if (!xw[i]) 574 if (!xw[i])
570 xw.erase_unordered (i); 575 xw.erase_unordered (i);
571 else if (xw[i]->window == xev.xany.window) 576 else if (xw[i]->window == xev.xany.window)
572 xw[i]->call (xev); 577 xw[i]->call (xev);
573 } 578 }
574#ifdef USE_XIM 579#ifdef USE_XIM
575 } 580 }
576#endif 581#endif
577 } 582 }
578 while (XEventsQueued (dpy, QueuedAlready)); 583 while (XEventsQueued (dpy, QueuedAlready));
579 584
580 XFlush (dpy); 585 w.stop ();
581}
582
583void rxvt_display::flush ()
584{
585 if (XEventsQueued (dpy, QueuedAlready))
586 x_cb (x_ev, EVENT_READ);
587
588 XFlush (dpy);
589} 586}
590 587
591void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
592{ 589{
593 if (!w->active) 590 if (!w->active)
… …
604 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
605 w->active = 0; 602 w->active = 0;
606 } 603 }
607} 604}
608 605
609void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
610{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
611 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
612 selection_owner->selection_clear (); 611 {
612 rxvt_term *term = cur_owner;
613 term->selection_clear (clipboard);
614 term->flush ();
615 }
613 616
614 selection_owner = owner; 617 cur_owner = owner;
615} 618}
616 619
617#ifdef USE_XIM 620#ifdef USE_XIM
618 621
619void rxvt_display::reg (im_watcher *w) 622void rxvt_display::reg (im_watcher *w)
… …
632 int l, m; 635 int l, m;
633 636
634 l = strlen (locale); 637 l = strlen (locale);
635 m = strlen (modifiers); 638 m = strlen (modifiers);
636 639
637 if (!(id = (char *)malloc (l + m + 2))) 640 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
638 return 0; 641 return 0;
639 642
640 memcpy (id, locale, l); id[l] = '\n'; 643 memcpy (id, locale, l); id[l] = '\n';
641 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 644 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
642 645
643 rxvt_xim *xim = xims.get (id); 646 rxvt_xim *xim = xims.get (id);
644
645 free (id);
646 647
647 return xim; 648 return xim;
648} 649}
649 650
650void rxvt_display::put_xim (rxvt_xim *xim) 651void rxvt_display::put_xim (rxvt_xim *xim)
… …
672static unsigned int 673static unsigned int
673insert_component (unsigned int value, unsigned int mask, unsigned int shift) 674insert_component (unsigned int value, unsigned int mask, unsigned int shift)
674{ 675{
675 return (value * (mask + 1) >> 16) << shift; 676 return (value * (mask + 1) >> 16) << shift;
676} 677}
677 678
678bool 679bool
679rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 680rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
680{ 681{
682 //TODO: only supports 24 bit
683 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
684
681#if XFT 685#if XFT
682 XRenderPictFormat *format; 686 XRenderPictFormat *format;
683 687
684 // FUCKING Xft gets it wrong, of course, so work around it. 688 // FUCKING Xft gets it wrong, of course, so work around it.
685 // Transparency users should eat shit and die, and then 689 // Transparency users should eat shit and die, and then
… …
689 { 693 {
690 // the fun lies in doing everything manually... 694 // the fun lies in doing everything manually...
691 c.color.red = color.r; 695 c.color.red = color.r;
692 c.color.green = color.g; 696 c.color.green = color.g;
693 c.color.blue = color.b; 697 c.color.blue = color.b;
694 c.color.alpha = color.a; 698 c.color.alpha = alpha;
695 699
696 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 )
697 | insert_component (color.g, format->direct.greenMask, format->direct.green) 701 | insert_component (color.g, format->direct.greenMask, format->direct.green)
698 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 702 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
699 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 703 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
700 704
701 return true; 705 return true;
702 } 706 }
703 else 707 else
704 { 708 {
705 XRenderColor d; 709 XRenderColor d;
706 710
707 d.red = color.r; 711 d.red = color.r;
708 d.green = color.g; 712 d.green = color.g;
709 d.blue = color.b; 713 d.blue = color.b;
710 d.alpha = color.a; 714 d.alpha = alpha;
711 715
712 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 716 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
713 } 717 }
714#else 718#else
715 c.red = color.r; 719 c.red = color.r;
716 c.green = color.g; 720 c.green = color.g;
717 c.blue = color.b; 721 c.blue = color.b;
718 722
719 if (screen->visual->c_class == TrueColor) 723 if (screen->visual->c_class == TrueColor)
720 { 724 {
721 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 ))
722 | (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))
723 | (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 ));
724 728
725 return true; 729 return true;
726 } 730 }
727 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 731 else if (XAllocColor (screen->dpy, screen->cmap, &c))
728 return true; 732 return true;
… …
740{ 744{
741 rgba c; 745 rgba c;
742 char eos; 746 char eos;
743 int skip; 747 int skip;
744 748
749 c.a = rgba::MAX_CC;
750
745 // parse the nonstandard "[alphapercent]" prefix 751 // parse the nonstandard "[alphapercent]" prefix
746 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 752 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
747 { 753 {
748 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);
749 name += skip; 755 name += skip;
750 } 756 }
751 else
752 c.a = rgba::MAX_CC;
753 757
754 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 758 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
755 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))
756 { 760 {
757 XColor xc, xc_exact; 761 XColor xc;
758 762
759 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 763 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
760 { 764 {
761 c.r = xc.red; 765 c.r = xc.red;
762 c.g = xc.green; 766 c.g = xc.green;
… …
789 { 793 {
790 XColor *colors = new XColor [screen->visual->map_entries]; 794 XColor *colors = new XColor [screen->visual->map_entries];
791 795
792 for (int i = 0; i < cmap_size; i++) 796 for (int i = 0; i < cmap_size; i++)
793 colors [i].pixel = i; 797 colors [i].pixel = i;
794 798
795 // many kilobytes transfer per colour, but pseudocolor isn't worth 799 // many kilobytes transfer per colour, but pseudocolor isn't worth
796 // many extra optimisations. 800 // many extra optimisations.
797 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 801 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
798 802
799 int diff = 0x7fffffffUL; 803 int diff = 0x7fffffffUL;
… …
812 } 816 }
813 } 817 }
814 818
815 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 819 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
816 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 820 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
817 821
818 got = alloc (screen, rgba (best->red, best->green, best->blue)); 822 got = alloc (screen, rgba (best->red, best->green, best->blue));
819 823
820 delete [] colors; 824 delete [] colors;
821 } 825 }
822#endif 826#endif
… …
850 color.green = c.g; 854 color.green = c.g;
851 color.blue = c.b; 855 color.blue = c.b;
852 color.pixel = (Pixel)*this; 856 color.pixel = (Pixel)*this;
853} 857}
854 858
855void 859void
856rxvt_color::free (rxvt_screen *screen) 860rxvt_color::free (rxvt_screen *screen)
857{ 861{
858 if (screen->visual->c_class == TrueColor) 862 if (screen->visual->c_class == TrueColor)
859 return; // nothing to do 863 return; // nothing to do
860 864
… …
880 lerp (c.a, to.a, percent) 884 lerp (c.a, to.a, percent)
881 ) 885 )
882 ); 886 );
883} 887}
884 888
889#if TRACE_PIXMAPS
890# undef XCreatePixmap
891# undef XFreePixmap
892Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
893{
894 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
895 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
896 return res;
897}
898
899void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
900{
901 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
902 XFreePixmap (dpy,p);
903}
904#endif

Diff Legend

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