Changeset 3607Tweet

Timestamp:

08/02/09 13:09:42 (4 years ago)

Author:

sam

Message:

Implement conio.h functions cgets(), cputs(), getpass(), movetext(),
putch() and _setcurstortype().

File:

• libcaca/trunk/caca/caca_conio.c (modified) (9 diffs)

libcaca/trunk/caca/caca_conio.c

@@ -37 +37 @@
 static int unget_ch = -1;
 static int kbhit_ch = -1;
-static char pass_buffer[BUFSIZ];
-static char cgets_buffer[BUFSIZ];
+static char pass_buffer[8 + 1];
 
 static void conio_init(void);
@@ -44 +43 @@
 static void conio_fini(void);
 
-int caca_conio_directvideo;
-int caca_conio__wscroll;
+int caca_conio_directvideo = 0;
+int caca_conio__wscroll = 1;
 
 /** \brief DOS conio.h cgets() equivalent */
 char * caca_conio_cgets(char *str)
 {
-    conio_init();
-
-    /* TODO: implement this function */
-    cgets_buffer[0] = '\0';
-
-    return cgets_buffer;
+    int len = ((uint8_t *)str)[0];
+    int pos = 0;
+
+    conio_init();
+
+    while (pos < len)
+    {
+        int ch = caca_conio_getch();
+        if (ch == '\n' || ch == '\r')
+            break;
+        str[2 + pos] = (char)(uint8_t)ch;
+        /* FIXME: handle scrolling */
+        caca_put_char(cv, caca_wherex(cv), caca_wherey(cv), ch);
+        caca_gotoxy(cv, caca_wherex(cv) + 1, caca_wherey(cv));
+        pos++;
+    }
+
+    str[2 + pos] = '\0';
+    str[1] = (char)(uint8_t)pos;
+
+    conio_refresh();
+
+    return str + 2;
 }
 
@@ -75 +91 @@
     conio_init();
 
+    /* FIXME: must work within the currently active text window */
     caca_clear_canvas(cv);
     caca_gotoxy(cv, 0, 0);
@@ -89 +106 @@
     conio_init();
 
+    /* FIXME: handle scrolling */
     va_start(args, format);
     ret = caca_vprintf(cv, caca_wherex(cv), caca_wherey(cv), format, args);
@@ -103 +121 @@
 int caca_conio_cputs(const char *str)
 {
-    conio_init();
-
-    /* TODO: implement this function */
-
-    return 0;
-}
-
-/** \brief DOS conio.h cscanf() equivalent */
+    int ch;
+
+    conio_init();
+
+    while ((ch = (uint8_t)*str++))
+    {
+        /* FIXME: handle windows, scrolling, '\n' and '\r' */
+        caca_put_char(cv, caca_wherex(cv), caca_wherey(cv), ch);
+        caca_gotoxy(cv, caca_wherex(cv) + 1, caca_wherey(cv));
+    }
+
+    conio_refresh();
+
+    return ch;
+}
+
+/** \brief DOS stdio.h cscanf() equivalent */
 int caca_conio_cscanf(char *format, ...)
 {
@@ -198 +225 @@
 char * caca_conio_getpass(const char *prompt)
 {
-    conio_init();
-
-    /* TODO: implement this function */
-    pass_buffer[0] = '\0';
+    int pos = 0;
+
+    conio_init();
+
+    while (pos < 8)
+    {
+        int ch = caca_conio_getch();
+        if (ch == '\n' || ch == '\r')
+            break;
+        pass_buffer[pos] = (char)(uint8_t)ch;
+        pos++;
+    }
+
+    pass_buffer[pos] = '\0';
+
+    conio_refresh();
 
     return pass_buffer;
@@ -296 +335 @@
                         int destleft, int desttop)
 {
-    conio_init();
-
-    /* TODO: implement this function */
-
-    return 0;
+    caca_canvas_t *tmp;
+
+    conio_init();
+
+    if (left < 1 || top < 1 || left > right || top > bottom
+         || destleft < 1 || desttop < 1 || destleft > right
+         || desttop > bottom || right > caca_get_canvas_width(cv)
+         || bottom > caca_get_canvas_width(cv))
+        return 0;
+
+    tmp = caca_create_canvas(right - left + 1, bottom - top + 1);
+    caca_blit(tmp, 1 - left, 1 - top, cv, NULL);
+    caca_blit(cv, destleft - 1, desttop - 1, tmp, NULL);
+
+    conio_refresh();
+
+    return 1;
 }
 
@@ -343 +394 @@
     conio_init();
 
-    /* TODO: implement this function */
-
-    return 0;
+    /* FIXME: handle scrolling, windows */
+    caca_put_char(cv, caca_wherex(cv), caca_wherey(cv), ch);
+    caca_gotoxy(cv, caca_wherex(cv) + 1, caca_wherey(cv));
+
+    return ch;
 }
 
@@ -363 +416 @@
     conio_init();
 
-    /* TODO: implement this function */
+    switch(cur_t)
+    {
+        case CACA_CONIO__NOCURSOR:
+            caca_set_cursor(dp, 0);
+            break;
+        case CACA_CONIO__SOLIDCURSOR:
+        case CACA_CONIO__NORMALCURSOR:
+            caca_set_cursor(dp, 1);
+            break;
+    }
+
+    conio_refresh();
 }