X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fbsetroot.cc;h=460dc350ac9891803a31452cee22b7526309ac89;hb=eb19a6b69e89c6adae1b99705b0a26edc344c87a;hp=39d8b2c7b968eea895a67eb7b91e10870fa573dd;hpb=f7ace0fad8ddfc2cfc9e3a127ff00c6338958078;p=chaz%2Fopenbox diff --git a/util/bsetroot.cc b/util/bsetroot.cc index 39d8b2c7..460dc350 100644 --- a/util/bsetroot.cc +++ b/util/bsetroot.cc @@ -1,5 +1,5 @@ -// bsetroot.cc for Openbox -// Copyright (c) 2002 - 2002 Ben Janens (ben@orodu.net) +// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- +// bsetroot.cc for Blackbox - an X11 Window manager // Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry // Copyright (c) 1997 - 2000, 2002 Brad Hughes // @@ -25,31 +25,37 @@ # include "../config.h" #endif // HAVE_CONFIG_H -#ifdef HAVE_STRING_H -# include -#endif // HAVE_STRING_H - -#ifdef HAVE_STDLIB_H +extern "C" { +#ifdef HAVE_STDLIB_H # include #endif // HAVE_STDLIB_H +#ifdef HAVE_STRING_H +# include +#endif // HAVE_STRING_H + #ifdef HAVE_STDIO_H # include #endif // HAVE_STDIO_H -#include "../src/i18n.h" -#include "../src/BaseDisplay.h" -#include "../src/Image.h" -#include "bsetroot.h" +#ifdef HAVE_CTYPE_H +# include +#endif // HAVE_CTYPE_H +} -#include +#include "../src/i18n.hh" +#include "../src/GCCache.hh" +#include "../src/Texture.hh" +#include "../src/Util.hh" +#include "bsetroot.hh" + + +I18n i18n; bsetroot::bsetroot(int argc, char **argv, char *dpy_name) - : BaseDisplay(argv[0], dpy_name) -{ - grad = fore = back = (char *) 0; + : BaseDisplay(argv[0], dpy_name) { - Bool mod = False, sol = False, grd = False; + bool mod = False, sol = False, grd = False; int mod_x = 0, mod_y = 0; for (int i = 1; i < argc; i++) { @@ -93,27 +99,30 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name) } else if (! strcmp("-display", argv[i])) { // -display passed through tests ealier... we just skip it now i++; - } else + } else { usage(); + } } if ((mod + sol + grd) != True) { fprintf(stderr, - i18n->getMessage(bsetrootSet, bsetrootMustSpecify, - "%s: error: must specify one of: " - "-solid, -mod, -gradient\n"), - getApplicationName()); + i18n(bsetrootSet, bsetrootMustSpecify, + "%s: error: must specify one of: -solid, -mod, -gradient\n"), + getApplicationName()); usage(2); } img_ctrl = new BImageControl*[getNumberOfScreens()]; for (unsigned int s = 0; s < getNumberOfScreens(); ++s) - img_ctrl[s] = new BImageControl(*this, *getScreenInfo(s), true); - - if (sol && fore) solid(); - else if (mod && mod_x && mod_y && fore && back) modula(mod_x, mod_y); - else if (grd && grad && fore && back) gradient(); + img_ctrl[s] = new BImageControl(this, getScreenInfo(s), True); + + if (sol && ! fore.empty()) + solid(); + else if (mod && mod_x && mod_y && ! (fore.empty() || back.empty())) + modula(mod_x, mod_y); + else if (grd && ! (grad.empty() || fore.empty() || back.empty())) + gradient(); else usage(); } @@ -136,46 +145,45 @@ void bsetroot::setPixmapProperty(int screen, Pixmap pixmap) { int format; unsigned long length, after; unsigned char *data; - int mode = PropModeAppend; - int emode = PropModeAppend; const ScreenInfo *screen_info = getScreenInfo(screen); if (rootpmap_id == None) { - rootpmap_id = XInternAtom(getXDisplay(), "_XROOTPMAP_ID", True); - esetroot_id = XInternAtom(getXDisplay(), "ESETROOT_PMAP_ID", True); + rootpmap_id = XInternAtom(getXDisplay(), "_XROOTPMAP_ID", False); + esetroot_id = XInternAtom(getXDisplay(), "ESETROOT_PMAP_ID", False); } XGrabServer(getXDisplay()); - // Clear out the old pixmap? + /* Clear out the old pixmap */ XGetWindowProperty(getXDisplay(), screen_info->getRootWindow(), - rootpmap_id, 0L, 1L, False, AnyPropertyType, - &type, &format, &length, &after, &data); + rootpmap_id, 0L, 1L, False, AnyPropertyType, + &type, &format, &length, &after, &data); + if ((type == XA_PIXMAP) && (format == 32) && (length == 1)) { - XKillClient(getXDisplay(), *((Pixmap *) data)); - XSync(getXDisplay(), False); - mode = PropModeReplace; + unsigned char* data_esetroot = 0; + XGetWindowProperty(getXDisplay(), screen_info->getRootWindow(), + esetroot_id, 0L, 1L, False, AnyPropertyType, + &type, &format, &length, &after, &data_esetroot); + if (data && data_esetroot && *((Pixmap *) data)) { + XKillClient(getXDisplay(), *((Pixmap *) data)); + XSync(getXDisplay(), False); + XFree(data_esetroot); + } + XFree(data); } - // Clear out the old esetroot pixmap? - XGetWindowProperty(getXDisplay(), screen_info->getRootWindow(), - esetroot_id, 0L, 1L, False, AnyPropertyType, - &type, &format, &length, &after, &data); - if ((type == XA_PIXMAP) && (format == 32) && (length == 1)) - emode = PropModeReplace; - if (pixmap) { XChangeProperty(getXDisplay(), screen_info->getRootWindow(), - rootpmap_id, XA_PIXMAP, 32, mode, - (unsigned char *) &pixmap, 1); + rootpmap_id, XA_PIXMAP, 32, PropModeReplace, + (unsigned char *) &pixmap, 1); XChangeProperty(getXDisplay(), screen_info->getRootWindow(), - esetroot_id, XA_PIXMAP, 32, emode, - (unsigned char *) &pixmap, 1); + esetroot_id, XA_PIXMAP, 32, PropModeReplace, + (unsigned char *) &pixmap, 1); } else { XDeleteProperty(getXDisplay(), screen_info->getRootWindow(), - rootpmap_id); + rootpmap_id); XDeleteProperty(getXDisplay(), screen_info->getRootWindow(), - esetroot_id); + esetroot_id); } XUngrabServer(getXDisplay()); @@ -185,15 +193,15 @@ void bsetroot::setPixmapProperty(int screen, Pixmap pixmap) { // adapted from wmsetbg Pixmap bsetroot::duplicatePixmap(int screen, Pixmap pixmap, - int width, int height) { + int width, int height) { XSync(getXDisplay(), False); Pixmap copyP = XCreatePixmap(getXDisplay(), - getScreenInfo(screen)->getRootWindow(), - width, height, - DefaultDepth(getXDisplay(), screen)); + getScreenInfo(screen)->getRootWindow(), + width, height, + DefaultDepth(getXDisplay(), screen)); XCopyArea(getXDisplay(), pixmap, copyP, DefaultGC(getXDisplay(), screen), - 0, 0, width, height, 0, 0); + 0, 0, width, height, 0, 0); XSync(getXDisplay(), False); return copyP; @@ -202,25 +210,18 @@ Pixmap bsetroot::duplicatePixmap(int screen, Pixmap pixmap, void bsetroot::solid(void) { for (unsigned int screen = 0; screen < getNumberOfScreens(); screen++) { - BColor c; - - img_ctrl[screen]->parseColor(&c, fore); - if (! c.isAllocated()) c.setPixel(BlackPixel(getXDisplay(), screen)); - + BColor c(fore, this, screen); const ScreenInfo *screen_info = getScreenInfo(screen); XSetWindowBackground(getXDisplay(), screen_info->getRootWindow(), - c.getPixel()); + c.pixel()); XClearWindow(getXDisplay(), screen_info->getRootWindow()); Pixmap pixmap = XCreatePixmap(getXDisplay(), - screen_info->getRootWindow(), - 8, 8, DefaultDepth(getXDisplay(), screen)); - - XSetForeground(getXDisplay(), DefaultGC(getXDisplay(), screen), - c.getPixel()); - XFillRectangle(getXDisplay(), pixmap, DefaultGC(getXDisplay(), screen), - 0, 0, 8, 8); + screen_info->getRootWindow(), + 8, 8, DefaultDepth(getXDisplay(), screen)); + BPen pen(c); + XFillRectangle(getXDisplay(), pixmap, pen.gc(), 0, 0, 8, 8); setPixmapProperty(screen, duplicatePixmap(screen, pixmap, 8, 8)); @@ -244,41 +245,34 @@ void bsetroot::modula(int x, int y) { for (i = 0; i < 16; i++) { if ((i % y) == 0) { - data[(i * 2)] = (char) 0xff; - data[(i * 2) + 1] = (char) 0xff; + data[(i * 2)] = static_cast(0xff); + data[(i * 2) + 1] = static_cast(0xff); } else { data[(i * 2)] = pattern & 0xff; data[(i * 2) + 1] = (pattern >> 8) & 0xff; } } - BColor f, b; + BColor f(fore, this, screen), b(back, this, screen); GC gc; Pixmap bitmap; - const ScreenInfo *screen_info = getScreenInfo(screen); bitmap = XCreateBitmapFromData(getXDisplay(), screen_info->getRootWindow(), data, 16, 16); - - img_ctrl[screen]->parseColor(&f, fore); - img_ctrl[screen]->parseColor(&b, back); - - if (! f.isAllocated()) f.setPixel(WhitePixel(getXDisplay(), screen)); - if (! b.isAllocated()) b.setPixel(BlackPixel(getXDisplay(), screen)); XGCValues gcv; - gcv.foreground = f.getPixel(); - gcv.background = b.getPixel(); + gcv.foreground = f.pixel(); + gcv.background = b.pixel(); gc = XCreateGC(getXDisplay(), screen_info->getRootWindow(), GCForeground | GCBackground, &gcv); Pixmap pixmap = XCreatePixmap(getXDisplay(), - screen_info->getRootWindow(), - 16, 16, screen_info->getDepth()); + screen_info->getRootWindow(), + 16, 16, screen_info->getDepth()); XCopyPlane(getXDisplay(), bitmap, pixmap, gc, 0, 0, 16, 16, 0, 0, 1l); @@ -288,7 +282,7 @@ void bsetroot::modula(int x, int y) { XClearWindow(getXDisplay(), screen_info->getRootWindow()); setPixmapProperty(screen, - duplicatePixmap(screen, pixmap, 16, 16)); + duplicatePixmap(screen, pixmap, 16, 16)); XFreeGC(getXDisplay(), gc); XFreePixmap(getXDisplay(), bitmap); @@ -300,22 +294,40 @@ void bsetroot::modula(int x, int y) { void bsetroot::gradient(void) { + /* + we have to be sure that neither raised nor sunken is specified otherwise + odd looking borders appear. So we convert to lowercase then look for + 'raised' or 'sunken' in the description and erase them. To be paranoid + the search is done in a loop. + */ + std::string descr; + descr.reserve(grad.size()); + + std::string::const_iterator it = grad.begin(), end = grad.end(); + for (; it != end; ++it) + descr += tolower(*it); + + std::string::size_type pos; + while ((pos = descr.find("raised")) != std::string::npos) + descr.erase(pos, 6); // 6 is strlen raised + + while ((pos = descr.find("sunken")) != std::string::npos) + descr.erase(pos, 6); + + // now add on 'flat' to prevent the bevels from being added + descr += "flat"; + for (unsigned int screen = 0; screen < getNumberOfScreens(); screen++) { - BTexture texture; - img_ctrl[screen]->parseTexture(&texture, grad); - img_ctrl[screen]->parseColor(texture.getColor(), fore); - img_ctrl[screen]->parseColor(texture.getColorTo(), back); + BTexture texture(descr, this, screen, img_ctrl[screen]); const ScreenInfo *screen_info = getScreenInfo(screen); - if (! texture.getColor()->isAllocated()) - texture.getColor()->setPixel(WhitePixel(getXDisplay(), screen)); - if (! texture.getColorTo()->isAllocated()) - texture.getColorTo()->setPixel(BlackPixel(getXDisplay(), screen)); + texture.setColor(BColor(fore, this, screen)); + texture.setColorTo(BColor(back, this, screen)); Pixmap pixmap = - img_ctrl[screen]->renderImage(screen_info->size().w(), - screen_info->size().h(), - &texture); + img_ctrl[screen]->renderImage(screen_info->getWidth(), + screen_info->getHeight(), + texture); XSetWindowBackgroundPixmap(getXDisplay(), screen_info->getRootWindow(), @@ -323,9 +335,9 @@ void bsetroot::gradient(void) { XClearWindow(getXDisplay(), screen_info->getRootWindow()); setPixmapProperty(screen, - duplicatePixmap(screen, pixmap, - screen_info->size().w(), - screen_info->size().h())); + duplicatePixmap(screen, pixmap, + screen_info->getWidth(), + screen_info->getHeight())); if (! (screen_info->getVisual()->c_class & 1)) { img_ctrl[screen]->removeImage(pixmap); @@ -336,20 +348,20 @@ void bsetroot::gradient(void) { void bsetroot::usage(int exit_code) { fprintf(stderr, - i18n->getMessage(bsetrootSet, bsetrootUsage, - "%s 2.0\n\n" - "Copyright (c) 1997-2000, 2002 Bradley T Hughes\n" - "Copyright (c) 2001-2002 Sean 'Shaleh' Perry\n\n" - " -display display connection\n" - " -mod modula pattern\n" - " -foreground, -fg modula foreground color\n" - " -background, -bg modula background color\n\n" - " -gradient gradient texture\n" - " -from gradient start color\n" - " -to gradient end color\n\n" - " -solid solid color\n\n" - " -help print this help text and exit\n"), - getApplicationName()); + i18n(bsetrootSet, bsetrootUsage, + "%s 2.0\n\n" + "Copyright (c) 1997-2000, 2002 Bradley T Hughes\n" + "Copyright (c) 2001-2002 Sean 'Shaleh' Perry\n\n" + " -display use display connection\n" + " -mod modula pattern\n" + " -foreground, -fg modula foreground color\n" + " -background, -bg modula background color\n\n" + " -gradient gradient texture\n" + " -from gradient start color\n" + " -to gradient end color\n\n" + " -solid solid color\n\n" + " -help print this help text and exit\n"), + getApplicationName()); exit(exit_code); } @@ -357,15 +369,15 @@ void bsetroot::usage(int exit_code) { int main(int argc, char **argv) { char *display_name = (char *) 0; - NLSInit("openbox.cat"); - + i18n.openCatalog("openbox.cat"); + for (int i = 1; i < argc; i++) { if (! strcmp(argv[i], "-display")) { // check for -display option if ((++i) >= argc) { - fprintf(stderr, i18n->getMessage(mainSet, mainDISPLAYRequiresArg, - "error: '-display' requires an argument\n")); + fprintf(stderr, i18n(mainSet, mainDISPLAYRequiresArg, + "error: '-display' requires an argument\n")); ::exit(1); } @@ -378,4 +390,3 @@ int main(int argc, char **argv) { return 0; } -