--- rxvt-unicode/src/rxvttoolkit.C 2004/12/29 19:59:46 1.10 +++ rxvt-unicode/src/rxvttoolkit.C 2006/01/11 00:59:58 1.23 @@ -27,6 +27,8 @@ #include #include +#include + #ifndef NO_SLOW_LINK_SUPPORT # include # include @@ -49,17 +51,17 @@ { if (!strcmp (id, (*i)->id)) { - (*i)->referenced++; + ++(*i)->referenced; + (*i)->ref_next (); return *i; } } T *obj = new T (id); - obj->referenced = 1; - - if (obj && obj->init ()) + if (obj && obj->ref_init ()) { + obj->referenced = 1; this->push_back (obj); return obj; } @@ -84,7 +86,7 @@ } template -refcache::~refcache () +void refcache::clear () { while (this->size ()) put (*this->begin ()); @@ -109,7 +111,8 @@ display->im_change_cb (); } -bool rxvt_xim::init () +bool +rxvt_xim::ref_init () { display = GET_R->display; //HACK: TODO @@ -143,9 +146,103 @@ { } -bool rxvt_display::init () +XrmDatabase +rxvt_display::get_resources () +{ + char *homedir = (char *)getenv ("HOME"); + char fname[1024]; + + /* + * get resources using the X library function + */ + char *displayResource, *xe; + XrmDatabase database, rdb1; + + database = NULL; + + // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 + + // 6. System wide per application default file. + + /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ + if ((xe = (char *)getenv ("XAPPLRESDIR"))) + { + snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); + + if ((rdb1 = XrmGetFileDatabase (fname))) + XrmMergeDatabases (rdb1, &database); + } + + // 5. User's per application default file. + // none + + // 4. User's defaults file. + /* Get any Xserver defaults */ + displayResource = XResourceManagerString (display); + + if (displayResource != NULL) + { + if ((rdb1 = XrmGetStringDatabase (displayResource))) + XrmMergeDatabases (rdb1, &database); + } + else if (homedir) + { + snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir); + + if ((rdb1 = XrmGetFileDatabase (fname))) + XrmMergeDatabases (rdb1, &database); + } + + /* Get screen specific resources */ + displayResource = XScreenResourceString (ScreenOfDisplay (display, screen)); + + if (displayResource != NULL) + { + if ((rdb1 = XrmGetStringDatabase (displayResource))) + /* Merge with screen-independent resources */ + XrmMergeDatabases (rdb1, &database); + + XFree (displayResource); + } + + // 3. User's per host defaults file + /* Add in XENVIRONMENT file */ + if ((xe = (char *)getenv ("XENVIRONMENT")) + && (rdb1 = XrmGetFileDatabase (xe))) + XrmMergeDatabases (rdb1, &database); + else if (homedir) + { + struct utsname un; + + if (!uname (&un)) + { + snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename); + + if ((rdb1 = XrmGetFileDatabase (fname))) + XrmMergeDatabases (rdb1, &database); + } + } + + return database; +} + +bool rxvt_display::ref_init () { - display = XOpenDisplay (id); +#ifdef LOCAL_X_IS_UNIX + if (id[0] == ':') + { + val = rxvt_malloc (5 + strlen (id) + 1); + strcpy (val, "unix/"); + strcat (val, id); + display = XOpenDisplay (val); + free (val); + } + else +#endif + display = 0; + + if (!display) + display = XOpenDisplay (id); if (!display) return false; @@ -156,18 +253,17 @@ cmap = DefaultColormap (display, screen); depth = DefaultDepth (display, screen); - int fd = XConnectionNumber (display); - -#ifndef NO_SLOW_LINK_SUPPORT - // try to detetc wether we have a local connection. - // assume unix domains socket == local, everything else not - // TODO: might want to check for inet/127.0.0.1 - is_local = 0; - sockaddr_un sa; - socklen_t sl = sizeof (sa); + XrmSetDatabase (display, get_resources ()); - if (!getsockname (fd, (sockaddr *)&sa, &sl)) - is_local = sa.sun_family == AF_LOCAL; +#ifdef POINTER_BLANK + XColor blackcolour; + blackcolour.red = 0; + blackcolour.green = 0; + blackcolour.blue = 0; + Font f = XLoadFont (display, "fixed"); + blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', + &blackcolour, &blackcolour); + XUnloadFont (display, f); #endif #ifdef PREFER_24BIT @@ -189,6 +285,20 @@ } #endif + int fd = XConnectionNumber (display); + +#ifndef NO_SLOW_LINK_SUPPORT + // try to detect wether we have a local connection. + // assume unix domains socket == local, everything else not + // TODO: might want to check for inet/127.0.0.1 + is_local = 0; + sockaddr_un sa; + socklen_t sl = sizeof (sa); + + if (!getsockname (fd, (sockaddr *)&sa, &sl)) + is_local = sa.sun_family == AF_LOCAL; +#endif + x_ev.start (fd, EVENT_READ); fcntl (fd, F_SETFD, FD_CLOEXEC); @@ -202,12 +312,28 @@ return true; } +void +rxvt_display::ref_next () +{ + // TODO: somehow check wether the database files/resources changed + // before re-loading/parsing + XrmDestroyDatabase (XrmGetDatabase (display)); + XrmSetDatabase (display, get_resources ()); +} + rxvt_display::~rxvt_display () { - x_ev.stop (); + if (!display) + return; - if (display) - XCloseDisplay (display); +#ifdef POINTER_BLANK + XFreeCursor (display, blank_cursor); +#endif + x_ev.stop (); +#ifdef USE_XIM + xims.clear (); +#endif + XCloseDisplay (display); } #ifdef USE_XIM @@ -219,7 +345,7 @@ void rxvt_display::im_change_check () { - // make sure we only call im_change_cb when a new input method + // try to only call im_change_cb when a new input method // registers, as xlib crashes due to a race otherwise. Atom actual_type, *atoms; int actual_format; @@ -253,7 +379,6 @@ #ifdef USE_XIM if (!XFilterEvent (&xev, None)) { - if (xev.type == PropertyNotify && xev.xany.window == root && xev.xproperty.atom == xa_xim_servers) @@ -448,14 +573,43 @@ rxvt_color rxvt_color::fade (rxvt_display *display, int percent) { + percent = 100 - percent; + unsigned short cr, cg, cb; rxvt_color faded; get (display, cr, cg, cb); - faded.set (display, - cr * percent / 100, - cg * percent / 100, - cb * percent / 100); + + faded.set ( + display, + cr * percent / 100, + cg * percent / 100, + cb * percent / 100 + ); + + return faded; +} + +#define LERP(a,b,p) (a * p + b * (100 - p)) / 100 + +rxvt_color +rxvt_color::fade (rxvt_display *display, int percent, rxvt_color &fadeto) +{ + percent = 100 - percent; + + unsigned short cr, cg, cb; + unsigned short fcr, fcg, fcb; + rxvt_color faded; + + get (display, cr, cg, cb); + fadeto.get(display, fcr, fcg, fcb); + + faded.set ( + display, + LERP (cr, fcr, percent), + LERP (cg, fcg, percent), + LERP (cb, fcb, percent) + ); return faded; }