Merge GDB 7.5.1

gdb/tui/tui-win.c

 /* TUI window generic functions.
 
    Copyright (C) 1998-2004, 2006-2012 Free Software Foundation, Inc.
 
    Contributed by Hewlett-Packard Company.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ skipping 89 matching lines @@
 #  define ACS_URCORNER '+'
 #endif
 #ifndef ACS_HLINE
 #  define ACS_HLINE '-'
 #endif
 #ifndef ACS_VLINE
 #  define ACS_VLINE '|'
 #endif
 
 /* Possible values for tui-border-kind variable.  */
-static const char *tui_border_kind_enums[] = {
+static const char *const tui_border_kind_enums[] = {
   "space",
   "ascii",
   "acs",
   NULL
 };
 
 /* Possible values for tui-border-mode and tui-active-border-mode.  */
-static const char *tui_border_mode_enums[] = {
+static const char *const tui_border_mode_enums[] = {
   "normal",
   "standout",
   "reverse",
   "half",
   "half-standout",
   "bold",
   "bold-standout",
   NULL
 };
 
@@ skipping 554 matching lines @@
           || cur_layout == SRC_DATA_COMMAND
           || cur_layout == DISASSEM_DATA_COMMAND)
         num_wins_displayed++;
       split_diff = height_diff / num_wins_displayed;
       cmd_split_diff = split_diff;
       if (height_diff % num_wins_displayed)
         {
           if (height_diff < 0)
             cmd_split_diff--;
           else
-            cmd_split_diff++;
-        }
+           cmd_split_diff++;
+       }
       /* Now adjust each window.  */
-      clear ();
+      /* erase + clearok are used instead of a straightforward clear as
+         AIX 5.3 does not define clear.  */
+      erase ();
+      clearok (curscr, TRUE);
       refresh ();
       switch (cur_layout)
-        {
+       {
         case SRC_COMMAND:
         case DISASSEM_COMMAND:
           first_win = (struct tui_win_info *) (tui_source_windows ())->list[0];
           first_win->generic.width += width_diff;
           locator->width += width_diff;
           /* Check for invalid heights.  */
           if (height_diff == 0)
             new_height = first_win->generic.height;
           else if ((first_win->generic.height + split_diff) >=
                    (screenheight - MIN_CMD_WIN_HEIGHT - 1))
@@ skipping 866 matching lines @@
       if (buf_ptr != (char *) NULL)
         {
           char *wname;
           int i;
 
           if (*buf_ptr == ' ')
             while (*(++buf_ptr) == ' ')
               ;
 
           if (*buf_ptr != (char) 0)
-            wname = buf_ptr;
+            {
+              wname = buf_ptr;
+
+              /* Validate the window name.  */
+              for (i = 0; i < strlen (wname); i++)
+                wname[i] = toupper (wname[i]);
+            }
           else
             wname = "?";
           
-          /* Validate the window name.  */
-          for (i = 0; i < strlen (wname); i++)
-            wname[i] = toupper (wname[i]);
           *win_to_scroll = tui_partial_win_by_name (wname);
 
           if (*win_to_scroll == (struct tui_win_info *) NULL
               || !(*win_to_scroll)->generic.is_visible)
             error (_("Invalid window specified. \n\
 The window name specified must be valid and visible.\n"));
           else if (*win_to_scroll == TUI_CMD_WIN)
             *win_to_scroll = (tui_source_windows ())->list[0];
         }
       xfree (buf);
     }
 }