Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from curlpipe:master #2

Merged
merged 30 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
a23cddf
dependency bump
curlpipe Nov 15, 2024
3f34bcf
Groundwork for splits
curlpipe Nov 22, 2024
ead3156
Slightly cleaner code
curlpipe Nov 22, 2024
3a0891c
Rustfmt
curlpipe Nov 22, 2024
3ec5a0c
Started split API and restored help message
curlpipe Nov 23, 2024
cc46f32
Added backend API for creating splits
curlpipe Nov 23, 2024
e649fe9
rustfmt
curlpipe Nov 23, 2024
99ce7ee
Added split control command
curlpipe Nov 24, 2024
bd10c8e
Fixed cursor and selection issues
curlpipe Nov 24, 2024
0b0a56b
Fixed bug with splits not rendering correctly
curlpipe Nov 25, 2024
14fedb4
rustfmt
curlpipe Nov 25, 2024
3cfd73c
Proper quitting implementation with splits
curlpipe Nov 26, 2024
6df9abc
Fixed some rendering issues
curlpipe Nov 26, 2024
7636de4
Fixed some more rendering issues
curlpipe Nov 26, 2024
2a314e0
Made it so documents are always the correct size
curlpipe Nov 26, 2024
5e5eb7f
Fixed status line disk indicator issue when working with splits
curlpipe Nov 26, 2024
a34ea2c
Reworked mouse feature to work with splits
curlpipe Nov 26, 2024
918d94e
Used geometric implementation when moving split focus
curlpipe Nov 27, 2024
c2807ad
Fixed horizontal bars being placed where they shouldn't
curlpipe Nov 27, 2024
bba95f7
Simplified intro and added more info to README
curlpipe Nov 27, 2024
e8f8426
Much better resizing split command
curlpipe Nov 27, 2024
4aefad7
Splits can now be grown/shrunk with an optional size parameter
curlpipe Nov 27, 2024
32ae6b2
Completely rewrote super dodgy span algorithm
curlpipe Nov 27, 2024
1b6660a
Ran through clippy lints
curlpipe Nov 27, 2024
f25ad71
Fixed mouse not taking into account x offset
curlpipe Nov 28, 2024
ab1e1ce
Fixed replace feature not rendering correctly
curlpipe Nov 28, 2024
ee680ee
Removed debug infrastructure from code
curlpipe Nov 28, 2024
97e65b9
Fixed issues with resizing
curlpipe Nov 28, 2024
4989c08
Fixed mlua's userdataborrowmuterror issue when opening duplicate file…
curlpipe Nov 28, 2024
6bc2a50
Merge pull request #182 from curlpipe/0.7.2
curlpipe Nov 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ members = [

[package]
name = "ox"
version = "0.7.1"
version = "0.7.2"
edition = "2021"
authors = ["Curlpipe <[email protected]>"]
description = "A simple but flexible text editor."
Expand Down
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,7 @@ Ox is an independent text editor that can be used to write everything from text
If you're looking for a text editor that...
1. :feather: Is lightweight and efficient
2. :wrench: Can be configured to your heart's content
3. :package: Has features out of the box, including
- syntax highlighting
- undo and redo
- search and replace
- line numbers
- opening multiple files
- full mouse cursor interaction
3. :package: Has useful features out of the box

...then Ox is right up your street

Expand Down Expand Up @@ -66,6 +60,8 @@ It works best on linux, but macOS and Windows are also supported.
- :eye: UI that shows you the state of the editor and file
- :computer_mouse: You can move the cursor and select text with your mouse
- :writing_hand: Convenient shortcuts when writing code
- :crossed_swords: Multi-editing features such as multiple cursors and recordable macros
- :window: Splits to view multiple documents on the same screen at the same time

### Robustness

Expand Down
40 changes: 40 additions & 0 deletions config/.oxrc
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,46 @@ commands = {
editor:reload_config()
editor:display_info("Configuration file reloaded")
end,
["split"] = function(arguments)
local file = arguments[2]
local result = false
if arguments[1] == "left" then
result = editor:open_split_left(file)
elseif arguments[1] == "right" then
result = editor:open_split_right(file)
elseif arguments[1] == "up" then
result = editor:open_split_up(file)
elseif arguments[1] == "down" then
result = editor:open_split_down(file)
elseif arguments[1] == "grow" then
result = true
local amount = tonumber(arguments[3]) or 0.15
editor:grow_split(amount, arguments[2])
elseif arguments[1] == "shrink" then
result = true
local amount = tonumber(arguments[3]) or 0.15
editor:shrink_split(amount, arguments[2])
elseif arguments[1] == "focus" then
result = true
if arguments[2] == "up" then
editor:focus_split_up()
elseif arguments[2] == "down" then
editor:focus_split_down()
elseif arguments[2] == "left" then
editor:focus_split_left()
elseif arguments[2] == "right" then
editor:focus_split_right()
else
editor:display_error("Unknown direction for split focus")
end
else
result = true
editor:display_error(tostring(arguments[1]) .. " is not a valid split command")
end
if not result then
editor:display_error("Failed to open file, please check your path")
end
end,
["macro"] = function(arguments)
if arguments[1] == "record" then
editor:macro_record_start()
Expand Down
Loading
Loading