ncurses 6.1 - patch 20191012

[ncurses.git] / menu / m_opts.c

diff --git a/menu/m_opts.c b/menu/m_opts.c
index 1875f418755b12aea940edd1c17e0eaf0c794042..bc6924b65149fd10e860841eab57220e40a61d1d 100644 (file)
--- a/menu/m_opts.c
+++ b/menu/m_opts.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 <juergen.pfeifer@gmx.net> 1995,1997            *
+ *   Author:  Juergen Pfeifer, 1995,1997                                    *
  ****************************************************************************/
 
 /***************************************************************************
@@ -37,7 +37,7 @@
 
 #include "menu.priv.h"
 
-MODULE_ID("$Id: m_opts.c,v 1.12 1999/05/16 17:27:08 juergen Exp $")
+MODULE_ID("$Id: m_opts.c,v 1.20 2010/01/23 21:20:10 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnmenu
@@ -52,8 +52,11 @@ MODULE_ID("$Id: m_opts.c,v 1.12 1999/05/16 17:27:08 juergen Exp $")
 |                    E_BAD_ARGUMENT - invalid menu options
 |                    E_POSTED       - menu is already posted
 +--------------------------------------------------------------------------*/
-int set_menu_opts(MENU * menu, Menu_Options opts)
+NCURSES_EXPORT(int)
+set_menu_opts(MENU * menu, Menu_Options opts)
 {
+  T((T_CALLED("set_menu_opts(%p,%d)"), (void *)menu, opts));
+
   opts &= ALL_MENU_OPTS;
 
   if (opts & ~ALL_MENU_OPTS)
@@ -61,18 +64,18 @@ int set_menu_opts(MENU * menu, Menu_Options opts)
 
   if (menu)
     {
-      if ( menu->status & _POSTED )
+      if (menu->status & _POSTED)
        RETURN(E_POSTED);
 
-      if ( (opts&O_ROWMAJOR) != (menu->opt&O_ROWMAJOR))
+      if ((opts & O_ROWMAJOR) != (menu->opt & O_ROWMAJOR))
        {
          /* we need this only if the layout really changed ... */
          if (menu->items && menu->items[0])
            {
-             menu->toprow  = 0;
+             menu->toprow = 0;
              menu->curitem = menu->items[0];
              assert(menu->curitem);
-             set_menu_format( menu, menu->frows, menu->fcols );
+             set_menu_format(menu, menu->frows, menu->fcols);
            }
        }
 
@@ -82,13 +85,13 @@ int set_menu_opts(MENU * menu, Menu_Options opts)
        {
          ITEM **item;
 
-         if ( ((item=menu->items) != (ITEM**)0) )
-           for(;*item;item++)
+         if (((item = menu->items) != (ITEM **) 0))
+           for (; *item; item++)
              (*item)->value = FALSE;
        }
 
       if (opts & O_SHOWDESC)   /* this also changes the geometry */
-       _nc_Calculate_Item_Length_and_Width( menu );
+       _nc_Calculate_Item_Length_and_Width(menu);
     }
   else
     _nc_Default_Menu.opt = opts;
@@ -109,10 +112,14 @@ int set_menu_opts(MENU * menu, Menu_Options opts)
 |                    E_BAD_ARGUMENT - invalid options
 |                    E_POSTED       - menu is already posted
 +--------------------------------------------------------------------------*/
-int menu_opts_off(MENU *menu, Menu_Options  opts)
+NCURSES_EXPORT(int)
+menu_opts_off(MENU * menu, Menu_Options opts)
 {
-  MENU *cmenu = menu; /* use a copy because set_menu_opts must detect
-                         NULL menu itself to adjust its behaviour */
+  MENU *cmenu = menu;          /* use a copy because set_menu_opts must detect
+
+                                  NULL menu itself to adjust its behavior */
+
+  T((T_CALLED("menu_opts_off(%p,%d)"), (void *)menu, opts));
 
   opts &= ALL_MENU_OPTS;
   if (opts & ~ALL_MENU_OPTS)
@@ -121,7 +128,7 @@ int menu_opts_off(MENU *menu, Menu_Options  opts)
     {
       Normalize_Menu(cmenu);
       opts = cmenu->opt & ~opts;
-      return set_menu_opts( menu, opts );
+      returnCode(set_menu_opts(menu, opts));
     }
 }
 
@@ -138,10 +145,14 @@ int menu_opts_off(MENU *menu, Menu_Options  opts)
 |                    E_BAD_ARGUMENT - invalid menu options
 |                    E_POSTED       - menu is already posted
 +--------------------------------------------------------------------------*/
-int menu_opts_on(MENU * menu, Menu_Options opts)
+NCURSES_EXPORT(int)
+menu_opts_on(MENU * menu, Menu_Options opts)
 {
-  MENU *cmenu = menu; /* use a copy because set_menu_opts must detect
-                         NULL menu itself to adjust its behaviour */
+  MENU *cmenu = menu;          /* use a copy because set_menu_opts must detect
+
+                                  NULL menu itself to adjust its behavior */
+
+  T((T_CALLED("menu_opts_on(%p,%d)"), (void *)menu, opts));
 
   opts &= ALL_MENU_OPTS;
   if (opts & ~ALL_MENU_OPTS)
@@ -150,7 +161,7 @@ int menu_opts_on(MENU * menu, Menu_Options opts)
     {
       Normalize_Menu(cmenu);
       opts = cmenu->opt | opts;
-      return set_menu_opts(menu, opts);
+      returnCode(set_menu_opts(menu, opts));
     }
 }
 
@@ -162,9 +173,11 @@ int menu_opts_on(MENU * menu, Menu_Options opts)
 |
 |   Return Values :  Menu options
 +--------------------------------------------------------------------------*/
-Menu_Options menu_opts(const MENU *menu)
+NCURSES_EXPORT(Menu_Options)
+menu_opts(const MENU * menu)
 {
-  return (ALL_MENU_OPTS & Normalize_Menu( menu )->opt);
+  T((T_CALLED("menu_opts(%p)"), (const void *)menu));
+  returnMenuOpts(ALL_MENU_OPTS & Normalize_Menu(menu)->opt);
 }
 
 /* m_opts.c ends here */