wlt: terminal: add TSM and PTY objects

Create TSM screens and VTE objects plus a PTY and connect everything so we
have a working terminal. Keyboard input still needs to be hooked up and
the drawing functions aren't implemented, yet.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann committed 2012-09-26 21:39:15 +02:00
1 parent 27fa6c3310
commit 6e5eb4f92f
2 files changed
+76 -2

No files matched your search

+3 -1
View File
@@ -422,7 +422,9 @@ wlterm_SOURCES = \
src/log.h \
src/log.c \
src/conf.h \
src/conf.c
src/conf.c \
src/pty.h \
src/pty.c
wlterm_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(WAYLAND_CFLAGS)
+73 -1
View File
@@ -30,7 +30,9 @@
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include "eloop.h"
#include "log.h"
#include "pty.h"
#include "tsm_unicode.h"
#include "tsm_screen.h"
#include "tsm_vte.h"
@@ -39,9 +41,15 @@
#define LOG_SUBSYSTEM "wlt_terminal"
struct wlt_terminal {
struct ev_eloop *eloop;
struct wlt_window *wnd;
struct wlt_widget *widget;
struct wlt_shm_buffer buffer;
struct tsm_screen *scr;
struct tsm_vte *vte;
struct kmscon_pty *pty;
struct ev_fd *pty_fd;
};
static void widget_redraw(struct wlt_widget *widget, void *data)
@@ -72,10 +80,41 @@ static void widget_resize(struct wlt_widget *widget, struct wlt_rect *alloc,
alloc->height = 0;
}
static void vte_event(struct tsm_vte *vte, const char *u8, size_t len,
void *data)
{
struct wlt_terminal *term = data;
kmscon_pty_write(term->pty, u8, len);
}
static void pty_input(struct kmscon_pty *pty, const char *u8, size_t len,
void *data)
{
struct wlt_terminal *term = data;
if (!len) {
log_debug("hangup on PTY");
/* TODO: signal that to caller */
} else {
tsm_vte_input(term->vte, u8, len);
wlt_window_schedule_redraw(term->wnd);
}
}
static void pty_event(struct ev_fd *fd, int mask, void *data)
{
struct wlt_terminal *term = data;
kmscon_pty_dispatch(term->pty);
}
static void widget_destroy(struct wlt_widget *widget, void *data)
{
struct wlt_terminal *term = data;
tsm_vte_unref(term->vte);
tsm_screen_unref(term->scr);
free(term);
}
@@ -92,11 +131,36 @@ int wlt_terminal_new(struct wlt_terminal **out, struct wlt_window *wnd)
return -ENOMEM;
memset(term, 0, sizeof(*term));
term->wnd = wnd;
term->eloop = wlt_window_get_eloop(wnd);
ret = tsm_screen_new(&term->scr, NULL);
if (ret) {
log_error("cannot create tsm-screen object");
goto err_free;
}
ret = tsm_vte_new(&term->vte, term->scr, vte_event, term, NULL);
if (ret) {
log_error("cannot create tsm-vte object");
goto err_scr;
}
ret = kmscon_pty_new(&term->pty, pty_input, term);
if (ret) {
log_error("cannot create pty object");
goto err_vte;
}
ret = ev_eloop_new_fd(term->eloop, &term->pty_fd,
kmscon_pty_get_fd(term->pty),
EV_READABLE, pty_event, term);
if (ret)
goto err_pty;
ret = wlt_window_create_widget(wnd, &term->widget, term);
if (ret) {
log_error("cannot create terminal widget");
goto err_free;
goto err_pty_fd;
}
wlt_widget_set_destroy_cb(term->widget, widget_destroy);
@@ -105,6 +169,14 @@ int wlt_terminal_new(struct wlt_terminal **out, struct wlt_window *wnd)
*out = term;
return 0;
err_pty_fd:
ev_eloop_rm_fd(term->pty_fd);
err_pty:
kmscon_pty_unref(term->pty);
err_vte:
tsm_vte_unref(term->vte);
err_scr:
tsm_screen_unref(term->scr);
err_free:
free(term);
return ret;