[Cmake-commits] CMake branch, next, updated. v2.8.3-1152-g2a672c1

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2a672c1206e6fbe8ef6b3a7998f6a361d1168018 (commit)
       via  7d691cab9b479b154653f49057724a7707015828 (commit)
      from  77dfea4f2e9fd8a11f497a85fc03ce433c6e9deb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a672c1206e6fbe8ef6b3a7998f6a361d1168018
commit 2a672c1206e6fbe8ef6b3a7998f6a361d1168018
Merge: 77dfea4 7d691ca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 3 12:21:30 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 3 12:21:30 2011 -0500

    Merge topic 'linux-standard-base' into next
    
    7d691ca ccmake: Port for LSB 4.0 (#11648)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d691cab9b479b154653f49057724a7707015828
commit 7d691cab9b479b154653f49057724a7707015828
Author:     Craig Scott <craig.scott at csiro.au>
AuthorDate: Mon Jan 3 12:15:41 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 3 12:15:41 2011 -0500

    ccmake: Port for LSB 4.0 (#11648)
    
    Use getmaxyx instead of getmax[xy].  Avoid using getattrs.

diff --git a/Source/CursesDialog/form/frm_driver.c b/Source/CursesDialog/form/frm_driver.c
index 0b53b5a..519d66d 100644
--- a/Source/CursesDialog/form/frm_driver.c
+++ b/Source/CursesDialog/form/frm_driver.c
@@ -357,8 +357,7 @@ static void Buffer_To_Window(const FIELD  * field, WINDOW * win)
 
   assert(win && field);
 
-  width  = getmaxx(win);
-  height = getmaxy(win);
+  getmaxyx(win, height, width);
 
   for(row=0, pBuffer=field->buf; 
       row < height; 
@@ -390,13 +389,13 @@ static void Window_To_Buffer(WINDOW * win, FIELD  * field)
   int pad;
   int len = 0;
   char *p;
-  int row, height;
+  int row, height, width;
   
   assert(win && field && field->buf );
 
   pad = field->pad;
   p = field->buf;
-  height = getmaxy(win);
+  getmaxyx(win, height, width);
 
   for(row=0; (row < height) && (row < field->drows); row++ )
     {
@@ -856,6 +855,8 @@ static int Display_Or_Erase_Field(FIELD * field, bool bEraseFlag)
 {
   WINDOW *win;
   WINDOW *fwin;
+  attr_t fwinAttrs;
+  short  fwinPair;
 
   if (!field)
     return E_SYSTEM_ERROR;
@@ -871,7 +872,12 @@ static int Display_Or_Erase_Field(FIELD * field, bool bEraseFlag)
       if (field->opts & O_VISIBLE)
         Set_Field_Window_Attributes(field,win);
       else
-        wattrset(win,getattrs(fwin));
+      {
+        /* getattrs() would be handy, but it is not part of LSB 4.0 */
+        /* wattrset(win,getattrs(fwin)); */
+        wattr_get(fwin, &fwinAttrs, &fwinPair, 0);
+        wattr_set(win, fwinAttrs, fwinPair, 0);
+      }
       werase(win);
     }
 
diff --git a/Source/CursesDialog/form/frm_post.c b/Source/CursesDialog/form/frm_post.c
index 5ead942..924fe6a 100644
--- a/Source/CursesDialog/form/frm_post.c
+++ b/Source/CursesDialog/form/frm_post.c
@@ -51,6 +51,7 @@ int post_form(FORM * form)
   WINDOW *formwin;
   int err;
   int page;
+  int height, width;
 
   if (!form)
     RETURN(E_BAD_ARGUMENT);
@@ -62,7 +63,8 @@ int post_form(FORM * form)
     RETURN(E_NOT_CONNECTED);
   
   formwin = Get_Form_Window(form);
-  if ((form->cols > getmaxx(formwin)) || (form->rows > getmaxy(formwin))) 
+  getmaxyx(formwin, height, width);
+  if ((form->cols > width) || (form->rows > height))
     RETURN(E_NO_ROOM);
 
   /* reset form->curpage to an invald value. This forces Set_Form_Page

-----------------------------------------------------------------------

Summary of changes:
 Source/CursesDialog/form/frm_driver.c |   16 +++++++++++-----
 Source/CursesDialog/form/frm_post.c   |    4 +++-
 2 files changed, 14 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake