From baaaed3dc16b38e9704da7c6bc0edce7f2df068b Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 17 Jan 2003 06:52:34 +0000 Subject: [PATCH] add a drag threshold --- src/actions.cc | 19 ++++++++++++++++++- src/actions.hh | 3 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/actions.cc b/src/actions.cc index 5a799a58..73601922 100644 --- a/src/actions.cc +++ b/src/actions.cc @@ -14,13 +14,15 @@ #include "otk/display.hh" #include +#include namespace ob { const int Actions::BUTTONS; Actions::Actions() - : _button(0) + : _button(0), + _dragging(false) { for (int i=0; ifindHandler(e.window)); if (!w) return; + if (!_dragging) { + long threshold; + int dx = x_root - _posqueue[0]->pos.x(); + int dy = y_root - _posqueue[0]->pos.y(); + // XXX: dont get this from python every time! + if (!python_get_long("drag_threshold", &threshold)) + threshold = 0; + if (!(std::abs(dx) >= threshold || std::abs(dy) >= threshold)) + return; // not at the threshold yet + } + _dragging = true; // in a drag now + + // check if the movement is more than the threshold + // run the MOTION python hook // kill off the Button1Mask etc, only want the modifiers unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask | diff --git a/src/actions.hh b/src/actions.hh index 603450e4..1c0c064e 100644 --- a/src/actions.hh +++ b/src/actions.hh @@ -55,6 +55,9 @@ private: Used for motion events as the starting position. */ ButtonPressAction *_posqueue[BUTTONS]; + //! This is set to true once a drag has started and false when done to make + //! sure the threshold isnt checked anymore once a drag is underway + bool _dragging; void insertPress(const XButtonEvent &e); -- 2.45.2