X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Fuse_screen.c;h=3b3f7361d91699623e700f7dcb48905fc7c69e42;hp=27730b055c12603840a5fe07294305d5e651f305;hb=7a6bbc8cf41c5186d46accc3d08622dc86526b34;hpb=b17ff3673e886e3cbb6b523341aa10b0c26b3903 diff --git a/ncurses/tinfo/use_screen.c b/ncurses/tinfo/use_screen.c index 27730b05..3b3f7361 100644 --- a/ncurses/tinfo/use_screen.c +++ b/ncurses/tinfo/use_screen.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2007 Free Software Foundation, Inc. * + * Copyright (c) 2007,2008 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 * @@ -32,10 +32,10 @@ #include -MODULE_ID("$Id: use_screen.c,v 1.2 2007/09/08 21:46:48 tom Exp $") +MODULE_ID("$Id: use_screen.c,v 1.7 2008/11/16 00:19:59 juergen Exp $") NCURSES_EXPORT(int) -use_screen(SCREEN *screen, NCURSES_CALLBACK func, void *data) +use_screen(SCREEN *screen, NCURSES_SCREEN_CB func, void *data) { SCREEN *save_SP; int code = OK; @@ -46,15 +46,13 @@ use_screen(SCREEN *screen, NCURSES_CALLBACK func, void *data) * FIXME - add a flag so a given thread can check if _it_ has already * recurred through this point, return an error if so. */ - _nc_lock_global(use_screen); - save_SP = SP; + _nc_lock_global(curses); + save_SP = CURRENT_SCREEN; set_term(screen); - code = func(screen->_stdscr, data); + code = func(screen, data); set_term(save_SP); - _nc_unlock_global(use_screen); + _nc_unlock_global(curses); returnCode(code); - - return 0; }