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.67 by ayin, Mon Jun 25 23:27:18 2007 UTC vs.
Revision 1.76 by root, Sun Nov 11 18:05:19 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 ()
… …
443 return false; 443 return false;
444 444
445 screen = DefaultScreen (dpy); 445 screen = DefaultScreen (dpy);
446 root = DefaultRootWindow (dpy); 446 root = DefaultRootWindow (dpy);
447 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
454 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 448 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
455 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 449 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
456 450
457 XrmSetDatabase (dpy, get_resources (false)); 451 XrmSetDatabase (dpy, get_resources (false));
458 452
… …
468#endif 462#endif
469 463
470 int fd = XConnectionNumber (dpy); 464 int fd = XConnectionNumber (dpy);
471 465
472 // try to detect wether we have a local connection. 466 // try to detect wether we have a local connection.
473 // assume unix domains socket == local, everything else not 467 // assume unix domain socket == local, everything else not
474 // TODO: might want to check for inet/127.0.0.1 468 // TODO: might want to check for inet/127.0.0.1
475 is_local = 0; 469 is_local = 0;
476 sockaddr_un sa; 470 sockaddr_un sa;
477 socklen_t sl = sizeof (sa); 471 socklen_t sl = sizeof (sa);
478 472
479 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 473 if (!getsockname (fd, (sockaddr *)&sa, &sl))
480 is_local = sa.sun_family == AF_UNIX; 474 is_local = sa.sun_family == AF_UNIX;
481 475
482 x_ev.start (fd, EVENT_READ); 476 x_ev.start (fd, ev::READ);
483 fcntl (fd, F_SETFD, FD_CLOEXEC); 477 fcntl (fd, F_SETFD, FD_CLOEXEC);
484 478
485 XSelectInput (dpy, root, PropertyChangeMask); 479 XSelectInput (dpy, root, PropertyChangeMask);
486 480
487 flush (); 481 flush ();
… …
544 538
545 XFree (atoms); 539 XFree (atoms);
546} 540}
547#endif 541#endif
548 542
549void rxvt_display::x_cb (io_watcher &w, short revents) 543void rxvt_display::x_cb (ev::io &w, int revents)
550{ 544{
551 do 545 do
552 { 546 {
553 XEvent xev; 547 XEvent xev;
554 XNextEvent (dpy, &xev); 548 XNextEvent (dpy, &xev);
… …
559 if (xev.type == PropertyNotify 553 if (xev.type == PropertyNotify
560 && xev.xany.window == root 554 && xev.xany.window == root
561 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 555 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
562 im_change_check (); 556 im_change_check ();
563#endif 557#endif
558 if (xev.type == MappingNotify)
559 XRefreshKeyboardMapping (&xev.xmapping);
560
564 for (int i = xw.size (); i--; ) 561 for (int i = xw.size (); i--; )
565 { 562 {
566 if (!xw[i]) 563 if (!xw[i])
567 xw.erase_unordered (i); 564 xw.erase_unordered (i);
568 else if (xw[i]->window == xev.xany.window) 565 else if (xw[i]->window == xev.xany.window)
… …
578} 575}
579 576
580void rxvt_display::flush () 577void rxvt_display::flush ()
581{ 578{
582 if (XEventsQueued (dpy, QueuedAlready)) 579 if (XEventsQueued (dpy, QueuedAlready))
583 x_cb (x_ev, EVENT_READ); 580 x_cb (x_ev, ev::READ);
584 581
585 XFlush (dpy); 582 XFlush (dpy);
586} 583}
587 584
588void rxvt_display::reg (xevent_watcher *w) 585void rxvt_display::reg (xevent_watcher *w)
… …
669static unsigned int 666static unsigned int
670insert_component (unsigned int value, unsigned int mask, unsigned int shift) 667insert_component (unsigned int value, unsigned int mask, unsigned int shift)
671{ 668{
672 return (value * (mask + 1) >> 16) << shift; 669 return (value * (mask + 1) >> 16) << shift;
673} 670}
674 671
675bool 672bool
676rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 673rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
677{ 674{
678#if XFT 675#if XFT
679 XRenderPictFormat *format; 676 XRenderPictFormat *format;
… …
746 name += skip; 743 name += skip;
747 } 744 }
748 else 745 else
749 c.a = rgba::MAX_CC; 746 c.a = rgba::MAX_CC;
750 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 }
751 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 760 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
752 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))
753 { 762 {
754 XColor xc, xc_exact; 763 XColor xc;
755 764
756 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 765 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
757 { 766 {
758 c.r = xc.red; 767 c.r = xc.red;
759 c.g = xc.green; 768 c.g = xc.green;
… …
786 { 795 {
787 XColor *colors = new XColor [screen->visual->map_entries]; 796 XColor *colors = new XColor [screen->visual->map_entries];
788 797
789 for (int i = 0; i < cmap_size; i++) 798 for (int i = 0; i < cmap_size; i++)
790 colors [i].pixel = i; 799 colors [i].pixel = i;
791 800
792 // many kilobytes transfer per colour, but pseudocolor isn't worth 801 // many kilobytes transfer per colour, but pseudocolor isn't worth
793 // many extra optimisations. 802 // many extra optimisations.
794 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 803 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
795 804
796 int diff = 0x7fffffffUL; 805 int diff = 0x7fffffffUL;
… …
809 } 818 }
810 } 819 }
811 820
812 //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",
813 // 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);
814 823
815 got = alloc (screen, rgba (best->red, best->green, best->blue)); 824 got = alloc (screen, rgba (best->red, best->green, best->blue));
816 825
817 delete [] colors; 826 delete [] colors;
818 } 827 }
819#endif 828#endif
… …
847 color.green = c.g; 856 color.green = c.g;
848 color.blue = c.b; 857 color.blue = c.b;
849 color.pixel = (Pixel)*this; 858 color.pixel = (Pixel)*this;
850} 859}
851 860
852void 861void
853rxvt_color::free (rxvt_screen *screen) 862rxvt_color::free (rxvt_screen *screen)
854{ 863{
855 if (screen->visual->c_class == TrueColor) 864 if (screen->visual->c_class == TrueColor)
856 return; // nothing to do 865 return; // nothing to do
857 866

Diff Legend

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