 @@ -1,14 +1,14 @@
-/* $NetBSD: vncfb.c,v 1.6 2011/12/30 13:08:30 reinoud Exp $ */
+/* $NetBSD: vncfb.c,v 1.7 2011/12/30 14:20:33 jmcneill Exp $ */
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -25,27 +25,27 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "opt_wsemul.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vncfb.c,v 1.6 2011/12/30 13:08:30 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vncfb.c,v 1.7 2011/12/30 14:20:33 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wsfont/wsfont.h>
 #include <dev/rasops/rasops.h>
 #include <dev/wscons/wsdisplay_vconsvar.h>
 @@ -93,27 +93,28 @@ CFATTACH_DECL_NEW(vncfb, sizeof(struct v
 static void	vncfb_putchar(void *, int, int, u_int, long);
 static void	vncfb_copycols(void *, int, int, int, int);
 static void	vncfb_erasecols(void *, int, int, int, long);
 static void	vncfb_copyrows(void *, int, int, int);
 static void	vncfb_eraserows(void *, int, int, long);
 static void	vncfb_cursor(void *, int, int, int);
 static int	vncfb_ioctl(void *, void *, u_long, void *, int, lwp_t *);
 static paddr_t	vncfb_mmap(void *, void *, off_t, int);
 static void	vncfb_init_screen(void *, struct vcons_screen *, int, long *);
 static void	vncfb_update(struct vncfb_softc *, int, int, int, int);
-static void	vncfb_copyrect(struct vncfb_softc *sc, int, int, int, int, int, int);
+static void	vncfb_copyrect(struct vncfb_softc *, int, int, int, int, int, int);
 static void	vncfb_fillrect(struct vncfb_softc *, int, int, int, int, uint32_t);
 static int	vncfb_intr(void *);
 static void	vncfb_softintr(void *);
 static int	vncfb_kbd_enable(void *, int);
 static void	vncfb_kbd_set_leds(void *, int);
 static int	vncfb_kbd_ioctl(void *, u_long, void *, int, lwp_t *);
 static void	vncfb_kbd_cngetc(void *, u_int *, int *);
 static void	vncfb_kbd_cnpollc(void *, int);
 static void	vncfb_kbd_bell(void *, u_int, u_int, u_int);
 static struct vcons_screen vncfb_console_screen;
 @@ -321,79 +322,85 @@ vncfb_copycols(void *priv, int row, int
 		w = (srccol - dstcol) * ri->ri_font->fontwidth;
+	}
 	vncfb_update(sc, x, y, w, h);
+}
 static void
 vncfb_erasecols(void *priv, int row, int startcol, int ncols, long fillattr)
+{
 	struct rasops_info *ri = priv;
 	struct vcons_screen *scr = ri->ri_hw;
 	struct vncfb_softc *sc = scr->scr_cookie;
 	struct vncfb_fbops *ops = &sc->sc_ops;
-	int x, y, w, h;
+	int x, y, w, h, c;
 	ops->erasecols(ri, row, startcol, ncols, fillattr);
 	y = ri->ri_yorigin + (row * ri->ri_font->fontheight);
 	h = ri->ri_font->fontheight;
 	x = ri->ri_xorigin + (startcol * ri->ri_font->fontwidth);
 	w = ncols * ri->ri_font->fontwidth;
 	c = ri->ri_devcmap[(fillattr >> 16) & 0xf] & 0xffffff;
-	vncfb_update(sc, x, y, w, h);
+	vncfb_fillrect(sc, x, y, w, h, c);
+}
 static void
 vncfb_copyrows(void *priv, int srcrow, int dstrow, int nrows)
+{
 	struct rasops_info *ri = priv;
 	struct vcons_screen *scr = ri->ri_hw;
 	struct vncfb_softc *sc = scr->scr_cookie;
 	struct vncfb_fbops *ops = &sc->sc_ops;
 	int x, y, w, h, srcx, srcy;
 	int fontheight;
 	/* barrier */
 	while (sc->sc_rfb.nupdates > 0)
 		thunk_rfb_poll(&sc->sc_rfb, NULL);
 	ops->copyrows(ri, srcrow, dstrow, nrows);
 	fontheight = ri->ri_font->fontheight;
 	x = ri->ri_xorigin;
 	y = ri->ri_yorigin + dstrow * fontheight;
 	w = ri->ri_width;
 	h = nrows * fontheight;
 	srcx = ri->ri_xorigin;
 	srcy = ri->ri_yorigin + srcrow * fontheight;
 	vncfb_copyrect(sc, x, y, w, h, srcx, srcy);
+}
 static void
 vncfb_eraserows(void *priv, int row, int nrows, long fillattr)
+{
 	struct rasops_info *ri = priv;
 	struct vcons_screen *scr = ri->ri_hw;
 	struct vncfb_softc *sc = scr->scr_cookie;
 	struct vncfb_fbops *ops = &sc->sc_ops;
-	int x, y, w, h;
+	int x, y, w, h, c;
 	ops->eraserows(ri, row, nrows, fillattr);
 	y = ri->ri_yorigin + (row * ri->ri_font->fontheight);
 	h = nrows * ri->ri_font->fontheight;
 	x = ri->ri_xorigin;
 	w = ri->ri_width;
 	c = ri->ri_devcmap[(fillattr >> 16) & 0xf] & 0xffffff;
-	vncfb_update(sc, x, y, w, h);
+	vncfb_fillrect(sc, x, y, w, h, c);
+}
 static void
 vncfb_cursor(void *priv, int on, int row, int col)
+{
 	struct rasops_info *ri = priv;
 	struct vcons_screen *scr = ri->ri_hw;
 	struct vncfb_softc *sc = scr->scr_cookie;
 	struct vncfb_fbops *ops = &sc->sc_ops;
 	int ox, oy, x, y, w, h;
 	w = ri->ri_font->fontwidth;
 	h = ri->ri_font->fontheight;
 @@ -455,26 +462,34 @@ vncfb_update(struct vncfb_softc *sc, int
+{
 	thunk_rfb_update(&sc->sc_rfb, x, y, w, h);
 	softint_schedule(sc->sc_sih);
+}
 static void
 vncfb_copyrect(struct vncfb_softc *sc, int x, int y, int w, int h,
 	int srcx, int srcy)
+{
 	thunk_rfb_copyrect(&sc->sc_rfb, x, y, w, h, srcx, srcy);
 	softint_schedule(sc->sc_sih);
+}
 static void
 vncfb_fillrect(struct vncfb_softc *sc, int x, int y, int w, int h, uint32_t c)
+{
 	thunk_rfb_fillrect(&sc->sc_rfb, x, y, w, h, (uint8_t *)&c);
 	softint_schedule(sc->sc_sih);
+}
 static int
 vncfb_intr(void *priv)
+{
 	struct vncfb_softc *sc = priv;
 	softint_schedule(sc->sc_sih);
 	return 0;
+}
 static void
 vncfb_softintr(void *priv)
+{

 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.h,v 1.51 2011/12/30 12:54:41 jmcneill Exp $ */
+/* $NetBSD: thunk.h,v 1.52 2011/12/30 14:20:34 jmcneill Exp $ */
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -185,27 +185,27 @@ typedef struct {
 	union {
 		struct {
 			uint8_t		down_flag;
 			uint32_t	keysym;
 		} key_event;
 	} data;
 } thunk_rfb_event_t;
 typedef struct {
 	uint8_t			enc;
 	uint16_t		x, y, w, h;
 	uint16_t		srcx, srcy;
-	uint32_t		colour;		/* for RRE clear */
+	uint8_t			pixel[4];
 } thunk_rfb_update_t;
 #define THUNK_RFB_TYPE_RAW	0
 #define THUNK_RFB_TYPE_COPYRECT	1
 #define THUNK_RFB_TYPE_RRE	2		/* rectangle fill */
 #define THUNK_RFB_QUEUELEN	128
 typedef struct {
 	int			sockfd;
 	int			clientfd;
 	thunk_rfb_event_t	event;
 	bool			connected;
 @@ -217,15 +217,16 @@ typedef struct {
 	uint8_t			*framebuf;
 	bool			schedule_bell;
 	unsigned int		nupdates;
 	unsigned int		first_mergable;
 	thunk_rfb_update_t	update[THUNK_RFB_QUEUELEN];
 } thunk_rfb_t;
 int	thunk_rfb_open(thunk_rfb_t *, uint16_t);
 int	thunk_rfb_poll(thunk_rfb_t *, thunk_rfb_event_t *);
 void	thunk_rfb_bell(thunk_rfb_t *);
 void	thunk_rfb_update(thunk_rfb_t *, int, int, int, int);
 void	thunk_rfb_copyrect(thunk_rfb_t *, int, int, int, int, int, int);
 void	thunk_rfb_fillrect(thunk_rfb_t *, int, int, int, int, uint8_t *);
 #endif /* !_ARCH_USERMODE_INCLUDE_THUNK_H */

 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.c,v 1.65 2011/12/30 13:08:30 reinoud Exp $ */
+/* $NetBSD: thunk.c,v 1.66 2011/12/30 14:20:34 jmcneill Exp $ */
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __NetBSD__
-__RCSID("$NetBSD: thunk.c,v 1.65 2011/12/30 13:08:30 reinoud Exp $");
+__RCSID("$NetBSD: thunk.c,v 1.66 2011/12/30 14:20:34 jmcneill Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/reboot.h>
 #include <sys/poll.h>
 #include <sys/sysctl.h>
 #include <sys/socket.h>
 #include <sys/audioio.h>
 #include <sys/shm.h>
 #include <machine/vmparam.h>
 #include <net/if.h>
 @@ -993,26 +993,27 @@ thunk_rfb_send_pending(thunk_rfb_t *rfb)
 	thunk_rfb_update_t *update;
 	uint8_t buf[32];
 	uint8_t *p;
 	unsigned int n;
 	unsigned int bytes_per_pixel;
 	ssize_t stride, line_len, len;
 	if (rfb->connected == false || rfb->nupdates == 0)
 		return;
 	/* If we have too many updates queued, just send a single update */
 	if (rfb->nupdates >= __arraycount(rfb->update)) {
 		rfb->nupdates = 1;
 		rfb->update[0].enc = THUNK_RFB_TYPE_RAW;
 		rfb->update[0].x = 0;
 		rfb->update[0].y = 0;
 		rfb->update[0].w = rfb->width;
 		rfb->update[0].h = rfb->height;
+	}
 #ifdef RFB_DEBUG
 	fprintf(stdout, "rfb: sending %d updates\n", rfb->nupdates);
 #endif
 	p = buf;
 	*(uint8_t *)p = 0;		p += 1;		/* FramebufferUpdate */
 	*(uint8_t *)p = 0;		p += 1;		/* padding */
 @@ -1029,42 +1030,64 @@ thunk_rfb_send_pending(thunk_rfb_t *rfb)
 		update = &rfb->update[n];
 		*(uint16_t *)p = htons(update->x);	p += 2;
 		*(uint16_t *)p = htons(update->y);	p += 2;
 		*(uint16_t *)p = htons(update->w);	p += 2;
 		*(uint16_t *)p = htons(update->h);	p += 2;
 		*(uint32_t *)p = htonl(update->enc);	p += 4;	/* encoding */
 #ifdef RFB_DEBUG
 		fprintf(stdout, "rfb: [%u] enc %d, [%d, %d] - [%d, %d]",
 		    n, update->enc, update->x, update->y, update->w, update->h);
 		if (update->enc == THUNK_RFB_TYPE_COPYRECT)
 			fprintf(stdout, " from [%d, %d]",
 			    update->srcx, update->srcy);
 		if (update->enc == THUNK_RFB_TYPE_RRE)
 			fprintf(stdout, " pixel [%02x %02x %02x %02x]",
 			    update->pixel[0], update->pixel[1],
 			    update->pixel[2], update->pixel[3]);
 		fprintf(stdout, "\n");
 #endif
 		len = safe_send(rfb->clientfd, buf, 12);
 		if (len < 0)
 			goto disco;
 		if (update->enc == THUNK_RFB_TYPE_COPYRECT) {
 			p = buf;
 			*(uint16_t *)p = htons(update->srcx);	p += 2;
 			*(uint16_t *)p = htons(update->srcy);	p += 2;
 			len = safe_send(rfb->clientfd, buf, 4);
 			if (len < 0)
 				goto disco;
+		}
 		if (update->enc == THUNK_RFB_TYPE_RRE) {
 			p = buf;
 			/* header */
 			*(uint32_t *)p = htonl(1);		p += 4;
 			memcpy(p, update->pixel, 4);		p += 4;
 			/* subrectangle */
 			memcpy(p, update->pixel, 4);		p += 4;
 			*(uint16_t *)p = htons(update->x);	p += 2;
 			*(uint16_t *)p = htons(update->y);	p += 2;
 			*(uint16_t *)p = htons(update->w);	p += 2;
 			*(uint16_t *)p = htons(update->h);	p += 2;
 			/* send it */
 			len = safe_send(rfb->clientfd, buf, 20);
 			if (len < 0)
 				goto disco;
+		}
 		if (update->enc == THUNK_RFB_TYPE_RAW) {
 			p = rfb->framebuf + (update->y * stride)
 				+ (update->x * bytes_per_pixel);
 			line_len = update->w * bytes_per_pixel;
 			while (update->h-- > 0) {
 				len = safe_send(rfb->clientfd, p, line_len);
 				if (len < 0)
 					goto disco;
 				p += stride;
+			}
+		}
+	}
 @@ -1136,26 +1159,29 @@ thunk_rfb_poll(thunk_rfb_t *rfb, thunk_r
 			return -1;
+		}
 		rfb->schedule_bell = false;
 		rfb->nupdates = 0;
 		rfb->first_mergable = 0;
 		thunk_rfb_update(rfb, 0, 0, rfb->width, rfb->height);
+	}
 	thunk_rfb_send_pending(rfb);
 	if (rfb->clientfd == -1)
 		return -1;
 	if (event == NULL)
 		return 0;
 	if (rfb->schedule_bell) {
 		uint8_t msg_type = 2;	/* bell */
 		safe_send(rfb->clientfd, &msg_type, sizeof(msg_type));
 		rfb->schedule_bell = false;
+	}
 	error = ioctl(rfb->clientfd, FIONREAD, &len);
 	if (error) {
 		//printf("rfb: FIONREAD failed: %s\n", strerror(errno));
 		close(rfb->clientfd);
 		rfb->clientfd = -1;
 		return -1;
+	}
 @@ -1267,15 +1293,41 @@ thunk_rfb_copyrect(thunk_rfb_t *rfb, int
 	    rfb->nupdates, x, y, w, h);
 #endif
 	/* add the update request to the queue */
 	update = &rfb->update[rfb->nupdates++];
 	update->enc = THUNK_RFB_TYPE_COPYRECT;
 	update->x = x;
 	update->y = y;
 	update->w = w;
 	update->h = h;
 	update->srcx = srcx;
 	update->srcy = srcy;
-	rfb->first_mergable = rfb->nupdates+1;
+	rfb->first_mergable = rfb->nupdates;
+}
 void
 thunk_rfb_fillrect(thunk_rfb_t *rfb, int x, int y, int w, int h, uint8_t *pixel)
+{
 	thunk_rfb_update_t *update = NULL;
 	/* if the queue is full, just return */
 	if (rfb->nupdates >= __arraycount(rfb->update))
 		return;
 #ifdef RFB_DEBUG
 	fprintf(stdout, "rfb: fillrect queue slot %d, x=%d y=%d w=%d h=%d\n",
 	    rfb->nupdates, x, y, w, h);
 #endif
 	/* add the update request to the queue */
 	update = &rfb->update[rfb->nupdates++];
 	update->enc = THUNK_RFB_TYPE_RRE;
 	update->x = x;
 	update->y = y;
 	update->w = w;
 	update->h = h;
 	memcpy(update->pixel, pixel, 4);
 	rfb->first_mergable = rfb->nupdates;
+}