diff options
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 80d055b..058c858 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -211,7 +211,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
211 | m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"), | 211 | m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"), |
212 | m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"), | 212 | m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"), |
213 | m_rc_auto_raise_delay(m_resourcemanager, 250, "session.autoRaiseDelay", "Session.AutoRaiseDelay"), | 213 | m_rc_auto_raise_delay(m_resourcemanager, 250, "session.autoRaiseDelay", "Session.AutoRaiseDelay"), |
214 | m_rc_mod_key(m_resourcemanager, "Mod1", "session.modKey", "Session.ModKey"), | ||
215 | m_masked_window(0), | 214 | m_masked_window(0), |
216 | m_mousescreen(0), | 215 | m_mousescreen(0), |
217 | m_keyscreen(0), | 216 | m_keyscreen(0), |
@@ -643,7 +642,7 @@ void Fluxbox::setupConfigFiles() { | |||
643 | if (create_init) | 642 | if (create_init) |
644 | FbTk::FileUtil::copyFile(DEFAULT_INITFILE, init_file.c_str()); | 643 | FbTk::FileUtil::copyFile(DEFAULT_INITFILE, init_file.c_str()); |
645 | 644 | ||
646 | #define CONFIG_VERSION 3 | 645 | #define CONFIG_VERSION 4 |
647 | FbTk::Resource<int> config_version(m_resourcemanager, 0, | 646 | FbTk::Resource<int> config_version(m_resourcemanager, 0, |
648 | "session.configVersion", "Session.ConfigVersion"); | 647 | "session.configVersion", "Session.ConfigVersion"); |
649 | if (*config_version < CONFIG_VERSION) { | 648 | if (*config_version < CONFIG_VERSION) { |
@@ -1707,22 +1706,3 @@ void Fluxbox::updateFrameExtents(FluxboxWindow &win) { | |||
1707 | (*it).first->updateFrameExtents(win); | 1706 | (*it).first->updateFrameExtents(win); |
1708 | } | 1707 | } |
1709 | } | 1708 | } |
1710 | |||
1711 | unsigned int Fluxbox::getModKey() const { | ||
1712 | if (!(m_rc_mod_key->c_str())) | ||
1713 | return 0; | ||
1714 | else | ||
1715 | return FbTk::KeyUtil::instance().getModifier(m_rc_mod_key->c_str()); | ||
1716 | } | ||
1717 | |||
1718 | void Fluxbox::setModKey(const char* modkeyname) { | ||
1719 | |||
1720 | if (!modkeyname) | ||
1721 | return; | ||
1722 | |||
1723 | unsigned int modkey = FbTk::KeyUtil::instance().getModifier(modkeyname); | ||
1724 | |||
1725 | if (modkey > 0) { | ||
1726 | m_rc_mod_key = modkeyname; | ||
1727 | } | ||
1728 | } | ||