nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use mod1 resource

Browse source
This commit is contained in:
fluxgen 2003-12-31 00:35:21 +00:00
parent 2dce9840d8
commit 6bacfb6ed9
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/fluxbox.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.cc,v 1.215 2003/12/30 20:56:40 fluxgen Exp $
// $Id: fluxbox.cc,v 1.216 2003/12/31 00:35:21 fluxgen Exp $
#include "fluxbox.hh"
@ -392,6 +392,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"),
m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"),
m_rc_auto_raise_delay(m_resourcemanager, 250, "session.autoRaiseDelay", "Session.AutoRaiseDelay"),
m_rc_use_mod1(m_resourcemanager, true, "session.useMod1", "Session.UseMod1"),
m_focused_window(0), m_masked_window(0),
m_mousescreen(0),
m_keyscreen(0),
@ -958,6 +959,13 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
}
#endif // USE_TOOLBAR
// strip num/caps/scroll-lock and
// see if we're using any other modifier,
// if we're we shouldn't show the root menu
// this could happen if we're resizing aterm for instance
if (FbTk::KeyUtil::instance().cleanMods(be.state) != 0)
return;
if (be.button == 1) {
if (! screen->isRootColormapInstalled())
screen->imageControl().installRootColormap();

4
src/fluxbox.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.hh,v 1.80 2003/12/30 20:56:40 fluxgen Exp $
// $Id: fluxbox.hh,v 1.81 2003/12/31 00:35:21 fluxgen Exp $
#ifndef FLUXBOX_HH
#define FLUXBOX_HH
@ -148,6 +148,7 @@ public:
inline unsigned int getCacheLife() const { return *m_rc_cache_life * 60000; }
inline unsigned int getCacheMax() const { return *m_rc_cache_max; }
inline bool useMod1() const { return *m_rc_use_mod1; }
inline void maskWindowEvents(Window w, FluxboxWindow *bw)
{ m_masked = w; m_masked_window = bw; }
@ -246,6 +247,7 @@ private:
FbTk::Resource<TitlebarList> m_rc_titlebar_left, m_rc_titlebar_right;
FbTk::Resource<unsigned int> m_rc_cache_life, m_rc_cache_max;
FbTk::Resource<time_t> m_rc_auto_raise_delay;
FbTk::Resource<bool> m_rc_use_mod1; /// temporary!, to disable mod1 for resize/move
std::map<Window, WinClient *> m_window_search;
std::map<Window, FluxboxWindow *> m_window_search_group;