about summary refs log tree commit diff stats
path: root/main.lua
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2022-12-23 19:47:10 -0800
committerKartik K. Agaram <vc@akkartik.com>2022-12-23 19:47:10 -0800
commit48541656304c49005e951f7d67f6b5e47485dd53 (patch)
tree3f7d4ea1def48bcfd7050591f45c38ba76daabce /main.lua
parent97fa2b0a7a397d94337fb6d514e0d2e0eb8022af (diff)
parente0448d7d7f1f6ec7ff88b222f59abe88503437e6 (diff)
downloadview.love-48541656304c49005e951f7d67f6b5e47485dd53.tar.gz
Merge lines.love
Diffstat (limited to 'main.lua')
-rw-r--r--main.lua26
1 files changed, 13 insertions, 13 deletions
diff --git a/main.lua b/main.lua
index e9a7da5..34ece94 100644
--- a/main.lua
+++ b/main.lua
@@ -107,9 +107,9 @@ end
 
 function App.filedropped(file)
   if Current_app == 'run' then
-    if run.filedropped then run.filedropped(file) end
+    if run.file_drop then run.file_drop(file) end
   elseif Current_app == 'source' then
-    if source.filedropped then source.filedropped(file) end
+    if source.file_drop then source.file_drop(file) end
   else
     assert(false, 'unknown app "'..Current_app..'"')
   end
@@ -154,7 +154,7 @@ function App.update(dt)
   end
 end
 
-function App.keychord_pressed(chord, key)
+function App.keychord_press(chord, key)
   -- ignore events for some time after window in focus (mostly alt-tab)
   if Current_time < Last_focus_time + 0.01 then
     return
@@ -184,9 +184,9 @@ function App.keychord_pressed(chord, key)
     return
   end
   if Current_app == 'run' then
-    if run.keychord_pressed then run.keychord_pressed(chord, key) end
+    if run.keychord_press then run.keychord_press(chord, key) end
   elseif Current_app == 'source' then
-    if source.keychord_pressed then source.keychord_pressed(chord, key) end
+    if source.keychord_press then source.keychord_press(chord, key) end
   else
     assert(false, 'unknown app "'..Current_app..'"')
   end
@@ -199,9 +199,9 @@ function App.textinput(t)
   end
   --
   if Current_app == 'run' then
-    if run.textinput then run.textinput(t) end
+    if run.text_input then run.text_input(t) end
   elseif Current_app == 'source' then
-    if source.textinput then source.textinput(t) end
+    if source.text_input then source.text_input(t) end
   else
     assert(false, 'unknown app "'..Current_app..'"')
   end
@@ -214,9 +214,9 @@ function App.keyreleased(chord, key)
   end
   --
   if Current_app == 'run' then
-    if run.key_released then run.key_released(chord, key) end
+    if run.key_release then run.key_release(chord, key) end
   elseif Current_app == 'source' then
-    if source.key_released then source.key_released(chord, key) end
+    if source.key_release then source.key_release(chord, key) end
   else
     assert(false, 'unknown app "'..Current_app..'"')
   end
@@ -225,9 +225,9 @@ end
 function App.mousepressed(x,y, mouse_button)
 --?   print('mouse press', x,y)
   if Current_app == 'run' then
-    if run.mouse_pressed then run.mouse_pressed(x,y, mouse_button) end
+    if run.mouse_pressed then run.mouse_press(x,y, mouse_button) end
   elseif Current_app == 'source' then
-    if source.mouse_pressed then source.mouse_pressed(x,y, mouse_button) end
+    if source.mouse_pressed then source.mouse_press(x,y, mouse_button) end
   else
     assert(false, 'unknown app "'..Current_app..'"')
   end
@@ -235,9 +235,9 @@ end
 
 function App.mousereleased(x,y, mouse_button)
   if Current_app == 'run' then
-    if run.mouse_released then run.mouse_released(x,y, mouse_button) end
+    if run.mouse_release then run.mouse_release(x,y, mouse_button) end
   elseif Current_app == 'source' then
-    if source.mouse_released then source.mouse_released(x,y, mouse_button) end
+    if source.mouse_release then source.mouse_release(x,y, mouse_button) end
   else
     assert(false, 'unknown app "'..Current_app..'"')
   end