ncurses 6.0 - patch 20170401

[ncurses.git] / menu / m_global.c

diff --git a/menu/m_global.c b/menu/m_global.c
index dbd58652a3f9dcffc4f70133107611d2d00a0fbc..fc4103c2b88c0f4631493b861beb03be57d9e929 100644 (file)
--- a/menu/m_global.c
+++ b/menu/m_global.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2014 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_global.c,v 1.26 2012/03/10 23:43:41 tom Exp $")
+MODULE_ID("$Id: m_global.c,v 1.28 2014/03/15 20:37:22 tom Exp $")
 
 static char mark[] = "-";
 /* *INDENT-OFF* */
@@ -117,17 +117,17 @@ ComputeMaximum_NameDesc_Lengths(MENU * menu)
   assert(menu && menu->items);
   for (items = menu->items; *items; items++)
     {
-      check = (unsigned) _nc_Calculate_Text_Width(&((*items)->name));
+      check = (unsigned)_nc_Calculate_Text_Width(&((*items)->name));
       if (check > MaximumNameLength)
        MaximumNameLength = check;
 
-      check = (unsigned) _nc_Calculate_Text_Width(&((*items)->description));
+      check = (unsigned)_nc_Calculate_Text_Width(&((*items)->description));
       if (check > MaximumDescriptionLength)
        MaximumDescriptionLength = check;
     }
 
-  menu->namelen = (short) MaximumNameLength;
-  menu->desclen = (short) MaximumDescriptionLength;
+  menu->namelen = (short)MaximumNameLength;
+  menu->desclen = (short)MaximumDescriptionLength;
   T(("ComputeMaximum_NameDesc_Lengths %d,%d", menu->namelen, menu->desclen));
 }
 
@@ -195,7 +195,7 @@ _nc_Connect_Items(MENU * menu, ITEM ** items)
                {
                  (*item)->value = FALSE;
                }
-             (*item)->index = (short) ItemCount++;
+             (*item)->index = (short)ItemCount++;
              (*item)->imenu = menu;
            }
        }
@@ -206,7 +206,7 @@ _nc_Connect_Items(MENU * menu, ITEM ** items)
   if (ItemCount != 0)
     {
       menu->items = items;
-      menu->nitems = (short) ItemCount;
+      menu->nitems = (short)ItemCount;
       ComputeMaximum_NameDesc_Lengths(menu);
       if ((menu->pattern = typeMalloc(char, (unsigned)(1 + menu->namelen))))
        {
@@ -256,7 +256,7 @@ _nc_Calculate_Text_Width(const TEXT * item /*FIXME: limit length */ )
   T((T_CALLED("_nc_menu_text_width(%p)"), (const void *)item));
   if (result != 0 && item->str != 0)
     {
-      int count = (int) mbstowcs(0, item->str, 0);
+      int count = (int)mbstowcs(0, item->str, 0);
       wchar_t *temp = 0;
 
       if (count > 0
@@ -343,7 +343,7 @@ _nc_Calculate_Item_Length_and_Width(MENU * menu)
 
   assert(menu);
 
-  menu->height = (short) (1 + menu->spc_rows * (menu->arows - 1));
+  menu->height = (short)(1 + menu->spc_rows * (menu->arows - 1));
 
   l = calculate_actual_width(menu, TRUE);
   l += menu->marklen;
@@ -354,10 +354,10 @@ _nc_Calculate_Item_Length_and_Width(MENU * menu)
       l += menu->spc_desc;
     }
 
-  menu->itemlen = (short) l;
+  menu->itemlen = (short)l;
   l *= menu->cols;
   l += (menu->cols - 1) * menu->spc_cols;      /* for the padding between the columns */
-  menu->width = (short) l;
+  menu->width = (short)l;
 
   T(("_nc_CalculateItem_Length_and_Width columns %d, item %d, width %d",
      menu->cols,
@@ -388,7 +388,7 @@ _nc_Link_Items(MENU * menu)
       int Last_in_Column;
       bool cycle = (menu->opt & O_NONCYCLIC) ? FALSE : TRUE;
 
-      menu->status &= (unsigned short) (~_LINK_NEEDED);
+      ClrStatus(menu, _LINK_NEEDED);
 
       if (menu->opt & O_ROWMAJOR)
        {
@@ -431,8 +431,8 @@ _nc_Link_Items(MENU * menu)
                (cycle ? menu->items[(row + 1) < menu->rows ?
                                     Number_Of_Items - 1 : col] :
                 (ITEM *) 0);
-             item->x = (short) col;
-             item->y = (short) row;
+             item->x = (short)col;
+             item->y = (short)row;
              if (++col == Number_Of_Columns)
                {
                  row++;
@@ -482,8 +482,8 @@ _nc_Link_Items(MENU * menu)
                 (ITEM *) 0
                );
 
-             item->x = (short) col;
-             item->y = (short) row;
+             item->x = (short)col;
+             item->y = (short)row;
              if ((++row) == Number_Of_Rows)
                {
                  col++;
@@ -568,7 +568,9 @@ _nc_New_TopRow_and_CurrentItem(
 
       cur_item = menu->curitem;
       assert(cur_item);
-      menu->toprow = (short) new_toprow;
+      menu->toprow = (short)(((menu->rows - menu->frows) >= 0)
+                            ? min(menu->rows - menu->frows, new_toprow)
+                            : 0);
       menu->curitem = new_current_item;
 
       if (mterm_called)
@@ -590,7 +592,9 @@ _nc_New_TopRow_and_CurrentItem(
     }
   else
     {                          /* if we are not posted, this is quite simple */
-      menu->toprow = (short) new_toprow;
+      menu->toprow = (short)(((menu->rows - menu->frows) >= 0)
+                            ? min(menu->rows - menu->frows, new_toprow)
+                            : 0);
       menu->curitem = new_current_item;
     }
 }