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.57 by root, Mon Feb 20 22:42:01 2006 UTC vs.
Revision 1.69 by root, Sat Jun 30 18:10:41 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",
… …
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)
… …
441 if (!dpy) 442 if (!dpy)
442 return false; 443 return false;
443 444
444 screen = DefaultScreen (dpy); 445 screen = DefaultScreen (dpy);
445 root = DefaultRootWindow (dpy); 446 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
446 453
447 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 454 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
448 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 455 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
449 456
450 XrmSetDatabase (dpy, get_resources (false)); 457 XrmSetDatabase (dpy, get_resources (false));
… …
468 is_local = 0; 475 is_local = 0;
469 sockaddr_un sa; 476 sockaddr_un sa;
470 socklen_t sl = sizeof (sa); 477 socklen_t sl = sizeof (sa);
471 478
472 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 479 if (!getsockname (fd, (sockaddr *)&sa, &sl))
473 is_local = sa.sun_family == AF_LOCAL; 480 is_local = sa.sun_family == AF_UNIX;
474 481
475 x_ev.start (fd, EVENT_READ); 482 x_ev.start (fd, EVENT_READ);
476 fcntl (fd, F_SETFD, FD_CLOEXEC); 483 fcntl (fd, F_SETFD, FD_CLOEXEC);
477 484
478 XSelectInput (dpy, root, PropertyChangeMask); 485 XSelectInput (dpy, root, PropertyChangeMask);
… …
552 if (xev.type == PropertyNotify 559 if (xev.type == PropertyNotify
553 && xev.xany.window == root 560 && xev.xany.window == root
554 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 561 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
555 im_change_check (); 562 im_change_check ();
556#endif 563#endif
564 if (xev.type == MappingNotify)
565 XRefreshKeyboardMapping (&xev.xmapping);
566
557 for (int i = xw.size (); i--; ) 567 for (int i = xw.size (); i--; )
558 { 568 {
559 if (!xw[i]) 569 if (!xw[i])
560 xw.erase_unordered (i); 570 xw.erase_unordered (i);
561 else if (xw[i]->window == xev.xany.window) 571 else if (xw[i]->window == xev.xany.window)
… …
578 XFlush (dpy); 588 XFlush (dpy);
579} 589}
580 590
581void rxvt_display::reg (xevent_watcher *w) 591void rxvt_display::reg (xevent_watcher *w)
582{ 592{
593 if (!w->active)
594 {
583 xw.push_back (w); 595 xw.push_back (w);
584 w->active = xw.size (); 596 w->active = xw.size ();
597 }
585} 598}
586 599
587void rxvt_display::unreg (xevent_watcher *w) 600void rxvt_display::unreg (xevent_watcher *w)
588{ 601{
589 if (w->active) 602 if (w->active)
603 {
590 xw[w->active - 1] = 0; 604 xw[w->active - 1] = 0;
605 w->active = 0;
606 }
591} 607}
592 608
593void rxvt_display::set_selection_owner (rxvt_term *owner) 609void rxvt_display::set_selection_owner (rxvt_term *owner)
594{ 610{
595 if (selection_owner && selection_owner != owner) 611 if (selection_owner && selection_owner != owner)
… …
649 665
650template class refcache<rxvt_display>; 666template class refcache<rxvt_display>;
651refcache<rxvt_display> displays; 667refcache<rxvt_display> displays;
652 668
653///////////////////////////////////////////////////////////////////////////// 669/////////////////////////////////////////////////////////////////////////////
670//
671
672static unsigned int
673insert_component (unsigned int value, unsigned int mask, unsigned int shift)
674{
675 return (value * (mask + 1) >> 16) << shift;
676}
654 677
655bool 678bool
656rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 679rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
657{ 680{
658#if XFT 681#if XFT
… …
668 c.color.red = color.r; 691 c.color.red = color.r;
669 c.color.green = color.g; 692 c.color.green = color.g;
670 c.color.blue = color.b; 693 c.color.blue = color.b;
671 c.color.alpha = color.a; 694 c.color.alpha = color.a;
672 695
673 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 696 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
674 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 697 | insert_component (color.g, format->direct.greenMask, format->direct.green)
675 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 698 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
676 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 699 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha);
677 700
678 return true; 701 return true;
679 } 702 }
680 else 703 else
681 { 704 {
… …
693 c.green = color.g; 716 c.green = color.g;
694 c.blue = color.b; 717 c.blue = color.b;
695 718
696 if (screen->visual->c_class == TrueColor) 719 if (screen->visual->c_class == TrueColor)
697 { 720 {
698 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 721 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask ))
699 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 722 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
700 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
701 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
702 | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask )) 723 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
703 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
704 724
705 return true; 725 return true;
706 } 726 }
707 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 727 else if (XAllocColor (screen->dpy, screen->cmap, &c))
708 return true; 728 return true;
… …
795 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 815 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
796 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 816 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
797 817
798 got = alloc (screen, rgba (best->red, best->green, best->blue)); 818 got = alloc (screen, rgba (best->red, best->green, best->blue));
799 819
800 delete colors; 820 delete [] colors;
801 } 821 }
802#endif 822#endif
803 823
804 return got; 824 return got;
805} 825}

Diff Legend

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