[src/trunk]: src/sys/arch/usermode/dev implement cngetc and cnpollc

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/daaec25aa8d8
branches:  trunk
changeset: 772449:daaec25aa8d8
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed Jan 04 14:53:57 2012 +0000

description:
implement cngetc and cnpollc

diffstat:

 sys/arch/usermode/dev/vncfb.c |  22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diffs (48 lines):

diff -r 898e0b1430f3 -r daaec25aa8d8 sys/arch/usermode/dev/vncfb.c
--- a/sys/arch/usermode/dev/vncfb.c     Wed Jan 04 14:31:17 2012 +0000
+++ b/sys/arch/usermode/dev/vncfb.c     Wed Jan 04 14:53:57 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vncfb.c,v 1.11 2012/01/02 00:20:30 jmcneill Exp $ */
+/* $NetBSD: vncfb.c,v 1.12 2012/01/04 14:53:57 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -35,7 +35,7 @@
 #include "opt_wsemul.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vncfb.c,v 1.11 2012/01/02 00:20:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vncfb.c,v 1.12 2012/01/04 14:53:57 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -651,11 +651,29 @@
 static void
 vncfb_kbd_cngetc(void *priv, u_int *type, int *data)
 {
+       struct vncfb_softc *sc = priv;
+       thunk_rfb_event_t event;
+
+       for (;;) {
+               if (thunk_rfb_poll(&sc->sc_rfb, &event) > 0) {
+                       if (event.message_type == THUNK_RFB_KEY_EVENT) {
+                               *type = event.data.key_event.down_flag ?
+                                   WSCONS_EVENT_KEY_DOWN : WSCONS_EVENT_KEY_UP;
+                               *data = event.data.key_event.keysym & 0xfff;
+                               return;
+                       }
+               }
+       }
 }
 
 static void
 vncfb_kbd_cnpollc(void *priv, int on)
 {
+       struct vncfb_softc *sc = priv;
+
+       if (!on) {
+               vncfb_intr(sc);
+       }
 }
 
 static void