aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-12-31 00:35:21 (GMT)
committerfluxgen <fluxgen>2003-12-31 00:35:21 (GMT)
commit6bacfb6ed9f383ddfa3440102250dccbb591242c (patch)
tree255481c14227d24da3698c5525fdfe074eede4d5
parent2dce9840d82f01acd5f67646b920ffc7dbdbc361 (diff)
downloadfluxbox-6bacfb6ed9f383ddfa3440102250dccbb591242c.zip
fluxbox-6bacfb6ed9f383ddfa3440102250dccbb591242c.tar.bz2
use mod1 resource
-rw-r--r--src/fluxbox.cc10
-rw-r--r--src/fluxbox.hh6
2 files changed, 13 insertions, 3 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();
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index a02ece0..cf61e25 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -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.hh,v 1.80 2003/12/30 20:56:40 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.81 2003/12/31 00:35:21 fluxgen Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
@@ -148,6 +148,7 @@ public:
148 148
149 inline unsigned int getCacheLife() const { return *m_rc_cache_life * 60000; } 149 inline unsigned int getCacheLife() const { return *m_rc_cache_life * 60000; }
150 inline unsigned int getCacheMax() const { return *m_rc_cache_max; } 150 inline unsigned int getCacheMax() const { return *m_rc_cache_max; }
151 inline bool useMod1() const { return *m_rc_use_mod1; }
151 152
152 inline void maskWindowEvents(Window w, FluxboxWindow *bw) 153 inline void maskWindowEvents(Window w, FluxboxWindow *bw)
153 { m_masked = w; m_masked_window = bw; } 154 { m_masked = w; m_masked_window = bw; }
@@ -246,7 +247,8 @@ private:
246 FbTk::Resource<TitlebarList> m_rc_titlebar_left, m_rc_titlebar_right; 247 FbTk::Resource<TitlebarList> m_rc_titlebar_left, m_rc_titlebar_right;
247 FbTk::Resource<unsigned int> m_rc_cache_life, m_rc_cache_max; 248 FbTk::Resource<unsigned int> m_rc_cache_life, m_rc_cache_max;
248 FbTk::Resource<time_t> m_rc_auto_raise_delay; 249 FbTk::Resource<time_t> m_rc_auto_raise_delay;
249 250 FbTk::Resource<bool> m_rc_use_mod1; /// temporary!, to disable mod1 for resize/move
251
250 std::map<Window, WinClient *> m_window_search; 252 std::map<Window, WinClient *> m_window_search;
251 std::map<Window, FluxboxWindow *> m_window_search_group; 253 std::map<Window, FluxboxWindow *> m_window_search_group;
252 // A window is the group leader, which can map to several 254 // A window is the group leader, which can map to several