Implement space completion when selling items.

[c128-kasse] / src / general.c

diff --git a/src/general.c b/src/general.c
index bdd38eafe1387be80e5f3bf1280404242a30ff5e..53d7804864952b7ac38f265dd1fd4d06c14bade0 100644 (file)
--- a/src/general.c
+++ b/src/general.c
@@ -12,38 +12,52 @@
 #include "general.h"
 
 /*
- * Liest (maximal 31) Zeichen ein, bis Enter gedrückt wird.
- * Vorsicht: Es wird ein statischer Buffer benutzt, sodass man
- * das Ergebnis via strdup() retten muss, bevor man get_input()
- * erneut aufruft
+ * 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.
  *
  */
-char *get_input(void) {
-       BYTE i = 0;
+input_terminator_t get_input_terminated_by(input_terminator_mask_t terminators, char *out, BYTE outlen) {
+       BYTE i = strlen(out);
        BYTE c, x, y;
-       static char output[32];
-       x = wherex();
+       x = wherex() - i;
        y = wherey();
-       memset(output, '\0', 32);
        while (1) {
-               if (i == 31)
-                       break;
                c = cgetc();
-               if (c == 13)
-                       break;
-               /* backspace? */
-               if (c == 20) {
+               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;
-                       output[--i] = '\0';
+                       out[--i] = '\0';
                        cputcxy(x+i, y, ' ');
                        gotoxy(x+i, y);
                        continue;
                }
+               if (i == (outlen-1)) {
+                       continue;
+               }
                cputc(c);
-               output[i++] = c;
+               out[i++] = c;
        }
+}
+
+/*
+ * Liest (maximal 31) Zeichen ein, bis Enter gedrückt wird.
+ * Vorsicht: Es wird ein statischer Buffer benutzt, sodass man
+ * das Ergebnis via strdup() retten muss, bevor man get_input()
+ * erneut aufruft
+ *
+ */
+char *get_input(void) {
+       static char output[32];
+       memset(output, '\0', sizeof(output));
+       get_input_terminated_by(INPUT_TERMINATOR_RETURN, output, sizeof(output));
        return output;
 }