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.77 by sasha, Wed Nov 14 22:25:42 2007 UTC

… …
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 ()
… …
313 */ 313 */
314 char *displayResource, *xe; 314 char *displayResource, *xe;
315 XrmDatabase rdb1, database = 0; 315 XrmDatabase rdb1, database = 0;
316 316
317 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 317 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
318 // as opposed to "standard practise", we always read in ~/.Xdefaults
318 319
319 // 6. System wide per application default file. 320 // 6. System wide per application default file.
320 321
321 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
322 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 323 if ((xe = (char *)getenv ("XAPPLRESDIR")))
… …
329 330
330 // 5. User's per application default file. 331 // 5. User's per application default file.
331 // none 332 // none
332 333
333 // 4. User's defaults file. 334 // 4. User's defaults file.
335 if (homedir)
336 {
337 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
338
339 if ((rdb1 = XrmGetFileDatabase (fname)))
340 XrmMergeDatabases (rdb1, &database);
341 }
342
334 /* Get any Xserver defaults */ 343 /* Get any Xserver defaults */
335 if (refresh) 344 if (refresh)
336 { 345 {
337 // fucking xlib keeps a copy of the rm string 346 // fucking xlib keeps a copy of the rm string
338 Atom actual_type; 347 Atom actual_type;
… …
354 && actual_format == 8) 363 && actual_format == 8)
355 displayResource = val; 364 displayResource = val;
356 else 365 else
357 { 366 {
358 displayResource = 0; 367 displayResource = 0;
368
359 if (val) 369 if (val)
360 XFree(val); 370 XFree(val);
361 } 371 }
362 372
363#if XLIB_ILLEGAL_ACCESS 373#if XLIB_ILLEGAL_ACCESS
… …
368 displayResource = XResourceManagerString (dpy); 378 displayResource = XResourceManagerString (dpy);
369 379
370 if (displayResource) 380 if (displayResource)
371 { 381 {
372 if ((rdb1 = XrmGetStringDatabase (displayResource))) 382 if ((rdb1 = XrmGetStringDatabase (displayResource)))
373 XrmMergeDatabases (rdb1, &database);
374 }
375 else if (homedir)
376 {
377 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
378
379 if ((rdb1 = XrmGetFileDatabase (fname)))
380 XrmMergeDatabases (rdb1, &database); 383 XrmMergeDatabases (rdb1, &database);
381 } 384 }
382 385
383#if !XLIB_ILLEGAL_ACCESS 386#if !XLIB_ILLEGAL_ACCESS
384 if (refresh && displayResource) 387 if (refresh && displayResource)
… …
459#endif 462#endif
460 463
461 int fd = XConnectionNumber (dpy); 464 int fd = XConnectionNumber (dpy);
462 465
463 // try to detect wether we have a local connection. 466 // try to detect wether we have a local connection.
464 // assume unix domains socket == local, everything else not 467 // assume unix domain socket == local, everything else not
465 // TODO: might want to check for inet/127.0.0.1 468 // TODO: might want to check for inet/127.0.0.1
466 is_local = 0; 469 is_local = 0;
467 sockaddr_un sa; 470 sockaddr_un sa;
468 socklen_t sl = sizeof (sa); 471 socklen_t sl = sizeof (sa);
469 472
470 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 473 if (!getsockname (fd, (sockaddr *)&sa, &sl))
471 is_local = sa.sun_family == AF_LOCAL; 474 is_local = sa.sun_family == AF_UNIX;
472 475
473 x_ev.start (fd, EVENT_READ); 476 x_ev.start (fd, ev::READ);
474 fcntl (fd, F_SETFD, FD_CLOEXEC); 477 fcntl (fd, F_SETFD, FD_CLOEXEC);
475 478
476 XSelectInput (dpy, root, PropertyChangeMask); 479 XSelectInput (dpy, root, PropertyChangeMask);
477 480
478 flush (); 481 flush ();
… …
535 538
536 XFree (atoms); 539 XFree (atoms);
537} 540}
538#endif 541#endif
539 542
540void rxvt_display::x_cb (io_watcher &w, short revents) 543void rxvt_display::x_cb (ev::io &w, int revents)
541{ 544{
542 do 545 do
543 { 546 {
544 XEvent xev; 547 XEvent xev;
545 XNextEvent (dpy, &xev); 548 XNextEvent (dpy, &xev);
… …
550 if (xev.type == PropertyNotify 553 if (xev.type == PropertyNotify
551 && xev.xany.window == root 554 && xev.xany.window == root
552 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 555 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
553 im_change_check (); 556 im_change_check ();
554#endif 557#endif
558 if (xev.type == MappingNotify)
559 XRefreshKeyboardMapping (&xev.xmapping);
560
555 for (int i = xw.size (); i--; ) 561 for (int i = xw.size (); i--; )
556 { 562 {
557 if (!xw[i]) 563 if (!xw[i])
558 xw.erase_unordered (i); 564 xw.erase_unordered (i);
559 else if (xw[i]->window == xev.xany.window) 565 else if (xw[i]->window == xev.xany.window)
… …
569} 575}
570 576
571void rxvt_display::flush () 577void rxvt_display::flush ()
572{ 578{
573 if (XEventsQueued (dpy, QueuedAlready)) 579 if (XEventsQueued (dpy, QueuedAlready))
574 x_cb (x_ev, EVENT_READ); 580 x_cb (x_ev, ev::READ);
575 581
576 XFlush (dpy); 582 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)
… …
654static unsigned int 666static unsigned int
655insert_component (unsigned int value, unsigned int mask, unsigned int shift) 667insert_component (unsigned int value, unsigned int mask, unsigned int shift)
656{ 668{
657 return (value * (mask + 1) >> 16) << shift; 669 return (value * (mask + 1) >> 16) << shift;
658} 670}
659 671
660bool 672bool
661rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 673rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
662{ 674{
663#if XFT 675#if XFT
664 XRenderPictFormat *format; 676 XRenderPictFormat *format;
… …
698 c.green = color.g; 710 c.green = color.g;
699 c.blue = color.b; 711 c.blue = color.b;
700 712
701 if (screen->visual->c_class == TrueColor) 713 if (screen->visual->c_class == TrueColor)
702 { 714 {
703 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 715 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask ))
704 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 716 | (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 )) 717 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
708 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
709 718
710 return true; 719 return true;
711 } 720 }
712 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 721 else if (XAllocColor (screen->dpy, screen->cmap, &c))
713 return true; 722 return true;
… …
734 name += skip; 743 name += skip;
735 } 744 }
736 else 745 else
737 c.a = rgba::MAX_CC; 746 c.a = rgba::MAX_CC;
738 747
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 }
739 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 760 // 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)) 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))
741 { 762 {
742 XColor xc, xc_exact; 763 XColor xc;
743 764
744 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 765 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
745 { 766 {
746 c.r = xc.red; 767 c.r = xc.red;
747 c.g = xc.green; 768 c.g = xc.green;
… …
774 { 795 {
775 XColor *colors = new XColor [screen->visual->map_entries]; 796 XColor *colors = new XColor [screen->visual->map_entries];
776 797
777 for (int i = 0; i < cmap_size; i++) 798 for (int i = 0; i < cmap_size; i++)
778 colors [i].pixel = i; 799 colors [i].pixel = i;
779 800
780 // many kilobytes transfer per colour, but pseudocolor isn't worth 801 // many kilobytes transfer per colour, but pseudocolor isn't worth
781 // many extra optimisations. 802 // many extra optimisations.
782 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 803 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
783 804
784 int diff = 0x7fffffffUL; 805 int diff = 0x7fffffffUL;
… …
797 } 818 }
798 } 819 }
799 820
800 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 821 //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); 822 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
802 823
803 got = alloc (screen, rgba (best->red, best->green, best->blue)); 824 got = alloc (screen, rgba (best->red, best->green, best->blue));
804 825
805 delete colors; 826 delete [] colors;
806 } 827 }
807#endif 828#endif
808 829
809 return got; 830 return got;
810} 831}
… …
835 color.green = c.g; 856 color.green = c.g;
836 color.blue = c.b; 857 color.blue = c.b;
837 color.pixel = (Pixel)*this; 858 color.pixel = (Pixel)*this;
838} 859}
839 860
840void 861void
841rxvt_color::free (rxvt_screen *screen) 862rxvt_color::free (rxvt_screen *screen)
842{ 863{
843 if (screen->visual->c_class == TrueColor) 864 if (screen->visual->c_class == TrueColor)
844 return; // nothing to do 865 return; // nothing to do
845 866
… …
865 lerp (c.a, to.a, percent) 886 lerp (c.a, to.a, percent)
866 ) 887 )
867 ); 888 );
868} 889}
869 890
891#if TRACE_PIXMAPS
892# undef XCreatePixmap
893# undef XFreePixmap
894Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
895{
896 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
897 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
898 return res;
899}
900
901void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
902{
903 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
904 XFreePixmap (dpy,p);
905}
906#endif

Diff Legend

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