X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_winch.c;h=43c614593100433c70861ab696ff2f46ed1aff1e;hp=119c731ebe3b92ba9979224c2e2bbe2c82bacc67;hb=4573ed8af000c7a7907a59ec750da29c46c15498;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce;ds=sidebyside

diff --git a/ncurses/base/lib_winch.c b/ncurses/base/lib_winch.c
index 119c731e..43c61459 100644
--- 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-2001,2009 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            *
@@ -39,14 +39,16 @@
 
 #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.7 2009/10/24 22:35:54 tom 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)"), (void *) win));
+    if (win != 0) {
+	returnChtype(CharOf(win->_line[win->_cury].text[win->_curx]) |
+		     AttrOf(win->_line[win->_cury].text[win->_curx]));
+    } else {
+	returnChtype(0);
+    }
 }