* drop duplicate prototype for lib_get_sysinfo() * fix delay handling in tiny curses keyboard driver * fix off by one error in video driver Signed-off-by: Stefan Reinauer Index: include/sysinfo.h =================================================================== --- include/sysinfo.h (revision 4472) +++ include/sysinfo.h (working copy) @@ -54,7 +54,6 @@ }; extern struct sysinfo_t lib_sysinfo; -void lib_get_sysinfo(void); #endif Index: curses/keyboard.c =================================================================== --- curses/keyboard.c (revision 4472) +++ curses/keyboard.c (working copy) @@ -179,7 +179,7 @@ break; if (delay > 0) { - mdelay(100); + mdelay(1); delay--; } @@ -195,15 +195,17 @@ { int delay = -1; - if (_halfdelay || win->_delay) - delay = win->_delay ? 0 : _halfdelay; + if (_halfdelay) + delay = _halfdelay; + else + delay = win->_delay; return curses_getchar(delay); } int nodelay(WINDOW *win, NCURSES_BOOL flag) { - win->_delay = flag ? 1 : 0; + win->_delay = flag ? 0 : -1; return 0; } Index: drivers/video/video.c =================================================================== --- drivers/video/video.c (revision 4472) +++ drivers/video/video.c (working copy) @@ -66,7 +66,7 @@ if (cursory < 0) cursory = 0; - if (cursorx > VIDEO_COLS) { + if (cursorx >= VIDEO_COLS) { cursorx = 0; cursory++; }