Use iskey() and getchar() to interact with console, rather than object

abstraction.

diff --git a/src/hci/mucurses/kb.c b/src/hci/mucurses/kb.c
index 639484695b75098afab6b49abbba5dce2822c225..1d02a0c88f681a9cc63b26dff02487357fc20eb6 100644 (file)
--- a/src/hci/mucurses/kb.c
+++ b/src/hci/mucurses/kb.c
@@ -1,6 +1,7 @@
 #include <curses.h>
 #include <stddef.h>
 #include <timer.h>
+#include <console.h>
 #include "core.h"
 
 /** @file
@@ -37,7 +38,7 @@ int _wgetc ( WINDOW *win ) {
                return ERR;
 
        timer = INPUT_DELAY_TIMEOUT;
-       while ( ! win->scr->peek( win->scr ) ) {
+       while ( ! iskey() ) {
                if ( m_delay == 0 ) // non-blocking read
                        return ERR;
                if ( timer > 0 ) {  // time-limited blocking read
@@ -47,7 +48,7 @@ int _wgetc ( WINDOW *win ) {
                } else { return ERR; } // non-blocking read
        }
 
-       c = win->scr->getc( win->scr );
+       c = getchar();
 
        if ( m_echo && ( c >= 32 && c <= 126 ) ) // printable ASCII characters
                _wputch( win, (chtype) ( c | win->attrs ), WRAP );

diff --git a/src/include/curses.h b/src/include/curses.h
index 27edb3760a26689d06c014343e3f9f1334fe463c..86825be4d33d5fdeaea2f1aa4def9f5947b8691b 100644 (file)
--- a/src/include/curses.h
+++ b/src/include/curses.h
@@ -46,21 +46,6 @@ typedef struct _curses_screen {
         * @v c         character to be written
         */
        void ( * putc ) ( struct _curses_screen *scr, chtype c );
-       /**
-        * Pop a character from the keyboard input stream
-        *
-        * @v scr       screen on which to operate
-        * @ret c       popped character
-        */
-       int ( * getc ) ( struct _curses_screen *scr );
-       /**
-        * Checks to see whether a character is waiting in the input stream
-        *
-        * @v scr       screen on which to operate
-        * @ret TRUE    character waiting in stream
-        * @ret FALSE   no character waiting in stream
-        */
-       bool ( *peek ) ( struct _curses_screen *scr );
 } SCREEN;
 
 /** Curses Window struct */

diff --git a/src/tests/curses_scr.c b/src/tests/curses_scr.c
index 398b9cf9965770a815e3d73031b074d1e0bf417b..63e114ac5a4c610c02a837a39c555667a28da2bf 100644 (file)
--- a/src/tests/curses_scr.c
+++ b/src/tests/curses_scr.c
@@ -83,6 +83,6 @@ SCREEN _curscr = {
        .exit = _exit_screen,
        .movetoyx = _movetoyx,
        .putc = _putc,
-       .getc = _getc,
-       .peek = _peek,
+       //      .getc = _getc,
+       //      .peek = _peek,
 };