aboutsummaryrefslogtreecommitdiff
path: root/menu/m_win.c
diff options
context:
space:
mode:
Diffstat (limited to 'menu/m_win.c')
-rw-r--r--menu/m_win.c30
1 files changed, 22 insertions, 8 deletions
diff --git a/menu/m_win.c b/menu/m_win.c
index c3f857f71688..d88fa674c608 100644
--- a/menu/m_win.c
+++ b/menu/m_win.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2003,2004 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 *
@@ -37,7 +37,7 @@
#include "menu.priv.h"
-MODULE_ID("$Id: m_win.c,v 1.15 2004/12/25 21:39:20 tom Exp $")
+MODULE_ID("$Id: m_win.c,v 1.17 2010/01/23 21:20:11 tom Exp $")
/*---------------------------------------------------------------------------
| Facility : libnmenu
@@ -51,14 +51,28 @@ MODULE_ID("$Id: m_win.c,v 1.15 2004/12/25 21:39:20 tom Exp $")
NCURSES_EXPORT(int)
set_menu_win(MENU * menu, WINDOW *win)
{
- T((T_CALLED("set_menu_win(%p,%p)"), menu, win));
+ T((T_CALLED("set_menu_win(%p,%p)"), (void *)menu, (void *)win));
if (menu)
{
if (menu->status & _POSTED)
RETURN(E_POSTED);
- menu->userwin = win;
- _nc_Calculate_Item_Length_and_Width(menu);
+ else
+#if NCURSES_SP_FUNCS
+ {
+ /* We ensure that userwin is never null. So even if a null
+ WINDOW parameter is passed, we store the SCREENS stdscr.
+ The only MENU that can have a null userwin is the static
+ _nc_default_Menu.
+ */
+ SCREEN *sp = _nc_screen_of(menu->userwin);
+
+ menu->userwin = win ? win : sp->_stdscr;
+ _nc_Calculate_Item_Length_and_Width(menu);
+ }
+#else
+ menu->userwin = win;
+#endif
}
else
_nc_Default_Menu.userwin = win;
@@ -68,7 +82,7 @@ set_menu_win(MENU * menu, WINDOW *win)
/*---------------------------------------------------------------------------
| Facility : libnmenu
-| Function : WINDOW *menu_win(const MENU *)
+| Function : WINDOW* menu_win(const MENU*)
|
| Description : Returns pointer to the window of the menu
|
@@ -79,8 +93,8 @@ menu_win(const MENU * menu)
{
const MENU *m = Normalize_Menu(menu);
- T((T_CALLED("menu_win(%p)"), menu));
- returnWin(m->userwin ? m->userwin : stdscr);
+ T((T_CALLED("menu_win(%p)"), (const void *)menu));
+ returnWin(Get_Menu_UserWin(m));
}
/* m_win.c ends here */