aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index c7828ac..24f2556 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.256 2004/09/12 14:01:29 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.257 2004/09/12 14:56:19 rathnor Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -49,6 +49,7 @@
49#include "FbTk/RefCount.hh" 49#include "FbTk/RefCount.hh"
50#include "FbTk/SimpleCommand.hh" 50#include "FbTk/SimpleCommand.hh"
51#include "FbTk/CompareEqual.hh" 51#include "FbTk/CompareEqual.hh"
52#include "FbTk/Transparent.hh"
52 53
53//Use GNU extensions 54//Use GNU extensions
54#ifndef _GNU_SOURCE 55#ifndef _GNU_SOURCE
@@ -203,6 +204,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
203 m_screen_rm(m_resourcemanager), 204 m_screen_rm(m_resourcemanager),
204 m_rc_tabs(m_resourcemanager, true, "session.tabs", "Session.Tabs"), 205 m_rc_tabs(m_resourcemanager, true, "session.tabs", "Session.Tabs"),
205 m_rc_ignoreborder(m_resourcemanager, false, "session.ignoreBorder", "Session.IgnoreBorder"), 206 m_rc_ignoreborder(m_resourcemanager, false, "session.ignoreBorder", "Session.IgnoreBorder"),
207 m_rc_pseudotrans(m_resourcemanager, false, "session.forcePseudoTransparency", "Session.forcePseudoTransparency"),
206 m_rc_colors_per_channel(m_resourcemanager, 4, 208 m_rc_colors_per_channel(m_resourcemanager, 4,
207 "session.colorsPerChannel", "Session.ColorsPerChannel"), 209 "session.colorsPerChannel", "Session.ColorsPerChannel"),
208 m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"), 210 m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"),
@@ -1469,6 +1471,9 @@ void Fluxbox::load_rc() {
1469 1471
1470 if (m_rc_menufile->empty()) 1472 if (m_rc_menufile->empty())
1471 m_rc_menufile.setDefaultValue(); 1473 m_rc_menufile.setDefaultValue();
1474
1475 if (FbTk::Transparent::haveComposite())
1476 FbTk::Transparent::usePseudoTransparent(*m_rc_pseudotrans);
1472 1477
1473 if (!m_rc_slitlistfile->empty()) { 1478 if (!m_rc_slitlistfile->empty()) {
1474 *m_rc_slitlistfile = StringUtil::expandFilename(*m_rc_slitlistfile); 1479 *m_rc_slitlistfile = StringUtil::expandFilename(*m_rc_slitlistfile);