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.59 by root, Wed Jul 5 20:31:48 2006 UTC vs.
Revision 1.95 by root, Sat Jan 26 12:03:36 2008 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.
… …
64#endif 64#endif
65#if USE_XIM 65#if USE_XIM
66 "WM_LOCALE_NAME", 66 "WM_LOCALE_NAME",
67 "XIM_SERVERS", 67 "XIM_SERVERS",
68#endif 68#endif
69#ifdef TRANSPARENT 69#ifdef ENABLE_TRANSPARENCY
70 "_XROOTPMAP_ID", 70 "_XROOTPMAP_ID",
71 "ESETROOT_PMAP_ID", 71 "ESETROOT_PMAP_ID",
72#endif 72#endif
73#if ENABLE_XEMBED 73#if ENABLE_XEMBED
74 "_XEMBED", 74 "_XEMBED",
… …
183 183
184 XIMCallback ximcallback; 184 XIMCallback ximcallback;
185 ximcallback.client_data = (XPointer)this; 185 ximcallback.client_data = (XPointer)this;
186 ximcallback.callback = im_destroy_cb; 186 ximcallback.callback = im_destroy_cb;
187 187
188 XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0); 188 XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
189 189
190 return true; 190 return true;
191} 191}
192 192
193rxvt_xim::~rxvt_xim () 193rxvt_xim::~rxvt_xim ()
… …
295 295
296///////////////////////////////////////////////////////////////////////////// 296/////////////////////////////////////////////////////////////////////////////
297 297
298rxvt_display::rxvt_display (const char *id) 298rxvt_display::rxvt_display (const char *id)
299: refcounted (id) 299: refcounted (id)
300, x_ev (this, &rxvt_display::x_cb)
301, selection_owner (0) 300, selection_owner (0)
302{ 301{
302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
303} 304}
304 305
305XrmDatabase 306XrmDatabase
306rxvt_display::get_resources (bool refresh) 307rxvt_display::get_resources (bool refresh)
307{ 308{
308 char *homedir = (char *)getenv ("HOME"); 309 char *homedir = getenv ("HOME");
309 char fname[1024]; 310 char fname[1024];
310 311
311 /* 312 /*
312 * get resources using the X library function 313 * get resources using the X library function
313 */ 314 */
314 char *displayResource, *xe; 315 char *displayResource, *xe;
315 XrmDatabase rdb1, database = 0; 316 XrmDatabase rdb1, database = 0;
316 317
317 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 318 // 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
318 320
319 // 6. System wide per application default file. 321 // 6. System wide per application default file.
320 322
321 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 323 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
322 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 324 if ((xe = getenv ("XAPPLRESDIR")))
323 { 325 {
324 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 326 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
325 327
326 if ((rdb1 = XrmGetFileDatabase (fname))) 328 if ((rdb1 = XrmGetFileDatabase (fname)))
327 XrmMergeDatabases (rdb1, &database); 329 XrmMergeDatabases (rdb1, &database);
… …
329 331
330 // 5. User's per application default file. 332 // 5. User's per application default file.
331 // none 333 // none
332 334
333 // 4. User's defaults file. 335 // 4. User's defaults file.
336 if (homedir)
337 {
338 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
339
340 if ((rdb1 = XrmGetFileDatabase (fname)))
341 XrmMergeDatabases (rdb1, &database);
342 }
343
334 /* Get any Xserver defaults */ 344 /* Get any Xserver defaults */
335 if (refresh) 345 if (refresh)
336 { 346 {
337 // fucking xlib keeps a copy of the rm string 347 // fucking xlib keeps a copy of the rm string
338 Atom actual_type; 348 Atom actual_type;
… …
354 && actual_format == 8) 364 && actual_format == 8)
355 displayResource = val; 365 displayResource = val;
356 else 366 else
357 { 367 {
358 displayResource = 0; 368 displayResource = 0;
369
359 if (val) 370 if (val)
360 XFree(val); 371 XFree(val);
361 } 372 }
362 373
363#if XLIB_ILLEGAL_ACCESS 374#if XLIB_ILLEGAL_ACCESS
… …
370 if (displayResource) 381 if (displayResource)
371 { 382 {
372 if ((rdb1 = XrmGetStringDatabase (displayResource))) 383 if ((rdb1 = XrmGetStringDatabase (displayResource)))
373 XrmMergeDatabases (rdb1, &database); 384 XrmMergeDatabases (rdb1, &database);
374 } 385 }
375 else if (homedir)
376 {
377 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
378
379 if ((rdb1 = XrmGetFileDatabase (fname)))
380 XrmMergeDatabases (rdb1, &database);
381 }
382 386
383#if !XLIB_ILLEGAL_ACCESS 387#if !XLIB_ILLEGAL_ACCESS
384 if (refresh && displayResource) 388 if (refresh && displayResource)
385 XFree (displayResource); 389 XFree (displayResource);
386#endif 390#endif
… …
397 XFree (displayResource); 401 XFree (displayResource);
398 } 402 }
399 403
400 // 3. User's per host defaults file 404 // 3. User's per host defaults file
401 /* Add in XENVIRONMENT file */ 405 /* Add in XENVIRONMENT file */
402 if ((xe = (char *)getenv ("XENVIRONMENT")) 406 if ((xe = getenv ("XENVIRONMENT"))
403 && (rdb1 = XrmGetFileDatabase (xe))) 407 && (rdb1 = XrmGetFileDatabase (xe)))
404 XrmMergeDatabases (rdb1, &database); 408 XrmMergeDatabases (rdb1, &database);
405 else if (homedir) 409 else if (homedir)
406 { 410 {
407 struct utsname un; 411 struct utsname un;
… …
459#endif 463#endif
460 464
461 int fd = XConnectionNumber (dpy); 465 int fd = XConnectionNumber (dpy);
462 466
463 // try to detect wether we have a local connection. 467 // try to detect wether we have a local connection.
464 // assume unix domains socket == local, everything else not 468 // assume unix domain socket == local, everything else not
465 // TODO: might want to check for inet/127.0.0.1 469 // TODO: might want to check for inet/127.0.0.1
466 is_local = 0; 470 is_local = 0;
467 sockaddr_un sa; 471 sockaddr_un sa;
468 socklen_t sl = sizeof (sa); 472 socklen_t sl = sizeof (sa);
469 473
470 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 474 if (!getsockname (fd, (sockaddr *)&sa, &sl))
471 is_local = sa.sun_family == AF_LOCAL; 475 is_local = sa.sun_family == AF_UNIX;
472 476
477 flush_ev.start ();
473 x_ev.start (fd, EVENT_READ); 478 x_ev.start (fd, ev::READ);
474 fcntl (fd, F_SETFD, FD_CLOEXEC); 479 fcntl (fd, F_SETFD, FD_CLOEXEC);
475 480
476 XSelectInput (dpy, root, PropertyChangeMask); 481 XSelectInput (dpy, root, PropertyChangeMask);
477 482
478 flush (); 483 flush ();
… …
496 501
497#ifdef POINTER_BLANK 502#ifdef POINTER_BLANK
498 XFreeCursor (dpy, blank_cursor); 503 XFreeCursor (dpy, blank_cursor);
499#endif 504#endif
500 x_ev.stop (); 505 x_ev.stop ();
506 flush_ev.stop ();
501#ifdef USE_XIM 507#ifdef USE_XIM
502 xims.clear (); 508 xims.clear ();
503#endif 509#endif
504 XCloseDisplay (dpy); 510 XCloseDisplay (dpy);
505} 511}
… …
535 541
536 XFree (atoms); 542 XFree (atoms);
537} 543}
538#endif 544#endif
539 545
540void rxvt_display::x_cb (io_watcher &w, short revents) 546void rxvt_display::x_cb (ev::io &w, int revents)
541{ 547{
542 do 548 while (XEventsQueued (dpy, QueuedAfterReading))
543 { 549 {
544 XEvent xev; 550 XEvent xev;
545 XNextEvent (dpy, &xev); 551 XNextEvent (dpy, &xev);
546 552
547#ifdef USE_XIM 553#ifdef USE_XIM
548 if (!XFilterEvent (&xev, None)) 554 if (!XFilterEvent (&xev, None))
555#endif
549 { 556 {
550 if (xev.type == PropertyNotify 557 if (xev.type == PropertyNotify
551 && xev.xany.window == root 558 && xev.xany.window == root
552 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 559 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
553 im_change_check (); 560 im_change_check ();
554#endif 561
562 if (xev.type == MappingNotify)
563 XRefreshKeyboardMapping (&xev.xmapping);
564
555 for (int i = xw.size (); i--; ) 565 for (int i = xw.size (); i--; )
556 { 566 {
557 if (!xw[i]) 567 if (!xw[i])
558 xw.erase_unordered (i); 568 xw.erase_unordered (i);
559 else if (xw[i]->window == xev.xany.window) 569 else if (xw[i]->window == xev.xany.window)
560 xw[i]->call (xev); 570 xw[i]->call (xev);
561 } 571 }
562#ifdef USE_XIM
563 } 572 }
564#endif
565 } 573 }
566 while (XEventsQueued (dpy, QueuedAlready));
567 574
575 flush_ev.start ();
576}
577
578void rxvt_display::flush_cb (ev::prepare &w, int revents)
579{
580 x_cb(x_ev,0);//D
568 XFlush (dpy); 581 XFlush (dpy);
569} 582 w.stop ();
570
571void rxvt_display::flush ()
572{
573 if (XEventsQueued (dpy, QueuedAlready))
574 x_cb (x_ev, EVENT_READ);
575
576 XFlush (dpy);
577} 583}
578 584
579void rxvt_display::reg (xevent_watcher *w) 585void rxvt_display::reg (xevent_watcher *w)
580{ 586{
587 if (!w->active)
588 {
581 xw.push_back (w); 589 xw.push_back (w);
582 w->active = xw.size (); 590 w->active = xw.size ();
591 }
583} 592}
584 593
585void rxvt_display::unreg (xevent_watcher *w) 594void rxvt_display::unreg (xevent_watcher *w)
586{ 595{
587 if (w->active) 596 if (w->active)
597 {
588 xw[w->active - 1] = 0; 598 xw[w->active - 1] = 0;
599 w->active = 0;
600 }
589} 601}
590 602
591void rxvt_display::set_selection_owner (rxvt_term *owner) 603void rxvt_display::set_selection_owner (rxvt_term *owner)
592{ 604{
593 if (selection_owner && selection_owner != owner) 605 if (selection_owner && selection_owner != owner)
606 {
607 rxvt_term *owner = selection_owner;
608
594 selection_owner->selection_clear (); 609 owner->selection_clear ();
610 owner->flush ();
611 }
595 612
596 selection_owner = owner; 613 selection_owner = owner;
597} 614}
598 615
599#ifdef USE_XIM 616#ifdef USE_XIM
… …
654static unsigned int 671static unsigned int
655insert_component (unsigned int value, unsigned int mask, unsigned int shift) 672insert_component (unsigned int value, unsigned int mask, unsigned int shift)
656{ 673{
657 return (value * (mask + 1) >> 16) << shift; 674 return (value * (mask + 1) >> 16) << shift;
658} 675}
659 676
660bool 677bool
661rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 678rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
662{ 679{
680 //TODO: only supports 24 bit
681 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
682
663#if XFT 683#if XFT
664 XRenderPictFormat *format; 684 XRenderPictFormat *format;
665 685
666 // FUCKING Xft gets it wrong, of course, so work around it. 686 // FUCKING Xft gets it wrong, of course, so work around it.
667 // Transparency users should eat shit and die, and then 687 // Transparency users should eat shit and die, and then
… …
671 { 691 {
672 // the fun lies in doing everything manually... 692 // the fun lies in doing everything manually...
673 c.color.red = color.r; 693 c.color.red = color.r;
674 c.color.green = color.g; 694 c.color.green = color.g;
675 c.color.blue = color.b; 695 c.color.blue = color.b;
676 c.color.alpha = color.a; 696 c.color.alpha = alpha;
677 697
678 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 698 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
679 | insert_component (color.g, format->direct.greenMask, format->direct.green) 699 | insert_component (color.g, format->direct.greenMask, format->direct.green)
680 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 700 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
681 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 701 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
682 702
683 return true; 703 return true;
684 } 704 }
685 else 705 else
686 { 706 {
687 XRenderColor d; 707 XRenderColor d;
688 708
689 d.red = color.r; 709 d.red = color.r;
690 d.green = color.g; 710 d.green = color.g;
691 d.blue = color.b; 711 d.blue = color.b;
692 d.alpha = color.a; 712 d.alpha = alpha;
693 713
694 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 714 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
695 } 715 }
696#else 716#else
697 c.red = color.r; 717 c.red = color.r;
698 c.green = color.g; 718 c.green = color.g;
699 c.blue = color.b; 719 c.blue = color.b;
700 720
701 if (screen->visual->c_class == TrueColor) 721 if (screen->visual->c_class == TrueColor)
702 { 722 {
703 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 723 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask ))
704 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 724 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
705 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
706 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
707 | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask )) 725 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
708 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
709 726
710 return true; 727 return true;
711 } 728 }
712 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 729 else if (XAllocColor (screen->dpy, screen->cmap, &c))
713 return true; 730 return true;
… …
725{ 742{
726 rgba c; 743 rgba c;
727 char eos; 744 char eos;
728 int skip; 745 int skip;
729 746
747 c.a = rgba::MAX_CC;
748
730 // parse the nonstandard "[alphapercent]" prefix 749 // parse the nonstandard "[alphapercent]" prefix
731 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 750 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
732 { 751 {
733 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 752 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
734 name += skip; 753 name += skip;
735 } 754 }
736 else
737 c.a = rgba::MAX_CC;
738 755
739 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 756 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
740 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 757 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
741 { 758 {
742 XColor xc, xc_exact; 759 XColor xc;
743 760
744 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 761 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
745 { 762 {
746 c.r = xc.red; 763 c.r = xc.red;
747 c.g = xc.green; 764 c.g = xc.green;
… …
774 { 791 {
775 XColor *colors = new XColor [screen->visual->map_entries]; 792 XColor *colors = new XColor [screen->visual->map_entries];
776 793
777 for (int i = 0; i < cmap_size; i++) 794 for (int i = 0; i < cmap_size; i++)
778 colors [i].pixel = i; 795 colors [i].pixel = i;
779 796
780 // many kilobytes transfer per colour, but pseudocolor isn't worth 797 // many kilobytes transfer per colour, but pseudocolor isn't worth
781 // many extra optimisations. 798 // many extra optimisations.
782 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 799 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
783 800
784 int diff = 0x7fffffffUL; 801 int diff = 0x7fffffffUL;
… …
797 } 814 }
798 } 815 }
799 816
800 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 817 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
801 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 818 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
802 819
803 got = alloc (screen, rgba (best->red, best->green, best->blue)); 820 got = alloc (screen, rgba (best->red, best->green, best->blue));
804 821
805 delete colors; 822 delete [] colors;
806 } 823 }
807#endif 824#endif
808 825
809 return got; 826 return got;
810} 827}
… …
835 color.green = c.g; 852 color.green = c.g;
836 color.blue = c.b; 853 color.blue = c.b;
837 color.pixel = (Pixel)*this; 854 color.pixel = (Pixel)*this;
838} 855}
839 856
840void 857void
841rxvt_color::free (rxvt_screen *screen) 858rxvt_color::free (rxvt_screen *screen)
842{ 859{
843 if (screen->visual->c_class == TrueColor) 860 if (screen->visual->c_class == TrueColor)
844 return; // nothing to do 861 return; // nothing to do
845 862
… …
865 lerp (c.a, to.a, percent) 882 lerp (c.a, to.a, percent)
866 ) 883 )
867 ); 884 );
868} 885}
869 886
887#if TRACE_PIXMAPS
888# undef XCreatePixmap
889# undef XFreePixmap
890Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
891{
892 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
893 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
894 return res;
895}
896
897void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
898{
899 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
900 XFreePixmap (dpy,p);
901}
902#endif

Diff Legend

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