ncurses 5.3

[ncurses.git] / form / fld_opts.c

diff --git a/form/fld_opts.c b/form/fld_opts.c
index 98af32f57099c41c8f668a3756887884656119ea..585c391c4596d1db341480caaa757b86081245e4 100644 (file)
--- a/form/fld_opts.c
+++ b/form/fld_opts.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998,2000 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,11 +27,12 @@
  ****************************************************************************/
 
 /****************************************************************************
  ****************************************************************************/
 
 /****************************************************************************

- *   Author: Juergen Pfeifer <Juergen.Pfeifer@T-Online.de> 1995,1997        *
+ *   Author:  Juergen Pfeifer, 1995,1997                                    *
+ *   Contact: http://www.familiepfeifer.de/Contact.aspx?Lang=en             *

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

-MODULE_ID("$Id: fld_opts.c,v 1.2 1998/02/11 12:13:44 tom Exp $")
+MODULE_ID("$Id: fld_opts.c,v 1.8 2002/07/06 15:33:27 juergen Exp $")

 
 /*----------------------------------------------------------------------------
   Field-Options manipulation routines
 
 /*----------------------------------------------------------------------------
   Field-Options manipulation routines


@@ -49,9 +50,11 @@ MODULE_ID("$Id: fld_opts.c,v 1.2 1998/02/11 12:13:44 tom Exp $")
 |                    E_BAD_ARGUMENT  - invalid options
 |                    E_SYSTEM_ERROR  - system error
 +--------------------------------------------------------------------------*/
 |                    E_BAD_ARGUMENT  - invalid options
 |                    E_SYSTEM_ERROR  - system error
 +--------------------------------------------------------------------------*/

-int set_field_opts(FIELD * field, Field_Options opts)
+NCURSES_EXPORT(int)
+set_field_opts (FIELD * field, Field_Options opts)

 {
   int res = E_BAD_ARGUMENT;
 {
   int res = E_BAD_ARGUMENT;

+  opts &= ALL_FIELD_OPTS;

   if (!(opts & ~ALL_FIELD_OPTS))
     res = _nc_Synchronize_Options( Normalize_Field(field), opts );
   RETURN(res);
   if (!(opts & ~ALL_FIELD_OPTS))
     res = _nc_Synchronize_Options( Normalize_Field(field), opts );
   RETURN(res);


@@ -65,7 +68,8 @@ int set_field_opts(FIELD * field, Field_Options opts)
 |
 |   Return Values :  The options.
 +--------------------------------------------------------------------------*/
 |
 |   Return Values :  The options.
 +--------------------------------------------------------------------------*/

-Field_Options field_opts(const FIELD * field)
+NCURSES_EXPORT(Field_Options)
+field_opts (const FIELD * field)

 {
   return ALL_FIELD_OPTS & Normalize_Field( field )->opts;
 }
 {
   return ALL_FIELD_OPTS & Normalize_Field( field )->opts;
 }


@@ -82,10 +86,12 @@ Field_Options field_opts(const FIELD * field)
 |                    E_BAD_ARGUMENT  - invalid options
 |                    E_SYSTEM_ERROR  - system error
 +--------------------------------------------------------------------------*/
 |                    E_BAD_ARGUMENT  - invalid options
 |                    E_SYSTEM_ERROR  - system error
 +--------------------------------------------------------------------------*/

-int field_opts_on(FIELD * field, Field_Options opts)
+NCURSES_EXPORT(int)
+field_opts_on (FIELD * field, Field_Options opts)

 {
   int res = E_BAD_ARGUMENT;
 
 {
   int res = E_BAD_ARGUMENT;
 

+  opts &= ALL_FIELD_OPTS;

   if (!(opts & ~ALL_FIELD_OPTS))
     {
       Normalize_Field( field );
   if (!(opts & ~ALL_FIELD_OPTS))
     {
       Normalize_Field( field );


@@ -106,10 +112,12 @@ int field_opts_on(FIELD * field, Field_Options opts)
 |                    E_BAD_ARGUMENT  - invalid options
 |                    E_SYSTEM_ERROR  - system error
 +--------------------------------------------------------------------------*/
 |                    E_BAD_ARGUMENT  - invalid options
 |                    E_SYSTEM_ERROR  - system error
 +--------------------------------------------------------------------------*/

-int field_opts_off(FIELD  * field, Field_Options opts)
+NCURSES_EXPORT(int)
+field_opts_off (FIELD  * field, Field_Options opts)

 {
   int res = E_BAD_ARGUMENT;
 
 {
   int res = E_BAD_ARGUMENT;
 

+  opts &= ALL_FIELD_OPTS;

   if (!(opts & ~ALL_FIELD_OPTS))
     {
       Normalize_Field( field );
   if (!(opts & ~ALL_FIELD_OPTS))
     {
       Normalize_Field( field );