AstralTransRocketries/OCEmu
1
0
Fork 0
mirror of https://github.com/zenith391/OCEmu.git synced 2025-09-20 10:13:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add support for precise screen coords

Browse Source 
Also fix drop not being emitted if the mouse is moved
This used to be correct but seems to have changed
This commit is contained in:
gamax92 2018-04-24 11:55:02 -06:00
parent 81e35cee5f
commit 035278e216
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/component/screen_sdl2.lua
View File

@ -13,6 +13,7 @@ local scrfgc, scrfgp, scrrfp = 0xFFFFFF
local scrbgc, scrfgp, scrrbp = 0x000000
local scrrfc, srcrbc = scrfgc, scrbgc
local palcol = {}
local precise = false
t3pal = {}
for i = 0,15 do
@ -56,7 +57,7 @@ if tier > 1 then
end
local buttons = {[SDL.BUTTON_LEFT] = 0, [SDL.BUTTON_RIGHT] = 1}
local moved, bttndown, lx, ly, windowID = false
local bttndown, lx, ly, windowID
function elsa.mousebuttondown(event)
local mbevent = ffi.cast("SDL_MouseButtonEvent*", event)
if mbevent.windowID ~= windowID then
@ -64,7 +65,11 @@ function elsa.mousebuttondown(event)
end
if buttons[mbevent.button] then
if not bttndown then
lx, ly = math.floor(mbevent.x/8)+1,math.floor(mbevent.y/16)+1
if precise then
lx, ly = math.floor(mbevent.x/2)/4,math.floor(mbevent.y/2)/8
else
lx, ly = math.floor(mbevent.x/8)+1,math.floor(mbevent.y/16)+1
end
table.insert(machine.signals,{"touch",address,lx,ly,buttons[mbevent.button]})
end
bttndown = buttons[mbevent.button]
@ -77,10 +82,7 @@ function elsa.mousebuttonup(event)
return
end
if bttndown and buttons[mbevent.button] then
if moved then
moved = false
table.insert(machine.signals,{"drop",address,lx,ly,buttons[mbevent.button]})
end
table.insert(machine.signals,{"drop",address,lx,ly,buttons[mbevent.button]})
bttndown = nil
end
end
@ -91,9 +93,13 @@ function elsa.mousemotion(event)
return
end
if bttndown then
local nx, ny = math.floor(mmevent.x/8)+1,math.floor(mmevent.y/16)+1
local nx, ny
if precise then
nx, ny = math.floor(mmevent.x/2)/4,math.floor(mmevent.y/2)/8
else
nx, ny = math.floor(mmevent.x/8)+1,math.floor(mmevent.y/16)+1
end
if nx ~= lx or ny ~= ly then
moved = true
table.insert(machine.signals,{"drag",address,nx,ny,bttndown})
lx, ly = nx, ny
end
@ -319,7 +325,6 @@ local function getColor(value, sel)
end
local touchinvert = false
local precise = false
-- screen component
local mai = {}