X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fgccache.cc;h=554fd14329cc7c554b04ffbb3ed86cdb456a6160;hb=bf24a3b7fcf8235a272a86c1e81e902aba2304d6;hp=02d3b80b06c849cf1928be73818f4e8d3b4aecf0;hpb=8f8acc24933830d4f5784616b9b0c5896bde0b93;p=chaz%2Fopenbox diff --git a/otk/gccache.cc b/otk/gccache.cc index 02d3b80b..554fd143 100644 --- a/otk/gccache.cc +++ b/otk/gccache.cc @@ -19,7 +19,7 @@ namespace otk { GCCacheContext::~GCCacheContext(void) { if (gc) - XFreeGC(Display::display, gc); + XFreeGC(**display, gc); } @@ -44,7 +44,7 @@ void GCCacheContext::set(const Color &_color, fontid = 0; } - XChangeGC(Display::display, gc, mask, &gcv); + XChangeGC(**display, gc, mask, &gcv); } @@ -56,7 +56,7 @@ void GCCacheContext::set(const XFontStruct * const _font) { XGCValues gcv; fontid = gcv.font = _font->fid; - XChangeGC(Display::display, gc, GCFont, &gcv); + XChangeGC(**display, gc, GCFont, &gcv); } @@ -86,7 +86,7 @@ GCCache::~GCCache(void) { GCCacheContext *GCCache::nextContext(unsigned int scr) { - Window hd = Display::screenInfo(scr)->rootWindow(); + Window hd = display->screenInfo(scr)->rootWindow(); GCCacheContext *c; @@ -94,7 +94,7 @@ GCCacheContext *GCCache::nextContext(unsigned int scr) { c = contexts[i]; if (! c->gc) { - c->gc = XCreateGC(Display::display, hd, 0, 0); + c->gc = XCreateGC(**display, hd, 0, 0); c->used = false; c->screen = scr; }