Skip to content

make cursive work with ncurses v6.0.1 #778

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.

Sign up for GitHub

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

Merged
gyscos merged 3 commits into from
Jul 12, 2024
Merged

make cursive work with ncurses v6.0.1 #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4247f8
make it work with ncurses-rs >=6.0.1
correabuscar Apr 11, 2024
c02de5b
get rid of a warning when using newterm
correabuscar Apr 11, 2024
0bd373d
get rid of unused warning for addstr
correabuscar Jun 5, 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
2 changes: 1 addition & 1 deletion cursive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ version = "2"
[dependencies.ncurses]
features = ["wide"]
optional = true
version = "5.99.0"
version = "6.0.1"

[dependencies.pancurses]
features = ["wide"]
Expand Down
43 changes: 24 additions & 19 deletions cursive/src/backends/curses/n.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@ impl Backend {
let path = CString::new(output_path).unwrap();
unsafe { libc::fopen(path.as_ptr(), mode.as_ptr()) }
};
ncurses::newterm(None, output, input);
ncurses::newterm(None, output, input).map_err(|e| {
io::Error::new(io::ErrorKind::Other, format!("could not call newterm: {e}"))
})?;

// Enable keypad (like arrows)
ncurses::keypad(ncurses::stdscr(), true);

Expand Down Expand Up @@ -357,28 +360,28 @@ impl backend::Backend for Backend {

fn set_effect(&self, effect: Effect) {
let style = match effect {
Effect::Reverse => ncurses::A_REVERSE(),
Effect::Simple => ncurses::A_NORMAL(),
Effect::Dim => ncurses::A_DIM(),
Effect::Bold => ncurses::A_BOLD(),
Effect::Blink => ncurses::A_BLINK(),
Effect::Italic => ncurses::A_ITALIC(),
Effect::Strikethrough => ncurses::A_NORMAL(),
Effect::Underline => ncurses::A_UNDERLINE(),
Effect::Reverse => ncurses::A_REVERSE,
Effect::Simple => ncurses::A_NORMAL,
Effect::Dim => ncurses::A_DIM,
Effect::Bold => ncurses::A_BOLD,
Effect::Blink => ncurses::A_BLINK,
Effect::Italic => ncurses::A_ITALIC,
Effect::Strikethrough => ncurses::A_NORMAL,
Effect::Underline => ncurses::A_UNDERLINE,
};
ncurses::attron(style);
}

fn unset_effect(&self, effect: Effect) {
let style = match effect {
Effect::Reverse => ncurses::A_REVERSE(),
Effect::Simple => ncurses::A_NORMAL(),
Effect::Dim => ncurses::A_DIM(),
Effect::Bold => ncurses::A_BOLD(),
Effect::Blink => ncurses::A_BLINK(),
Effect::Italic => ncurses::A_ITALIC(),
Effect::Strikethrough => ncurses::A_NORMAL(),
Effect::Underline => ncurses::A_UNDERLINE(),
Effect::Reverse => ncurses::A_REVERSE,
Effect::Simple => ncurses::A_NORMAL,
Effect::Dim => ncurses::A_DIM,
Effect::Bold => ncurses::A_BOLD,
Effect::Blink => ncurses::A_BLINK,
Effect::Italic => ncurses::A_ITALIC,
Effect::Strikethrough => ncurses::A_NORMAL,
Effect::Underline => ncurses::A_UNDERLINE,
};
ncurses::attroff(style);
}
Expand All @@ -402,7 +405,9 @@ impl backend::Backend for Backend {
}

fn print(&self, text: &str) {
ncurses::addstr(text);
// &str is assured it doesn't contain any \0 aka nuls here due to PR 786
// thus we can ignore the return value and avoid warning: unused `Result` that must be used
let _ = ncurses::addstr(text);
}
}

Expand Down Expand Up @@ -533,7 +538,7 @@ fn initialize_keymap() -> HashMap<i32, Event> {
}

// Ncurses provides a F1 variable, but no modifiers
add_fn(ncurses::KEY_F1, Event::Key, &mut map);
add_fn(ncurses::KEY_F(1), Event::Key, &mut map);
add_fn(277, Event::Shift, &mut map);
add_fn(289, Event::Ctrl, &mut map);
add_fn(301, Event::CtrlShift, &mut map);
Expand Down