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

Revert "bugfix: fbsetroot needs to use 24bit visuals as well"

Browse source 
This reverts commit 4f4d5e25d9.

The patch resolved a problem introduced by the ::setDepth abuse in
FbRootWindow, but this fails if the root window is *really* 32bit
With commit dcdde4d, the broken workaround depth selection is no longer
required.

BUG: 1093
This commit is contained in:
Thomas Lübking 2016-07-01 23:09:40 +02:00 committed by Mathias Gumz
parent b6f620597b
commit 848875eb92
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
util/fbsetroot.cc
View file

@ -38,11 +38,6 @@ using std::cerr;
using std::endl; using std::endl;
using std::string; using std::string;
inline int getRootDepth(const FbTk::FbWindow& w) {
return (w.depth() == 32 ? 24 : w.depth());
}
fbsetroot::fbsetroot(int argc, char **argv, char *dpy_name) fbsetroot::fbsetroot(int argc, char **argv, char *dpy_name)
: FbTk::App(dpy_name), m_app_name(argv[0]) { : FbTk::App(dpy_name), m_app_name(argv[0]) {
@ -202,7 +197,7 @@ void fbsetroot::solid() {
pixmap = new Pixmap(XCreatePixmap(display(), pixmap = new Pixmap(XCreatePixmap(display(),
root.window(), root.window(),
root.width(), root.height(), root.width(), root.height(),
getRootDepth(root))); root.depth()));
XFillRectangle(display(), *pixmap, gc.gc(), 0, 0, XFillRectangle(display(), *pixmap, gc.gc(), 0, 0,
root.width(), root.height()); root.width(), root.height());
@ -254,7 +249,7 @@ void fbsetroot::modula(int x, int y) {
// 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(),
root.window(), s, s, root.window(), s, s,
(root.depth() == 32 ? 24 : root.depth())); root.depth());
FbTk::Color f(fore, screen), b(back, screen); FbTk::Color f(fore, screen), b(back, screen);
@ -278,7 +273,7 @@ void fbsetroot::modula(int x, int y) {
pixmap = new Pixmap(XCreatePixmap(display(), pixmap = new Pixmap(XCreatePixmap(display(),
root.window(), root.window(),
root.width(), root.height(), root.width(), root.height(),
getRootDepth(root))); root.depth()));
XFillRectangle(display(), *pixmap, gc.gc(), 0, 0, XFillRectangle(display(), *pixmap, gc.gc(), 0, 0,
root.width(), root.height()); root.width(), root.height());
@ -324,7 +319,7 @@ void fbsetroot::gradient() {
pixmap = new Pixmap(XCreatePixmap(display(), pixmap = new Pixmap(XCreatePixmap(display(),
root.window(), root.window(),
root.width(), root.height(), root.width(), root.height(),
getRootDepth(root))); root.depth()));
XCopyArea(display(), tmp, *pixmap, gc.gc(), 0, 0, XCopyArea(display(), tmp, *pixmap, gc.gc(), 0, 0,