From a5530361c2c9e5ea34f40d4a7192f87ce3d2c6bc Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Wed, 19 Jul 2017 05:08:20 -0400 Subject: bump libvt100 --- libvt100 | 2 +- src/ffi.c | 5 +++-- src/ffi.rs | 2 +- src/screen.rs | 8 +++++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/libvt100 b/libvt100 index 32f97d8..b7d5aba 160000 --- a/libvt100 +++ b/libvt100 @@ -1 +1 @@ -Subproject commit 32f97d8385d591ec4026f3fb5a1ab8e34e12a06d +Subproject commit b7d5ababc641e86e70308f182ad768b5fc1e99a1 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 } } -- cgit v1.2.3