X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_clreol.c;h=0b6b0ff8f7de6f3067d8dc633c09df7c0a29d9d4;hp=d6cb9b26128386a03b7930e082ff13a008453437;hb=63d26709472433a4660c88461162252bf0e5fde8;hpb=d21ad44bdac29dcfbd1cf10a1918a42c43215b3d diff --git a/ncurses/base/lib_clreol.c b/ncurses/base/lib_clreol.c index d6cb9b26..0b6b0ff8 100644 --- a/ncurses/base/lib_clreol.c +++ b/ncurses/base/lib_clreol.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2021 Thomas E. Dickey * * Copyright 1998-2001,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -41,7 +41,7 @@ #include -MODULE_ID("$Id: lib_clreol.c,v 1.23 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_clreol.c,v 1.24 2021/10/23 19:06:01 tom Exp $") NCURSES_EXPORT(int) wclrtoeol(WINDOW *win) @@ -61,7 +61,7 @@ wclrtoeol(WINDOW *win) * If we have just wrapped the cursor, the clear applies to the * new line, unless we are at the lower right corner. */ - if ((win->_flags & _WRAPPED) != 0 + if (IS_WRAPPED(win) != 0 && y < win->_maxy) { win->_flags &= ~_WRAPPED; } @@ -70,7 +70,7 @@ wclrtoeol(WINDOW *win) * There's no point in clearing if we're not on a legal * position, either. */ - if ((win->_flags & _WRAPPED) != 0 + if (IS_WRAPPED(win) || y > win->_maxy || x > win->_maxx) returnCode(ERR);