X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fbsetroot.cc;h=0f36e1e2c7e835ee6d3c7beef9f3e7a0c4a54650;hb=52c955c4917582ecf229ec63ea4d7f0c4eede7c0;hp=cb37cb6bb66f63e64b27e771e43b407f7cf8e464;hpb=6796e798277cc4821c955d425f4994f1484d35df;p=chaz%2Fopenbox diff --git a/util/bsetroot.cc b/util/bsetroot.cc index cb37cb6b..0f36e1e2 100644 --- a/util/bsetroot.cc +++ b/util/bsetroot.cc @@ -1,11 +1,37 @@ +// bsetroot.cc for Openbox +// Copyright (c) 2002 - 2002 Ben Janens (ben@orodu.net) +// Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry +// Copyright (c) 1997 - 2000, 2002 Brad Hughes +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. + #ifdef HAVE_CONFIG_H # include "../config.h" #endif // HAVE_CONFIG_H -#ifdef STDC_HEADERS +#ifdef HAVE_STRING_H # include +#endif // HAVE_STRING_H + +#ifdef HAVE_STDLIB_H # include -#endif // STDC_HEADERS +#endif // HAVE_STDLIB_H #ifdef HAVE_STDIO_H # include @@ -16,6 +42,7 @@ #include "../src/Image.h" #include "bsetroot.h" +#include bsetroot::bsetroot(int argc, char **argv, char *dpy_name) : BaseDisplay(argv[0], dpy_name) @@ -72,16 +99,17 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name) if ((mod + sol + grd) != True) { fprintf(stderr, - i18n->getMessage(bsetrootSet, bsetrootMustSpecify, - "%s: error: must specify one of: -solid, -mod, -gradient\n"), - getApplicationName()); - + i18n->getMessage(bsetrootSet, bsetrootMustSpecify, + "%s: error: must specify one of: " + "-solid, -mod, -gradient\n"), + getApplicationName()); + usage(2); } - - img_ctrl = new BImageControl*[getNumberOfScreens()]; - for (int i = 0; i < getNumberOfScreens(); i++) - img_ctrl[i] = new BImageControl(*this, *getScreenInfo(i), True); + + img_ctrl = new BImageControl*[numberOfScreens()]; + for (unsigned int s = 0; s < numberOfScreens(); ++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); @@ -95,47 +123,61 @@ bsetroot::~bsetroot(void) { XKillClient(getXDisplay(), AllTemporary); - for (int i = 0; i < getNumberOfScreens(); i++) - delete img_ctrl[i]; + std::for_each(img_ctrl, img_ctrl + numberOfScreens(), PointerAssassin()); delete [] img_ctrl; } + // adapted from wmsetbg void bsetroot::setPixmapProperty(int screen, Pixmap pixmap) { - static Atom rootpmap_id = None; + static Atom rootpmap_id = None, esetroot_id = None; Atom type; int format; unsigned long length, after; unsigned char *data; - int mode; - - if (rootpmap_id == None) - rootpmap_id = XInternAtom(getXDisplay(), "_XROOTPMAP_ID", False); + 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); + } XGrabServer(getXDisplay()); - - /* Clear out the old pixmap */ - XGetWindowProperty(getXDisplay(), getScreenInfo(screen)->getRootWindow(), - rootpmap_id, 0L, 1L, False, AnyPropertyType, - &type, &format, &length, &after, &data); - + + // Clear out the old pixmap? + XGetWindowProperty(getXDisplay(), screen_info->getRootWindow(), + rootpmap_id, 0L, 1L, False, AnyPropertyType, + &type, &format, &length, &after, &data); if ((type == XA_PIXMAP) && (format == 32) && (length == 1)) { - XKillClient(getXDisplay(), *((Pixmap *)data)); + XKillClient(getXDisplay(), *((Pixmap *) data)); XSync(getXDisplay(), False); mode = PropModeReplace; - } else { - mode = PropModeAppend; } + + // 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(), getScreenInfo(screen)->getRootWindow(), - rootpmap_id, XA_PIXMAP, 32, mode, - (unsigned char *) &pixmap, 1); + XChangeProperty(getXDisplay(), screen_info->getRootWindow(), + rootpmap_id, XA_PIXMAP, 32, mode, + (unsigned char *) &pixmap, 1); + XChangeProperty(getXDisplay(), screen_info->getRootWindow(), + esetroot_id, XA_PIXMAP, 32, emode, + (unsigned char *) &pixmap, 1); } else { - XDeleteProperty(getXDisplay(), getScreenInfo(screen)->getRootWindow(), - rootpmap_id); + XDeleteProperty(getXDisplay(), screen_info->getRootWindow(), + rootpmap_id); + XDeleteProperty(getXDisplay(), screen_info->getRootWindow(), + esetroot_id); } - + XUngrabServer(getXDisplay()); XFlush(getXDisplay()); } @@ -143,15 +185,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; @@ -159,23 +201,26 @@ Pixmap bsetroot::duplicatePixmap(int screen, Pixmap pixmap, void bsetroot::solid(void) { - for (int screen = 0; screen < getNumberOfScreens(); screen++) { + for (unsigned int screen = 0; screen < numberOfScreens(); screen++) { BColor c; img_ctrl[screen]->parseColor(&c, fore); if (! c.isAllocated()) c.setPixel(BlackPixel(getXDisplay(), screen)); - XSetWindowBackground(getXDisplay(), getScreenInfo(screen)->getRootWindow(), + const ScreenInfo *screen_info = getScreenInfo(screen); + + XSetWindowBackground(getXDisplay(), screen_info->getRootWindow(), c.getPixel()); - XClearWindow(getXDisplay(), getScreenInfo(screen)->getRootWindow()); + XClearWindow(getXDisplay(), screen_info->getRootWindow()); Pixmap pixmap = XCreatePixmap(getXDisplay(), - getScreenInfo(screen)->getRootWindow(), - 8, 8, DefaultDepth(getXDisplay(), screen)); + screen_info->getRootWindow(), + 8, 8, DefaultDepth(getXDisplay(), screen)); + XSetForeground(getXDisplay(), DefaultGC(getXDisplay(), screen), - c.getPixel()); + c.getPixel()); XFillRectangle(getXDisplay(), pixmap, DefaultGC(getXDisplay(), screen), - 0, 0, 8, 8); + 0, 0, 8, 8); setPixmapProperty(screen, duplicatePixmap(screen, pixmap, 8, 8)); @@ -188,9 +233,9 @@ void bsetroot::modula(int x, int y) { char data[32]; long pattern; - int screen, i; + unsigned int screen, i; - for (pattern = 0, screen = 0; screen < getNumberOfScreens(); screen++) { + for (pattern = 0, screen = 0; screen < numberOfScreens(); screen++) { for (i = 0; i < 16; i++) { pattern <<= 1; if ((i % x) == 0) @@ -210,54 +255,57 @@ void bsetroot::modula(int x, int y) { BColor f, b; GC gc; Pixmap bitmap; - XGCValues gcv; + + const ScreenInfo *screen_info = getScreenInfo(screen); bitmap = XCreateBitmapFromData(getXDisplay(), - getScreenInfo(screen)->getRootWindow(), data, + 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(); - gc = XCreateGC(getXDisplay(), getScreenInfo(screen)->getRootWindow(), + gc = XCreateGC(getXDisplay(), screen_info->getRootWindow(), GCForeground | GCBackground, &gcv); Pixmap pixmap = XCreatePixmap(getXDisplay(), - getScreenInfo(screen)->getRootWindow(), - 16, 16, getScreenInfo(screen)->getDepth()); + screen_info->getRootWindow(), + 16, 16, screen_info->getDepth()); XCopyPlane(getXDisplay(), bitmap, pixmap, gc, 0, 0, 16, 16, 0, 0, 1l); XSetWindowBackgroundPixmap(getXDisplay(), - getScreenInfo(screen)->getRootWindow(), + screen_info->getRootWindow(), pixmap); - XClearWindow(getXDisplay(), getScreenInfo(screen)->getRootWindow()); + XClearWindow(getXDisplay(), screen_info->getRootWindow()); setPixmapProperty(screen, - duplicatePixmap(screen, pixmap, 16, 16)); + duplicatePixmap(screen, pixmap, 16, 16)); XFreeGC(getXDisplay(), gc); XFreePixmap(getXDisplay(), bitmap); - if (! (getScreenInfo(screen)->getVisual()->c_class & 1)) + if (! (screen_info->getVisual()->c_class & 1)) XFreePixmap(getXDisplay(), pixmap); } } void bsetroot::gradient(void) { - for (int screen = 0; screen < getNumberOfScreens(); screen++) { + for (unsigned int screen = 0; screen < numberOfScreens(); screen++) { BTexture texture; img_ctrl[screen]->parseTexture(&texture, grad); img_ctrl[screen]->parseColor(texture.getColor(), fore); img_ctrl[screen]->parseColor(texture.getColorTo(), back); + const ScreenInfo *screen_info = getScreenInfo(screen); if (! texture.getColor()->isAllocated()) texture.getColor()->setPixel(WhitePixel(getXDisplay(), screen)); @@ -265,21 +313,21 @@ void bsetroot::gradient(void) { texture.getColorTo()->setPixel(BlackPixel(getXDisplay(), screen)); Pixmap pixmap = - img_ctrl[screen]->renderImage(getScreenInfo(screen)->size().w(), - getScreenInfo(screen)->size().h(), + img_ctrl[screen]->renderImage(screen_info->size().w(), + screen_info->size().h(), &texture); XSetWindowBackgroundPixmap(getXDisplay(), - getScreenInfo(screen)->getRootWindow(), + screen_info->getRootWindow(), pixmap); - XClearWindow(getXDisplay(), getScreenInfo(screen)->getRootWindow()); + XClearWindow(getXDisplay(), screen_info->getRootWindow()); setPixmapProperty(screen, - duplicatePixmap(screen, pixmap, - getScreenInfo(screen)->size().w(), - getScreenInfo(screen)->size().h())); - - if (! (getScreenInfo(screen)->getVisual()->c_class & 1)) { + duplicatePixmap(screen, pixmap, + screen_info->size().w(), + screen_info->size().h())); + + if (! (screen_info->getVisual()->c_class & 1)) { img_ctrl[screen]->removeImage(pixmap); } } @@ -287,47 +335,47 @@ void bsetroot::gradient(void) { void bsetroot::usage(int exit_code) { - fprintf(stderr, - i18n-> - getMessage(bsetrootSet, bsetrootUsage, - "%s 2.0 : (c) 1997-1999 Brad Hughes\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()); - - exit(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()); + + exit(exit_code); } - int main(int argc, char **argv) { char *display_name = (char *) 0; - + NLSInit("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->getMessage(mainSet, mainDISPLAYRequiresArg, + "error: '-display' requires an argument\n")); + ::exit(1); } - + display_name = argv[i]; } } - + bsetroot app(argc, argv, display_name); - + return 0; } +