--- sourceforge.net/trunk/rdesktop/cache.c	2000/09/28 07:04:14	16
+++ sourceforge.net/trunk/rdesktop/cache.c	2004/10/02 01:36:20	777
@@ -1,18 +1,18 @@
 /*
    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
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -21,82 +21,153 @@
 #include "rdesktop.h"
 
 #define NUM_ELEMENTS(array) (sizeof(array) / sizeof(array[0]))
+#define TOUCH(id, idx) (g_bmpcache[id][idx].usage = ++g_stamp)
+#define IS_PERSISTENT(id) (g_pstcache_fd[id] > 0)
+
+extern int g_pstcache_fd[];
+extern BOOL g_use_rdp5;
 
+uint32 g_stamp;
+
+static int g_num_bitmaps_in_memory[3];
 
 /* BITMAP CACHE */
-static HBITMAP bmpcache[3][600];
+static BMPCACHEENTRY g_bmpcache[3][0xa00];
+static HBITMAP g_volatile_bc[3];
+
+/* Remove the least-recently used bitmap from the cache */
+void
+cache_remove_lru_bitmap(uint8 cache_id)
+{
+	uint32 i;
+	uint16 cache_idx = 0;
+	uint32 m = 0xffffffff;
+	BMPCACHEENTRY *pbce;
+
+	for (i = 0; i < NUM_ELEMENTS(g_bmpcache[cache_id]); i++)
+	{
+		if (g_bmpcache[cache_id][i].bitmap && g_bmpcache[cache_id][i].usage < m)
+		{
+			cache_idx = i;
+			m = g_bmpcache[cache_id][i].usage;
+		}
+	}
+
+	pbce = &g_bmpcache[cache_id][cache_idx];
+	ui_destroy_bitmap(pbce->bitmap);
+	--g_num_bitmaps_in_memory[cache_id];
+	pbce->bitmap = 0;
+	pbce->usage = 0;
+}
 
 /* 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;
+	HBITMAP *pbitmap;
 
-	if ((cache_id < NUM_ELEMENTS(bmpcache))
-			&& (cache_idx < NUM_ELEMENTS(bmpcache[0])))
+	if ((cache_id < NUM_ELEMENTS(g_bmpcache)) && (cache_idx < NUM_ELEMENTS(g_bmpcache[0])))
 	{
-		bitmap = bmpcache[cache_id][cache_idx];
-		if (bitmap != NULL)
-			return bitmap;
+		pbitmap = &g_bmpcache[cache_id][cache_idx].bitmap;
+		if ((*pbitmap != 0) || pstcache_load_bitmap(cache_id, cache_idx))
+		{
+			if (IS_PERSISTENT(cache_id))
+				TOUCH(cache_id, cache_idx);
+
+			return *pbitmap;
+		}
+	}
+	else if ((cache_id < NUM_ELEMENTS(g_volatile_bc)) && (cache_idx == 0x7fff))
+	{
+		return g_volatile_bc[cache_id];
 	}
 
-	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, uint32 stamp)
 {
 	HBITMAP old;
 
-	if ((cache_id < NUM_ELEMENTS(bmpcache))
-			&& (cache_idx < NUM_ELEMENTS(bmpcache[0])))
+	if ((cache_id < NUM_ELEMENTS(g_bmpcache)) && (cache_idx < NUM_ELEMENTS(g_bmpcache[0])))
 	{
-		old = bmpcache[cache_id][cache_idx];
+		old = g_bmpcache[cache_id][cache_idx].bitmap;
 		if (old != NULL)
+		{
 			ui_destroy_bitmap(old);
+		}
+		else if (g_use_rdp5)
+		{
+			if (++g_num_bitmaps_in_memory[cache_id] > BMPCACHE2_C2_CELLS)
+				cache_remove_lru_bitmap(cache_id);
+		}
 
-		bmpcache[cache_id][cache_idx] = bitmap;
+		g_bmpcache[cache_id][cache_idx].bitmap = bitmap;
+		g_bmpcache[cache_id][cache_idx].usage = stamp;
+	}
+	else if ((cache_id < NUM_ELEMENTS(g_volatile_bc)) && (cache_idx == 0x7fff))
+	{
+		old = g_volatile_bc[cache_id];
+		if (old != NULL)
+			ui_destroy_bitmap(old);
+		g_volatile_bc[cache_id] = bitmap;
 	}
 	else
 	{
-		ERROR("put bitmap %d:%d\n", cache_id, cache_idx);
+		error("put bitmap %d:%d\n", cache_id, cache_idx);
 	}
 }
 
+/* Updates the persistent bitmap cache MRU information on exit */
+void
+cache_save_state(void)
+{
+	uint32 id, idx;
+
+	for (id = 0; id < NUM_ELEMENTS(g_bmpcache); id++)
+		if (IS_PERSISTENT(id))
+			for (idx = 0; idx < NUM_ELEMENTS(g_bmpcache[id]); idx++)
+				pstcache_touch_bitmap(id, idx, g_bmpcache[id][idx].usage);
+}
+
 
 /* FONT CACHE */
-static FONTGLYPH fontcache[12][256];
+static FONTGLYPH g_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(g_fontcache)) && (character < NUM_ELEMENTS(g_fontcache[0])))
 	{
-		glyph = &fontcache[font][character];
+		glyph = &g_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(g_fontcache)) && (character < NUM_ELEMENTS(g_fontcache[0])))
 	{
-		glyph = &fontcache[font][character];
+		glyph = &g_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,38 +175,40 @@
 	}
 	else
 	{
-		ERROR("put font %d:%d\n", font, character);
+		error("put font %d:%d\n", font, character);
 	}
 }
 
 
 /* TEXT CACHE */
-static DATABLOB textcache[256];
+static DATABLOB g_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;
 
-	if (cache_id < NUM_ELEMENTS(textcache))
+	if (cache_id < NUM_ELEMENTS(g_textcache))
 	{
-		text = &textcache[cache_id];
+		text = &g_textcache[cache_id];
 		if (text->data != NULL)
 			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;
 
-	if (cache_id < NUM_ELEMENTS(textcache))
+	if (cache_id < NUM_ELEMENTS(g_textcache))
 	{
-		text = &textcache[cache_id];
+		text = &g_textcache[cache_id];
 		if (text->data != NULL)
 			xfree(text->data);
 
@@ -145,45 +218,94 @@
 	}
 	else
 	{
-		ERROR("put text %d\n", cache_id);
+		error("put text %d\n", cache_id);
 	}
 }
 
 
 /* DESKTOP CACHE */
-static uint8 deskcache[0x38400];
+static uint8 g_deskcache[0x38400 * 4];
 
 /* Retrieve desktop data from the cache */
-uint8 *cache_get_desktop(uint32 offset, int cx, int cy)
+uint8 *
+cache_get_desktop(uint32 offset, int cx, int cy, int bytes_per_pixel)
 {
-	int length = cx * cy;
+	int length = cx * cy * bytes_per_pixel;
 
-	if ((offset + length) <= sizeof(deskcache))
+	if (offset > sizeof(g_deskcache))
+		offset = 0;
+
+	if ((offset + length) <= sizeof(g_deskcache))
 	{
-		return &deskcache[offset];
+		return &g_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, int cx, int cy, int scanline, uint8 *data)
+void
+cache_put_desktop(uint32 offset, int cx, int cy, int scanline, int bytes_per_pixel, uint8 * data)
 {
-	int length = cx * cy;
+	int length = cx * cy * bytes_per_pixel;
+
+	if (offset > sizeof(g_deskcache))
+		offset = 0;
 
-	if ((offset + length) <= sizeof(deskcache))
+	if ((offset + length) <= sizeof(g_deskcache))
 	{
+		cx *= bytes_per_pixel;
 		while (cy--)
 		{
-			memcpy(&deskcache[offset], data, cx);
+			memcpy(&g_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 g_cursorcache[0x20];
+
+/* Retrieve cursor from cache */
+HCURSOR
+cache_get_cursor(uint16 cache_idx)
+{
+	HCURSOR cursor;
+
+	if (cache_idx < NUM_ELEMENTS(g_cursorcache))
+	{
+		cursor = g_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(g_cursorcache))
+	{
+		old = g_cursorcache[cache_idx];
+		if (old != NULL)
+			ui_destroy_cursor(old);
+
+		g_cursorcache[cache_idx] = cursor;
+	}
+	else
+	{
+		error("put cursor %d\n", cache_idx);
+	}
+}