vte: handle keyboard input (stub)

Make the vte subsystem handle the keyboard input instead of doing this
inside of test_terminal.

The handling is just a stub function. No actual keys are parsed yet.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>

diff --git a/src/terminal.c b/src/terminal.c
index f7789f4..829b0cd 100644 (file)
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -112,7 +112,8 @@ static void pty_input(struct kmscon_pty *pty, char *u8, size_t len, void *data)
        struct kmscon_terminal *term = data;
 
        if (!len) {
-               kmscon_terminal_close(term);
+               if (term->closed_cb)
+                       term->closed_cb(term, term->closed_data);
        } else {
                /* FIXME: UTF-8. */
                for (i=0; i < len; i++)
@@ -125,7 +126,7 @@ static void pty_input(struct kmscon_pty *pty, char *u8, size_t len, void *data)
 
 int kmscon_terminal_new(struct kmscon_terminal **out,
                struct kmscon_eloop *loop, struct kmscon_font_factory *ff,
-                                       struct kmscon_compositor *comp)
+               struct kmscon_compositor *comp, struct kmscon_symbol_table *st)
 {
        struct kmscon_terminal *term;
        int ret;
@@ -152,7 +153,7 @@ int kmscon_terminal_new(struct kmscon_terminal **out,
        if (ret)
                goto err_idle;
 
-       ret = kmscon_vte_new(&term->vte);
+       ret = kmscon_vte_new(&term->vte, st);
        if (ret)
                goto err_con;
        kmscon_vte_bind(term->vte, term->console);
@@ -194,7 +195,6 @@ void kmscon_terminal_unref(struct kmscon_terminal *term)
        if (--term->ref)
                return;
 
-       term->closed_cb = NULL;
        kmscon_terminal_close(term);
        kmscon_terminal_rm_all_outputs(term);
        kmscon_pty_unref(term->pty);
@@ -229,21 +229,12 @@ int kmscon_terminal_open(struct kmscon_terminal *term,
 
 void kmscon_terminal_close(struct kmscon_terminal *term)
 {
-       kmscon_terminal_closed_cb cb;
-       void *data;
-
        if (!term)
                return;
 
-       cb = term->closed_cb;
-       data = term->closed_data;
+       kmscon_pty_close(term->pty);
        term->closed_data = NULL;
        term->closed_cb = NULL;
-
-       kmscon_pty_close(term->pty);
-
-       if (cb)
-               cb(term, data);
 }
 
 int kmscon_terminal_add_output(struct kmscon_terminal *term,
@@ -298,14 +289,27 @@ void kmscon_terminal_rm_all_outputs(struct kmscon_terminal *term)
        }
 }
 
-void kmscon_terminal_input(struct kmscon_terminal *term, kmscon_symbol_t ch)
+int kmscon_terminal_input(struct kmscon_terminal *term,
+                                       const struct kmscon_input_event *ev)
 {
        int ret;
+       const char *u8;
+       size_t len;
 
-       /* FIXME: UTF-8. */
-       if (ch < 128) {
-               ret = kmscon_pty_write(term->pty, (char *)&ch, 1);
-               if (ret)
-                       kmscon_terminal_close(term);
+       if (!term || !ev)
+               return -EINVAL;
+
+       ret = kmscon_vte_handle_keyboard(term->vte, ev, &u8, &len);
+       switch (ret) {
+               case KMSCON_VTE_SEND:
+                       ret = kmscon_pty_write(term->pty, u8, len);
+                       if (ret)
+                               return ret;
+                       break;
+               case KMSCON_VTE_DROP:
+               default:
+                       break;
        }
+
+       return 0;
 }

diff --git a/src/terminal.h b/src/terminal.h
index 34a2c19..3dfac7f 100644 (file)
--- a/src/terminal.h
+++ b/src/terminal.h
@@ -47,7 +47,7 @@ typedef void (*kmscon_terminal_closed_cb) (struct kmscon_terminal *term,
 
 int kmscon_terminal_new(struct kmscon_terminal **out,
                struct kmscon_eloop *loop, struct kmscon_font_factory *ff,
-                                       struct kmscon_compositor *comp);
+               struct kmscon_compositor *comp, struct kmscon_symbol_table *st);
 void kmscon_terminal_ref(struct kmscon_terminal *term);
 void kmscon_terminal_unref(struct kmscon_terminal *term);
 
@@ -59,6 +59,7 @@ int kmscon_terminal_add_output(struct kmscon_terminal *term,
                                                struct kmscon_output *output);
 void kmscon_terminal_rm_all_outputs(struct kmscon_terminal *term);
 
-void kmscon_terminal_input(struct kmscon_terminal *term, kmscon_symbol_t ch);
+int kmscon_terminal_input(struct kmscon_terminal *term,
+                                       const struct kmscon_input_event *ev);
 
 #endif /* KMSCON_TERMINAL_H */

diff --git a/src/vte.c b/src/vte.c
index 105e501..8249cba 100644 (file)
--- a/src/vte.c
+++ b/src/vte.c
@@ -35,16 +35,20 @@
 #include <string.h>
 
 #include "console.h"
+#include "input.h"
 #include "log.h"
 #include "unicode.h"
 #include "vte.h"
 
 struct kmscon_vte {
        unsigned long ref;
+       struct kmscon_symbol_table *st;
        struct kmscon_console *con;
+
+       const char *kbd_sym;
 };
 
-int kmscon_vte_new(struct kmscon_vte **out)
+int kmscon_vte_new(struct kmscon_vte **out, struct kmscon_symbol_table *st)
 {
        struct kmscon_vte *vte;
 
@@ -59,7 +63,9 @@ int kmscon_vte_new(struct kmscon_vte **out)
 
        memset(vte, 0, sizeof(*vte));
        vte->ref = 1;
+       vte->st = st;
 
+       kmscon_symbol_table_ref(vte->st);
        *out = vte;
        return 0;
 }
@@ -81,6 +87,8 @@ void kmscon_vte_unref(struct kmscon_vte *vte)
                return;
 
        kmscon_console_unref(vte->con);
+       kmscon_symbol_free_u8(vte->kbd_sym);
+       kmscon_symbol_table_unref(vte->st);
        free(vte);
        log_debug("vte: destroying vte object\n");
 }
@@ -105,3 +113,19 @@ void kmscon_vte_input(struct kmscon_vte *vte, kmscon_symbol_t ch)
        else
                kmscon_console_write(vte->con, ch);
 }
+
+int kmscon_vte_handle_keyboard(struct kmscon_vte *vte,
+       const struct kmscon_input_event *ev, const char **u8, size_t *len)
+{
+       kmscon_symbol_t sym;
+
+       if (ev->unicode != KMSCON_INPUT_INVALID) {
+               kmscon_symbol_free_u8(vte->kbd_sym);
+               sym = kmscon_symbol_make(ev->unicode);
+               vte->kbd_sym = kmscon_symbol_get_u8(vte->st, sym, len);
+               *u8 = vte->kbd_sym;
+               return KMSCON_VTE_SEND;
+       } else {
+               return KMSCON_VTE_DROP;
+       }
+}

diff --git a/src/vte.h b/src/vte.h
index 1d82752..44bda3b 100644 (file)
--- a/src/vte.h
+++ b/src/vte.h
@@ -35,15 +35,23 @@
 
 #include <stdlib.h>
 #include "console.h"
+#include "input.h"
 #include "unicode.h"
 
 struct kmscon_vte;
 
-int kmscon_vte_new(struct kmscon_vte **out);
+enum kmscon_vte_keyboard_action {
+       KMSCON_VTE_DROP,
+       KMSCON_VTE_SEND,
+};
+
+int kmscon_vte_new(struct kmscon_vte **out, struct kmscon_symbol_table *st);
 void kmscon_vte_ref(struct kmscon_vte *vte);
 void kmscon_vte_unref(struct kmscon_vte *vte);
 
 void kmscon_vte_bind(struct kmscon_vte *vte, struct kmscon_console *con);
 void kmscon_vte_input(struct kmscon_vte *vte, kmscon_symbol_t ch);
+int kmscon_vte_handle_keyboard(struct kmscon_vte *vte,
+       const struct kmscon_input_event *ev, const char **u8, size_t *len);
 
 #endif /* KMSCON_VTE_H */

diff --git a/tests/test_terminal.c b/tests/test_terminal.c
index d94cf3b..4a7754a 100644 (file)
--- a/tests/test_terminal.c
+++ b/tests/test_terminal.c
@@ -98,26 +98,7 @@ static void sig_chld(struct kmscon_signal *sig, int signum, void *data)
 
 static void terminal_closed(struct kmscon_terminal *term, void *data)
 {
-#if 0
-       /*
-        * Alternativly, we could spwan a new login/shell here, like what
-        * happens when the user exits the shell in a linux console:
-        */
-
-       int ret;
-       struct app *app = data;
-
-       if (!app)
-               goto err_out;
-
-       ret = kmscon_terminal_open(app->term, terminal_closed, app);
-       if (ret)
-               goto err_out;
-
-       return;
-
-err_out:
-#endif
+       kmscon_terminal_close(term);
        terminate = 1;
 }
 
@@ -125,13 +106,13 @@ static void read_input(struct kmscon_input *input,
                                struct kmscon_input_event *ev, void *data)
 {
        struct app *app = data;
-       kmscon_symbol_t ch;
-
-       if (ev->unicode == KMSCON_INPUT_INVALID)
-               return;
+       int ret;
 
-       ch = kmscon_symbol_make(ev->unicode);
-       kmscon_terminal_input(app->term, ch);
+       ret = kmscon_terminal_input(app->term, ev);
+       if (ret) {
+               kmscon_terminal_close(app->term);
+               terminate = 1;
+       }
 }
 
 static void activate_outputs(struct app *app)
@@ -246,7 +227,8 @@ static int setup_app(struct app *app)
        if (ret)
                goto err_loop;
 
-       ret = kmscon_terminal_new(&app->term, app->eloop, app->ff, app->comp);
+       ret = kmscon_terminal_new(&app->term, app->eloop, app->ff,
+                                                       app->comp, app->st);
        if (ret)
                goto err_loop;