FFI updates from Evgeny

* merges:
  files.el:    - Check file existance when openning file with      `find-file-magic-files-alist'
  ffi-wand:   "logo" is unsupported format for read
  [fix] effi: ffi-slot-offset        - calculate offset correctly

diff --git a/src/ui/TTY/console-tty.h b/src/ui/TTY/console-tty.h
index 707881f..fc4718d 100644 (file)
--- a/src/ui/TTY/console-tty.h
+++ b/src/ui/TTY/console-tty.h
@@ -182,7 +182,9 @@ struct tty_console {
                const char *audio_bell_;        /* bel, bl */
 
                const char *cursor_visible_;    /* cvvis, vs */
+               const char *cursor_invisible_;  /* civis, vi */
                const char *cursor_normal_;     /* cnorm, ve */
+               const char *hard_cursor_;       /* chts, HC */
                const char *init_motion_;       /* smcup, ti */
                const char *end_motion_;        /* rmcup, te */
                const char *keypad_on_;         /* smkx, ks */

diff --git a/src/ui/TTY/redisplay-tty.c b/src/ui/TTY/redisplay-tty.c
index a907ce0..65ecc1d 100644 (file)
--- a/src/ui/TTY/redisplay-tty.c
+++ b/src/ui/TTY/redisplay-tty.c
@@ -1155,12 +1155,14 @@ int init_tty_for_redisplay(struct device *d, char *terminal_type)
                TTY_SD(c).audio_bell_ = "\07";
        }
 
-       TTY_SD(c).cursor_visible_ = tgetstr("ve", &bufptr);
-       TTY_SD(c).cursor_normal_  = tgetstr("vs", &bufptr);
-       TTY_SD(c).init_motion_    = tgetstr("ti", &bufptr);
-       TTY_SD(c).end_motion_     = tgetstr("te", &bufptr);
-       TTY_SD(c).keypad_on_      = tgetstr("ks", &bufptr);
-       TTY_SD(c).keypad_off_     = tgetstr("ke", &bufptr);
+       TTY_SD(c).cursor_visible_   = tgetstr("vs", &bufptr);
+       TTY_SD(c).cursor_invisible_ = tgetstr("vi", &bufptr);
+       TTY_SD(c).cursor_normal_    = tgetstr("ve", &bufptr);
+       TTY_SD(c).hard_cursor_      = tgetstr("HC", &bufptr);
+       TTY_SD(c).init_motion_      = tgetstr("ti", &bufptr);
+       TTY_SD(c).end_motion_       = tgetstr("te", &bufptr);
+       TTY_SD(c).keypad_on_        = tgetstr("ks", &bufptr);
+       TTY_SD(c).keypad_off_       = tgetstr("ke", &bufptr);
 
        /*
         * Initialize additional terminal information.