#include <algorithm>
+I18n i18n("openbox.cat");
+
bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
: BaseDisplay(argv[0], dpy_name)
{
if ((mod + sol + grd) != True) {
fprintf(stderr,
- i18n->getMessage(bsetrootSet, bsetrootMustSpecify,
- "%s: error: must specify one of: "
- "-solid, -mod, -gradient\n"),
+ 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 = new BImageControl*[numberOfScreens()];
+ for (unsigned int s = 0, n = numberOfScreens(); s < n; ++s)
img_ctrl[s] = new BImageControl(*this, *getScreenInfo(s), true);
if (sol && fore) solid();
XKillClient(getXDisplay(), AllTemporary);
- std::for_each(img_ctrl, img_ctrl + getNumberOfScreens(), PointerAssassin());
+ std::for_each(img_ctrl, img_ctrl + numberOfScreens(), PointerAssassin());
delete [] img_ctrl;
}
int format;
unsigned long length, after;
unsigned char *data;
- int mode = 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);
-
- if ((type == XA_PIXMAP) && (format == 32) && (length == 1)) {
- unsigned char* data_esetroot = 0;
- XGetWindowProperty(getXDisplay(), screen_info->getRootWindow(),
- esetroot_id, 0L, 1L, False, AnyPropertyType,
- &type, &format, &length, &after, &data);
- if (data && data_esetroot && *((Pixmap *) data)) {
- XKillClient(getXDisplay(), *((Pixmap *) data));
- XSync(getXDisplay(), False);
- mode = PropModeReplace;
- }
+ rootpmap_id, 0L, 1L, False, XA_PIXMAP,
+ &type, &format, &length, &after, &data);
+ if (type == XA_PIXMAP && format == 32) {
+ XKillClient(getXDisplay(), *((Pixmap *) data));
+ XSync(getXDisplay(), False);
+ XFree(data);
}
if (pixmap) {
XChangeProperty(getXDisplay(), screen_info->getRootWindow(),
- rootpmap_id, XA_PIXMAP, 32, mode,
+ rootpmap_id, XA_PIXMAP, 32, PropModeReplace,
(unsigned char *) &pixmap, 1);
XChangeProperty(getXDisplay(), screen_info->getRootWindow(),
- esetroot_id, XA_PIXMAP, 32, mode,
+ esetroot_id, XA_PIXMAP, 32, PropModeReplace,
(unsigned char *) &pixmap, 1);
} else {
XDeleteProperty(getXDisplay(), screen_info->getRootWindow(),
void bsetroot::solid(void) {
- for (unsigned int screen = 0; screen < getNumberOfScreens(); screen++) {
+ for (unsigned int screen = 0, n = numberOfScreens(); screen < n; screen++) {
BColor c;
img_ctrl[screen]->parseColor(&c, fore);
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);
long pattern;
unsigned int screen, i;
+ unsigned int n = numberOfScreens();
- for (pattern = 0, screen = 0; screen < getNumberOfScreens(); screen++) {
+ for (pattern = 0, screen = 0; screen < n; screen++) {
for (i = 0; i < 16; i++) {
pattern <<= 1;
if ((i % x) == 0)
void bsetroot::gradient(void) {
- for (unsigned int screen = 0; screen < getNumberOfScreens(); screen++) {
+ 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);
void bsetroot::usage(int exit_code) {
fprintf(stderr,
- i18n->getMessage(bsetrootSet, bsetrootUsage,
+ 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"
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->getMessage(mainSet, mainDISPLAYRequiresArg,
- "error: '-display' requires an argument\n"));
+ fprintf(stderr, i18n(mainSet, mainDISPLAYRequiresArg,
+ "error: '-display' requires an argument\n"));
::exit(1);
}