nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better behavior with root pixmap atoms. create them if they do not exist.

Browse source
This commit is contained in:
Dana Jansens 2002-05-15 03:54:43 +00:00
parent 52c955c491
commit c1bf229290
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
util/bsetroot.cc
View file

@ -108,7 +108,7 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
} }
img_ctrl = new BImageControl*[numberOfScreens()]; img_ctrl = new BImageControl*[numberOfScreens()];
for (unsigned int s = 0; s < numberOfScreens(); ++s) for (unsigned int s = 0, n = numberOfScreens(); s < n; ++s)
img_ctrl[s] = new BImageControl(*this, *getScreenInfo(s), true); img_ctrl[s] = new BImageControl(*this, *getScreenInfo(s), true);
if (sol && fore) solid(); if (sol && fore) solid();
@ -141,8 +141,8 @@ void bsetroot::setPixmapProperty(int screen, Pixmap pixmap) {
const ScreenInfo *screen_info = getScreenInfo(screen); const ScreenInfo *screen_info = getScreenInfo(screen);
if (rootpmap_id == None) { if (rootpmap_id == None) {
rootpmap_id = XInternAtom(getXDisplay(), "_XROOTPMAP_ID", True); rootpmap_id = XInternAtom(getXDisplay(), "_XROOTPMAP_ID", False);
esetroot_id = XInternAtom(getXDisplay(), "ESETROOT_PMAP_ID", True); esetroot_id = XInternAtom(getXDisplay(), "ESETROOT_PMAP_ID", False);
} }
XGrabServer(getXDisplay()); XGrabServer(getXDisplay());
@ -201,7 +201,7 @@ Pixmap bsetroot::duplicatePixmap(int screen, Pixmap pixmap,
void bsetroot::solid(void) { void bsetroot::solid(void) {
for (unsigned int screen = 0; screen < numberOfScreens(); screen++) { for (unsigned int screen = 0, n = numberOfScreens(); screen < n; screen++) {
BColor c; BColor c;
img_ctrl[screen]->parseColor(&c, fore); img_ctrl[screen]->parseColor(&c, fore);
@ -234,8 +234,9 @@ void bsetroot::modula(int x, int y) {
long pattern; long pattern;
unsigned int screen, i; unsigned int screen, i;
unsigned int n = numberOfScreens();
for (pattern = 0, screen = 0; screen < numberOfScreens(); screen++) { for (pattern = 0, screen = 0; screen < n; screen++) {
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
pattern <<= 1; pattern <<= 1;
if ((i % x) == 0) if ((i % x) == 0)
@ -300,7 +301,7 @@ void bsetroot::modula(int x, int y) {
void bsetroot::gradient(void) { void bsetroot::gradient(void) {
for (unsigned int screen = 0; screen < numberOfScreens(); screen++) { for (unsigned int screen = 0, n = numberOfScreens(); screen < n; screen++) {
BTexture texture; BTexture texture;
img_ctrl[screen]->parseTexture(&texture, grad); img_ctrl[screen]->parseTexture(&texture, grad);
img_ctrl[screen]->parseColor(texture.getColor(), fore); img_ctrl[screen]->parseColor(texture.getColor(), fore);