imprted new tools from bb-cvs re-change bsetroot to work preperly regarding the root window atoms
Dana Jansens danakj@orodu.net
5 files changed,
149 insertions(+),
139 deletions(-)
M
util/Makefile.am
→
util/Makefile.am
@@ -1,18 +1,21 @@
-# util/Makefile.am for Openbox +# util/Makefile.am for Blackbox - an X11 Window manager -CPPFLAGS= @CPPFLAGS@ @DEBUG@ @NLS@ @TIMEDCACHE@ @NEWWMSPEC@ @INTERLACE@ \ -@ORDEREDPSEUDO@ @CLOBBER@ +CPPFLAGS= @CPPFLAGS@ @DEBUG@ @NLS@ @TIMEDCACHE@ @ORDEREDPSEUDO@ bin_SCRIPTS = bsetbg bin_PROGRAMS = bsetroot bsetroot_SOURCES = bsetroot.cc -bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/Geometry.o +bsetroot_LDADD = ../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o MAINTAINERCLEANFILES = Makefile.in distclean-local: rm -f *\~ -bsetroot.o: bsetroot.cc ../config.h bsetroot.h ../src/BaseDisplay.h \ - ../src/Timer.h ../src/Image.h ../src/Geometry.h +# local dependencies + +bsetroot.o: bsetroot.cc ../config.h ../src/i18n.hh \ + ../src/../nls/blackbox-nls.hh ../src/GCCache.hh ../src/BaseDisplay.hh \ + ../src/Timer.hh ../src/Color.hh ../src/Texture.hh ../src/Util.hh \ + bsetroot.hh ../src/Image.hh
M
util/bsetbg
→
util/bsetbg
@@ -22,7 +22,7 @@ # DEALINGS IN THE SOFTWARE.
PATH=$PATH:/usr/bin:/usr/local/bin:/usr/X11R6/bin -img_apps="qiv xli xv wmsetbg Esetroot display xsetbg" +img_apps="display xli xsetbg Esetroot qiv wmsetbg xv" display_full_cmd="display -geometry 800x600 -window root" display_tile_cmd="display -window root"@@ -54,7 +54,7 @@ xli_tile_cmd="xli -onroot -quiet"
xli_center_cmd="xli -center -onroot quiet" xli_default_cmd="$xli_center_cmd" -xsetbg_full_cmd="xsetbg -fillscreen" +xsetbg_full_cmd="xsetbg -fullscreen" xsetbg_tile_cmd="xsetbg" xsetbg_center_cmd="xsetbg -center" xsetbg_default_cmd="$xsetbg_center_cmd"@@ -76,8 +76,7 @@ [ "$*" ] && echo -e $*
exit ${rc:-0} } -bool() -{ +bool() { case $1 in [yY][eE][sS]|1|[yY]|[tT][rR][uU][eE]|[oO][nN]) : ;; *) return 1 ;;
M
util/bsetroot.cc
→
util/bsetroot.cc
@@ -1,5 +1,5 @@
-// bsetroot.cc for Openbox -// Copyright (c) 2002 - 2002 Ben Janens (ben@orodu.net) +// -*- mode++; indent-tabs-mode: nil; c-basic-offset: 2; -*- +// Window.cc for Blackbox - an X11 Window manager // Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry <shaleh at debian.org> // Copyright (c) 1997 - 2000, 2002 Brad Hughes <bhughes at trolltech.com> //@@ -25,33 +25,35 @@ #ifdef HAVE_CONFIG_H
# include "../config.h" #endif // HAVE_CONFIG_H -#ifdef HAVE_STRING_H -# include <string.h> -#endif // HAVE_STRING_H - -#ifdef HAVE_STDLIB_H +extern "C" { +#ifdef HAVE_STDLIB_H # include <stdlib.h> #endif // HAVE_STDLIB_H +#ifdef HAVE_STRING_H +# include <string.h> +#endif // HAVE_STRING_H + #ifdef HAVE_STDIO_H # include <stdio.h> #endif // HAVE_STDIO_H +} -#include "../src/i18n.h" -#include "../src/BaseDisplay.h" -#include "../src/Image.h" -#include "bsetroot.h" +#include "../src/i18n.hh" +#include "../src/GCCache.hh" +#include "../src/Texture.hh" +#include "../src/Util.hh" +#include "bsetroot.hh" -#include <algorithm> -I18n i18n("openbox.cat"); +I18n i18n; bsetroot::bsetroot(int argc, char **argv, char *dpy_name) : BaseDisplay(argv[0], dpy_name) { grad = fore = back = (char *) 0; - 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++) {@@ -101,16 +103,16 @@ }
if ((mod + sol + grd) != True) { fprintf(stderr, - i18n(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*[numberOfScreens()]; - for (unsigned int s = 0, n = numberOfScreens(); s < n; ++s) - img_ctrl[s] = new BImageControl(*this, *getScreenInfo(s), true); + 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);@@ -124,7 +126,7 @@ XSetCloseDownMode(getXDisplay(), RetainPermanent);
XKillClient(getXDisplay(), AllTemporary); - std::for_each(img_ctrl, img_ctrl + numberOfScreens(), PointerAssassin()); + std::for_each(img_ctrl, img_ctrl + getNumberOfScreens(), PointerAssassin()); delete [] img_ctrl; }@@ -146,7 +148,7 @@ }
XGrabServer(getXDisplay()); - // Clear out the old pixmap + /* Clear out the old pixmap */ XGetWindowProperty(getXDisplay(), screen_info->getRootWindow(), rootpmap_id, 0L, 1L, False, XA_PIXMAP, &type, &format, &length, &after, &data);@@ -158,16 +160,16 @@ }
if (pixmap) { XChangeProperty(getXDisplay(), screen_info->getRootWindow(), - rootpmap_id, XA_PIXMAP, 32, PropModeReplace, - (unsigned char *) &pixmap, 1); + rootpmap_id, XA_PIXMAP, 32, PropModeReplace, + (unsigned char *) &pixmap, 1); XChangeProperty(getXDisplay(), screen_info->getRootWindow(), - esetroot_id, XA_PIXMAP, 32, PropModeReplace, - (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());@@ -177,15 +179,15 @@
// 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;@@ -193,26 +195,19 @@ }
void bsetroot::solid(void) { - for (unsigned int screen = 0, n = numberOfScreens(); screen < n; screen++) { - BColor c; - - img_ctrl[screen]->parseColor(&c, fore); - if (! c.isAllocated()) c.setPixel(BlackPixel(getXDisplay(), screen)); - + for (unsigned int screen = 0; screen < getNumberOfScreens(); 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));@@ -226,9 +221,8 @@ char data[32];
long pattern; unsigned int screen, i; - unsigned int n = numberOfScreens(); - for (pattern = 0, screen = 0; screen < n; screen++) { + for (pattern = 0, screen = 0; screen < getNumberOfScreens(); screen++) { for (i = 0; i < 16; i++) { pattern <<= 1; if ((i % x) == 0)@@ -237,41 +231,34 @@ }
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<char>(0xff); + data[(i * 2) + 1] = static_cast<char>(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);@@ -281,7 +268,7 @@ pixmap);
XClearWindow(getXDisplay(), screen_info->getRootWindow()); setPixmapProperty(screen, - duplicatePixmap(screen, pixmap, 16, 16)); + duplicatePixmap(screen, pixmap, 16, 16)); XFreeGC(getXDisplay(), gc); XFreePixmap(getXDisplay(), bitmap);@@ -293,22 +280,17 @@ }
void bsetroot::gradient(void) { - for (unsigned int screen = 0, n = numberOfScreens(); screen < n; screen++) { - BTexture texture; - img_ctrl[screen]->parseTexture(&texture, grad); - img_ctrl[screen]->parseColor(texture.getColor(), fore); - img_ctrl[screen]->parseColor(texture.getColorTo(), back); + for (unsigned int screen = 0; screen < getNumberOfScreens(); screen++) { + BTexture texture(grad, 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(),@@ -316,9 +298,9 @@ pixmap);
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);@@ -329,20 +311,20 @@
void bsetroot::usage(int exit_code) { fprintf(stderr, - 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 <string> display connection\n" - " -mod <x> <y> modula pattern\n" - " -foreground, -fg <color> modula foreground color\n" - " -background, -bg <color> modula background color\n\n" - " -gradient <texture> gradient texture\n" - " -from <color> gradient start color\n" - " -to <color> gradient end color\n\n" - " -solid <color> 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 <string> display connection\n" + " -mod <x> <y> modula pattern\n" + " -foreground, -fg <color> modula foreground color\n" + " -background, -bg <color> modula background color\n\n" + " -gradient <texture> gradient texture\n" + " -from <color> gradient start color\n" + " -to <color> gradient end color\n\n" + " -solid <color> solid color\n\n" + " -help print this help text and exit\n"), + getApplicationName()); exit(exit_code); }@@ -350,13 +332,15 @@
int main(int argc, char **argv) { char *display_name = (char *) 0; + i18n.openCatalog("blackbox.cat"); + for (int i = 1; i < argc; i++) { if (! strcmp(argv[i], "-display")) { // check for -display option if ((++i) >= argc) { fprintf(stderr, i18n(mainSet, mainDISPLAYRequiresArg, - "error: '-display' requires an argument\n")); + "error: '-display' requires an argument\n")); ::exit(1); }@@ -369,4 +353,3 @@ bsetroot app(argc, argv, display_name);
return 0; } -
D
util/bsetroot.h
@@ -1,34 +0,0 @@
-#ifndef __bsetroot2_hh -#define __bsetroot2_hh - -#include "../src/BaseDisplay.h" -#include "../src/Image.h" - -class bsetroot : public BaseDisplay { -private: - BImageControl **img_ctrl; - - char *fore, *back, *grad; - - // no copying!! - bsetroot(const bsetroot &); - bsetroot& operator=(const bsetroot&); - - inline virtual void process_event(XEvent * /*unused*/) { } - -public: - bsetroot(int argc, char **argv, char *dpy_name = 0); - ~bsetroot(void); - - inline virtual Bool handleSignal(int /*unused*/) { return False; } - - void setPixmapProperty(int screen, Pixmap pixmap); - Pixmap duplicatePixmap(int screen, Pixmap pixmap, int width, int height); - - void gradient(void); - void modula(int x, int y); - void solid(void); - void usage(int exit_code = 0); -}; - -#endif // __bsetroot2_hh
A
util/bsetroot.hh
@@ -0,0 +1,59 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- +// Window.cc for Blackbox - an X11 Window manager +// Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry <shaleh at debian.org> +// Copyright (c) 1997 - 2000, 2002 Brad Hughes <bhughes at trolltech.com> +// +// 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. + +#ifndef __bsetroot2_hh +#define __bsetroot2_hh + +#include "../src/BaseDisplay.hh" +#include "../src/Image.hh" + + +class bsetroot : public BaseDisplay { +private: + BImageControl **img_ctrl; + + char *fore, *back, *grad; + + // no copying!! + bsetroot(const bsetroot &); + bsetroot& operator=(const bsetroot&); + + inline virtual void process_event(XEvent * /*unused*/) { } + +public: + bsetroot(int argc, char **argv, char *dpy_name = 0); + ~bsetroot(void); + + inline virtual bool handleSignal(int /*unused*/) { return False; } + + void setPixmapProperty(int screen, Pixmap pixmap); + Pixmap duplicatePixmap(int screen, Pixmap pixmap, int width, int height); + + void gradient(void); + void modula(int x, int y); + void solid(void); + void usage(int exit_code = 0); +}; + + +#endif // __bsetroot2_hh