mouse scrolling / defer grab focus until first exposure

Author: osch

src/lwtk/Application.lua

@@ -343,6 +343,8 @@ createClosures = function(app)
  window:_handleFocusIn(...)
  elseif event == "FOCUS_OUT" then
  window:_handleFocusOut(...)
+ elseif event == "SCROLL" then
+ window:_handleMouseScroll(...)
  elseif event == "CLOSE" then
  window:_handleClose()
  elseif event == "MAP" then

src/lwtk/Component.lua

@@ -422,6 +422,20 @@ function Component:_processMouseLeave(x, y)
  call("onMouseLeave", self, x, y)
 end
 
+function Component:_processMouseScroll(dx, dy)
+ local comp = self
+ while true do
+ local onMouseScroll = comp.onMouseScroll
+ if onMouseScroll and onMouseScroll(comp, dx, dy) then
+ return true
+ end
+ comp = getParent[comp]
+ if not comp then 
+ return false
+ end
+ end
+end
+
 function Component:_processMouseDown(mx, my, button, modState)
  local onMouseDown = self.onMouseDown
  if onMouseDown then

src/lwtk/MouseDispatcher.lua

@@ -126,6 +126,13 @@ function MouseDispatcher:_processMouseMove(mouseEntered, mx, my)
  processMouseMove(self, mouseEntered, mx, my)
 end
 
+function MouseDispatcher:_processMouseScroll(dx, dy)
+ local hChild = self.mouseHoverChild
+ if hChild and hChild ~= self then
+ hChild:_processMouseScroll(dx, dy)
+ end
+end
+
 function MouseDispatcher:_processMouseLeave(mx, my)
  self.mouseX = mx
  self.mouseY = my

src/lwtk/Window.lua

@@ -381,6 +381,10 @@ function Window:_handleConfigure(x, y, w, h)
 end
 
 function Window:_handleExpose(x, y, w, h, count)
+ if self._grabFocus then
+ self.view:grabFocus()
+ self._grabFocus = nil
+ end
  self.exposedArea:addRect(x, y, w, h)
  if count == 0 then
  self.fullRedisplayOutstanding = false
@@ -421,6 +425,10 @@ function Window:_handleMouseMove(mx, my)
  self:_processMouseMove(self.mouseEntered, mx, my)
 end
 
+function Window:_handleMouseScroll(dx, dy)
+ self:_processMouseScroll(dx, dy)
+end
+
 function Window:_handleMouseLeave(mx, my)
  self.mouseX = mx
  self.mouseY = my
@@ -479,10 +487,6 @@ end
 
 function Window:_handleMap()
  self.mapped = true
- if self._grabFocus then
- self.view:grabFocus()
- self._grabFocus = nil
- end
 end
 
 function Window:requestClose()