Merge pull request #84 from jayrm/bugfix-877

#877: fix SLEEP behaviour in linux console

Author: jayrm

changelog.txt

@@ -54,6 +54,7 @@ Version 1.06.0
 - #875: Fix bug where boolean variable to single/double conversion gives wrong sign on -gen gas -fpu x87 & sse
 - #872: Fix broken boolean bitfield runtime assignments from unsigned values 
 - #876: ThreadCall does not support subroutine with [U]Long type parameter
+- #877: fix SLEEP behaviour in linux console and wait for key presses, and do not affect input buffer.  Match linux SLEEP to behaviour on Windows.
 - Fixed inline asm procedure name mangling bug (missing underscore prefix) with -gen gcc -asm intel on dos/win32
 
 

src/rtlib/unix/io_inkey.c

@@ -55,7 +55,7 @@ static const KEY_DATA key_data[] = {
 	{ NULL, 0 }
 };
 
-static int key_buffer[KEY_BUFFER_LEN], key_head = 0, key_tail = 0;
+static int key_buffer[KEY_BUFFER_LEN], key_head = 0, key_tail = 0, key_buffer_changed = FALSE;
 static NODE *root_node = NULL;
 
 static void add_key(NODE **node, char *key, short code)
@@ -205,6 +205,7 @@ void fb_hAddCh( int k )
 	if (((key_tail + 1) & (KEY_BUFFER_LEN - 1)) == key_head)
 		key_head = (key_head + 1) & (KEY_BUFFER_LEN - 1);
 	key_tail = (key_tail + 1) & (KEY_BUFFER_LEN - 1);
+	key_buffer_changed = TRUE;
 }
 
 int fb_hGetCh(int remove)
@@ -274,8 +275,13 @@ int fb_ConsoleGetkey( void )
 /* Caller is expected to hold FB_LOCK() */
 int fb_ConsoleKeyHit( void )
 {
+	int result;
+
 	if (!__fb_con.inited)
 		return feof(stdin) ? FALSE : TRUE;
 
-	return (fb_hGetCh(FALSE) < 0) ? 0 : 1;
+	fb_hGetCh(FALSE);
+	result = key_buffer_changed;
+	key_buffer_changed = FALSE;
+	return result;
 }

src/rtlib/unix/io_input.c

@@ -5,14 +5,5 @@
 
 int fb_hConsoleInputBufferChanged( void )
 {
-    /* FIXME: We need to find a method to set a flag whenver a NEW character
-     *        was passed to the input buffer. Maybe we can use something
-     *        like ftell( stdin ) + some modifications of key input functions?
-     *
-     * INFO: Don't clear the input buffer in any case because this will
-     *       cause more trouble than not clearing the input buffer.
-     *
-     * mjs, 2005-10-13
-     */
 	return fb_KeyHit();
 }