ncurses 5.6 - patch 20070901

[ncurses.git] / ncurses / base / lib_winch.c

diff --git a/ncurses/base/lib_winch.c b/ncurses/base/lib_winch.c
index 119c731ebe3b92ba9979224c2e2bbe2c82bacc67..18da9c594945d18ed4b0750f4fa3122afff9a08f 100644 (file)
--- a/ncurses/base/lib_winch.c
+++ b/ncurses/base/lib_winch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998,2000,2001 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            *


@@ -39,14 +39,16 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_winch.c,v 1.1 1998/11/14 22:06:09 tom Exp $")
+MODULE_ID("$Id: lib_winch.c,v 1.5 2001/06/02 23:42:08 skimo Exp $")

 
 

-chtype winch(WINDOW *win)
+NCURSES_EXPORT(chtype)
+winch(WINDOW *win)

 {
 {

-       T((T_CALLED("winch(%p)"), win));
-       if (win != 0) {
-               returnCode(win->_line[win->_cury].text[win->_curx]);
-       } else {
-               returnCode(0);
-       }
+    T((T_CALLED("winch(%p)"), win));
+    if (win != 0) {
+       returnChar(CharOf(win->_line[win->_cury].text[win->_curx]) |
+                  AttrOf(win->_line[win->_cury].text[win->_curx]));
+    } else {
+       returnChar(0);
+    }

 }
 }