Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-for-4.0-120319-1...

[mirror_qemu.git] / ui / vnc-palette.h

diff --git a/ui/vnc-palette.h b/ui/vnc-palette.h
index d0645ebde85a486c343db8fe74006355c32b032d..e9f0eaf73b85482998fa957e924a6ff602e987ba 100644 (file)
--- a/ui/vnc-palette.h
+++ b/ui/vnc-palette.h
@@ -29,11 +29,10 @@
 #ifndef VNC_PALETTE_H
 #define VNC_PALETTE_H
 
-#include "qlist.h"
-#include "qemu-queue.h"
-#include <stdint.h>
+#include "qemu/queue.h"
 
 #define VNC_PALETTE_HASH_SIZE 256
+#define VNC_PALETTE_MAX_SIZE  256
 
 typedef struct VncPaletteEntry {
     int idx;
@@ -42,7 +41,7 @@ typedef struct VncPaletteEntry {
 } VncPaletteEntry;
 
 typedef struct VncPalette {
-    QObject_HEAD;
+    VncPaletteEntry pool[VNC_PALETTE_MAX_SIZE];
     size_t size;
     size_t max;
     int bpp;
@@ -50,6 +49,7 @@ typedef struct VncPalette {
 } VncPalette;
 
 VncPalette *palette_new(size_t max, int bpp);
+void palette_init(VncPalette *palette, size_t max, int bpp);
 void palette_destroy(VncPalette *palette);
 
 int palette_put(VncPalette *palette, uint32_t color);
@@ -59,5 +59,8 @@ size_t palette_size(const VncPalette *palette);
 void palette_iter(const VncPalette *palette,
                   void (*iter)(int idx, uint32_t color, void *opaque),
                   void *opaque);
+uint32_t palette_color(const VncPalette *palette, int idx, bool *found);
+size_t palette_fill(const VncPalette *palette,
+                    uint32_t colors[VNC_PALETTE_MAX_SIZE]);
 
 #endif /* VNC_PALETTE_H */