Added .. mouse gestures. Yes right! Find them in the keybinder menu. You can now…

… bind mouse gestures to any bindable actions!
Module makers can use gestures easily with the engine.ui.Gesture class


git-svn-id: http://svn.net-core.org/repos/t-engine4@3381 51575b47-30f0-44d4-a5cc-537603b46e54

@@ -83,17 +83,23 @@ function _M:saveRemap(file)
 	end
 
 	local f = fs.open(file, "w")
+	
+	local k1, k2, k3
 
 	for virtual, keys in pairs(_M.binds_remap) do
-		if keys[1] and not keys[2] then
-			f:write(("%s = {%q,nil}\n"):format(virtual, keys[1]))
-		elseif not keys[1] and keys[2] then
-			f:write(("%s = {nil,%q}\n"):format(virtual, keys[2]))
-		elseif keys[1] and keys[2] then
-			f:write(("%s = {%q,%q}\n"):format(virtual, keys[1], keys[2]))
-		elseif not keys[1] and not keys[2] then
-			f:write(("%s = {nil,nil}\n"):format(virtual))
+		k1 = "nil"
+		k2 = "nil"
+		k3 = "nil"
+		if keys[1] then
+			k1 = ("%q"):format(keys[1])
 		end
+		if keys[2] then
+			k2 = ("%q"):format(keys[2])
+		end
+		if keys[3] then
+			k3 = ("%q"):format(keys[3])
+		end
+		f:write(("%s = {%s,%s,%s}\n"):format(virtual, k1, k2, k3))
 	end
 
 	f:close()
@@ -138,6 +144,10 @@ function _M:makeKeyString(sym, ctrl, shift, alt, meta, unicode)
 	return ("sym:%s:%s:%s:%s:%s"):format(tostring(sym), tostring(ctrl), tostring(shift), tostring(alt), tostring(meta)), unicode and "uni:"..unicode
 end
 
+function _M:makeGestureString(gesture)
+	return ("gest:%s"):format(tostring(gesture))
+end
+
 function _M:makeMouseString(button, ctrl, shift, alt, meta)
 	return ("mouse:%s:%s:%s:%s:%s"):format(tostring(button), tostring(ctrl), tostring(shift), tostring(alt), tostring(meta))
 end
@@ -181,6 +191,10 @@ function _M:formatKeyString(ks)
 		if meta then sym = "[meta]+"..sym end
 
 		return sym
+	elseif ks:find("^gest:") then
+		local i, j, sym = ks:find("^gest:([a-zA-Z0-9]+)$")
+		if not i then return "--" end
+		return sym
 	end
 end
 

@@ -50,12 +50,12 @@ function _M:generateList(actions)
 		resume = { "Resume", function() game:unregisterDialog(self) end },
 		keybinds = { "Key Bindings", function()
 			game:unregisterDialog(self)
-			local menu = require("engine.dialogs.KeyBinder").new(game.normal_key)
+			local menu = require("engine.dialogs.KeyBinder").new(game.normal_key, nil, game.gestures)
 			game:registerDialog(menu)
 		end },
 		keybinds_all = { "Key Bindings", function()
 			game:unregisterDialog(self)
-			local menu = require("engine.dialogs.KeyBinder").new(game.normal_key, true)
+			local menu = require("engine.dialogs.KeyBinder").new(game.normal_key, true, game.gestures)
 			game:registerDialog(menu)
 		end },
 		video = { "Video Options", function()

@@ -25,11 +25,12 @@ local Textbox = require "engine.ui.Textbox"
 
 module(..., package.seeall, class.inherit(Dialog))
 
-function _M:init(title, text, min, max, action, cancel)
+function _M:init(title, text, min, max, action, cancel, absolute)
 	self.action = action
 	self.cancel = cancel
 	self.min = min or 2
 	self.max = max or 25
+	self.absolute = absolute
 
 	Dialog.init(self, title, 320, 110)
 
@@ -53,11 +54,11 @@ end
 
 function _M:okclick()
 	self.name = self.c_box.text
-	if self.name:len() >= self.min then
+	if self.name:len() >= self.min and self.name:len() <= self.max then
 		game:unregisterDialog(self)
 		self.action(self.name)
 	else
-		Dialog:simplePopup("Error", "Must be between 2 and 25 characters.")
+		Dialog:simplePopup("Error", ("Must be between %i and %i characters."):format(self.min, self.max))
 	end
 end
 

@@ -23,21 +23,36 @@ local TreeList = require "engine.ui.TreeList"
 local Textzone = require "engine.ui.Textzone"
 local Separator = require "engine.ui.Separator"
 local KeyBind = require "engine.KeyBind"
+local Gestures = require "engine.ui.Gestures"
+local GetText = require "engine.dialogs.GetText"
 
 module(..., package.seeall, class.inherit(Dialog))
 
-function _M:init(key_source, force_all)
-	Dialog.init(self, "Key bindings", 800, game.h)
+function _M:init(key_source, force_all, gesture_source)
+	Dialog.init(self, "Key bindings", 800, game.h * 0.9)
+	self.gesture = gesture_source
+	self.key_source = key_source
 
 	self:generateList(key_source, force_all)
 
-	self.c_tree = TreeList.new{width=self.iw, height=self.ih, sel_by_col=true, scrollbar=true, columns={
-		{width=40, display_prop="name"},
-		{width=30, display_prop="b1"},
-		{width=30, display_prop="b2"},
-	}, tree=self.tree,
-		fct=function(item, sel, v) self:use(item, sel, v) end,
-	}
+	if self.gesture then
+		self.c_tree = TreeList.new{width=self.iw, height=self.ih, sel_by_col=true, scrollbar=true, columns={
+			{width=40, display_prop="name"},
+			{width=20, display_prop="b1"},
+			{width=20, display_prop="b2"},
+			{width=20, display_prop="g"},
+		}, tree=self.tree,
+			fct=function(item, sel, v) self:use(item, sel, v) end,
+		}
+	else
+		self.c_tree = TreeList.new{width=self.iw, height=self.ih, sel_by_col=true, scrollbar=true, columns={
+			{width=40, display_prop="name"},
+			{width=30, display_prop="b1"},
+			{width=30, display_prop="b2"},
+		}, tree=self.tree,
+			fct=function(item, sel, v) self:use(item, sel, v) end,
+		}
+	end
 
 	self:loadUI{
 		{left=0, top=0, ui=self.c_tree},
@@ -56,63 +71,118 @@ end
 function _M:use(item)
 	local t = item
 	local curcol = self.c_tree.cur_col - 1
-	if not item or item.nodes or curcol < 1 or curcol > 2 then return end
+	if not item or item.nodes or curcol < 1 or curcol > 3 then return end
 
 	--
 	-- Make a dialog to ask for the key
 	--
-	local title = "Press a key (or escape) for: "..tostring(t.name)
-	local font = self.font
-	local w, h = font:size(title)
-	local d = engine.Dialog.new(title, w + 8, h + 25, nil, nil, nil, font)
-	d:keyCommands{__DEFAULT=function(sym, ctrl, shift, alt, meta, unicode)
-		-- Modifier keys are not treated
-		if not t.single_key and (sym == KeyBind._LCTRL or sym == KeyBind._RCTRL or
-		   sym == KeyBind._LSHIFT or sym == KeyBind._RSHIFT or
-		   sym == KeyBind._LALT or sym == KeyBind._RALT or
-		   sym == KeyBind._LMETA or sym == KeyBind._RMETA) then
-			return
-		end
-
-		if sym == KeyBind._BACKSPACE then
-			KeyBind.binds_remap[t.type] = KeyBind.binds_remap[t.type] or t.k.default
-			KeyBind.binds_remap[t.type][curcol] = nil
-		elseif sym ~= KeyBind._ESCAPE then
-			local ks = KeyBind:makeKeyString(sym, ctrl, shift, alt, meta, unicode)
-			print("Binding", t.name, "to", ks, "::", curcol)
-
-			KeyBind.binds_remap[t.type] = KeyBind.binds_remap[t.type] or t.k.default
-			KeyBind.binds_remap[t.type][curcol] = ks
-		end
-		self.c_tree:drawItem(item)
-		game:unregisterDialog(d)
-	end}
-
-	d:mouseZones{ norestrict=true,
-		{ x=0, y=0, w=game.w, h=game.h, fct=function(button, x, y, xrel, yrel, tx, ty)
-			if xrel or yrel then return end
-			if button == "left" then return end
-
-			local ks = KeyBind:makeMouseString(
-				button,
-				core.key.modState("ctrl") and true or false,
-				core.key.modState("shift") and true or false,
-				core.key.modState("alt") and true or false,
-				core.key.modState("meta") and true or false
-			)
-			print("Binding", t.name, "to", ks)
-
-			KeyBind.binds_remap[t.type] = KeyBind.binds_remap[t.type] or t.k.default
-			KeyBind.binds_remap[t.type][curcol] = ks
+	if curcol == 1 or curcol == 2 then
+		local title = "Press a key (or escape) for: "..tostring(t.name)
+		local font = self.font
+		local w, h = font:size(title)
+		local d = engine.Dialog.new(title, w + 8, h + 25, nil, nil, nil, font)
+		d:keyCommands{__DEFAULT=function(sym, ctrl, shift, alt, meta, unicode)
+			-- Modifier keys are not treated
+			if not t.single_key and (sym == KeyBind._LCTRL or sym == KeyBind._RCTRL or
+			   sym == KeyBind._LSHIFT or sym == KeyBind._RSHIFT or
+			   sym == KeyBind._LALT or sym == KeyBind._RALT or
+			   sym == KeyBind._LMETA or sym == KeyBind._RMETA) then
+				return
+			end
+
+			if sym == KeyBind._BACKSPACE then
+				KeyBind.binds_remap[t.type] = KeyBind.binds_remap[t.type] or t.k.default
+				KeyBind.binds_remap[t.type][curcol] = nil
+			elseif sym ~= KeyBind._ESCAPE then
+				local ks = KeyBind:makeKeyString(sym, ctrl, shift, alt, meta, unicode)
+				print("Binding", t.name, "to", ks, "::", curcol)
+
+				KeyBind.binds_remap[t.type] = KeyBind.binds_remap[t.type] or t.k.default
+				KeyBind.binds_remap[t.type][curcol] = ks
+			end
 			self.c_tree:drawItem(item)
 			game:unregisterDialog(d)
-		end },
-	}
+		end}
+
+		d:mouseZones{ norestrict=true,
+			{ x=0, y=0, w=game.w, h=game.h, fct=function(button, x, y, xrel, yrel, tx, ty)
+				if xrel or yrel then return end
+				if button == "left" then return end
+
+				local ks = KeyBind:makeMouseString(
+					button,
+					core.key.modState("ctrl") and true or false,
+					core.key.modState("shift") and true or false,
+					core.key.modState("alt") and true or false,
+					core.key.modState("meta") and true or false
+				)
+				print("Binding", t.name, "to", ks)
+
+				KeyBind.binds_remap[t.type] = KeyBind.binds_remap[t.type] or t.k.default
+				KeyBind.binds_remap[t.type][curcol] = ks
+				self.c_tree:drawItem(item)
+				game:unregisterDialog(d)
+			end },
+		}
 
-	d.drawDialog = function(self, s)
-		s:drawColorStringBlendedCentered(self.font, curcol == 1 and "Bind key" or "Bind alternate key", 2, 2, self.iw - 2, self.ih - 2)
+		d.drawDialog = function(self, s)
+			s:drawColorStringBlendedCentered(self.font, curcol == 1 and "Bind key" or "Bind alternate key", 2, 2, self.iw - 2, self.ih - 2)
+		end
+		game:registerDialog(d)
+	elseif curcol == 3 then
+		local title = "Make gesture (using right mouse button) or type it (or escape) for: "..tostring(t.name)
+		local font = self.font
+		local w, h = font:size(title)
+		local d = GetText.new(title, "Gesture", 0, 5,
+			function(gesture)
+				if item.g and item.g ~= "--" then
+					self.gesture:removeGesture(item.g)
+				end
+				KeyBind.binds_remap[t.type] = KeyBind.binds_remap[t.type] or t.k.default
+				if gesture == "" then
+					KeyBind.binds_remap[t.type][curcol] = nil
+				else
+					KeyBind.binds_remap[t.type][curcol] = KeyBind:makeGestureString(gesture)
+				end
+				self.gesture:addGesture(gesture, function() self.key_source:triggerVirtual(t.type) end, t.sortname)
+				self.c_tree:drawItem(item)
+			end,
+			function()
+
+			end,
+		true)
+
+		d.c_box.filter = function(c)
+			c=string.upper(c)
+			local text = table.concat(d.c_box.tmp)
+			if (c =="U" or c=="D" or c=="L" or c=="R") and c:byte(1)~=text:byte(d.c_box.cursor-1) and c:byte(1)~=text:byte(d.c_box.cursor) then
+				return c
+			else
+				return nil
+			end
+		end
+		d.mouse:registerZone(0, 0, game.w, game.h, function(button, mx, my, xrel, yrel, bx, by, event)
+				if button == "right" then
+					if event == "motion" then
+						self.gesture:changeMouseButton(true)
+						self.gesture:mouseMove(mx, my)
+						local text = table.concat(d.c_box.tmp)
+						if #text < 5 and self.gesture.lastgesture~="" and self.gesture.lastgesture:byte(1)~=text:byte(d.c_box.cursor-1) and self.gesture.lastgesture:byte(1) ~= text:byte(d.c_box.cursor) then
+							table.insert(d.c_box.tmp, d.c_box.cursor, self.gesture.lastgesture)
+							d.c_box.cursor = d.c_box.cursor + 1
+							d.c_box:updateText()
+						end
+					elseif event == "button" then
+						self.gesture:changeMouseButton(false)
+						self.gesture:reset()
+					end
+				end
+
+				d:mouseEvent(button, mx, my, xrel, yrel, bx - d.display_x, by - d.display_y, event)
+			end)
+
+		game:registerDialog(d)
 	end
-	game:registerDialog(d)
 end
 
 function _M:generateList(key_source, force_all)
@@ -143,8 +213,10 @@ function _M:generateList(key_source, force_all)
 			single_key = k.single_key,
 			bind1 = function(item) return KeyBind:getBindTable(k)[1] end,
 			bind2 = function(item) return KeyBind:getBindTable(k)[2] end,
+			bind3 = function(item) return KeyBind:getBindTable(k)[3] end,
 			b1 = function(item) return KeyBind:formatKeyString(util.getval(item.bind1, item)) end,
 			b2 = function(item) return KeyBind:formatKeyString(util.getval(item.bind2, item)) end,
+			g = function(item) return KeyBind:formatKeyString(util.getval(item.bind3, item)) end,
 		}
 		groups[k.group] = groups[k.group] or {}
 		table.insert(groups[k.group], item)
@@ -154,7 +226,7 @@ function _M:generateList(key_source, force_all)
 		tree[#tree+1] = {
 			name = tstring{{"font","bold"}, {"color","GOLD"}, group:capitalize(), {"font","normal"}},
 			sortname = group:capitalize(),
-			b1 = "", b2 = "",
+			b1 = "", b2 = "", g = "",
 			shown = true,
 			nodes = data,
 		}

@@ -169,6 +169,9 @@ function _M:resize(w, h, nogen)
 	self.ix, self.iy = 5, 8 + 3 + self.font_bold_h
 	self.iw, self.ih = w - 2 * 5, h - 8 - 8 - 3 - self.font_bold_h
 
+--	self.display_x = util.bound(self.display_x, 0, game.w - (self.w+self.frame.ox2))
+--	self.display_y = util.bound(self.display_y, 0, game.h - (self.h+self.frame.oy2))
+
 	if not nogen then self:generate() end
 end
 
@@ -423,8 +426,6 @@ end
 
 function _M:toScreen(x, y, nb_keyframes)
 	if self.__hidden then return end
-	x = util.bound(x, 0, game.w - (self.w+self.frame.ox2))
-	y = util.bound(y, 0, game.h - (self.h+self.frame.oy2))
 
 	local zoom = 1
 	if self.__showup then

+-- TE4 - T-Engine 4
+-- Copyright (C) 2009, 2010, 2011 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+require "engine.class"
+local KeyBind = require "engine.KeyBind"
+
+module(..., package.seeall, class.make)
+
+function _M:init(text, key_source, force_all)
+	assert(key_source, "no key source")
+	self.text = text or "Gesture: "
+	self.gesture = ""
+	self.gestures = {}
+	self.font = core.display.newFont("/data/font/Vera.ttf", 12)
+
+	local gesttext = self.text.."WWWWW"
+	self.fontmax_w, self.font_h = self.font:size(gesttext)
+
+	self.surface = core.display.newSurface(self.fontmax_w, self.font_h)
+	self.surface:drawColorStringBlended(self.font, self.text, 0, 0, 255, 255, 255, true)
+	self.texture, self.texture_w, self.texture_h = self.surface:glTexture()
+	self.timeout = 1.7
+	self.lastupdate = os.time()
+	self.gesturing = false
+	self.mousebuttondown = false
+	self.distance = 0
+	self.lastgesture = ""
+	self.lastgesturename = ""
+
+	self:loadGestures(key_source, force_all)
+end
+
+function _M:loadGestures(key_source, force_all)
+	local l = {}
+
+	for virtual, t in pairs(KeyBind.binds_def) do
+		if (force_all or key_source.virtuals[virtual]) and t.group ~= "debug" then
+			l[#l+1] = t
+		end
+	end
+	table.sort(l, function(a,b)
+		if a.group ~= b.group then
+			return a.group < b.group
+		else
+			return a.order < b.order
+		end
+	end)
+
+	-- Makes up the list
+	local tree = {}
+	local groups = {}
+	for _, k in ipairs(l) do
+		local bind3 = KeyBind:getBindTable(k)[3]
+		local gesture = KeyBind:formatKeyString(util.getval(bind3))
+		if k.name ~= "" and k.name~= "--" then
+			self:addGesture(gesture, function() key_source:triggerVirtual(k.type) end, k.name)
+		end
+	end
+end
+
+function _M:mouseMove(mx, my)
+	if #self.gesture >= 5 then return end
+	if self.omx and self.omy then
+		self.distance = self.distance + (self.omy - my)^2 + (self.omx - mx)^2
+		if math.abs(self.omx - mx) > math.abs(self.omy - my) and self.distance > 100 then
+			if self.omx > mx then
+				if self.lastgesture~="L" then
+					self.gesture = self.gesture.."L"
+					self.lastgesture = "L"
+				end
+			else
+				if self.lastgesture~="R" then
+					self.gesture = self.gesture.."R"
+					self.lastgesture = "R"
+				end
+			end
+			self.gesturing = true
+			self.lastupdate = os.time()
+			self.distance = 0
+		end
+		if math.abs(self.omx - mx) < math.abs(self.omy - my) and self.distance > 100 then
+			if self.omy > my then
+				if self.lastgesture~="U" then
+					self.gesture = self.gesture.."U"
+					self.lastgesture = "U"
+				end
+			else
+				if self.lastgesture~="D" then
+					self.gesture = self.gesture.."D"
+					self.lastgesture = "D"
+				end
+			end
+			self.gesturing = true
+			self.lastupdate = os.time()
+			self.distance = 0
+		end
+	end
+
+	self.omx = mx
+	self.omy = my
+end
+
+function _M:isGesturing()
+	return self.gesturing
+end
+
+function _M:isMouseButtonDown()
+	return self.mousebuttondown
+end
+
+function _M:changeMouseButton(isDown)
+	self.mousebuttondown = isDown
+end
+
+function _M:useGesture()
+	if self.gestures[self.gesture] then
+		self.gestures[self.gesture].func()
+	end
+end
+
+function _M:reset()
+	self.gesturing = false
+	self.omx = nil
+	self.omy = nil
+	self.gesture = ""
+	self.lastgesture = ""
+	self.distance = 0
+end
+
+function _M:addGesture(gesture, func, name)
+	self.gestures[gesture] = {}
+	self.gestures[gesture].func = func
+	self.gestures[gesture].name = name
+end
+
+function _M:removeGesture(gesture)
+	if not self.gestures[gesture] then return end
+	self.gestures[gesture] = nil
+end
+
+function _M:empty()
+	self.gestures = {}
+	self:reset()
+end
+
+function _M:setTimeout(timeout)
+	self.timeout = timeout
+end
+
+function _M:getLastGesture()
+	return self.gesture
+end
+
+function _M:update()
+	local gesttxt = ""
+
+	if self.gesturing == true then
+		gesttxt = self.text
+		if os.difftime(os.time(),  self.lastupdate) >= self.timeout then
+			self:reset()
+		end
+	end
+
+	gesttxt = gesttxt..self.gesture
+
+	self.surface:erase(0,0,0,1)
+	self.surface:drawColorStringBlended(self.font, gesttxt, 0, 0, 255, 255, 255, true)
+	self.surface:updateTexture(self.texture)
+end
+
+function _M:display(display_x, display_y)
+	self.texture:toScreenFull(display_x, display_y, self.fontmax_w, self.font_h, self.texture_w, self.texture_h)
+
+	if self.gestures[self.gesture] then
+		if self.gestures[self.gesture].name == self.lastgesturename and self.gesturenametexure then
+			self.gesturenametexure:toScreenFull(display_x + self.fontmax_w, display_y, self.gesturenamefont_w , self.font_h, self.gesturenametexure_w, self.gesturenametexure_h)
+		else
+			self.gesturenamefont_w, _ = self.font:size(self.gestures[self.gesture].name)
+			local s = core.display.newSurface(self.gesturenamefont_w, self.font_h)
+			s:drawColorStringBlended(self.font, self.gestures[self.gesture].name, 0, 0, 255, 255, 255, true)
+			self.gesturenametexure, self.gesturenametexure_w, self.gesturenametexure_h = s:glTexture()
+			self.gesturenametexure:toScreenFull(display_x, display_y, self.fontmax_w, self.font_h, self.texture_w, self.texture_h)
+		end
+		self.lastgesturename = self.gestures[self.gesture].name
+	end
+end

@@ -54,6 +54,7 @@ local DebugConsole = require "engine.DebugConsole"
 local FlyingText = require "engine.FlyingText"
 local Tooltip = require "engine.Tooltip"
 local Calendar = require "engine.Calendar"
+local Gestures = require "engine.ui.Gestures"
 
 local Dialog = require "engine.ui.Dialog"
 local MapMenu = require "mod.dialogs.MapMenu"
@@ -854,6 +855,10 @@ function _M:display(nb_keyframes)
 		self.minimap_bg:toScreen(0, 35, 200, 200)
 		self.minimap_scroll_x, self.minimap_scroll_y = util.bound(self.player.x - 25, 0, map.w - 50), util.bound(self.player.y - 25, 0, map.h - 50)
 		map:minimapDisplay(0, 35, self.minimap_scroll_x, self.minimap_scroll_y, 50, 50, 1)
+
+		-- Mouse gestures
+		self.gestures:update()
+		self.gestures:display(map.display_x, map.display_y + map.viewport.height - self.gestures.font_h - 5)
 	end
 
 	-- We display the player's interface
@@ -907,6 +912,9 @@ function _M:setupCommands()
 	-- Activate profiler keybinds
 	self.key:setupProfiler()
 
+	-- Activate mouse gestures
+	self.gestures = Gestures.new("Gesture: ", self.key, true)
+
 	-- Helper function to not allow some actions on the wilderness map
 	local not_wild = function(f) return function() if self.zone and not self.zone.wilderness then f() else self.logPlayer(self.player, "You cannot do that on the world map.") end end end
 
@@ -1183,7 +1191,24 @@ function _M:setupMouse(reset)
 		if self:targetMouse(button, mx, my, xrel, yrel, event) then return end
 
 		-- Handle Use menu
-		if button == "right" and not xrel and not yrel and event == "button" then self:mouseRightClick(mx, my) return end
+		if button == "right" then
+			if event == "motion" then
+				self.gestures:changeMouseButton(true)
+				self.gestures:mouseMove(mx, my)
+			elseif event == "button" then
+				if not self.gestures:isGesturing() then
+					if not xrel and not yrel then
+						-- Handle Use menu
+						self:mouseRightClick(mx, my)
+						return
+					end
+				else
+					self.gestures:changeMouseButton(false)
+					self.gestures:useGesture()
+					self.gestures:reset()
+				end
+			end
+		end
 
 		-- Default left button action
 		if button == "left" and not xrel and not yrel and event == "button" and self.zone and not self.zone.wilderness then if self:mouseLeftClick(mx, my) then return end end