ncurses 5.9 - patch 20150404

[ncurses.git] / form / frm_win.c

diff --git a/form/frm_win.c b/form/frm_win.c
index 6cdfdd960448ae4b1cd0af753c449801aea2ad0f..a65cc59f843d7f49faab397443811d2aaa14f6cf 100644 (file)
--- a/form/frm_win.c
+++ b/form/frm_win.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -32,7 +32,7 @@
 
 #include "form.priv.h"
 
 
 #include "form.priv.h"
 

-MODULE_ID("$Id: frm_win.c,v 1.11 2003/10/25 15:17:08 tom Exp $")
+MODULE_ID("$Id: frm_win.c,v 1.16 2010/01/23 21:14:36 tom Exp $")

 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  


@@ -44,14 +44,25 @@ MODULE_ID("$Id: frm_win.c,v 1.11 2003/10/25 15:17:08 tom Exp $")
 |                    E_POSTED   - form is posted
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(int)
 |                    E_POSTED   - form is posted
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(int)

-set_form_win (FORM * form, WINDOW * win)
+set_form_win(FORM *form, WINDOW *win)

 {
 {

-  if (form && (form->status & _POSTED))        
+  T((T_CALLED("set_form_win(%p,%p)"), (void *)form, (void *)win));
+
+  if (form && (form->status & _POSTED))

     RETURN(E_POSTED);
     RETURN(E_POSTED);

+  else
+    {
+#if NCURSES_SP_FUNCS
+      FORM *f = Normalize_Form(form);

 
 

-  Normalize_Form( form )->win = win;
-  RETURN(E_OK);
-}      
+      f->win = win ? win : StdScreen(Get_Form_Screen(f));
+      RETURN(E_OK);
+#else
+      Normalize_Form(form)->win = win;
+      RETURN(E_OK);
+#endif
+    }
+}

 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  


@@ -62,11 +73,20 @@ set_form_win (FORM * form, WINDOW * win)
 |   Return Values :  The pointer to the Window or stdscr if there is none.
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(WINDOW *)
 |   Return Values :  The pointer to the Window or stdscr if there is none.
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(WINDOW *)

-form_win (const FORM * form)
+form_win(const FORM *form)

 {
 {

-  const FORM* f = Normalize_Form( form );
-  return (f->win ? f->win : stdscr);
+  WINDOW *result;
+  const FORM *f;
+
+  T((T_CALLED("form_win(%p)"), (const void *)form));
+
+  f = Normalize_Form(form);
+#if NCURSES_SP_FUNCS
+  result = (f->win ? f->win : StdScreen(Get_Form_Screen(f)));
+#else
+  result = (f->win ? f->win : stdscr);
+#endif
+  returnWin(result);

 }
 
 /* frm_win.c ends here */
 }
 
 /* frm_win.c ends here */

-