From 9b4c6c5542ca8e684aed3680d1c5ca4499d8ea4b Mon Sep 17 00:00:00 2001
From: David Herrmann <dh.herrmann@googlemail.com>
Date: Sat, 28 Jan 2012 13:45:06 +0100
Subject: [PATCH] pty: move output_cb to input_cb

The output_cb handles output from the pty but it actually makes more
sense to call it input_cb as we are handling input to our console here.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
---
 src/pty.c      | 18 +++++++++---------
 src/pty.h      |  2 +-
 src/terminal.c |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/pty.c b/src/pty.c
index 76a0e8b..744fe81 100644
--- a/src/pty.c
+++ b/src/pty.c
@@ -47,14 +47,14 @@ struct kmscon_pty {
 	int fd;
 	struct kmscon_fd *efd;
 
-	kmscon_pty_output_cb output_cb;
-	void *output_data;
+	kmscon_pty_input_cb input_cb;
+	void *data;
 
 	kmscon_pty_closed_cb closed_cb;
 	void *closed_data;
 };
 
-int kmscon_pty_new(struct kmscon_pty **out, kmscon_pty_output_cb output_cb,
+int kmscon_pty_new(struct kmscon_pty **out, kmscon_pty_input_cb input_cb,
 								void *data)
 {
 	struct kmscon_pty *pty;
@@ -71,8 +71,8 @@ int kmscon_pty_new(struct kmscon_pty **out, kmscon_pty_output_cb output_cb,
 	memset(pty, 0, sizeof(*pty));
 	pty->fd = -1;
 	pty->ref = 1;
-	pty->output_cb = output_cb;
-	pty->output_data = data;
+	pty->input_cb = input_cb;
+	pty->data = data;
 
 	*out = pty;
 	return 0;
@@ -243,7 +243,7 @@ err_master:
 	return ret;
 }
 
-static void pty_output(struct kmscon_fd *fd, int mask, void *data)
+static void pty_input(struct kmscon_fd *fd, int mask, void *data)
 {
 	int ret, nread;
 	ssize_t len;
@@ -286,8 +286,8 @@ static void pty_output(struct kmscon_fd *fd, int mask, void *data)
 		return;
 	}
 
-	if (pty->output_cb)
-		pty->output_cb(pty, u8, len, pty->output_data);
+	if (pty->input_cb)
+		pty->input_cb(pty, u8, len, pty->data);
 }
 
 static int connect_eloop(struct kmscon_pty *pty, struct kmscon_eloop *eloop)
@@ -298,7 +298,7 @@ static int connect_eloop(struct kmscon_pty *pty, struct kmscon_eloop *eloop)
 		return -EALREADY;
 
 	ret = kmscon_eloop_new_fd(eloop, &pty->efd, pty->fd,
-					KMSCON_READABLE, pty_output, pty);
+					KMSCON_READABLE, pty_input, pty);
 	if (ret)
 		return ret;
 
diff --git a/src/pty.h b/src/pty.h
index 148e455..302d2e8 100644
--- a/src/pty.h
+++ b/src/pty.h
@@ -47,7 +47,7 @@
 
 struct kmscon_pty;
 
-typedef void (*kmscon_pty_output_cb)
+typedef void (*kmscon_pty_input_cb)
 		(struct kmscon_pty *pty, char *u8, size_t len, void *data);
 typedef void (*kmscon_pty_closed_cb) (struct kmscon_pty *pty, void *data);
 
diff --git a/src/terminal.c b/src/terminal.c
index 4652456..da4b39d 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -106,7 +106,7 @@ static void schedule_redraw(struct kmscon_terminal *term)
 		log_warn("terminal: cannot schedule redraw\n");
 }
 
-static void pty_output(struct kmscon_pty *pty, char *u8, size_t len, void *data)
+static void pty_input(struct kmscon_pty *pty, char *u8, size_t len, void *data)
 {
 	size_t i;
 	struct kmscon_terminal *term = data;
@@ -151,7 +151,7 @@ int kmscon_terminal_new(struct kmscon_terminal **out,
 		goto err_con;
 	kmscon_vte_bind(term->vte, term->console);
 
-	ret = kmscon_pty_new(&term->pty, pty_output, term);
+	ret = kmscon_pty_new(&term->pty, pty_input, term);
 	if (ret)
 		goto err_vte;