X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/d9b82f8c1a43054489b827bba957c9894a3e1c38..33e49b2e6d599bc56326841b5b373b9f76adc5f7:/net/rfb.c

diff --git a/net/rfb.c b/net/rfb.c
index 232a2bb..276f724 100644
--- a/net/rfb.c
+++ b/net/rfb.c
@@ -2,8 +2,7 @@
 #include <minilib.h>
 #include <output.h>
 #include <fb.h>
-
-#include "../aseg-paging/keyboard.h"
+#include <keyboard.h>
 
 #include "lwip/tcp.h"
 #include "lwip/stats.h"
@@ -94,7 +93,7 @@ struct update_header {
 
 struct rfb_state {
 	enum {
-		ST_BEGIN,
+		ST_BEGIN = 0,
 		ST_CLIENTINIT,
 		ST_MAIN
 	} state;
@@ -111,7 +110,7 @@ struct rfb_state {
 	struct fb_update_req client_interest_area;
 
 	enum {
-		SST_IDLE,
+		SST_IDLE = 0,
 		SST_HEADER,
 		SST_DATA
 	} send_state;
@@ -126,8 +125,11 @@ struct rfb_state {
 	uint32_t chunk_height;
 
 	uint32_t chunk_lindex;
+	
+	uint32_t chunk_checksum;
 
-	uint32_t chunk_actually_sent;
+	int chunk_actually_sent;
+	int try_in_a_bit;
 };
 
 static struct server_init_message server_info;
@@ -177,7 +179,7 @@ static int advance_chunk(struct rfb_state *state) {
 		state->chunk_ynum = 0;
 		state->send_state = SST_IDLE;
 		if (!(state->chunk_actually_sent))
-			state->update_requested = 1;
+			state->try_in_a_bit = 2;
 			return 1;
 	}
 
@@ -188,7 +190,6 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
 	struct update_header hdr;
 	int lines_left;
 	unsigned char * lptr;
-	uint32_t checksum;
 	int totaldim;
 	err_t err;
 
@@ -236,24 +237,17 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
 				state->chunk_height -= (totaldim - fb->curmode.yres);
 			}
 
-			outputf("rfb send: (%d [%d], %d [%d]) %d x %d",
-				state->chunk_xnum, state->chunk_xpos,
-				state->chunk_ynum, state->chunk_ypos,
-				state->chunk_width, state->chunk_height);
-
 			/* Do we _actually_ need to send this chunk? */
 			if (fb->checksum_rect) {
-				checksum = fb->checksum_rect(state->chunk_xpos, state->chunk_ypos,
-						     state->chunk_width, state->chunk_height);
+				state->chunk_checksum = fb->checksum_rect(state->chunk_xpos, state->chunk_ypos,
+								state->chunk_width, state->chunk_height);
 
-				if (checksum == state->checksums[state->chunk_xnum][state->chunk_ynum]) {
-					outputf("!!!!!!! SKIPPING: %08x", checksum);
+				if (state->chunk_checksum == state->checksums[state->chunk_xnum][state->chunk_ynum]) {
 					if (advance_chunk(state))
 						return;
 					continue;
-				} else {
-					state->checksums[state->chunk_xnum][state->chunk_ynum] = checksum;
 				}
+				/* Checksum gets set in data block, AFTER the data has been sent. */
 			}
 
 			outputf("actually sent");
@@ -290,6 +284,7 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
 
 			if (lines_left == 0) {
 				state->send_state = SST_HEADER;
+				state->checksums[state->chunk_xnum][state->chunk_ynum] = state->chunk_checksum;
 				if (advance_chunk(state))
 					return;
 				break;
@@ -333,6 +328,12 @@ static err_t rfb_sent(void *arg, struct tcp_pcb *pcb, uint16_t len) {
 static err_t rfb_poll(void *arg, struct tcp_pcb *pcb) {
 	struct rfb_state *state = arg;
 	send_fsm(pcb, state);
+	if (state->try_in_a_bit) {
+		state->try_in_a_bit--;
+		if (!(state->try_in_a_bit)) {
+			state->update_requested = 1;
+		}
+	}
 /*
 	stats_display();
 */
@@ -589,12 +590,10 @@ static err_t rfb_accept(void *arg, struct tcp_pcb *pcb, err_t err) {
 
 	state = (struct rfb_state *)mem_malloc(sizeof(struct rfb_state));
 
+	memset(state, 0, sizeof(struct rfb_state));
+
 	state->state = ST_BEGIN;
-	state->readpos = 0;
-	state->writepos = 0;
-	state->update_requested = 0;
 	state->send_state = SST_IDLE;
-	memset(state->checksums, 0, sizeof(state->checksums));
 
 	/* XXX: update_server_info() should be called from the 64ms timer, and deal
 	 * with screen resizes appropriately. */