leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into primary

Browse source
This commit is contained in:
Mattias Eriksson 2024-04-12 13:06:59 +02:00
commit 1b9c815d64
2 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main.rs
View file

@ -2269,7 +2269,7 @@ impl Application for App {
} }
TermEvent::ChildExit(_error_code) => { TermEvent::ChildExit(_error_code) => {
//Ignore this for now //Ignore this for now
}, }
} }
} }
Message::TermEventTx(term_event_tx) => { Message::TermEventTx(term_event_tx) => {

28
src/terminal_box.rs
View file

@ -615,8 +615,22 @@ where
let escape_code = match named { let escape_code = match named {
Named::Insert => csi("2", "~", mod_no), Named::Insert => csi("2", "~", mod_no),
Named::Delete => csi("3", "~", mod_no), Named::Delete => csi("3", "~", mod_no),
Named::PageUp => csi("5", "~", mod_no), Named::PageUp => {
Named::PageDown => csi("6", "~", mod_no), if modifiers.shift() {
terminal.scroll(TerminalScroll::PageUp);
None
} else {
csi("5", "~", mod_no)
}
}
Named::PageDown => {
if modifiers.shift() {
terminal.scroll(TerminalScroll::PageDown);
None
} else {
csi("6", "~", mod_no)
}
}
Named::ArrowUp => { Named::ArrowUp => {
if is_app_cursor { if is_app_cursor {
ss3("A", mod_no) ss3("A", mod_no)
@ -646,14 +660,20 @@ where
} }
} }
Named::End => { Named::End => {
if is_app_cursor { if modifiers.shift() {
terminal.scroll(TerminalScroll::Bottom);
None
} else if is_app_cursor {
ss3("F", mod_no) ss3("F", mod_no)
} else { } else {
csi("F", "", mod_no) csi("F", "", mod_no)
} }
} }
Named::Home => { Named::Home => {
if is_app_cursor { if modifiers.shift() {
terminal.scroll(TerminalScroll::Top);
None
} else if is_app_cursor {
ss3("H", mod_no) ss3("H", mod_no)
} else { } else {
csi("H", "", mod_no) csi("H", "", mod_no)