aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-05-17 10:28:26 (GMT)
committersimonb <simonb>2006-05-17 10:28:26 (GMT)
commit5ddabb0f390f69db793b5a6e40be9f94b8f83136 (patch)
treedf25ac8877f8d64665af1d23055e1b0abeca5138
parent22060cac47ec81c0161e52e33af8e4385c6cd794 (diff)
downloadfluxbox_pavel-5ddabb0f390f69db793b5a6e40be9f94b8f83136.zip
fluxbox_pavel-5ddabb0f390f69db793b5a6e40be9f94b8f83136.tar.bz2
fix root pixmap + atoms indexes in FbPixmap
Fixes issues with transparency on multiple screens, and probably also some alternate rootbg atoms
-rw-r--r--ChangeLog4
-rw-r--r--src/FbTk/FbPixmap.cc4
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 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.16: 2Changes for 0.9.16:
3*06/05/17:
4 * Fix transparency on multiple screens & possibly bad root bg atom
5 reading (Simon)
6 FbTk/FbPixmap.cc
3*06/05/16: 7*06/05/16:
4 * Fix bug with horizontal maximisation when quadrant resizing (Mathias) 8 * Fix bug with horizontal maximisation when quadrant resizing (Mathias)
5 Window.hh/cc 9 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) {
369 unsigned long *data; 369 unsigned long *data;
370 370
371 if (XGetWindowProperty(display(), 371 if (XGetWindowProperty(display(),
372 RootWindow(display(), i), 372 RootWindow(display(), screen_num),
373 root_prop_atoms[i], 373 root_prop_atoms[i],
374 0l, 1l, 374 0l, 1l,
375 False, XA_PIXMAP, 375 False, XA_PIXMAP,
@@ -437,7 +437,7 @@ Pixmap FbPixmap::getRootPixmap(int screen_num, bool force_update) {
437 checkAtoms(); 437 checkAtoms();
438 if (XGetWindowProperty(display(), 438 if (XGetWindowProperty(display(),
439 RootWindow(display(), i), 439 RootWindow(display(), i),
440 root_prop_atoms[i], 440 root_prop_atoms[prop],
441 0l, 1l, 441 0l, 1l,
442 False, XA_PIXMAP, 442 False, XA_PIXMAP,
443 &real_type, &real_format, 443 &real_type, &real_format,