fix root pixmap + atoms indexes in FbPixmap

Fixes issues with transparency on multiple screens, and probably also
some alternate rootbg atoms

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e44efa..60d8910 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 (Format: Year/Month/Day)
 Changes for 0.9.16:
+*06/05/17:
+   * Fix transparency on multiple screens & possibly bad root bg atom
+     reading (Simon)
+     FbTk/FbPixmap.cc
 *06/05/16:
    * Fix bug with horizontal maximisation when quadrant resizing (Mathias)
      Window.hh/cc
diff --git a/src/FbTk/FbPixmap.cc b/src/FbTk/FbPixmap.cc
index 30f2c05..a7c49a1 100644
--- a/src/FbTk/FbPixmap.cc
+++ b/src/FbTk/FbPixmap.cc
@@ -369,7 +369,7 @@ void FbPixmap::rootwinPropertyNotify(int screen_num, Atom atom) {
             unsigned long *data;
 
             if (XGetWindowProperty(display(),
-                                   RootWindow(display(), i),
+                                   RootWindow(display(), screen_num),
                                    root_prop_atoms[i],
                                    0l, 1l,
                                    False, XA_PIXMAP,
@@ -437,7 +437,7 @@ Pixmap FbPixmap::getRootPixmap(int screen_num, bool force_update) {
             checkAtoms();
             if (XGetWindowProperty(display(),
                                    RootWindow(display(), i),
-                                   root_prop_atoms[i],
+                                   root_prop_atoms[prop],
                                    0l, 1l,
                                    False, XA_PIXMAP,
                                    &real_type, &real_format,