Merge branch 'master' of github.com:dankamongmen/notcurses
nick black
4 years ago
commit
fd52a5c49e
@ -1,42 +1,60 @@
|
||||
//! Example 'direct-cursor'
|
||||
//!
|
||||
//! Explore cursor functions in direct mode
|
||||
//!
|
||||
|
||||
use std::thread::sleep;
|
||||
use std::time::Duration;
|
||||
use std::ffi::CString;
|
||||
|
||||
/// utility macro: sleep for $s seconds
|
||||
macro_rules! sleep {
|
||||
($s:expr) => {
|
||||
sleep(Duration::new($s, 0));
|
||||
};
|
||||
}
|
||||
|
||||
use cstr_core::CString;
|
||||
/// utility macro: convert the String $s to *mut CString
|
||||
macro_rules! cstring {
|
||||
($s:expr) => {
|
||||
CString::new($s).unwrap().as_ptr();
|
||||
}
|
||||
}
|
||||
|
||||
use libnotcurses_sys as nc;
|
||||
use libnotcurses_sys::*;
|
||||
|
||||
fn main() {
|
||||
unsafe {
|
||||
let ncd = nc::NcDirect::new();
|
||||
let ncd = NcDirect::new();
|
||||
|
||||
let cols = nc::ncdirect_dim_x(ncd);
|
||||
let rows = nc::ncdirect_dim_y(ncd);
|
||||
let cols = ncdirect_dim_x(ncd);
|
||||
let rows = ncdirect_dim_y(ncd);
|
||||
println!("terminal size (rows, cols): {}, {}", rows, cols);
|
||||
|
||||
// show current coordinates
|
||||
let (mut cy, mut cx) = (0,0);
|
||||
nc::ncdirect_cursor_yx(ncd, &mut cy, &mut cx);
|
||||
nc::ncdirect_putstr(ncd, 0, CString::new(format!("({},{})\n", cy, cx)).unwrap().as_ptr());
|
||||
|
||||
// Write HELLO WORLD in steps
|
||||
let (mut cy, mut cx) = (0, 0);
|
||||
ncdirect_cursor_yx(ncd, &mut cy, &mut cx);
|
||||
ncdirect_putstr(ncd, 0, cstring![format!(" ({},{})\n", cy, cx)],
|
||||
);
|
||||
|
||||
sleep(Duration::new(1, 0));
|
||||
sleep![1];
|
||||
|
||||
nc::ncdirect_putstr(ncd, 0, CString::new("HELLO").unwrap().as_ptr());
|
||||
nc::ncdirect_flush(ncd);
|
||||
ncdirect_putstr(ncd, 0, cstring!["HELLO"]);
|
||||
ncdirect_flush(ncd);
|
||||
|
||||
sleep(Duration::new(1, 0));
|
||||
sleep![1];
|
||||
|
||||
nc::ncdirect_putstr(ncd, 0, CString::new(" WORLD").unwrap().as_ptr());
|
||||
nc::ncdirect_flush(ncd);
|
||||
ncdirect_putstr(ncd, 0, cstring!["HELLO"]);
|
||||
ncdirect_flush(ncd);
|
||||
|
||||
sleep(Duration::new(1, 0));
|
||||
sleep![2];
|
||||
|
||||
// show current coordinates
|
||||
nc::ncdirect_cursor_yx(ncd, &mut cy, &mut cx);
|
||||
nc::ncdirect_putstr(ncd, 0, CString::new(format!(" ({},{})\n", cy, cx)).unwrap().as_ptr());
|
||||
ncdirect_cursor_yx(ncd, &mut cy, &mut cx);
|
||||
ncdirect_putstr( ncd, 0, cstring![format!(" ({},{})\n", cy, cx)],
|
||||
);
|
||||
|
||||
sleep(Duration::new(1, 0));
|
||||
nc::ncdirect_stop(ncd);
|
||||
sleep![1];
|
||||
ncdirect_stop(ncd);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,31 +1,36 @@
|
||||
use cstr_core::CString;
|
||||
//! Example 'direct-image'
|
||||
//!
|
||||
//! Explore image rendering in direct mode
|
||||
|
||||
use libnotcurses_sys as nc;
|
||||
use std::ffi::CString;
|
||||
|
||||
// This time we are gonna use the notcurses library through the `sys` namespace
|
||||
use libnotcurses_sys as sys;
|
||||
|
||||
fn main() {
|
||||
unsafe {
|
||||
let ncd = nc::NcDirect::new();
|
||||
let ncd = sys::NcDirect::new();
|
||||
|
||||
render_image(&mut *ncd, nc::NCBLIT_1x1);
|
||||
render_image(&mut *ncd, nc::NCBLIT_2x1);
|
||||
render_image(&mut *ncd, nc::NCBLIT_BRAILLE);
|
||||
render_image(&mut *ncd, sys::NCBLIT_1x1);
|
||||
render_image(&mut *ncd, sys::NCBLIT_2x1);
|
||||
render_image(&mut *ncd, sys::NCBLIT_BRAILLE);
|
||||
|
||||
nc::ncdirect_stop(ncd);
|
||||
sys::ncdirect_stop(ncd);
|
||||
}
|
||||
}
|
||||
|
||||
fn render_image(ncd: &mut nc::NcDirect, blit: nc::NcBlitter) {
|
||||
fn render_image(ncd: &mut sys::NcDirect, blit: sys::NcBlitter) {
|
||||
unsafe {
|
||||
if nc::ncdirect_render_image(
|
||||
if sys::ncdirect_render_image(
|
||||
ncd,
|
||||
CString::new("image-16x16.png").unwrap().as_ptr(),
|
||||
nc::NCALIGN_CENTER,
|
||||
sys::NCALIGN_CENTER,
|
||||
blit,
|
||||
nc::NCSCALE_NONE,
|
||||
sys::NCSCALE_NONE,
|
||||
) != 0
|
||||
{
|
||||
panic!("ERR: ncdirect_render_image. \
|
||||
Make sure you are running this example from the examples folder");
|
||||
panic!("ERR: ncdirect_render_image. Make sure \
|
||||
you are running this example from the examples folder");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,18 +1,31 @@
|
||||
//use cstr_core::CString;
|
||||
use std::thread::sleep;
|
||||
use std::time::Duration;
|
||||
use std::ffi::CString;
|
||||
|
||||
/// utility macro: sleep for $s seconds
|
||||
macro_rules! sleep {
|
||||
($s:expr) => {
|
||||
sleep(Duration::new($s, 0));
|
||||
};
|
||||
}
|
||||
|
||||
use libnotcurses_sys as nc;
|
||||
/// utility macro: convert the String $s to *mut CString
|
||||
macro_rules! cstring {
|
||||
($s:expr) => {
|
||||
CString::new($s).unwrap().as_ptr();
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {
|
||||
use libnotcurses_sys::*;
|
||||
|
||||
fn main() {
|
||||
unsafe {
|
||||
// let options = nc::NotcursesOptions::new();
|
||||
// let app = nc::Notcurses::with_options(&options);
|
||||
|
||||
let app = nc::Notcurses::new();
|
||||
|
||||
let nc = Notcurses::new();
|
||||
|
||||
println!("WIP");
|
||||
sleep![2];
|
||||
|
||||
nc::notcurses_stop(app);
|
||||
notcurses_stop(nc);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,339 @@
|
||||
//! Wrapper for libc::FILE, both as used by notcurses and the libc crate
|
||||
//!
|
||||
//! The interface is largely based on the implementation of the
|
||||
//! [cfile-rs crate](https://github.com/jkarns275/cfile) by Joshua Karns
|
||||
|
||||
use core::ptr::{null_mut, NonNull};
|
||||
|
||||
use std::{
|
||||
// ffi::CString,
|
||||
io::{Error, ErrorKind, Read, Seek, SeekFrom},
|
||||
};
|
||||
|
||||
pub use libc::{
|
||||
c_long, c_void, fclose, feof, fread, fseek, ftell, FILE as LIBC_FILE, SEEK_CUR, SEEK_END,
|
||||
SEEK_SET,
|
||||
};
|
||||
|
||||
pub use crate::bindgen::_IO_FILE as NC_FILE;
|
||||
|
||||
/// Intended to be passed into the CFile::open method.
|
||||
/// It will open the file in a way that will allow reading and writing,
|
||||
/// including overwriting old data.
|
||||
/// It will not create the file if it does not exist.
|
||||
pub static RANDOM_ACCESS_MODE: &'static str = "rb+";
|
||||
|
||||
/// Intended to be passed into the CFile::open method.
|
||||
/// It will open the file in a way that will allow reading and writing,
|
||||
/// including overwriting old data
|
||||
pub static UPDATE: &'static str = "rb+";
|
||||
|
||||
/// Intended to be passed into the CFile::open method.
|
||||
/// It will only allow reading.
|
||||
pub static READ_ONLY: &'static str = "r";
|
||||
|
||||
/// Intended to be passed into the CFile::open method.
|
||||
/// It will only allow writing.
|
||||
pub static WRITE_ONLY: &'static str = "w";
|
||||
|
||||
/// Intended to be passed into the CFile::open method.
|
||||
/// It will only allow data to be appended to the end of the file.
|
||||
pub static APPEND_ONLY: &'static str = "a";
|
||||
|
||||
/// Intended to be passed into the CFile::open method.
|
||||
/// It will allow data to be appended to the end of the file, and data to be
|
||||
/// read from the file. It will create the file if it doesn't exist.
|
||||
pub static APPEND_READ: &'static str = "a+";
|
||||
|
||||
/// Intended to be passed into the CFile::open method.
|
||||
/// It will open the file in a way that will allow reading and writing,
|
||||
/// including overwriting old data. It will create the file if it doesn't exist
|
||||
pub static TRUNCATE_RANDOM_ACCESS_MODE: &'static str = "wb+";
|
||||
|
||||
/// A utility function to pull the current value of errno and put it into an
|
||||
/// Error::Errno
|
||||
fn get_error<T>() -> Result<T, Error> {
|
||||
Err(Error::last_os_error())
|
||||
}
|
||||
|
||||
/// A wrapper struct around libc::FILE for
|
||||
///
|
||||
/// The notcurses FILE type `NC_FILE` is imported through bindgen as a struct,
|
||||
/// while the equivalent Rust libc::FILE (`LIBC_FILE`) is an opaque enum.
|
||||
/// Several methods are provided to convert back and forth between both types,
|
||||
/// to allow both rust libc operations and notcurses file operations on it.
|
||||
#[derive(Debug)]
|
||||
pub struct NcFile {
|
||||
file_ptr: NonNull<LIBC_FILE>,
|
||||
}
|
||||
|
||||
impl NcFile {
|
||||
// constructors --
|
||||
|
||||
/// `NcFile` constructor from a file produced by notcurses
|
||||
pub fn from_nc(file: *mut NC_FILE) -> Self {
|
||||
NcFile {
|
||||
file_ptr: unsafe { NonNull::new_unchecked(NcFile::nc2libc(file)) },
|
||||
}
|
||||
}
|
||||
|
||||
/// `NcFile` constructor from a file produced by the libc crate
|
||||
pub fn from_libc(file: *mut LIBC_FILE) -> Self {
|
||||
NcFile {
|
||||
file_ptr: unsafe { NonNull::new_unchecked(file) },
|
||||
}
|
||||
}
|
||||
|
||||
// methods --
|
||||
|
||||
/// Returns the file pointer in the format expected by libc
|
||||
#[inline]
|
||||
pub fn as_libc_ptr(&self) -> *mut LIBC_FILE {
|
||||
self.file_ptr.as_ptr()
|
||||
}
|
||||
|
||||
/// Returns the file pointer in the format expected by notcurses
|
||||
#[inline]
|
||||
pub fn as_nc_ptr(&self) -> *mut NC_FILE {
|
||||
Self::libc2nc(self.file_ptr.as_ptr())
|
||||
}
|
||||
|
||||
/// Returns the current position in the file.
|
||||
///
|
||||
/// # Errors
|
||||
/// On error Error::Errno(errno) is returned.
|
||||
pub fn current_pos(&self) -> Result<u64, Error> {
|
||||
unsafe {
|
||||
let pos = ftell(self.as_libc_ptr());
|
||||
if pos != -1 {
|
||||
Ok(pos as u64)
|
||||
} else {
|
||||
get_error()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Reads the file from start to end. Convenience method
|
||||
///
|
||||
#[inline]
|
||||
pub fn read_all(&mut self, buf: &mut Vec<u8>) -> Result<usize, Error> {
|
||||
let _ = self.seek(SeekFrom::Start(0));
|
||||
self.read_to_end(buf)
|
||||
}
|
||||
|
||||
// private methods --
|
||||
|
||||
/// Converts a file pointer from the struct notcurses uses to the
|
||||
/// opaque enum type libc expects
|
||||
#[inline]
|
||||
fn nc2libc(file: *mut NC_FILE) -> *mut LIBC_FILE {
|
||||
file as *mut _ as *mut LIBC_FILE
|
||||
}
|
||||
|
||||
/// Converts a file pointer from the libc opaque enum format to the struct
|
||||
/// expected by notcurses
|
||||
#[inline]
|
||||
fn libc2nc(file: *mut LIBC_FILE) -> *mut NC_FILE {
|
||||
file as *mut _ as *mut NC_FILE
|
||||
}
|
||||
|
||||
/// A utility function to expand a vector without increasing its capacity
|
||||
/// more than it needs to be expanded.
|
||||
fn expand_buffer(buff: &mut Vec<u8>, by: usize) {
|
||||
if buff.capacity() < buff.len() + by {
|
||||
buff.reserve(by);
|
||||
}
|
||||
for _ in 0..by {
|
||||
buff.push(0u8);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Read for NcFile {
|
||||
/// Reads exactly the number of bytes required to fill buf.
|
||||
///
|
||||
/// # Errors
|
||||
/// If the end of the file is reached before buf is filled,
|
||||
/// Err(EndOfFile(bytes_read)) will be returned. The data that was read
|
||||
/// before that will still have been placed into buf.
|
||||
///
|
||||
/// Upon some other error, Err(Errno(errno)) will be returned.
|
||||
fn read(&mut self, buf: &mut [u8]) -> Result<usize, Error> {
|
||||
unsafe {
|
||||
let result = fread(
|
||||
buf.as_ptr() as *mut c_void,
|
||||
1,
|
||||
buf.len(),
|
||||
self.as_libc_ptr(),
|
||||
);
|
||||
if result != buf.len() {
|
||||
match get_error::<u8>() {
|
||||
Err(err) => {
|
||||
if err.kind() == ErrorKind::UnexpectedEof {
|
||||
Ok(result)
|
||||
} else {
|
||||
Err(err)
|
||||
}
|
||||
}
|
||||
Ok(_) => panic!("This is impossible"),
|
||||
}
|
||||
} else {
|
||||
Ok(result)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Reads the entire file starting from the current_position
|
||||
/// expanding buf as needed.
|
||||
///
|
||||
/// On a successful read, this function will return Ok(bytes_read).
|
||||
///
|
||||
/// # Errors
|
||||
/// If an error occurs during reading, some varient of error will be returned.
|
||||
fn read_to_end(&mut self, buf: &mut Vec<u8>) -> Result<usize, Error> {
|
||||
let pos = self.current_pos();
|
||||
let _ = self.seek(SeekFrom::End(0));
|
||||
let end = self.current_pos();
|
||||
match pos {
|
||||
Ok(cur_pos) => match end {
|
||||
Ok(end_pos) => {
|
||||
if end_pos == cur_pos {
|
||||
return Ok(0);
|
||||
}
|
||||
let to_read = (end_pos - cur_pos) as usize;
|
||||
if buf.len() < to_read {
|
||||
let to_reserve = to_read - buf.len();
|
||||
Self::expand_buffer(buf, to_reserve);
|
||||
}
|
||||
let _ = self.seek(SeekFrom::Start(cur_pos as u64));
|
||||
match self.read_exact(buf) {
|
||||
Ok(()) => Ok(to_read),
|
||||
Err(e) => Err(e),
|
||||
}
|
||||
}
|
||||
Err(e) => Err(e),
|
||||
},
|
||||
Err(e) => Err(e),
|
||||
}
|
||||
}
|
||||
|
||||
/// Reads the entire file from the beginning and stores it in a string
|
||||
///
|
||||
/// On a successful read, this function will return Ok(bytes_read).
|
||||
///
|
||||
/// # Errors
|
||||
/// If an error occurs during reading, some varient of error will be returned.
|
||||
fn read_to_string(&mut self, strbuf: &mut String) -> Result<usize, Error> {
|
||||
let mut bytes_read = 0_usize;
|
||||
let mut buffer = vec![0u8];
|
||||
let result = self.read_all(&mut buffer);
|
||||
|
||||
if let Ok(bytes) = result {
|
||||
bytes_read = bytes;
|
||||
}
|
||||
if let Err(e) = result {
|
||||
return Err(e);
|
||||
}
|
||||
|
||||
let result = std::str::from_utf8(&buffer);
|
||||
|
||||
if let Ok(strslice) = result {
|
||||
*strbuf = strslice.to_string();
|
||||
Ok(bytes_read)
|
||||
} else {
|
||||
get_error()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// Reads exactly the number of bytes required to fill buf.
|
||||
///
|
||||
/// # Errors
|
||||
/// If the end of the file is reached before buf is filled,
|
||||
/// Err(EndOfFile(bytes_read)) will be returned. The data that was read
|
||||
/// before that will still have been placed into buf.
|
||||
///
|
||||
/// Upon some other error, Err(Errno(errno)) will be returned.
|
||||
fn read_exact(&mut self, buf: &mut [u8]) -> Result<(), Error> {
|
||||
unsafe {
|
||||
let result = fread(
|
||||
buf.as_ptr() as *mut c_void,
|
||||
1,
|
||||
buf.len(),
|
||||
self.as_libc_ptr(),
|
||||
);
|
||||
if result == buf.len() {
|
||||
Ok(())
|
||||
} else {
|
||||
// Check if we hit the end of the file
|
||||
if feof(self.as_libc_ptr()) != 0 {
|
||||
get_error()
|
||||
} else {
|
||||
get_error()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Seek for NcFile {
|
||||
/// Changes the current position in the file using the SeekFrom enum.
|
||||
///
|
||||
/// To set relative to the beginning of the file (i.e. index is 0 + offset):
|
||||
/// ```ignore
|
||||
/// SeekFrom::Start(offset)
|
||||
/// ```
|
||||
/// To set relative to the end of the file (i.e. index is file_lenth - 1 - offset):
|
||||
/// ```ignore
|
||||
/// SeekFrom::End(offset)
|
||||
/// ```
|
||||
/// To set relative to the current position:
|
||||
/// ```ignore
|
||||
/// SeekFrom::End(offset)
|
||||
/// ```
|
||||
/// # Errors
|
||||
/// On error Error::Errno(errno) is returned.
|
||||
fn seek(&mut self, pos: SeekFrom) -> Result<u64, Error> {
|
||||
unsafe {
|
||||
let result = match pos {
|
||||
SeekFrom::Start(from) => fseek(self.as_libc_ptr(), from as c_long, SEEK_SET),
|
||||
SeekFrom::End(from) => fseek(self.as_libc_ptr(), from as c_long, SEEK_END),
|
||||
SeekFrom::Current(delta) => fseek(self.as_libc_ptr(), delta as c_long, SEEK_CUR),
|
||||
};
|
||||
if result == 0 {
|
||||
self.current_pos()
|
||||
} else {
|
||||
get_error()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for NcFile {
|
||||
/// Ensures the file stream is closed before abandoning the data.
|
||||
fn drop(&mut self) {
|
||||
let _ = unsafe {
|
||||
if !(self.as_libc_ptr()).is_null() {
|
||||
let res = fclose(self.as_libc_ptr());
|
||||
if res == 0 {
|
||||
self.file_ptr = NonNull::new_unchecked(null_mut::<LIBC_FILE>());
|
||||
Ok(())
|
||||
} else {
|
||||
get_error()
|
||||
}
|
||||
} else {
|
||||
Ok(())
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// /// A utility function that creates a "buffer" of len bytes.
|
||||
// // TODO: NcBuffer::new(size) .expand()?
|
||||
// pub fn buffer(len: usize) -> Vec<u8> {
|
||||
// vec![0u8; len]
|
||||
// }
|
||||
|
||||
|
||||
Loading…
Reference in New Issue