aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 439ed8f..05a2ac6 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.215 2003/12/30 20:56:40 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.216 2003/12/31 00:35:21 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -392,6 +392,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
392 m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"), 392 m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"),
393 m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"), 393 m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"),
394 m_rc_auto_raise_delay(m_resourcemanager, 250, "session.autoRaiseDelay", "Session.AutoRaiseDelay"), 394 m_rc_auto_raise_delay(m_resourcemanager, 250, "session.autoRaiseDelay", "Session.AutoRaiseDelay"),
395 m_rc_use_mod1(m_resourcemanager, true, "session.useMod1", "Session.UseMod1"),
395 m_focused_window(0), m_masked_window(0), 396 m_focused_window(0), m_masked_window(0),
396 m_mousescreen(0), 397 m_mousescreen(0),
397 m_keyscreen(0), 398 m_keyscreen(0),
@@ -958,6 +959,13 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
958 } 959 }
959#endif // USE_TOOLBAR 960#endif // USE_TOOLBAR
960 961
962 // strip num/caps/scroll-lock and
963 // see if we're using any other modifier,
964 // if we're we shouldn't show the root menu
965 // this could happen if we're resizing aterm for instance
966 if (FbTk::KeyUtil::instance().cleanMods(be.state) != 0)
967 return;
968
961 if (be.button == 1) { 969 if (be.button == 1) {
962 if (! screen->isRootColormapInstalled()) 970 if (! screen->isRootColormapInstalled())
963 screen->imageControl().installRootColormap(); 971 screen->imageControl().installRootColormap();