CONSOLE: console DELAY now does event processing

Author: chrisws

configure.ac

@@ -217,7 +217,6 @@ function buildSDL() {
    AC_DEFINE(_SDL, 1, [Defined when building SDL version])
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
    AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
-   AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
 
    BUILD_SUBDIRS="src/common src/platform/sdl"
@@ -233,7 +232,6 @@ function buildAndroid() {
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
    AC_DEFINE(_ANDROID, 1, [Defined for Android build.])
    AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
-   AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
 
    BUILD_SUBDIRS="src/platform/android"
@@ -258,7 +256,6 @@ function buildConsole() {
    )
 
    AM_CONDITIONAL(WITH_CYGWIN_CONSOLE, test $win32 = yes)
-   AC_DEFINE(BUILD_CONSOLE, 1, [Building a console based system.])
 
    if test $win32 = yes; then
       dnl test whether to build using mingw
@@ -318,7 +315,6 @@ function buildWeb() {
    BUILD_SUBDIRS="src/common src/platform/web"
    AM_CONDITIONAL(WITH_CYGWIN_CONSOLE, false)
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
-   AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
    AC_DEFINE(USE_TERM_IO, 0, [dont use the termios library.])
    AC_DEFINE(IMPL_DEV_ENV, 1, [Driver implements dev_env funcs])
@@ -372,7 +368,6 @@ function buildFLTK() {
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
    AC_DEFINE(_FLTK, 1, [Defined for FLTK build.])
    AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
-   AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
 
    BUILD_SUBDIRS="src/common src/platform/fltk"

src/common/device.c

@@ -16,10 +16,6 @@
 #include "common/keymap.h"
 #include "common/inet.h"
 
-#ifdef __MINGW32__
-#define usleep(s) Sleep((DWORD)((s+500)/1000))
-#endif
-
 /**
  * initialize all drivers
  */
@@ -75,236 +71,13 @@ int dev_events(int wait_flag) {
   return osd_events(wait_flag);
 }
 
-#ifndef IMPL_DEV_DELAY
-
-/**
- * delay for a specified amount of milliseconds
- */
-void dev_delay(uint32_t ms) {
-#if defined(_Win32)
-  Sleep(ms);
-#elif defined(_DOS)
-  delay(ms);
-#else // Unix
-  usleep(ms * 1000);
-#endif
-}
-#endif
-
-#if defined(BUILD_CONSOLE)
-
-/**
- * return the character (multibyte charsets support)
- */
-int dev_input_char2str(int ch, byte * cstr) {
-  memset(cstr, 0, 3);
-
-  switch (os_charset) {
-  case enc_sjis:               // Japan
-    if (IsJISFont(ch)) {
-      cstr[0] = ch >> 8;
-    }
-    cstr[1] = ch & 0xFF;
-    break;
-  case enc_big5:               // China/Taiwan (there is another charset for
-    // China but I don't know the difference)
-    if (IsBig5Font(ch)) {
-      cstr[0] = ch >> 8;
-    }
-    cstr[1] = ch & 0xFF;
-    break;
-  case enc_gmb:                // Generic multibyte
-    if (IsGMBFont(ch)) {
-      cstr[0] = ch >> 8;
-    }
-    cstr[1] = ch & 0xFF;
-    break;
-  case enc_unicode:            // Unicode
-    cstr[0] = ch >> 8;
-    cstr[1] = ch & 0xFF;
-    break;
-  default:
-    cstr[0] = ch;
-  };
-  return strlen((char *)cstr);
-}
-
-/**
- * return the character size at pos! (multibyte charsets support)
- */
-int dev_input_count_char(byte *buf, int pos) {
-  int count, ch;
-  byte cstr[3];
-
-  if (os_charset != enc_utf8) {
-    ch = buf[0];
-    ch = ch << 8;
-    ch = ch + buf[1];
-    count = dev_input_char2str(ch, cstr);
-  } else {
-    count = 1;
-  }
-  return count;
-}
-
-/**
- * stores a character at 'pos' position
- */
-int dev_input_insert_char(int ch, char *dest, int pos, int replace_mode) {
-  byte cstr[3];
-  int count, remain;
-  char *buf;
-
-  count = dev_input_char2str(ch, cstr);
-
-  // store character into buffer
-  if (replace_mode) {
-    // overwrite mode
-    remain = strlen((dest + pos));
-    buf = malloc(remain + 1);
-    strcpy(buf, dest + pos);
-    memcpy(dest + pos, cstr, count);
-    dest[pos + count] = '\0';
-
-    if (os_charset != enc_utf8) {
-      count = dev_input_char2str(((buf[0] << 8) | buf[1]), cstr);
-    } else {
-      count = 1;
-    }
-    if (buf[0]) {                // not a '\0'
-      strcat(dest, (buf + count));
-    }
-    free(buf);
-  } else {
-    // insert mode
-    remain = strlen((dest + pos));
-    buf = malloc(remain + 1);
-    strcpy(buf, dest + pos);
-    memcpy(dest + pos, cstr, count);
-    dest[pos + count] = '\0';
-    strcat(dest, buf);
-    free(buf);
-  }
-
-  return count;
-}
-
-/**
- * removes the character at 'pos' position
- */
-int dev_input_remove_char(char *dest, int pos) {
-  byte cstr[3];
-  int count, remain;
-  char *buf;
-
-  if (dest[pos]) {
-    if (os_charset != enc_utf8) {
-      count = dev_input_char2str(((dest[pos] << 8) | dest[pos + 1]), cstr);
-    } else {
-      count = 1;
-    }
-    remain = strlen((dest + pos + 1));
-    buf = malloc(remain + 1);
-    strcpy(buf, dest + pos + count);
-
-    dest[pos] = '\0';
-    strcat(dest, buf);
-    free(buf);
-    return count;
-  }
-  return 0;
-}
-
-/**
- * gets a string (INPUT)
- */
-char *dev_gets(char *dest, int size) {
-  long int ch = 0;
-  uint16_t pos, len = 0;
-  int replace_mode = 0;
-
-  *dest = '\0';
-  pos = 0;
-  do {
-    len = strlen(dest);
-    ch = fgetc(stdin);
-    switch (ch) {
-    case -1:
-    case -2:
-    case 0xFFFF:
-      dest[pos] = '\0';
-      return dest;
-    case 0:
-    case 10:
-    case 13:                 // ignore
-      break;
-    case SB_KEY_HOME:
-      pos = 0;
-      break;
-    case SB_KEY_END:
-      pos = len;
-      break;
-    case SB_KEY_BACKSPACE:   // backspace
-      if (pos > 0) {
-        pos -= dev_input_remove_char(dest, pos - 1);
-        len = strlen(dest);
-      } else {
-        dev_beep();
-      }
-      break;
-    case SB_KEY_DELETE:      // delete
-      if (pos < len) {
-        dev_input_remove_char(dest, pos);
-        len = strlen(dest);
-      } else
-        dev_beep();
-      break;
-    case SB_KEY_INSERT:
-      replace_mode = !replace_mode;
-      break;
-    case SB_KEY_LEFT:
-      if (pos > 0) {
-        pos -= dev_input_count_char((byte *)dest, pos);
-      } else {
-        dev_beep();
-      }
-      break;
-    case SB_KEY_RIGHT:
-      if (pos < len) {
-        pos += dev_input_count_char((byte *)dest, pos);
-      } else {
-        dev_beep();
-      }
-      break;
-    default:
-      if ((ch & 0xFF00) != 0xFF00) { // Not an hardware key
-        pos += dev_input_insert_char(ch, dest, pos, replace_mode);
-      } else {
-        ch = 0;
-      }
-      // check the size
-      len = strlen(dest);
-      if (len >= (size - 2)) {
-        break;
-      }
-    }
-  } while (ch != '\n' && ch != '\r');
-  dest[len] = '\0';
-  dev_print(dest);
-  return dest;
-}
-
-#endif // #if defined BUILD_CONSOLE
-
 /**
  * BEEP
  */
 void dev_beep() {
-#if !defined(BUILD_CONSOLE)
   if (!opt_mute_audio) {
     osd_beep();
   }
-#endif
 }
 
 /**
@@ -385,12 +158,6 @@ void log_printf(const char *format, ...) {
   }
 }
 
-#if defined(BUILD_CONSOLE)
-void v_create_form(var_p_t var) {}
-void v_create_window(var_p_t var) {}
-void dev_show_page() {}
-#endif
-
 #if !defined(_SDL)
 void dev_trace_line(int lineNo) {
   dev_printf("<%d>", lineNo);

src/platform/console/Makefile.am

@@ -12,6 +12,7 @@ bin_PROGRAMS = sbasic
 sbasic_SOURCES =    \
   ../../lib/lodepng/lodepng.cpp ../../lib/lodepng/lodepng.h \
   main.cpp	\
+  input.cpp \
   device.cpp \
   image.cpp \
   decomp.c

src/platform/console/device.cpp

@@ -13,6 +13,8 @@
 #include "common/extlib.h"
 #include "common/smbas.h"
 
+#define WAIT_INTERVAL 5
+
 typedef void (*settextcolor_fn)(long fg, long bg);
 typedef void (*setpenmode_fn)(int enable);
 typedef int  (*getpen_fn)(int code);
@@ -331,5 +333,27 @@ int osd_textheight(const char *str) {
   return result;
 }
 
+// delay while pumping events
+void dev_delay(uint32_t timeout) {
+  uint32_t slept = 0;
+  uint32_t now = dev_get_millisecond_count();
+  while (1) {
+    if (osd_events(0) == -2) {
+      break;
+    }
+    if (dev_get_millisecond_count() - now > timeout) {
+      break;
+    }
+    usleep(WAIT_INTERVAL * 1000);
+    slept += WAIT_INTERVAL;
+    if (timeout > 0 && slept > timeout) {
+      break;
+    }
+  }
+}
+
 // unused
 void dev_log_stack(const char *keyword, int type, int line) {}
+void v_create_form(var_p_t var) {}
+void v_create_window(var_p_t var) {}
+void dev_show_page() {}