… | |
… | |
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", |
… | |
… | |
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) |
… | |
… | |
466 | is_local = 0; |
469 | is_local = 0; |
467 | sockaddr_un sa; |
470 | sockaddr_un sa; |
468 | socklen_t sl = sizeof (sa); |
471 | socklen_t sl = sizeof (sa); |
469 | |
472 | |
470 | if (!getsockname (fd, (sockaddr *)&sa, &sl)) |
473 | if (!getsockname (fd, (sockaddr *)&sa, &sl)) |
471 | is_local = sa.sun_family == AF_LOCAL; |
474 | is_local = sa.sun_family == AF_UNIX; |
472 | |
475 | |
473 | x_ev.start (fd, EVENT_READ); |
476 | x_ev.start (fd, EVENT_READ); |
474 | fcntl (fd, F_SETFD, FD_CLOEXEC); |
477 | fcntl (fd, F_SETFD, FD_CLOEXEC); |
475 | |
478 | |
476 | XSelectInput (dpy, root, PropertyChangeMask); |
479 | XSelectInput (dpy, root, PropertyChangeMask); |
… | |
… | |
550 | if (xev.type == PropertyNotify |
553 | if (xev.type == PropertyNotify |
551 | && xev.xany.window == root |
554 | && xev.xany.window == root |
552 | && xev.xproperty.atom == xa[XA_XIM_SERVERS]) |
555 | && xev.xproperty.atom == xa[XA_XIM_SERVERS]) |
553 | im_change_check (); |
556 | im_change_check (); |
554 | #endif |
557 | #endif |
|
|
558 | if (xev.type == MappingNotify) |
|
|
559 | XRefreshKeyboardMapping (&xev.xmapping); |
|
|
560 | |
555 | for (int i = xw.size (); i--; ) |
561 | for (int i = xw.size (); i--; ) |
556 | { |
562 | { |
557 | if (!xw[i]) |
563 | if (!xw[i]) |
558 | xw.erase_unordered (i); |
564 | xw.erase_unordered (i); |
559 | else if (xw[i]->window == xev.xany.window) |
565 | else if (xw[i]->window == xev.xany.window) |
… | |
… | |
576 | XFlush (dpy); |
582 | XFlush (dpy); |
577 | } |
583 | } |
578 | |
584 | |
579 | void rxvt_display::reg (xevent_watcher *w) |
585 | void rxvt_display::reg (xevent_watcher *w) |
580 | { |
586 | { |
|
|
587 | if (!w->active) |
|
|
588 | { |
581 | xw.push_back (w); |
589 | xw.push_back (w); |
582 | w->active = xw.size (); |
590 | w->active = xw.size (); |
|
|
591 | } |
583 | } |
592 | } |
584 | |
593 | |
585 | void rxvt_display::unreg (xevent_watcher *w) |
594 | void rxvt_display::unreg (xevent_watcher *w) |
586 | { |
595 | { |
587 | if (w->active) |
596 | if (w->active) |
|
|
597 | { |
588 | xw[w->active - 1] = 0; |
598 | xw[w->active - 1] = 0; |
|
|
599 | w->active = 0; |
|
|
600 | } |
589 | } |
601 | } |
590 | |
602 | |
591 | void rxvt_display::set_selection_owner (rxvt_term *owner) |
603 | void rxvt_display::set_selection_owner (rxvt_term *owner) |
592 | { |
604 | { |
593 | if (selection_owner && selection_owner != owner) |
605 | if (selection_owner && selection_owner != owner) |
… | |
… | |
698 | c.green = color.g; |
710 | c.green = color.g; |
699 | c.blue = color.b; |
711 | c.blue = color.b; |
700 | |
712 | |
701 | if (screen->visual->c_class == TrueColor) |
713 | if (screen->visual->c_class == TrueColor) |
702 | { |
714 | { |
703 | 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 )) |
704 | / rgba::MAX_CC) << ctz (screen->visual->red_mask ) |
716 | | (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 )) |
717 | | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask )); |
708 | / rgba::MAX_CC) << ctz (screen->visual->blue_mask ); |
|
|
709 | |
718 | |
710 | return true; |
719 | return true; |
711 | } |
720 | } |
712 | else if (XAllocColor (screen->dpy, screen->cmap, &c)) |
721 | else if (XAllocColor (screen->dpy, screen->cmap, &c)) |
713 | return true; |
722 | return true; |
… | |
… | |
800 | //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", |
809 | //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); |
810 | // color.r, color.g, color.b, best->red, best->green, best->blue, diff); |
802 | |
811 | |
803 | got = alloc (screen, rgba (best->red, best->green, best->blue)); |
812 | got = alloc (screen, rgba (best->red, best->green, best->blue)); |
804 | |
813 | |
805 | delete colors; |
814 | delete [] colors; |
806 | } |
815 | } |
807 | #endif |
816 | #endif |
808 | |
817 | |
809 | return got; |
818 | return got; |
810 | } |
819 | } |