--- sourceforge.net/trunk/rdesktop/cache.c	2000/08/15 10:23:24	10
+++ sourceforge.net/trunk/rdesktop/cache.c	2002/09/26 14:26:46	207
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Cache routines
-   Copyright (C) Matthew Chapman 1999-2000
+   Copyright (C) Matthew Chapman 1999-2002
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,29 +27,29 @@
 static HBITMAP bmpcache[3][600];
 
 /* Retrieve a bitmap from the cache */
-HBITMAP cache_get_bitmap(uint8 cache_id, uint16 cache_idx)
+HBITMAP
+cache_get_bitmap(uint8 cache_id, uint16 cache_idx)
 {
 	HBITMAP bitmap;
 
-	if ((cache_id < NUM_ELEMENTS(bmpcache))
-			&& (cache_idx < NUM_ELEMENTS(bmpcache[0])))
+	if ((cache_id < NUM_ELEMENTS(bmpcache)) && (cache_idx < NUM_ELEMENTS(bmpcache[0])))
 	{
 		bitmap = bmpcache[cache_id][cache_idx];
 		if (bitmap != NULL)
 			return bitmap;
 	}
 
-	ERROR("get bitmap %d:%d\n", cache_id, cache_idx);
+	error("get bitmap %d:%d\n", cache_id, cache_idx);
 	return NULL;
 }
 
 /* Store a bitmap in the cache */
-void cache_put_bitmap(uint8 cache_id, uint16 cache_idx, HBITMAP bitmap)
+void
+cache_put_bitmap(uint8 cache_id, uint16 cache_idx, HBITMAP bitmap)
 {
 	HBITMAP old;
 
-	if ((cache_id < NUM_ELEMENTS(bmpcache))
-			&& (cache_idx < NUM_ELEMENTS(bmpcache[0])))
+	if ((cache_id < NUM_ELEMENTS(bmpcache)) && (cache_idx < NUM_ELEMENTS(bmpcache[0])))
 	{
 		old = bmpcache[cache_id][cache_idx];
 		if (old != NULL)
@@ -59,7 +59,7 @@
 	}
 	else
 	{
-		ERROR("put bitmap %d:%d\n", cache_id, cache_idx);
+		error("put bitmap %d:%d\n", cache_id, cache_idx);
 	}
 }
 
@@ -68,35 +68,36 @@
 static FONTGLYPH fontcache[12][256];
 
 /* Retrieve a glyph from the font cache */
-FONTGLYPH *cache_get_font(uint8 font, uint16 character)
+FONTGLYPH *
+cache_get_font(uint8 font, uint16 character)
 {
 	FONTGLYPH *glyph;
 
-	if ((font < NUM_ELEMENTS(fontcache))
-			&& (character < NUM_ELEMENTS(fontcache[0])))
+	if ((font < NUM_ELEMENTS(fontcache)) && (character < NUM_ELEMENTS(fontcache[0])))
 	{
 		glyph = &fontcache[font][character];
 		if (glyph->pixmap != NULL)
 			return glyph;
 	}
 
-	ERROR("get font %d:%d\n", font, character);
+	error("get font %d:%d\n", font, character);
 	return NULL;
 }
 
 /* Store a glyph in the font cache */
-void cache_put_font(uint8 font, uint32 character, uint16 baseline,
-		    uint16 width, uint16 height, HGLYPH pixmap)
+void
+cache_put_font(uint8 font, uint16 character, uint16 offset,
+	       uint16 baseline, uint16 width, uint16 height, HGLYPH pixmap)
 {
 	FONTGLYPH *glyph;
 
-	if ((font < NUM_ELEMENTS(fontcache))
-			&& (character < NUM_ELEMENTS(fontcache[0])))
+	if ((font < NUM_ELEMENTS(fontcache)) && (character < NUM_ELEMENTS(fontcache[0])))
 	{
 		glyph = &fontcache[font][character];
 		if (glyph->pixmap != NULL)
 			ui_destroy_glyph(glyph->pixmap);
 
+		glyph->offset = offset;
 		glyph->baseline = baseline;
 		glyph->width = width;
 		glyph->height = height;
@@ -104,7 +105,7 @@
 	}
 	else
 	{
-		ERROR("put font %d:%d\n", font, character);
+		error("put font %d:%d\n", font, character);
 	}
 }
 
@@ -113,7 +114,8 @@
 static DATABLOB textcache[256];
 
 /* Retrieve a text item from the cache */
-DATABLOB *cache_get_text(uint8 cache_id)
+DATABLOB *
+cache_get_text(uint8 cache_id)
 {
 	DATABLOB *text;
 
@@ -124,12 +126,13 @@
 			return text;
 	}
 
-	ERROR("get text %d\n", cache_id);
+	error("get text %d\n", cache_id);
 	return NULL;
 }
 
 /* Store a text item in the cache */
-void cache_put_text(uint8 cache_id, void *data, int length)
+void
+cache_put_text(uint8 cache_id, void *data, int length)
 {
 	DATABLOB *text;
 
@@ -145,36 +148,88 @@
 	}
 	else
 	{
-		ERROR("put text %d\n", cache_id);
+		error("put text %d\n", cache_id);
 	}
 }
 
 
 /* DESKTOP CACHE */
-static uint8 deskcache[0x38400];
+static uint8 deskcache[0x38400 * 4];
 
 /* Retrieve desktop data from the cache */
-uint8 *cache_get_desktop(uint32 offset, uint32 length)
+uint8 *
+cache_get_desktop(uint32 offset, int cx, int cy, int bytes_per_pixel)
 {
+	int length = cx * cy * bytes_per_pixel;
+
 	if ((offset + length) <= sizeof(deskcache))
 	{
 		return &deskcache[offset];
 	}
 
-	ERROR("get desktop %d:%d\n", offset, length);
+	error("get desktop %d:%d\n", offset, length);
 	return NULL;
 }
 
 /* Store desktop data in the cache */
-void cache_put_desktop(uint32 offset, uint32 length, uint8 *data)
+void
+cache_put_desktop(uint32 offset, int cx, int cy, int scanline, int bytes_per_pixel, uint8 * data)
 {
+	int length = cx * cy * bytes_per_pixel;
+
 	if ((offset + length) <= sizeof(deskcache))
 	{
-		memcpy(&deskcache[offset], data, length);
+		cx *= bytes_per_pixel;
+		while (cy--)
+		{
+			memcpy(&deskcache[offset], data, cx);
+			data += scanline;
+			offset += cx;
+		}
 	}
 	else
 	{
-		ERROR("put desktop %d:%d\n", offset, length);
+		error("put desktop %d:%d\n", offset, length);
 	}
 }
 
+
+/* CURSOR CACHE */
+static HCURSOR cursorcache[0x20];
+
+/* Retrieve cursor from cache */
+HCURSOR
+cache_get_cursor(uint16 cache_idx)
+{
+	HCURSOR cursor;
+
+	if (cache_idx < NUM_ELEMENTS(cursorcache))
+	{
+		cursor = cursorcache[cache_idx];
+		if (cursor != NULL)
+			return cursor;
+	}
+
+	error("get cursor %d\n", cache_idx);
+	return NULL;
+}
+
+/* Store cursor in cache */
+void
+cache_put_cursor(uint16 cache_idx, HCURSOR cursor)
+{
+	HCURSOR old;
+
+	if (cache_idx < NUM_ELEMENTS(cursorcache))
+	{
+		old = cursorcache[cache_idx];
+		if (old != NULL)
+			ui_destroy_cursor(old);
+
+		cursorcache[cache_idx] = cursor;
+	}
+	else
+	{
+		error("put cursor %d\n", cache_idx);
+	}
+}