ncurses 6.2 - patch 20210904

[ncurses.git] / form / frm_sub.c

diff --git a/form/frm_sub.c b/form/frm_sub.c
index 1c33930e65d43782973aede0b8606df0ae135d79..8f1de099cdf6e65c311435ac483baea1c2d991da 100644 (file)
--- a/form/frm_sub.c
+++ b/form/frm_sub.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
+ * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 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            *


@@ -27,46 +28,60 @@
  ****************************************************************************/
 
 /****************************************************************************
  ****************************************************************************/
 
 /****************************************************************************

- *   Author:  Juergen Pfeifer, 1995,1997                                    *
- *   Contact: http://www.familiepfeifer.de/Contact.aspx?Lang=en             *
+ *   Author:  Juergen Pfeifer, 1995-1997,2009                               *

  ****************************************************************************/
 
 #include "form.priv.h"
 
  ****************************************************************************/
 
 #include "form.priv.h"
 

-MODULE_ID("$Id: frm_sub.c,v 1.6 2002/07/06 15:33:27 juergen Exp $")
+MODULE_ID("$Id: frm_sub.c,v 1.15 2021/06/17 21:20:30 tom Exp $")

 
 /*---------------------------------------------------------------------------
 
 /*---------------------------------------------------------------------------

-|   Facility      :  libnform  
+|   Facility      :  libnform

 |   Function      :  int set_form_sub(FORM *form, WINDOW *win)
 |   Function      :  int set_form_sub(FORM *form, WINDOW *win)

-|   
-|   Description   :  Set the subwindow of the form to win. 
+|
+|   Description   :  Set the subwindow of the form to win.

 |
 |   Return Values :  E_OK       - success
 |                    E_POSTED   - form is posted
 +--------------------------------------------------------------------------*/
 |
 |   Return Values :  E_OK       - success
 |                    E_POSTED   - form is posted
 +--------------------------------------------------------------------------*/

-NCURSES_EXPORT(int)
-set_form_sub (FORM * form, WINDOW * win)
+FORM_EXPORT(int)
+set_form_sub(FORM *form, WINDOW *win)

 {
 {

-  if (form && (form->status & _POSTED))        
+  T((T_CALLED("set_form_sub(%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 )->sub = win;
-  RETURN(E_OK);
-}      
+      f->sub = win ? win : StdScreen(Get_Form_Screen(f));
+      RETURN(E_OK);
+#else
+      Normalize_Form(form)->sub = win;
+      RETURN(E_OK);
+#endif
+    }
+}

 
 /*---------------------------------------------------------------------------
 
 /*---------------------------------------------------------------------------

-|   Facility      :  libnform  
+|   Facility      :  libnform

 |   Function      :  WINDOW *form_sub(const FORM *)
 |   Function      :  WINDOW *form_sub(const FORM *)

-|   
+|

 |   Description   :  Retrieve the window of the form.
 |
 |   Return Values :  The pointer to the Subwindow.
 +--------------------------------------------------------------------------*/
 |   Description   :  Retrieve the window of the form.
 |
 |   Return Values :  The pointer to the Subwindow.
 +--------------------------------------------------------------------------*/

-NCURSES_EXPORT(WINDOW *)
-form_sub (const FORM * form)
+FORM_EXPORT(WINDOW *)
+form_sub(const FORM *form)

 {
 {

-  const FORM* f = Normalize_Form( form );
-  return Get_Form_Window(f);
+  const FORM *f;
+
+  T((T_CALLED("form_sub(%p)"), (const void *)form));
+
+  f = Normalize_Form(form);
+  returnWin(Get_Form_Window(f));

 }
 
 /* frm_sub.c ends here */
 }
 
 /* frm_sub.c ends here */