X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=aed5ff7befdcbdec665b3cfea0f344ea00321e94;hp=9951df3a4116416168270c90af1ad58b4a36432d;hb=d3e5eadbdcce508c48258b15664baa753ce6fc81;hpb=4341aeae5ace4f8137334d6e8fa885d546fd3216

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 9951df3..aed5ff7 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -230,6 +230,10 @@ struct nc_scr *cui_set_current(struct cui *cui, struct nc_scr *scr)
 	return old;
 }
 
+/**
+ * cui_process_key - Process input on stdin.
+ */
+
 static int cui_process_key(void *arg)
 {
 	struct cui *cui = cui_from_arg(arg);
@@ -242,6 +246,24 @@ static int cui_process_key(void *arg)
 	return 0;
 }
 
+/**
+ * cui_process_js - Process joystick events.
+ */
+
+static int cui_process_js(void *arg)
+{
+	struct cui *cui = cui_from_arg(arg);
+	int c;
+
+	c = pjs_process_event(cui->pjs);
+
+	if (c) {
+		ungetch(c);
+		cui_process_key(arg);
+	}
+
+	return 0;
+}
 /**
  * cui_client_process_socket - Process a socket event from the discover server.
  */
@@ -511,7 +533,8 @@ static struct discover_client_ops cui_client_ops = {
  */
 
 struct cui *cui_init(void* platform_info,
-	int (*on_kexec)(struct cui *, struct cui_opt_data *))
+	int (*on_kexec)(struct cui *, struct cui_opt_data *),
+	int (*js_map)(const struct js_event *e))
 {
 	struct cui *cui;
 	struct discover_client *client;
@@ -557,6 +580,15 @@ struct cui *cui_init(void* platform_info,
 
 	waiter_register(STDIN_FILENO, WAIT_IN, cui_process_key, cui);
 
+	if (js_map) {
+
+		cui->pjs = pjs_init(cui, js_map);
+
+		if (cui->pjs)
+			waiter_register(pjs_get_fd(cui->pjs), WAIT_IN,
+				cui_process_js, cui);
+	}
+
 	return cui;
 
 fail_client_init: