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.58 by root, Wed Jul 5 19:22:15 2006 UTC vs.
Revision 1.74 by root, Sat Nov 10 23:10:55 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 ()
… …
262 visual = DefaultVisualOfScreen (screen); 262 visual = DefaultVisualOfScreen (screen);
263 cmap = DefaultColormapOfScreen (screen); 263 cmap = DefaultColormapOfScreen (screen);
264} 264}
265 265
266void 266void
267rxvt_screen::set (rxvt_display *disp, int bitdepth) 267rxvt_screen::select_visual (int bitdepth)
268{ 268{
269 set (disp);
270
271#if XFT 269#if XFT
272 XVisualInfo vinfo; 270 XVisualInfo vinfo;
273 271
274 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo)) 272 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
275 { 273 {
276 depth = bitdepth; 274 depth = bitdepth;
277 visual = vinfo.visual; 275 visual = vinfo.visual;
278 cmap = XCreateColormap (dpy, disp->root, visual, AllocNone); 276 cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
279 } 277 }
280#endif 278#endif
281} 279}
282 280
283void 281void
… …
315 */ 313 */
316 char *displayResource, *xe; 314 char *displayResource, *xe;
317 XrmDatabase rdb1, database = 0; 315 XrmDatabase rdb1, database = 0;
318 316
319 // 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
320 319
321 // 6. System wide per application default file. 320 // 6. System wide per application default file.
322 321
323 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
324 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 323 if ((xe = (char *)getenv ("XAPPLRESDIR")))
… …
331 330
332 // 5. User's per application default file. 331 // 5. User's per application default file.
333 // none 332 // none
334 333
335 // 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
336 /* Get any Xserver defaults */ 343 /* Get any Xserver defaults */
337 if (refresh) 344 if (refresh)
338 { 345 {
339 // fucking xlib keeps a copy of the rm string 346 // fucking xlib keeps a copy of the rm string
340 Atom actual_type; 347 Atom actual_type;
… …
356 && actual_format == 8) 363 && actual_format == 8)
357 displayResource = val; 364 displayResource = val;
358 else 365 else
359 { 366 {
360 displayResource = 0; 367 displayResource = 0;
368
361 if (val) 369 if (val)
362 XFree(val); 370 XFree(val);
363 } 371 }
364 372
365#if XLIB_ILLEGAL_ACCESS 373#if XLIB_ILLEGAL_ACCESS
… …
370 displayResource = XResourceManagerString (dpy); 378 displayResource = XResourceManagerString (dpy);
371 379
372 if (displayResource) 380 if (displayResource)
373 { 381 {
374 if ((rdb1 = XrmGetStringDatabase (displayResource))) 382 if ((rdb1 = XrmGetStringDatabase (displayResource)))
375 XrmMergeDatabases (rdb1, &database);
376 }
377 else if (homedir)
378 {
379 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
380
381 if ((rdb1 = XrmGetFileDatabase (fname)))
382 XrmMergeDatabases (rdb1, &database); 383 XrmMergeDatabases (rdb1, &database);
383 } 384 }
384 385
385#if !XLIB_ILLEGAL_ACCESS 386#if !XLIB_ILLEGAL_ACCESS
386 if (refresh && displayResource) 387 if (refresh && displayResource)
… …
468 is_local = 0; 469 is_local = 0;
469 sockaddr_un sa; 470 sockaddr_un sa;
470 socklen_t sl = sizeof (sa); 471 socklen_t sl = sizeof (sa);
471 472
472 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 473 if (!getsockname (fd, (sockaddr *)&sa, &sl))
473 is_local = sa.sun_family == AF_LOCAL; 474 is_local = sa.sun_family == AF_UNIX;
474 475
475 x_ev.start (fd, EVENT_READ); 476 x_ev.start (fd, EVENT_READ);
476 fcntl (fd, F_SETFD, FD_CLOEXEC); 477 fcntl (fd, F_SETFD, FD_CLOEXEC);
477 478
478 XSelectInput (dpy, root, PropertyChangeMask); 479 XSelectInput (dpy, root, PropertyChangeMask);
… …
552 if (xev.type == PropertyNotify 553 if (xev.type == PropertyNotify
553 && xev.xany.window == root 554 && xev.xany.window == root
554 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 555 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
555 im_change_check (); 556 im_change_check ();
556#endif 557#endif
558 if (xev.type == MappingNotify)
559 XRefreshKeyboardMapping (&xev.xmapping);
560
557 for (int i = xw.size (); i--; ) 561 for (int i = xw.size (); i--; )
558 { 562 {
559 if (!xw[i]) 563 if (!xw[i])
560 xw.erase_unordered (i); 564 xw.erase_unordered (i);
561 else if (xw[i]->window == xev.xany.window) 565 else if (xw[i]->window == xev.xany.window)
… …
578 XFlush (dpy); 582 XFlush (dpy);
579} 583}
580 584
581void rxvt_display::reg (xevent_watcher *w) 585void rxvt_display::reg (xevent_watcher *w)
582{ 586{
587 if (!w->active)
588 {
583 xw.push_back (w); 589 xw.push_back (w);
584 w->active = xw.size (); 590 w->active = xw.size ();
591 }
585} 592}
586 593
587void rxvt_display::unreg (xevent_watcher *w) 594void rxvt_display::unreg (xevent_watcher *w)
588{ 595{
589 if (w->active) 596 if (w->active)
597 {
590 xw[w->active - 1] = 0; 598 xw[w->active - 1] = 0;
599 w->active = 0;
600 }
591} 601}
592 602
593void rxvt_display::set_selection_owner (rxvt_term *owner) 603void rxvt_display::set_selection_owner (rxvt_term *owner)
594{ 604{
595 if (selection_owner && selection_owner != owner) 605 if (selection_owner && selection_owner != owner)
… …
656static unsigned int 666static unsigned int
657insert_component (unsigned int value, unsigned int mask, unsigned int shift) 667insert_component (unsigned int value, unsigned int mask, unsigned int shift)
658{ 668{
659 return (value * (mask + 1) >> 16) << shift; 669 return (value * (mask + 1) >> 16) << shift;
660} 670}
661 671
662bool 672bool
663rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 673rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
664{ 674{
665#if XFT 675#if XFT
666 XRenderPictFormat *format; 676 XRenderPictFormat *format;
… …
700 c.green = color.g; 710 c.green = color.g;
701 c.blue = color.b; 711 c.blue = color.b;
702 712
703 if (screen->visual->c_class == TrueColor) 713 if (screen->visual->c_class == TrueColor)
704 { 714 {
705 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 ))
706 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 716 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
707 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
708 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
709 | (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 ));
710 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
711 718
712 return true; 719 return true;
713 } 720 }
714 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 721 else if (XAllocColor (screen->dpy, screen->cmap, &c))
715 return true; 722 return true;
… …
736 name += skip; 743 name += skip;
737 } 744 }
738 else 745 else
739 c.a = rgba::MAX_CC; 746 c.a = rgba::MAX_CC;
740 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 }
741 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 760 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
742 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))
743 { 762 {
744 XColor xc, xc_exact; 763 XColor xc;
745 764
746 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 765 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
747 { 766 {
748 c.r = xc.red; 767 c.r = xc.red;
749 c.g = xc.green; 768 c.g = xc.green;
… …
776 { 795 {
777 XColor *colors = new XColor [screen->visual->map_entries]; 796 XColor *colors = new XColor [screen->visual->map_entries];
778 797
779 for (int i = 0; i < cmap_size; i++) 798 for (int i = 0; i < cmap_size; i++)
780 colors [i].pixel = i; 799 colors [i].pixel = i;
781 800
782 // many kilobytes transfer per colour, but pseudocolor isn't worth 801 // many kilobytes transfer per colour, but pseudocolor isn't worth
783 // many extra optimisations. 802 // many extra optimisations.
784 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 803 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
785 804
786 int diff = 0x7fffffffUL; 805 int diff = 0x7fffffffUL;
… …
799 } 818 }
800 } 819 }
801 820
802 //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",
803 // 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);
804 823
805 got = alloc (screen, rgba (best->red, best->green, best->blue)); 824 got = alloc (screen, rgba (best->red, best->green, best->blue));
806 825
807 delete colors; 826 delete [] colors;
808 } 827 }
809#endif 828#endif
810 829
811 return got; 830 return got;
812} 831}
… …
837 color.green = c.g; 856 color.green = c.g;
838 color.blue = c.b; 857 color.blue = c.b;
839 color.pixel = (Pixel)*this; 858 color.pixel = (Pixel)*this;
840} 859}
841 860
842void 861void
843rxvt_color::free (rxvt_screen *screen) 862rxvt_color::free (rxvt_screen *screen)
844{ 863{
845 if (screen->visual->c_class == TrueColor) 864 if (screen->visual->c_class == TrueColor)
846 return; // nothing to do 865 return; // nothing to do
847 866

Diff Legend

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