X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fgeneral.c;h=668bdcf4b9c1765143bfcc0ab5f57829624fb2a9;hb=2931ff1e7bc2a60e9e8e4a3d90763cfed6e11c87;hp=bdd38eafe1387be80e5f3bf1280404242a30ff5e;hpb=3cdc0de1c9d9a6e85db0bbe8055c4998d6edf1a7;p=c128-kasse

diff --git a/src/general.c b/src/general.c
index bdd38ea..668bdcf 100644
--- a/src/general.c
+++ b/src/general.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * RGB2R-C128-Kassenprogramm
  * © 2007-2009 phil_fry, sECuRE, sur5r
  * See LICENSE for license information
@@ -11,6 +11,46 @@
 
 #include "general.h"
 
+/*
+ * get_input_terminated_by() reads input (handling backspace correctly) until
+ * a terminator of |terminators| is encountered or |out| is full (outlen-1
+ * characters were read).
+ *
+ * get_input_terminated_by() returns the terminator it encountered.
+ *
+ */
+input_terminator_t get_input_terminated_by(input_terminator_mask_t terminators,
+                                           char *out, BYTE outlen) {
+  BYTE i = strlen(out);
+  BYTE c, x, y;
+  x = wherex() - i;
+  y = wherey();
+  while (1) {
+    c = cgetc();
+    if (((terminators & INPUT_TERMINATOR_RETURN) == INPUT_TERMINATOR_RETURN) &&
+        (c == PETSCII_CR)) {
+      return INPUT_TERMINATOR_RETURN;
+    } else if (((terminators & INPUT_TERMINATOR_SPACE) ==
+                INPUT_TERMINATOR_SPACE) &&
+               (c == PETSCII_SP)) {
+      return INPUT_TERMINATOR_SPACE;
+    } else if (c == PETSCII_DEL) {
+      /* If you are at the left-most position, do nothing */
+      if (i == 0)
+        continue;
+      out[--i] = '\0';
+      cputcxy(x + i, y, ' ');
+      gotoxy(x + i, y);
+      continue;
+    }
+    if (i == (outlen - 1)) {
+      continue;
+    }
+    cputc(c);
+    out[i++] = c;
+  }
+}
+
 /*
  * Liest (maximal 31) Zeichen ein, bis Enter gedrückt wird.
  * Vorsicht: Es wird ein statischer Buffer benutzt, sodass man
@@ -19,55 +59,35 @@
  *
  */
 char *get_input(void) {
-	BYTE i = 0;
-	BYTE c, x, y;
-	static char output[32];
-	x = wherex();
-	y = wherey();
-	memset(output, '\0', 32);
-	while (1) {
-		if (i == 31)
-			break;
-		c = cgetc();
-		if (c == 13)
-			break;
-		/* backspace? */
-		if (c == 20) {
-			/* If you are at the left-most position, do nothing */
-			if (i == 0)
-				continue;
-			output[--i] = '\0';
-			cputcxy(x+i, y, ' ');
-			gotoxy(x+i, y);
-			continue;
-		}
-		cputc(c);
-		output[i++] = c;
-	}
-	return output;
+  static char output[32];
+  memset(output, '\0', sizeof(output));
+  get_input_terminated_by(INPUT_TERMINATOR_RETURN, output, sizeof(output));
+  return output;
 }
 
 char retry_or_quit(void) {
-	char *c;
-	do {
-		cprintf("\r\nr)etry or q)uit?\r\n");
-		c = get_input();
-	} while ((*c != 'r') && (*c != 'q'));
-	return *c;
+  char *c;
+  do {
+    cprintf("\r\nr)etry or q)uit?\r\n");
+    c = get_input();
+  } while ((*c != 'r') && (*c != 'q'));
+  return *c;
 }
 
-char *format_euro(char *s, int maxlen, int cent){
-	int tmp = cent;
-	int len = strlen(",EUR");
-	while ((tmp /= 10) > 0)
-		++len;
-	if (len >= maxlen)
-		return NULL;
-	// workaround to produce a leading zero for cents.. %0.2d won't work 
-	sprintf(s, "%3d,%s%dEUR", cent / 100, ((cent%100)<10?"0":""), cent % 100);
-	return s;
+char *format_euro(char *s, int maxlen, int cent) {
+  int tmp = cent;
+  int len = strlen(",EUR");
+  while ((tmp /= 10) > 0)
+    ++len;
+  if (len >= maxlen)
+    return NULL;
+  // workaround to produce a leading zero for cents.. %0.2d won't work
+  sprintf(s, "%3d,%s%dEUR", cent / 100, ((cent % 100) < 10 ? "0" : ""),
+          cent % 100);
+  return s;
 }
 
 void c128_perror(BYTE c, char *msg) {
-	cprintf("\r\nError (Code %d) while: %s\r\nOS Error = %d\r\n", c, msg, _oserror);
+  cprintf("\r\nError (Code %d) while: %s\r\nOS Error = %d\r\n", c, msg,
+          _oserror);
 }