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.66 by root, Sat Jun 9 13:04:27 2007 UTC

… …
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));
… …
578 XFlush (dpy); 585 XFlush (dpy);
579} 586}
580 587
581void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
582{ 589{
590 if (!w->active)
591 {
583 xw.push_back (w); 592 xw.push_back (w);
584 w->active = xw.size (); 593 w->active = xw.size ();
594 }
585} 595}
586 596
587void rxvt_display::unreg (xevent_watcher *w) 597void rxvt_display::unreg (xevent_watcher *w)
588{ 598{
589 if (w->active) 599 if (w->active)
600 {
590 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
602 w->active = 0;
603 }
591} 604}
592 605
593void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner)
594{ 607{
595 if (selection_owner && selection_owner != owner) 608 if (selection_owner && selection_owner != owner)
… …
700 c.green = color.g; 713 c.green = color.g;
701 c.blue = color.b; 714 c.blue = color.b;
702 715
703 if (screen->visual->c_class == TrueColor) 716 if (screen->visual->c_class == TrueColor)
704 { 717 {
705 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 718 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask ))
706 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 719 | (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 )) 720 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
710 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
711 721
712 return true; 722 return true;
713 } 723 }
714 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 724 else if (XAllocColor (screen->dpy, screen->cmap, &c))
715 return true; 725 return true;
… …
802 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 812 //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); 813 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
804 814
805 got = alloc (screen, rgba (best->red, best->green, best->blue)); 815 got = alloc (screen, rgba (best->red, best->green, best->blue));
806 816
807 delete colors; 817 delete [] colors;
808 } 818 }
809#endif 819#endif
810 820
811 return got; 821 return got;
812} 822}

Diff Legend

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