about summary refs log tree commit diff stats
path: root/edit.lua
Commit message (Collapse)AuthorAgeFilesLines
...
* switch to line index in a functionKartik K. Agaram2022-07-171-2/+2
| | | | - Text.to_pos_on_line
* switch to line index in a functionKartik K. Agaram2022-07-171-2/+2
| | | | - Text.in_line
* drop some extra argsKartik K. Agaram2022-07-171-4/+4
|
* fold together two largely similar casesKartik K. Agaram2022-07-171-28/+23
|
* drop some redundant args from Text.drawKartik K. Agaram2022-07-171-3/+3
|
* formattingKartik K. Agaram2022-07-161-1/+1
|
* bring back a set of constantsKartik K. Agaram2022-07-161-7/+6
| | | | | It's starting to sink in that I don't want hard-coded constants inside objects.
* more precise nameKartik K. Agaram2022-07-151-3/+10
|
* make test initializations a little more obviousKartik K. Agaram2022-07-151-7/+17
|
* a bug I've never run intoKartik K. Agaram2022-07-131-2/+8
| | | | | | The previous commit was failing inside a test that I can't reproduce manually. Perhaps it's something about how often draw/update run in practice. Anyways, it's definitely uncovered a real issue.
* replace globals with args in a few functionsKartik K. Agaram2022-07-121-2/+2
| | | | | | | | | - Drawing.draw_shape - Drawing.draw_pending_shape - Drawing.in_drawing - Drawing.find_or_insert_point - Drawing.near - Drawing.pixels
* correct a mis-named thresholdKartik K. Agaram2022-07-121-0/+2
|
* deduce left/right from state where possibleKartik K. Agaram2022-07-121-1/+1
|
* left/right margin -> left/right coordinatesKartik K. Agaram2022-07-121-16/+19
| | | | | Editor state initialization now depends on window dimensions, so we have to more carefully orchestrate startup.
* add state arg to a few functionsKartik K. Agaram2022-07-121-1/+1
| | | | | | | - Drawing.current_drawing - Drawing.select_shape_at_mouse - Drawing.select_point_at_mouse - Drawing.select_drawing_at_mouse
* add state arg to a few functionsKartik K. Agaram2022-07-121-10/+10
| | | | | | | | | | | | | - Text.cursor_at_final_screen_line - Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary - Text.snap_cursor_to_bottom_of_screen - Text.in_line - Text.to_pos_on_line - Text.to2 - Text.to1 - Text.previous_screen_line - Text.tweak_screen_top_and_cursor - Text.redraw_all
* add state arg to a few functionsKartik K. Agaram2022-07-121-2/+2
| | | | | - Text.pos_at_start_of_cursor_screen_line - Text.cursor_past_screen_bottom
* add state arg to a few functionsKartik K. Agaram2022-07-121-3/+3
| | | | | - Text.search_next - Text.search_previous
* add state arg to a few functionsKartik K. Agaram2022-07-121-15/+15
| | | | | | | - record_undo_event - undo_event - redo_event - snapshot
* add state arg to a few functionsKartik K. Agaram2022-07-121-3/+3
| | | | | | | | | | | - Text.draw_highlight - Text.clip_selection - Text.selection - Text.cut_selection - Text.delete_selection - Text.delete_selection_without_undo - Text.mouse_pos - Text.to_pos
* add state arg to a few functionsKartik K. Agaram2022-07-121-2/+2
| | | | | | | | | | | | | - Text.insert_at_cursor - Text.insert_return - Text.pageup - Text.pagedown - Text.up - Text.down - Text.start_of_line - Text.end_of_line - Text.word_left - Text.word_right
* add state arg to Text.textinputKartik K. Agaram2022-07-121-1/+1
|
* add state arg to schedule_saveKartik K. Agaram2022-07-121-12/+12
|
* add state arg to Drawing.updateKartik K. Agaram2022-07-121-1/+1
|
* add state arg to Drawing.drawKartik K. Agaram2022-07-121-1/+1
|
* add state arg to Text.keychord_pressedKartik K. Agaram2022-07-121-1/+1
|
* .Kartik K. Agaram2022-07-121-1/+1
|
* add state arg to Drawing.mouse_releasedKartik K. Agaram2022-07-121-1/+1
|
* add state arg to Drawing.keychord_pressedKartik K. Agaram2022-07-121-1/+1
|
* add state arg to Drawing.mouse_pressedKartik K. Agaram2022-07-121-1/+1
|
* add state arg to some functionsKartik K. Agaram2022-07-121-3/+3
| | | | | | - Text.draw - Text.draw_cursor - Text.draw_search_bar
* call edit rather than App callbacks in testsKartik K. Agaram2022-07-121-0/+43
|
* start passing in Editor_state explicitlyKartik K. Agaram2022-07-121-123/+123
| | | | | | | | | | | | In this commit, top-level edit functions: - edit.draw - edit.update - edit.quit - edit.mouse_pressed - edit.mouse_released - edit.textinput - edit.keychord_pressed - edit.key_released
* initialize contains test stateKartik K. Agaram2022-07-121-1/+1
|
* group all editor globalsKartik K. Agaram2022-07-121-188/+198
| | | | We're still accessing them through a global. But we'll change that next.
* bring couple more globals back to the app levelKartik K. Agaram2022-07-121-23/+0
|
* button framework is at the app levelKartik K. Agaram2022-07-121-3/+0
|
* make colors easier to editKartik K. Agaram2022-07-111-1/+13
|
* experiment: new edit namespaceKartik K. Agaram2022-07-111-0/+446
Still lots to do, but the eventual hope is that this will make this project's code easier to reuse from other LÖVE projects. One gotcha: even as we start putting code more aggressively into nested tables, tests must remain at the top-level. Otherwise they won't run.
e_directory('drawing.lua') load_file_from_source_or_save_directory('geom.lua') load_file_from_source_or_save_directory('help.lua') load_file_from_source_or_save_directory('drawing_tests.lua') load_file_from_source_or_save_directory('source_tests.lua') elseif current_app_is_warning() then else assert(false, 'unknown app "'..Current_app..'"') end end function App.initialize_globals() Supported_versions = {'11.5', '11.4', '12.0'} -- put the recommended version first check_love_version_for_tests() if Current_app == 'run' then run.initialize_globals() elseif Current_app == 'source' then source.initialize_globals() elseif current_app_is_warning() then else assert(false, 'unknown app "'..Current_app..'"') end -- for hysteresis in a few places Current_time = 0 Last_focus_time = 0 -- https://love2d.org/forums/viewtopic.php?p=249700 Last_resize_time = 0 -- Another weird bit for a class of corner cases. E.g.: -- * I press ctrl+e, switch Current_app. I don't want the new app to receive -- text_input and key_release events. -- If I try to avoid text_input events by switching modes on key_release, I -- hit a new problem: -- * I press ctrl+e, am running an untested version, Current_app goes to -- 'warning', and immediately rolls back out of 'warning' in the -- key_release event. -- Skip_rest_of_key_events is ugly, but feels cleaner than creating yet -- another possible value for Current_app. Skip_rest_of_key_events = nil end function check_love_version_for_tests() if array.find(Supported_versions, Version) == nil then -- warning to include in an error message if any tests failed Warning_before_tests = ("This app hasn't been tested with LÖVE version %s."):format(Version) end end function App.initialize(arg) love.keyboard.setKeyRepeat(true) love.graphics.setBackgroundColor(1,1,1) if Current_app == 'run' then run.initialize(arg) elseif Current_app == 'source' then source.initialize(arg) elseif current_app_is_warning() then else assert(false, 'unknown app "'..Current_app..'"') end check_love_version() end function check_love_version() if array.find(Supported_versions, Version) == nil then show_warning( ("This app hasn't been tested with LÖVE version %s; please switch to version %s if you run into issues. Press any key to continue."):format(Version, Supported_versions[1])) -- continue initializing everything; hopefully we won't have errors during initialization end end function App.resize(w,h) if current_app_is_warning() then return end if Current_app == 'run' then if run.resize then run.resize(w,h) end elseif Current_app == 'source' then if source.resize then source.resize(w,h) end else assert(false, 'unknown app "'..Current_app..'"') end Last_resize_time = Current_time end function App.filedropped(file) if current_app_is_warning() then return end if Current_app == 'run' then if run.file_drop then run.file_drop(file) end elseif Current_app == 'source' then if source.file_drop then source.file_drop(file) end else assert(false, 'unknown app "'..Current_app..'"') end end function App.focus(in_focus) if current_app_is_warning() then return end if in_focus then Last_focus_time = Current_time end if Current_app == 'run' then if run.focus then run.focus(in_focus) end elseif Current_app == 'source' then if source.focus then source.focus(in_focus) end else assert(false, 'unknown app "'..Current_app..'"') end end function App.draw() if Current_app == 'run' then run.draw() elseif Current_app == 'source' then source.draw() elseif current_app_is_warning() then love.graphics.setColor(0,0,1) love.graphics.rectangle('fill', 0,0, App.screen.width, App.screen.height) love.graphics.setColor(1,1,1) love.graphics.printf(Current_app.message, 40,40, 600) else assert(false, 'unknown app "'..Current_app..'"') end end function App.update(dt) Current_time = Current_time + dt if current_app_is_warning() then return end -- some hysteresis while resizing if Current_time < Last_resize_time + 0.1 then return end -- if Current_app == 'run' then run.update(dt) elseif Current_app == 'source' then source.update(dt) else assert(false, 'unknown app "'..Current_app..'"') end end 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 end -- Skip_rest_of_key_events = nil if current_app_is_warning() then if chord == 'C-c' then love.system.setClipboardText(warning_message()) else clear_warning() Skip_rest_of_key_events = true end return end if chord == 'C-e' then -- carefully save settings if Current_app == 'run' then local source_settings = Settings.source Settings = run.settings() Settings.source = source_settings if run.quit then run.quit() end Current_app = 'source' -- preserve any Error_message when going from run to source elseif Current_app == 'source' then Settings.source = source.settings() if source.quit then source.quit() end Current_app = 'run' Error_message = nil elseif current_app_is_warning() then else assert(false, 'unknown app "'..Current_app..'"') end Settings.current_app = Current_app love.filesystem.write('config', json.encode(Settings)) -- reboot load_file_from_source_or_save_directory('main.lua') App.undo_initialize() App.run_tests_and_initialize() Skip_rest_of_key_events = true return end if Current_app == 'run' then if run.keychord_press then run.keychord_press(chord, key) end elseif Current_app == 'source' then if source.keychord_press then source.keychord_press(chord, key) end else assert(false, 'unknown app "'..Current_app..'"') end end function App.textinput(t) if current_app_is_warning() then return end -- ignore events for some time after window in focus (mostly alt-tab) if Current_time < Last_focus_time + 0.01 then return end -- if Skip_rest_of_key_events then return end if Current_app == 'run' then if run.text_input then run.text_input(t) end elseif Current_app == 'source' then if source.text_input then source.text_input(t) end else assert(false, 'unknown app "'..Current_app..'"') end end function App.keyreleased(key, scancode) if current_app_is_warning() then return end -- ignore events for some time after window in focus (mostly alt-tab) if Current_time < Last_focus_time + 0.01 then return end -- if Skip_rest_of_key_events then return end if Current_app == 'run' then if run.key_release then run.key_release(key, scancode) end elseif Current_app == 'source' then if source.key_release then source.key_release(key, scancode) end else assert(false, 'unknown app "'..Current_app..'"') end end function App.mousepressed(x,y, mouse_button) if current_app_is_warning() then return end --? print('mouse press', x,y) if Current_app == 'run' then if run.mouse_press then run.mouse_press(x,y, mouse_button) end elseif Current_app == 'source' then if source.mouse_press then source.mouse_press(x,y, mouse_button) end else assert(false, 'unknown app "'..Current_app..'"') end end function App.mousereleased(x,y, mouse_button) if current_app_is_warning() then return end if Current_app == 'run' then if run.mouse_release then run.mouse_release(x,y, mouse_button) end elseif Current_app == 'source' then if source.mouse_release then source.mouse_release(x,y, mouse_button) end else assert(false, 'unknown app "'..Current_app..'"') end end function App.mousemoved(x,y, dx,dy, is_touch) if current_app_is_warning() then return end if Current_app == 'run' then if run.mouse_move then run.mouse_move(dx,dy) end elseif Current_app == 'source' then if source.mouse_move then source.mouse_move(dx,dy) end else assert(false, 'unknown app "'..Current_app..'"') end end function App.wheelmoved(dx,dy) if current_app_is_warning() then return end if Current_app == 'run' then if run.mouse_wheel_move then run.mouse_wheel_move(dx,dy) end elseif Current_app == 'source' then if source.mouse_wheel_move then source.mouse_wheel_move(dx,dy) end else assert(false, 'unknown app "'..Current_app..'"') end end function App.mousefocus(in_focus) if current_app_is_warning() then return end if Current_app == 'run' then if run.mouse_focus then run.mouse_focus(in_focus) end elseif Current_app == 'source' then if source.mouse_focus then source.mouse_focus(in_focus) end else assert(false, 'unknown app "'..Current_app..'"') end end function love.quit() if Disable_all_quit_handlers then return end if current_app_is_warning() then return end if Current_app == 'run' then local source_settings = Settings.source Settings = run.settings() Settings.source = source_settings else Settings.source = source.settings() end Settings.current_app = Current_app love.filesystem.write('config', json.encode(Settings)) if Current_app == 'run' then if run.quit then run.quit() end elseif Current_app == 'source' then if source.quit then source.quit() end else assert(false, 'unknown app "'..Current_app..'"') end end function current_app_is_warning() return type(Current_app) == 'table' and Current_app.name == 'warning' end function show_warning(message) assert(type(Current_app) == 'string') Current_app = { name = 'warning', message = message, next_app = Current_app, } end function clear_warning() assert(type(Current_app) == 'table') Current_app = Current_app.next_app end function warning_message() assert(type(Current_app) == 'table') return Current_app.message end