ncurses 5.7 - patch 20100206

[ncurses.git] / ncurses / base / lib_insnstr.c

diff --git a/ncurses/base/lib_insnstr.c b/ncurses/base/lib_insnstr.c
index b6ddfde3c52b57117fce0aef7a8a180f40695c59..ce03e64be0020b5a0b1b186a9c87e413af781b0c 100644 (file)
--- a/ncurses/base/lib_insnstr.c
+++ b/ncurses/base/lib_insnstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2004 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2004,2009 Free Software Foundation, Inc.                   *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -40,7 +40,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
 #include <curses.priv.h>
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_insnstr.c,v 1.1 2004/02/28 23:44:56 tom Exp $")
+MODULE_ID("$Id: lib_insnstr.c,v 1.3 2009/10/24 22:04:35 tom Exp $")

 
 NCURSES_EXPORT(int)
 winsnstr(WINDOW *win, const char *s, int n)
 
 NCURSES_EXPORT(int)
 winsnstr(WINDOW *win, const char *s, int n)


@@ -51,13 +51,15 @@ winsnstr(WINDOW *win, const char *s, int n)
     const unsigned char *str = (const unsigned char *) s;
     const unsigned char *cp;
 
     const unsigned char *str = (const unsigned char *) s;
     const unsigned char *cp;
 

-    T((T_CALLED("winsnstr(%p,%s,%d)"), win, _nc_visbufn(s, n), n));
+    T((T_CALLED("winsnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(s, n), n));

 
     if (win != 0 && str != 0) {
 
     if (win != 0 && str != 0) {

+       SCREEN *sp = _nc_screen_of(win);
+

        oy = win->_cury;
        ox = win->_curx;
        for (cp = str; *cp && (n <= 0 || (cp - str) < n); cp++) {
        oy = win->_cury;
        ox = win->_curx;
        for (cp = str; *cp && (n <= 0 || (cp - str) < n); cp++) {

-           _nc_insert_ch(win, (chtype) UChar(*cp));
+           _nc_insert_ch(sp, win, (chtype) UChar(*cp));

        }
        win->_curx = ox;
        win->_cury = oy;
        }
        win->_curx = ox;
        win->_cury = oy;