 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.h,v 1.52 2011/12/30 14:20:34 jmcneill Exp $ */
+/* $NetBSD: thunk.h,v 1.53 2011/12/30 20:08:00 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.
 @@ -177,26 +177,31 @@ typedef enum {
 	THUNK_RFB_FRAMEBUFFER_UPDATE_REQUEST = 3,
 	THUNK_RFB_KEY_EVENT = 4,
 	THUNK_RFB_POINTER_EVENT = 5,
 	THUNK_RFB_CLIENT_CUT_TEXT = 6,
 } thunk_rfb_message_t;
 typedef struct {
 	thunk_rfb_message_t	message_type;
 	union {
 		struct {
 			uint8_t		down_flag;
 			uint32_t	keysym;
 		} key_event;
 		struct {
 			uint8_t		button_mask;
 			uint16_t	absx;
 			uint16_t	absy;
 		} pointer_event;
 	} data;
 } thunk_rfb_event_t;
 typedef struct {
 	uint8_t			enc;
 	uint16_t		x, y, w, h;
 	uint16_t		srcx, srcy;
 	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 */

 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.c,v 1.66 2011/12/30 14:20:34 jmcneill Exp $ */
+/* $NetBSD: thunk.c,v 1.67 2011/12/30 20:08:00 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.66 2011/12/30 14:20:34 jmcneill Exp $");
+__RCSID("$NetBSD: thunk.c,v 1.67 2011/12/30 20:08:00 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>
 @@ -1206,27 +1206,40 @@ thunk_rfb_poll(thunk_rfb_t *rfb, thunk_r
 	case THUNK_RFB_KEY_EVENT:
 		recv(rfb->clientfd, key_event, sizeof(key_event), MSG_NOSIGNAL);
 		event->data.key_event.down_flag = key_event[0];
 		event->data.key_event.keysym =
 		    ntohl(*(uint32_t *)&key_event[3]);
 #ifdef RFB_DEBUG
 		fprintf(stdout, "rfb: key %04x %s\n",
 		    event->data.key_event.keysym,
 		    event->data.key_event.down_flag ? "pressed" : "released");
 #endif
 		msg_len = 0;
 		break;
 	case THUNK_RFB_POINTER_EVENT:
-		msg_len = sizeof(pointer_event);
+		recv(rfb->clientfd, pointer_event, sizeof(pointer_event),
 		    MSG_NOSIGNAL);
 		event->data.pointer_event.button_mask = pointer_event[0];
 		event->data.pointer_event.absx =
 		    ntohs(*(uint16_t *)&pointer_event[1]);
 		event->data.pointer_event.absy =
 		    ntohs(*(uint16_t *)&pointer_event[3]);
 #ifdef RFB_DEBUG
 		fprintf(stdout, "rfb: pointer mask %02x abs %dx%d\n",
 		    event->data.pointer_event.button_mask,
 		    event->data.pointer_event.absx,
 		    event->data.pointer_event.absy);
 #endif
 		msg_len = 0;
 		break;
 	case THUNK_RFB_CLIENT_CUT_TEXT:
 		recv(rfb->clientfd, client_cut_text, sizeof(client_cut_text),
 		    MSG_NOSIGNAL);
 		msg_len = ntohl(*(uint32_t *)&client_cut_text[3]);
 		break;
 	default:
 		fprintf(stdout, "rfb: unknown message type %d\n", ch);
 		close(rfb->clientfd);
 		rfb->clientfd = -1;
 		return -1;
+	}