X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=menu%2Fm_item_cur.c;h=18b1a2726af6034d0c7b163bc5b44afc5e59e35a;hp=36a7818e249685484f6de374679aab64b8af1517;hb=a84fd46191c61f1151a7258e1539b89c395e61f9;hpb=661078ddbde3ce0f3b06e95642fbb9b5fef7dca1 diff --git a/menu/m_item_cur.c b/menu/m_item_cur.c index 36a7818e..18b1a272 100644 --- a/menu/m_item_cur.c +++ b/menu/m_item_cur.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998 Free Software Foundation, Inc. * + * Copyright (c) 1998-2004,2010 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 * @@ -27,7 +27,7 @@ ****************************************************************************/ /**************************************************************************** - * Author: Juergen Pfeifer 1995,1997 * + * Author: Juergen Pfeifer, 1995,1997 * ****************************************************************************/ /*************************************************************************** @@ -37,7 +37,7 @@ #include "menu.priv.h" -MODULE_ID("$Id: m_item_cur.c,v 1.9 1998/02/11 12:13:49 tom Exp $") +MODULE_ID("$Id: m_item_cur.c,v 1.18 2010/01/23 21:20:10 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -47,14 +47,17 @@ MODULE_ID("$Id: m_item_cur.c,v 1.9 1998/02/11 12:13:49 tom Exp $") | | Return Values : E_OK - success +--------------------------------------------------------------------------*/ -int set_current_item(MENU * menu, ITEM * item) +NCURSES_EXPORT(int) +set_current_item(MENU * menu, ITEM * item) { - if (menu && item && (item->imenu==menu)) + T((T_CALLED("set_current_item(%p,%p)"), (void *)menu, (void *)item)); + + if (menu && item && (item->imenu == menu)) { - if ( menu->status & _IN_DRIVER ) + if (menu->status & _IN_DRIVER) RETURN(E_BAD_STATE); - - assert( menu->curitem ); + + assert(menu->curitem); if (item != menu->curitem) { if (menu->status & _LINK_NEEDED) @@ -68,12 +71,12 @@ int set_current_item(MENU * menu, ITEM * item) assert(menu->pattern); Reset_Pattern(menu); /* adjust the window to make item visible and update the menu */ - Adjust_Current_Item(menu,menu->toprow,item); + Adjust_Current_Item(menu, menu->toprow, item); } } else RETURN(E_BAD_ARGUMENT); - + RETURN(E_OK); } @@ -85,9 +88,11 @@ int set_current_item(MENU * menu, ITEM * item) | | Return Values : Item pointer or NULL if failure +--------------------------------------------------------------------------*/ -ITEM *current_item(const MENU * menu) +NCURSES_EXPORT(ITEM *) +current_item(const MENU * menu) { - return (menu && menu->items) ? menu->curitem : (ITEM *)0; + T((T_CALLED("current_item(%p)"), (const void *)menu)); + returnItem((menu && menu->items) ? menu->curitem : (ITEM *) 0); } /*--------------------------------------------------------------------------- @@ -98,9 +103,11 @@ ITEM *current_item(const MENU * menu) | | Return Values : The index or ERR if this is an invalid item pointer +--------------------------------------------------------------------------*/ -int item_index(const ITEM *item) +NCURSES_EXPORT(int) +item_index(const ITEM * item) { - return (item && item->imenu) ? item->index : ERR; + T((T_CALLED("item_index(%p)"), (const void *)item)); + returnCode((item && item->imenu) ? item->index : ERR); } /* m_item_cur.c ends here */