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.67 by ayin, Mon Jun 25 23:27:18 2007 UTC

… …
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)
… …
439 if (!dpy) 442 if (!dpy)
440 return false; 443 return false;
441 444
442 screen = DefaultScreen (dpy); 445 screen = DefaultScreen (dpy);
443 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
444 453
445 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 454 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
446 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 455 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
447 456
448 XrmSetDatabase (dpy, get_resources (false)); 457 XrmSetDatabase (dpy, get_resources (false));
… …
466 is_local = 0; 475 is_local = 0;
467 sockaddr_un sa; 476 sockaddr_un sa;
468 socklen_t sl = sizeof (sa); 477 socklen_t sl = sizeof (sa);
469 478
470 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 479 if (!getsockname (fd, (sockaddr *)&sa, &sl))
471 is_local = sa.sun_family == AF_LOCAL; 480 is_local = sa.sun_family == AF_UNIX;
472 481
473 x_ev.start (fd, EVENT_READ); 482 x_ev.start (fd, EVENT_READ);
474 fcntl (fd, F_SETFD, FD_CLOEXEC); 483 fcntl (fd, F_SETFD, FD_CLOEXEC);
475 484
476 XSelectInput (dpy, root, PropertyChangeMask); 485 XSelectInput (dpy, root, PropertyChangeMask);
… …
576 XFlush (dpy); 585 XFlush (dpy);
577} 586}
578 587
579void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
580{ 589{
590 if (!w->active)
591 {
581 xw.push_back (w); 592 xw.push_back (w);
582 w->active = xw.size (); 593 w->active = xw.size ();
594 }
583} 595}
584 596
585void rxvt_display::unreg (xevent_watcher *w) 597void rxvt_display::unreg (xevent_watcher *w)
586{ 598{
587 if (w->active) 599 if (w->active)
600 {
588 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
602 w->active = 0;
603 }
589} 604}
590 605
591void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner)
592{ 607{
593 if (selection_owner && selection_owner != owner) 608 if (selection_owner && selection_owner != owner)
… …
698 c.green = color.g; 713 c.green = color.g;
699 c.blue = color.b; 714 c.blue = color.b;
700 715
701 if (screen->visual->c_class == TrueColor) 716 if (screen->visual->c_class == TrueColor)
702 { 717 {
703 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 ))
704 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 719 | (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 )) 720 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
708 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
709 721
710 return true; 722 return true;
711 } 723 }
712 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 724 else if (XAllocColor (screen->dpy, screen->cmap, &c))
713 return true; 725 return true;
… …
800 //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",
801 // 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);
802 814
803 got = alloc (screen, rgba (best->red, best->green, best->blue)); 815 got = alloc (screen, rgba (best->red, best->green, best->blue));
804 816
805 delete colors; 817 delete [] colors;
806 } 818 }
807#endif 819#endif
808 820
809 return got; 821 return got;
810} 822}

Diff Legend

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