[src/trunk]: src/lib/libcurses curses: once __slk_init is called, reset slk_fmt

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e52cb7bbdbdf
branches:  trunk
changeset: 993844:e52cb7bbdbdf
user:      roy <roy%NetBSD.org@localhost>
date:      Thu Oct 04 19:11:09 2018 +0000

description:
curses: once __slk_init is called, reset slk_fmt

This allows soft label keys to be used on more than one terminal.

diffstat:

 lib/libcurses/slk.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 4064e6cac002 -r e52cb7bbdbdf lib/libcurses/slk.c
--- a/lib/libcurses/slk.c       Thu Oct 04 18:40:41 2018 +0000
+++ b/lib/libcurses/slk.c       Thu Oct 04 19:11:09 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: slk.c,v 1.3 2018/10/04 18:40:41 roy Exp $      */
+/*     $NetBSD: slk.c,v 1.4 2018/10/04 19:11:09 roy Exp $      */
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: slk.c,v 1.3 2018/10/04 18:40:41 roy Exp $");
+__RCSID("$NetBSD: slk.c,v 1.4 2018/10/04 19:11:09 roy Exp $");
 #endif                         /* not lint */
 
 #include <ctype.h>
@@ -560,10 +560,12 @@
 {
 
        __slk_free(screen);     /* safety */
+
+       screen->slk_format = slk_fmt;
        if (slk_fmt == SLK_FMT_INVAL)
                return OK;
+       slk_fmt = SLK_FMT_INVAL;
 
-       screen->slk_format = slk_fmt;
        switch(screen->slk_format) {
        case SLK_FMT_3_2_3:
        case SLK_FMT_4_4: