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

update for FbRootWindow

Browse source
This commit is contained in:
fluxgen 2003-05-11 00:00:32 +00:00
parent 5c181abb77
commit 93b610edf4
1 changed files with 40 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
util/bsetroot.cc
View file

@ -18,13 +18,13 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // 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 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// $Id: bsetroot.cc,v 1.16 2003/05/10 15:44:15 fluxgen Exp $ // $Id: bsetroot.cc,v 1.17 2003/05/11 00:00:32 fluxgen Exp $
#include "bsetroot.hh" #include "bsetroot.hh"
#include "../src/i18n.hh" #include "../src/i18n.hh"
#include "../src/FbTk/ImageControl.hh" #include "../src/FbTk/ImageControl.hh"
#include "../src/ScreenInfo.hh" #include "../src/FbRootWindow.hh"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
@ -161,15 +161,17 @@ void bsetroot::setRootAtoms(Pixmap pixmap, int screen) {
atom_root = XInternAtom(display(), "_XROOTMAP_ID", true); atom_root = XInternAtom(display(), "_XROOTMAP_ID", true);
atom_eroot = XInternAtom(display(), "ESETROOT_PMAP_ID", true); atom_eroot = XInternAtom(display(), "ESETROOT_PMAP_ID", true);
ScreenInfo screen_info(screen); FbRootWindow root(screen);
// doing this to clean up after old background // doing this to clean up after old background
if (atom_root != None && atom_eroot != None) { if (atom_root != None && atom_eroot != None) {
XGetWindowProperty(display(), screen_info.getRootWindow(),
XGetWindowProperty(display(), root.window(),
atom_root, 0L, 1L, false, AnyPropertyType, atom_root, 0L, 1L, false, AnyPropertyType,
&type, &format, &length, &after, &data_root); &type, &format, &length, &after, &data_root);
if (type == XA_PIXMAP) { if (type == XA_PIXMAP) {
XGetWindowProperty(display(), screen_info.getRootWindow(), XGetWindowProperty(display(), root.window(),
atom_eroot, 0L, 1L, False, AnyPropertyType, atom_eroot, 0L, 1L, False, AnyPropertyType,
&type, &format, &length, &after, &data_eroot); &type, &format, &length, &after, &data_eroot);
@ -190,9 +192,9 @@ void bsetroot::setRootAtoms(Pixmap pixmap, int screen) {
} }
// setting new background atoms // setting new background atoms
XChangeProperty(display(), screen_info.getRootWindow(), XChangeProperty(display(), root.window(),
atom_root, XA_PIXMAP, 32, PropModeReplace, (unsigned char *) &pixmap, 1); atom_root, XA_PIXMAP, 32, PropModeReplace, (unsigned char *) &pixmap, 1);
XChangeProperty(display(), screen_info.getRootWindow(), XChangeProperty(display(), root.window(),
atom_eroot, XA_PIXMAP, 32, PropModeReplace, (unsigned char *) &pixmap, 1); atom_eroot, XA_PIXMAP, 32, PropModeReplace, (unsigned char *) &pixmap, 1);
} }
@ -206,7 +208,7 @@ void bsetroot::solid() {
pixmaps = new Pixmap[ScreenCount(display())]; pixmaps = new Pixmap[ScreenCount(display())];
for (; screen < ScreenCount(display()); screen++) { for (; screen < ScreenCount(display()); screen++) {
ScreenInfo screen_info(screen); FbRootWindow root(screen);
FbTk::Color c; FbTk::Color c;
GC gc; GC gc;
@ -218,23 +220,23 @@ void bsetroot::solid() {
c.setPixel(BlackPixel(display(), screen)); c.setPixel(BlackPixel(display(), screen));
gcv.foreground = c.pixel(); gcv.foreground = c.pixel();
gc = XCreateGC(display(), screen_info.getRootWindow(), gc = XCreateGC(display(), root.window(),
GCForeground , &gcv); GCForeground , &gcv);
pixmaps[screen] = XCreatePixmap(display(), pixmaps[screen] = XCreatePixmap(display(),
screen_info.getRootWindow(), root.window(),
screen_info.getWidth(), screen_info.getHeight(), root.width(), root.height(),
screen_info.getDepth()); root.depth());
XFillRectangle(display(), pixmaps[screen], gc, 0, 0, XFillRectangle(display(), pixmaps[screen], gc, 0, 0,
screen_info.getWidth(), screen_info.getHeight()); root.width(), root.height());
setRootAtoms(pixmaps[screen], screen); setRootAtoms(pixmaps[screen], screen);
XSetWindowBackgroundPixmap(display(), XSetWindowBackgroundPixmap(display(),
screen_info.getRootWindow(), pixmaps[screen]); root.window(), pixmaps[screen]);
XClearWindow(display(), screen_info.getRootWindow()); XClearWindow(display(), root.window());
XFreeGC(display(), gc); XFreeGC(display(), gc);
} }
@ -253,7 +255,7 @@ void bsetroot::modula(int x, int y) {
pixmaps = new Pixmap[ScreenCount(display())]; pixmaps = new Pixmap[ScreenCount(display())];
for (pattern = 0, screen = 0; screen < ScreenCount(display()); screen++) { for (pattern = 0, screen = 0; screen < ScreenCount(display()); screen++) {
ScreenInfo screen_info(screen); FbRootWindow root(screen);
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
pattern <<= 1; pattern <<= 1;
@ -277,12 +279,12 @@ void bsetroot::modula(int x, int y) {
XGCValues gcv; XGCValues gcv;
bitmap = XCreateBitmapFromData(display(), bitmap = XCreateBitmapFromData(display(),
screen_info.getRootWindow(), data, 16, 16); root.window(), data, 16, 16);
// bitmap used as tile, needs to have the same depth as background pixmap // bitmap used as tile, needs to have the same depth as background pixmap
r_bitmap = XCreatePixmap(display(), r_bitmap = XCreatePixmap(display(),
screen_info.getRootWindow(), 16, 16, root.window(), 16, 16,
screen_info.getDepth()); root.depth());
f.setFromString(fore, screen); f.setFromString(fore, screen);
b.setFromString(back, screen); b.setFromString(back, screen);
@ -295,7 +297,7 @@ void bsetroot::modula(int x, int y) {
gcv.foreground = f.pixel(); gcv.foreground = f.pixel();
gcv.background = b.pixel(); gcv.background = b.pixel();
gc = XCreateGC(display(), screen_info.getRootWindow(), gc = XCreateGC(display(), root.window(),
GCForeground | GCBackground, &gcv); GCForeground | GCBackground, &gcv);
// copying bitmap to the one going to be used as tile // copying bitmap to the one going to be used as tile
@ -306,19 +308,19 @@ void bsetroot::modula(int x, int y) {
XSetFillStyle(display(), gc, FillTiled); XSetFillStyle(display(), gc, FillTiled);
pixmaps[screen] = XCreatePixmap(display(), pixmaps[screen] = XCreatePixmap(display(),
screen_info.getRootWindow(), root.window(),
screen_info.getWidth(), screen_info.getHeight(), root.width(), root.height(),
screen_info.getDepth()); root.depth());
XFillRectangle(display(), pixmaps[screen], gc, 0, 0, XFillRectangle(display(), pixmaps[screen], gc, 0, 0,
screen_info.getWidth(), screen_info.getHeight()); root.width(), root.height());
setRootAtoms(pixmaps[screen], screen); setRootAtoms(pixmaps[screen], screen);
XSetWindowBackgroundPixmap(display(), XSetWindowBackgroundPixmap(display(),
screen_info.getRootWindow(), pixmaps[screen]); root.window(), pixmaps[screen]);
XClearWindow(display(), screen_info.getRootWindow()); XClearWindow(display(), root.window());
XFreeGC(display(), gc); XFreeGC(display(), gc);
XFreePixmap(display(), bitmap); XFreePixmap(display(), bitmap);
@ -337,7 +339,8 @@ void bsetroot::gradient(void) {
pixmaps = new Pixmap[ScreenCount(display())]; pixmaps = new Pixmap[ScreenCount(display())];
for (int screen = 0; screen < ScreenCount(display()); screen++) { for (int screen = 0; screen < ScreenCount(display()); screen++) {
ScreenInfo screen_info(screen); FbRootWindow root(screen);
FbTk::Texture texture; FbTk::Texture texture;
GC gc; GC gc;
XGCValues gcv; XGCValues gcv;
@ -351,29 +354,29 @@ void bsetroot::gradient(void) {
if (! texture.colorTo().isAllocated()) if (! texture.colorTo().isAllocated())
texture.colorTo().setPixel(BlackPixel(display(), screen)); texture.colorTo().setPixel(BlackPixel(display(), screen));
tmp = img_ctrl[screen]->renderImage(screen_info.getWidth(), tmp = img_ctrl[screen]->renderImage(root.width(),
screen_info.getHeight(), texture); root.height(), texture);
pixmaps[screen] = XCreatePixmap(display(), pixmaps[screen] = XCreatePixmap(display(),
screen_info.getRootWindow(), root.window(),
screen_info.getWidth(), screen_info.getHeight(), root.width(), root.height(),
screen_info.getDepth()); root.depth());
gc = XCreateGC(display(), screen_info.getRootWindow(), gc = XCreateGC(display(), root.window(),
GCForeground , &gcv); GCForeground , &gcv);
XCopyArea(display(), tmp, pixmaps[screen], gc, 0, 0, XCopyArea(display(), tmp, pixmaps[screen], gc, 0, 0,
screen_info.getWidth(), screen_info.getHeight(), root.width(), root.height(),
0, 0); 0, 0);
setRootAtoms(pixmaps[screen], screen); setRootAtoms(pixmaps[screen], screen);
XSetWindowBackgroundPixmap(display(), XSetWindowBackgroundPixmap(display(),
screen_info.getRootWindow(), pixmaps[screen]); root.window(), pixmaps[screen]);
XClearWindow(display(), screen_info.getRootWindow()); XClearWindow(display(), root.window());
if (! (screen_info.getVisual()->c_class & 1)) { if (! (root.visual()->c_class & 1)) {
img_ctrl[screen]->removeImage(tmp); img_ctrl[screen]->removeImage(tmp);
img_ctrl[screen]->timeout(); img_ctrl[screen]->timeout();
} }