Index: uspace/app/top/Makefile =================================================================== --- uspace/app/top/Makefile (revision 933cadfdb63d0a16870db764880b5c144894e112) +++ uspace/app/top/Makefile (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -33,6 +33,5 @@ SOURCES = \ top.c \ - screen.c \ - input.c + screen.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/app/top/input.c =================================================================== --- uspace/app/top/input.c (revision 933cadfdb63d0a16870db764880b5c144894e112) +++ (revision ) @@ -1,200 +1,0 @@ -/* $OpenBSD: input.c,v 1.12 2005/04/13 02:33:08 deraadt Exp $ */ -/* $NetBSD: input.c,v 1.3 1996/02/06 22:47:33 jtc Exp $ */ - -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek and Darren F. Provine. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)input.c 8.1 (Berkeley) 5/31/93 - */ - -/** @addtogroup top - * @{ - */ -/** @file - */ - -/* - * Top input. - */ - -#include -#include -#include - -#include -#include -#include -#include - -#include "input.h" - -#include -#include -#include -#include - -#define USEC_COUNT 1000000 - -/* return true iff the given timeval is positive */ -#define TV_POS(tv) \ - ((tv)->tv_sec > 0 || ((tv)->tv_sec == 0 && (tv)->tv_usec > 0)) - -/* subtract timeval `sub' from `res' */ -#define TV_SUB(res, sub) \ - (res)->tv_sec -= (sub)->tv_sec; \ - (res)->tv_usec -= (sub)->tv_usec; \ - if ((res)->tv_usec < 0) { \ - (res)->tv_usec += 1000000; \ - (res)->tv_sec--; \ - } - -/* We will use a hack here - if lastchar is non-zero, it is - * the last character read. We will somehow simulate the select - * semantics. - */ -static aid_t getchar_inprog = 0; -static char lastchar = '\0'; - -/* - * Do a `read wait': select for reading from stdin, with timeout *tvp. - * On return, modify *tvp to reflect the amount of time spent waiting. - * It will be positive only if input appeared before the time ran out; - * otherwise it will be zero or perhaps negative. - * - * If tvp is nil, wait forever, but return if select is interrupted. - * - * Return 0 => no input, 1 => can read() from stdin - * - */ -int rwait(struct timeval *tvp) -{ - struct timeval starttv, endtv, *s; - static ipc_call_t charcall; - sysarg_t rc; - - /* - * Someday, select() will do this for us. - * Just in case that day is now, and no one has - * changed this, we use a temporary. - */ - if (tvp) { - (void) gettimeofday(&starttv, NULL); - endtv = *tvp; - s = &endtv; - } else - s = NULL; - - if (!lastchar) { -again: - if (!getchar_inprog) { - getchar_inprog = async_send_0(fphone(stdin), - CONSOLE_GET_EVENT, &charcall); - } - - if (!s) - async_wait_for(getchar_inprog, &rc); - else if (async_wait_timeout(getchar_inprog, &rc, s->tv_usec) == ETIMEOUT) { - tvp->tv_sec = 0; - tvp->tv_usec = 0; - return (0); - } - - getchar_inprog = 0; - if (rc) { - printf("End of file, bug?\n"); - exit(1); - } - - if (IPC_GET_ARG1(charcall) == KEY_RELEASE) - goto again; - - lastchar = IPC_GET_ARG4(charcall); - } - - if (tvp) { - /* since there is input, we may not have timed out */ - (void) gettimeofday(&endtv, NULL); - TV_SUB(&endtv, &starttv); - TV_SUB(tvp, &endtv); /* adjust *tvp by elapsed time */ - } - - return 1; -} - -/* - * `sleep' for the current turn time (using select). - * Eat any input that might be available. - */ -void tsleep(unsigned int sec) -{ - struct timeval tv; - - tv.tv_sec = 0; - tv.tv_usec = sec * USEC_COUNT; - while (TV_POS(&tv)) - if (rwait(&tv)) { - lastchar = '\0'; - } else - break; -} - -/* - * getchar with timeout. - */ -int tgetchar(unsigned int sec) -{ - static struct timeval timeleft; - char c; - - /* - * Reset timeleft to USEC_COUNT whenever it is not positive. - * In any case, wait to see if there is any input. If so, - * take it, and update timeleft so that the next call to - * tgetchar() will not wait as long. If there is no input, - * make timeleft zero or negative, and return -1. - * - * Most of the hard work is done by rwait(). - */ - if (!TV_POS(&timeleft)) { - timeleft.tv_sec = 0; - timeleft.tv_usec = sec * USEC_COUNT; - } - - if (!rwait(&timeleft)) - return -1; - - c = lastchar; - lastchar = '\0'; - return ((int) (unsigned char) c); -} - -/** @} - */ Index: uspace/app/top/input.h =================================================================== --- uspace/app/top/input.h (revision 933cadfdb63d0a16870db764880b5c144894e112) +++ (revision ) @@ -1,56 +1,0 @@ -/* $OpenBSD: input.h,v 1.5 2003/06/03 03:01:41 millert Exp $ */ -/* $NetBSD: input.h,v 1.2 1995/04/22 07:42:36 cgd Exp $ */ - -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek and Darren F. Provine. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)input.h 8.1 (Berkeley) 5/31/93 - */ - -/** @addtogroup top - * @{ - */ -/** @file - */ - -#ifndef TOP_INPUT_ -#define TOP_INPUT_ - -#include - -extern int rwait(struct timeval *); -extern int tgetchar(unsigned int sec); -extern void tsleep(unsigned int sec); - -#endif - -/** @} - */ Index: uspace/app/top/screen.c =================================================================== --- uspace/app/top/screen.c (revision 933cadfdb63d0a16870db764880b5c144894e112) +++ uspace/app/top/screen.c (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -46,35 +46,40 @@ #include "top.h" +#define USEC_COUNT 1000000 + static sysarg_t warn_col = 0; static sysarg_t warn_row = 0; +static suseconds_t timeleft = 0; + +console_ctrl_t *console; static void screen_style_normal(void) { - fflush(stdout); - console_set_style(fphone(stdout), STYLE_NORMAL); + console_flush(console); + console_set_style(console, STYLE_NORMAL); } static void screen_style_inverted(void) { - fflush(stdout); - console_set_style(fphone(stdout), STYLE_INVERTED); + console_flush(console); + console_set_style(console, STYLE_INVERTED); } static void screen_moveto(sysarg_t col, sysarg_t row) { - fflush(stdout); - console_set_pos(fphone(stdout), col, row); + console_flush(console); + console_set_pos(console, col, row); } static void screen_get_pos(sysarg_t *col, sysarg_t *row) { - fflush(stdout); - console_get_pos(fphone(stdout), col, row); + console_flush(console); + console_get_pos(console, col, row); } static void screen_get_size(sysarg_t *col, sysarg_t *row) { - fflush(stdout); - console_get_size(fphone(stdout), col, row); + console_flush(console); + console_get_size(console, col, row); } @@ -84,6 +89,6 @@ if (clear) { - fflush(stdout); - console_clear(fphone(stdout)); + console_flush(console); + console_clear(console); } @@ -111,6 +116,8 @@ void screen_init(void) { - fflush(stdout); - console_cursor_visibility(fphone(stdout), false); + console = console_init(stdin, stdout); + + console_flush(console); + console_cursor_visibility(console, false); screen_restart(true); @@ -121,6 +128,6 @@ screen_restart(true); - fflush(stdout); - console_cursor_visibility(fphone(stdout), true); + console_flush(console); + console_cursor_visibility(console, true); } @@ -508,5 +515,5 @@ } - fflush(stdout); + console_flush(console); } @@ -521,5 +528,41 @@ screen_newline(); - fflush(stdout); + console_flush(console); +} + +/** Get char with timeout + * + */ +int tgetchar(unsigned int sec) +{ + /* + * Reset timeleft whenever it is not positive. + */ + + if (timeleft <= 0) + timeleft = sec * USEC_COUNT; + + /* + * Wait to see if there is any input. If so, take it and + * update timeleft so that the next call to tgetchar() + * will not wait as long. If there is no input, + * make timeleft zero and return -1. + */ + + wchar_t c = 0; + + while (c == 0) { + kbd_event_t event; + + if (!console_get_kbd_event_timeout(console, &event, &timeleft)) { + timeleft = 0; + return -1; + } + + if (event.type == KEY_PRESS) + c = event.c; + } + + return (int) c; } Index: uspace/app/top/screen.h =================================================================== --- uspace/app/top/screen.h (revision 933cadfdb63d0a16870db764880b5c144894e112) +++ uspace/app/top/screen.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -35,5 +35,8 @@ #define TOP_SCREEN_H_ +#include #include "top.h" + +extern console_ctrl_t *console; extern void screen_init(void); @@ -42,4 +45,6 @@ extern void print_warning(const char *, ...); +extern int tgetchar(unsigned int); + #endif Index: uspace/app/top/top.c =================================================================== --- uspace/app/top/top.c (revision 933cadfdb63d0a16870db764880b5c144894e112) +++ uspace/app/top/top.c (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -46,5 +46,4 @@ #include #include "screen.h" -#include "input.h" #include "top.h"