aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2017-07-19 05:08:20 -0400
committerJesse Luehrs <doy@tozt.net>2017-07-19 05:08:20 -0400
commita5530361c2c9e5ea34f40d4a7192f87ce3d2c6bc (patch)
treeb154ddfdc78679a1fdff65d41c6ade3abb5558fc
parentb19b92e4482b080d23d867a9750ec21492848b43 (diff)
downloadvt100-rust-a5530361c2c9e5ea34f40d4a7192f87ce3d2c6bc.tar.gz
vt100-rust-a5530361c2c9e5ea34f40d4a7192f87ce3d2c6bc.zip
bump libvt100
m---------libvt1000
-rw-r--r--src/ffi.c5
-rw-r--r--src/ffi.rs2
-rw-r--r--src/screen.rs8
4 files changed, 11 insertions, 4 deletions
diff --git a/libvt100 b/libvt100
-Subproject 32f97d8385d591ec4026f3fb5a1ab8e34e12a06
+Subproject b7d5ababc641e86e70308f182ad768b5fc1e99a
diff --git a/src/ffi.c b/src/ffi.c
index 61a4a20..cff8da3 100644
--- a/src/ffi.c
+++ b/src/ffi.c
@@ -31,9 +31,10 @@ int vt100_wrapper_screen_mouse_reporting_button_motion(struct vt100_screen *scre
return screen->mouse_reporting_button_motion;
}
-int vt100_wrapper_screen_mouse_reporting_sgr_mode(struct vt100_screen *screen)
+unsigned char vt100_wrapper_screen_mouse_reporting_mode(
+ struct vt100_screen *screen)
{
- return screen->mouse_reporting_sgr_mode;
+ return screen->mouse_reporting_mode;
}
int vt100_wrapper_screen_bracketed_paste(struct vt100_screen *screen)
diff --git a/src/ffi.rs b/src/ffi.rs
index 284a98c..ab9abc8 100644
--- a/src/ffi.rs
+++ b/src/ffi.rs
@@ -53,7 +53,7 @@ extern "C" {
pub fn vt100_wrapper_screen_mouse_reporting_press(screen: *mut types::ScreenImpl) -> libc::c_int;
pub fn vt100_wrapper_screen_mouse_reporting_press_release(screen: *mut types::ScreenImpl) -> libc::c_int;
pub fn vt100_wrapper_screen_mouse_reporting_button_motion(screen: *mut types::ScreenImpl) -> libc::c_int;
- pub fn vt100_wrapper_screen_mouse_reporting_sgr_mode(screen: *mut types::ScreenImpl) -> libc::c_int;
+ pub fn vt100_wrapper_screen_mouse_reporting_mode(screen: *mut types::ScreenImpl) -> libc::c_uchar;
pub fn vt100_wrapper_screen_bracketed_paste(screen: *mut types::ScreenImpl) -> libc::c_int;
pub fn vt100_wrapper_screen_visual_bell(screen: *mut types::ScreenImpl) -> libc::c_int;
pub fn vt100_wrapper_screen_audible_bell(screen: *mut types::ScreenImpl) -> libc::c_int;
diff --git a/src/screen.rs b/src/screen.rs
index 1073a6b..6fdb804 100644
--- a/src/screen.rs
+++ b/src/screen.rs
@@ -20,16 +20,22 @@ struct ScreenGridPrefix {
row_top: libc::c_int,
}
+enum ScreenParserState {}
+
#[repr(C)]
struct ScreenPrefix {
grid: *mut ScreenGridPrefix,
alternate: *mut ScreenGridPrefix,
+ parser_state: *mut ScreenParserState,
+
title: *mut libc::c_char,
title_len: libc::size_t,
icon_name: *mut libc::c_char,
icon_name_len: libc::size_t,
+ scrollback_length: libc::c_int,
+
attrs: types::CellAttrs,
}
@@ -350,7 +356,7 @@ impl Screen {
pub fn mouse_reporting_sgr_mode(&self) -> bool {
let Screen(screen_impl) = *self;
unsafe {
- ffi::vt100_wrapper_screen_mouse_reporting_sgr_mode(screen_impl) != 0
+ ffi::vt100_wrapper_screen_mouse_reporting_mode(screen_impl) == 2
}
}