diff options
Diffstat (limited to 'ext')
-rw-r--r-- | ext/Setup | 2 | ||||
-rw-r--r-- | ext/curses/curses.c | 22 |
2 files changed, 19 insertions, 5 deletions
@@ -1,7 +1,7 @@ #option nodynamic #GD -#curses +curses #dbm #etc #fcntl diff --git a/ext/curses/curses.c b/ext/curses/curses.c index 0230636c50..127f51a0cb 100644 --- a/ext/curses/curses.c +++ b/ext/curses/curses.c @@ -99,15 +99,27 @@ curses_stdscr() static VALUE curses_close_screen() { - endwin(); +#ifdef HAVE_ISENDWIN + if (!isendwin()) +#endif + endwin(); return Qnil; } +static void +curses_finalize() +{ +#ifdef HAVE_ISENDWIN + if (!isendwin()) +#endif + endwin(); +} + /* def closed? */ static VALUE curses_closed() { -#ifdef HAVE_ENDWIN +#ifdef HAVE_ISENDWIN if (isendwin()) { return TRUE; } @@ -313,7 +325,7 @@ curses_addstr(obj, str) VALUE obj; VALUE str; { - addstr(RSTRING(str)->ptr); + addstr(STR2CSTR(str)); return Qnil; } @@ -659,7 +671,7 @@ window_addstr(obj, str) struct windata *winp; GetWINDOW(obj, winp); - waddstr(winp->window, RSTRING(str)->ptr); + waddstr(winp->window, STR2CSTR(str)); return Qnil; } @@ -787,4 +799,6 @@ Init_curses() rb_define_method(cWindow, "getstr", window_getstr, 0); rb_define_method(cWindow, "delch", window_delch, 0); rb_define_method(cWindow, "deleteln", window_deleteln, 0); + + rb_set_end_proc(curses_finalize, 0); } |