Rename all identifiers

This is just the result of running:
./rename-identifiers.sh renames spice/*.h
This commit is contained in:
Alexander Larsson 2010-02-04 16:46:27 +01:00
parent b0188a46d1
commit 90352580a0
6 changed files with 667 additions and 667 deletions

View File

@ -35,338 +35,338 @@
#include <spice/start-packed.h>
#define GET_ADDRESS(addr) ((void *)(unsigned long)(addr))
#define SET_ADDRESS(addr, val) ((addr) = (unsigned long)(val))
#define SPICE_GET_ADDRESS(addr) ((void *)(unsigned long)(addr))
#define SPICE_SET_ADDRESS(addr, val) ((addr) = (unsigned long)(val))
typedef int32_t FIXED28_4;
typedef uint64_t ADDRESS;
typedef int32_t SPICE_FIXED28_4;
typedef uint64_t SPICE_ADDRESS;
enum {
PATH_BEGIN = (1 << 0),
PATH_END = (1 << 1),
PATH_CLOSE = (1 << 3),
PATH_BEZIER = (1 << 4),
SPICE_PATH_BEGIN = (1 << 0),
SPICE_PATH_END = (1 << 1),
SPICE_PATH_CLOSE = (1 << 3),
SPICE_PATH_BEZIER = (1 << 4),
};
enum {
LINE_ATTR_STARTGAP = (1 << 2),
LINE_ATTR_STYLED = (1 << 3),
SPICE_LINE_ATTR_STARTGAP = (1 << 2),
SPICE_LINE_ATTR_STYLED = (1 << 3),
};
typedef struct SPICE_ATTR_PACKED PointFix {
FIXED28_4 x;
FIXED28_4 y;
} PointFix;
typedef struct SPICE_ATTR_PACKED SpicePointFix {
SPICE_FIXED28_4 x;
SPICE_FIXED28_4 y;
} SpicePointFix;
typedef struct SPICE_ATTR_PACKED Point {
typedef struct SPICE_ATTR_PACKED SpicePoint {
int32_t x;
int32_t y;
} Point;
} SpicePoint;
typedef struct SPICE_ATTR_PACKED Point16 {
typedef struct SPICE_ATTR_PACKED SpicePoint16 {
int16_t x;
int16_t y;
} Point16;
} SpicePoint16;
typedef struct SPICE_ATTR_PACKED Rect {
typedef struct SPICE_ATTR_PACKED SpiceRect {
int32_t top;
int32_t left;
int32_t bottom;
int32_t right;
} Rect;
} SpiceRect;
typedef struct SPICE_ATTR_PACKED PathSeg {
typedef struct SPICE_ATTR_PACKED SpicePathSeg {
uint32_t flags;
uint32_t count;
uint8_t data[0];
} PathSeg;
} SpicePathSeg;
enum ClipType {
CLIP_TYPE_NONE,
CLIP_TYPE_RECTS,
CLIP_TYPE_PATH,
enum SpiceClipType {
SPICE_CLIP_TYPE_NONE,
SPICE_CLIP_TYPE_RECTS,
SPICE_CLIP_TYPE_PATH,
};
typedef struct SPICE_ATTR_PACKED Clip {
typedef struct SPICE_ATTR_PACKED SpiceClip {
uint32_t type;
ADDRESS data;
} Clip;
SPICE_ADDRESS data;
} SpiceClip;
enum ROPDescriptor {
ROPD_INVERS_SRC = (1 << 0),
ROPD_INVERS_BRUSH = (1 << 1),
ROPD_INVERS_DEST = (1 << 2),
ROPD_OP_PUT = (1 << 3),
ROPD_OP_OR = (1 << 4),
ROPD_OP_AND = (1 << 5),
ROPD_OP_XOR = (1 << 6),
ROPD_OP_BLACKNESS = (1 << 7),
ROPD_OP_WHITENESS = (1 << 8),
ROPD_OP_INVERS = (1 << 9),
ROPD_INVERS_RES = (1 << 10),
enum SpiceROPDescriptor {
SPICE_ROPD_INVERS_SRC = (1 << 0),
SPICE_ROPD_INVERS_BRUSH = (1 << 1),
SPICE_ROPD_INVERS_DEST = (1 << 2),
SPICE_ROPD_OP_PUT = (1 << 3),
SPICE_ROPD_OP_OR = (1 << 4),
SPICE_ROPD_OP_AND = (1 << 5),
SPICE_ROPD_OP_XOR = (1 << 6),
SPICE_ROPD_OP_BLACKNESS = (1 << 7),
SPICE_ROPD_OP_WHITENESS = (1 << 8),
SPICE_ROPD_OP_INVERS = (1 << 9),
SPICE_ROPD_INVERS_RES = (1 << 10),
};
typedef struct SPICE_ATTR_PACKED Pattern {
ADDRESS pat;
Point pos;
} Pattern;
typedef struct SPICE_ATTR_PACKED SpicePattern {
SPICE_ADDRESS pat;
SpicePoint pos;
} SpicePattern;
enum {
BRUSH_TYPE_NONE,
BRUSH_TYPE_SOLID,
BRUSH_TYPE_PATTERN,
SPICE_BRUSH_TYPE_NONE,
SPICE_BRUSH_TYPE_SOLID,
SPICE_BRUSH_TYPE_PATTERN,
};
typedef struct SPICE_ATTR_PACKED Brush {
typedef struct SPICE_ATTR_PACKED SpiceBrush {
uint32_t type;
union {
uint32_t color;
Pattern pattern;
SpicePattern pattern;
} u;
} Brush;
} SpiceBrush;
enum {
MASK_INVERS = (1 << 0),
SPICE_MASK_FLAGS_INVERS = (1 << 0),
};
typedef struct SPICE_ATTR_PACKED QMask {
typedef struct SPICE_ATTR_PACKED SpiceQMask {
uint8_t flags;
Point pos;
ADDRESS bitmap;
} QMask;
SpicePoint pos;
SPICE_ADDRESS bitmap;
} SpiceQMask;
typedef struct SPICE_ATTR_PACKED Fill {
Brush brush;
typedef struct SPICE_ATTR_PACKED SpiceFill {
SpiceBrush brush;
uint16_t rop_decriptor;
QMask mask;
} Fill;
SpiceQMask mask;
} SpiceFill;
typedef struct SPICE_ATTR_PACKED Palette {
typedef struct SPICE_ATTR_PACKED SpicePalette {
uint64_t unique;
uint16_t num_ents;
uint32_t ents[0];
} Palette;
} SpicePalette;
enum {
IMAGE_TYPE_BITMAP,
IMAGE_TYPE_QUIC,
IMAGE_TYPE_RESERVED,
IMAGE_TYPE_LZ_PLT = 100,
IMAGE_TYPE_LZ_RGB,
IMAGE_TYPE_GLZ_RGB,
IMAGE_TYPE_FROM_CACHE,
SPICE_IMAGE_TYPE_BITMAP,
SPICE_IMAGE_TYPE_QUIC,
SPICE_IMAGE_TYPE_RESERVED,
SPICE_IMAGE_TYPE_LZ_PLT = 100,
SPICE_IMAGE_TYPE_LZ_RGB,
SPICE_IMAGE_TYPE_GLZ_RGB,
SPICE_IMAGE_TYPE_FROM_CACHE,
};
enum {
IMAGE_CACHE_ME = (1 << 0),
SPICE_IMAGE_FLAGS_CACHE_ME = (1 << 0),
};
typedef struct SPICE_ATTR_PACKED ImageDescriptor {
typedef struct SPICE_ATTR_PACKED SpiceImageDescriptor {
uint64_t id;
uint8_t type;
uint8_t flags;
uint32_t width;
uint32_t height;
} ImageDescriptor;
} SpiceImageDescriptor;
enum {
BITMAP_FMT_INVALID,
BITMAP_FMT_1BIT_LE,
BITMAP_FMT_1BIT_BE,
BITMAP_FMT_4BIT_LE,
BITMAP_FMT_4BIT_BE,
BITMAP_FMT_8BIT,
BITMAP_FMT_16BIT,
BITMAP_FMT_24BIT,
BITMAP_FMT_32BIT,
BITMAP_FMT_RGBA,
SPICE_BITMAP_FMT_INVALID,
SPICE_BITMAP_FMT_1BIT_LE,
SPICE_BITMAP_FMT_1BIT_BE,
SPICE_BITMAP_FMT_4BIT_LE,
SPICE_BITMAP_FMT_4BIT_BE,
SPICE_BITMAP_FMT_8BIT,
SPICE_BITMAP_FMT_16BIT,
SPICE_BITMAP_FMT_24BIT,
SPICE_BITMAP_FMT_32BIT,
SPICE_BITMAP_FMT_RGBA,
};
enum {
BITMAP_PAL_CACHE_ME = (1 << 0),
BITMAP_PAL_FROM_CACHE = (1 << 1),
BITMAP_TOP_DOWN = (1 << 2),
SPICE_BITMAP_FLAGS_PAL_CACHE_ME = (1 << 0),
SPICE_BITMAP_FLAGS_PAL_FROM_CACHE = (1 << 1),
SPICE_BITMAP_FLAGS_TOP_DOWN = (1 << 2),
};
typedef struct SPICE_ATTR_PACKED Bitmap {
typedef struct SPICE_ATTR_PACKED SpiceBitmap {
uint8_t format;
uint8_t flags;
uint32_t x;
uint32_t y;
uint32_t stride;
ADDRESS palette;
ADDRESS data; //data[0] ?
} Bitmap;
SPICE_ADDRESS palette;
SPICE_ADDRESS data; //data[0] ?
} SpiceBitmap;
typedef struct SPICE_ATTR_PACKED BitmapImage {
ImageDescriptor descriptor;
Bitmap bitmap;
} BitmapImage;
typedef struct SPICE_ATTR_PACKED SpiceBitmapImage {
SpiceImageDescriptor descriptor;
SpiceBitmap bitmap;
} SpiceBitmapImage;
typedef struct SPICE_ATTR_PACKED QUICData {
typedef struct SPICE_ATTR_PACKED SpiceQUICData {
uint32_t data_size;
uint8_t data[0];
} QUICData, LZ_RGBData;
} SpiceQUICData, SpiceLZRGBData;
typedef struct SPICE_ATTR_PACKED QUICImage {
ImageDescriptor descriptor;
QUICData quic;
} QUICImage;
typedef struct SPICE_ATTR_PACKED SpiceQUICImage {
SpiceImageDescriptor descriptor;
SpiceQUICData quic;
} SpiceQUICImage;
typedef struct SPICE_ATTR_PACKED LZ_RGBImage {
ImageDescriptor descriptor;
LZ_RGBData lz_rgb;
} LZ_RGBImage;
typedef struct SPICE_ATTR_PACKED SpiceLZRGBImage {
SpiceImageDescriptor descriptor;
SpiceLZRGBData lz_rgb;
} SpiceLZRGBImage;
typedef struct SPICE_ATTR_PACKED LZ_PLTData {
typedef struct SPICE_ATTR_PACKED SpiceLZPLTData {
uint8_t flags;
uint32_t data_size;
ADDRESS palette;
SPICE_ADDRESS palette;
uint8_t data[0];
} LZ_PLTData;
} SpiceLZPLTData;
typedef struct SPICE_ATTR_PACKED LZ_PLTImage {
ImageDescriptor descriptor;
LZ_PLTData lz_plt;
} LZ_PLTImage;
typedef struct SPICE_ATTR_PACKED SpiceLZPLTImage {
SpiceImageDescriptor descriptor;
SpiceLZPLTData lz_plt;
} SpiceLZPLTImage;
enum {
IMAGE_SCALE_INTERPOLATE,
IMAGE_SCALE_NEAREST,
SPICE_IMAGE_SCALE_MODE_INTERPOLATE,
SPICE_IMAGE_SCALE_MODE_NEAREST,
};
typedef struct SPICE_ATTR_PACKED Opaque {
ADDRESS src_bitmap;
Rect src_area;
Brush brush;
typedef struct SPICE_ATTR_PACKED SpiceOpaque {
SPICE_ADDRESS src_bitmap;
SpiceRect src_area;
SpiceBrush brush;
uint16_t rop_decriptor;
uint8_t scale_mode;
QMask mask;
} Opaque;
SpiceQMask mask;
} SpiceOpaque;
typedef struct SPICE_ATTR_PACKED Copy {
ADDRESS src_bitmap;
Rect src_area;
typedef struct SPICE_ATTR_PACKED SpiceCopy {
SPICE_ADDRESS src_bitmap;
SpiceRect src_area;
uint16_t rop_decriptor;
uint8_t scale_mode;
QMask mask;
} Copy, Blend;
SpiceQMask mask;
} SpiceCopy, SpiceBlend;
typedef struct SPICE_ATTR_PACKED Transparent {
ADDRESS src_bitmap;
Rect src_area;
typedef struct SPICE_ATTR_PACKED SpiceTransparent {
SPICE_ADDRESS src_bitmap;
SpiceRect src_area;
uint32_t src_color;
uint32_t true_color;
} Transparent;
} SpiceTransparent;
typedef struct SPICE_ATTR_PACKED AlphaBlnd {
typedef struct SPICE_ATTR_PACKED SpiceAlphaBlnd {
uint8_t alpha;
ADDRESS src_bitmap;
Rect src_area;
} AlphaBlnd;
SPICE_ADDRESS src_bitmap;
SpiceRect src_area;
} SpiceAlphaBlnd;
typedef struct SPICE_ATTR_PACKED Rop3 {
ADDRESS src_bitmap;
Rect src_area;
Brush brush;
typedef struct SPICE_ATTR_PACKED SpiceRop3 {
SPICE_ADDRESS src_bitmap;
SpiceRect src_area;
SpiceBrush brush;
uint8_t rop3;
uint8_t scale_mode;
QMask mask;
} Rop3;
SpiceQMask mask;
} SpiceRop3;
typedef struct SPICE_ATTR_PACKED Blackness {
QMask mask;
} Blackness, Invers, Whiteness;
typedef struct SPICE_ATTR_PACKED SpiceBlackness {
SpiceQMask mask;
} SpiceBlackness, SpiceInvers, SpiceWhiteness;
enum {
LINE_STYLED = (1 << 3),
LINE_START_WITH_GAP = (1 << 2),
SPICE_LINE_FLAGS_STYLED = (1 << 3),
SPICE_LINE_FLAGS_START_WITH_GAP = (1 << 2),
};
enum {
LINE_CAP_ROUND,
LINE_CAP_SQUARE,
LINE_CAP_BUTT,
SPICE_LINE_CAP_ROUND,
SPICE_LINE_CAP_SQUARE,
SPICE_LINE_CAP_BUTT,
};
enum {
LINE_JOIN_ROUND,
LINE_JOIN_BEVEL,
LINE_JOIN_MITER,
SPICE_LINE_JOIN_ROUND,
SPICE_LINE_JOIN_BEVEL,
SPICE_LINE_JOIN_MITER,
};
typedef struct SPICE_ATTR_PACKED LineAttr {
typedef struct SPICE_ATTR_PACKED SpiceLineAttr {
uint8_t flags;
uint8_t join_style;
uint8_t end_style;
uint8_t style_nseg;
FIXED28_4 width;
FIXED28_4 miter_limit;
ADDRESS style; //data[0] ?
} LineAttr;
SPICE_FIXED28_4 width;
SPICE_FIXED28_4 miter_limit;
SPICE_ADDRESS style; //data[0] ?
} SpiceLineAttr;
typedef struct SPICE_ATTR_PACKED Stroke {
ADDRESS path;
LineAttr attr;
Brush brush;
typedef struct SPICE_ATTR_PACKED SpiceStroke {
SPICE_ADDRESS path;
SpiceLineAttr attr;
SpiceBrush brush;
uint16_t fore_mode;
uint16_t back_mode;
} Stroke;
} SpiceStroke;
typedef struct SPICE_ATTR_PACKED RasterGlyph {
Point render_pos;
Point glyph_origin;
typedef struct SPICE_ATTR_PACKED SpiceRasterGlyph {
SpicePoint render_pos;
SpicePoint glyph_origin;
uint16_t width;
uint16_t height;
uint8_t data[0];
} RasterGlyph;
} SpiceRasterGlyph;
typedef struct SPICE_ATTR_PACKED VectotGlyph {
Point render_pos;
typedef struct SPICE_ATTR_PACKED SpiceVectorGlyph {
SpicePoint render_pos;
uint32_t data_size;
uint8_t data[0]; //PathSeg[]
} VectotGlyph;
uint8_t data[0]; //SpicePathSeg[]
} SpiceVectorGlyph;
enum {
STRING_RASTER_A1 = 1 << 0,
STRING_RASTER_A4 = 1 << 1,
STRING_RASTER_A8 = 1 << 2,
STRING_RASTER_TOP_DOWN = 1 << 3,
SPICE_STRING_FLAGS_RASTER_A1 = 1 << 0,
SPICE_STRING_FLAGS_RASTER_A4 = 1 << 1,
SPICE_STRING_FLAGS_RASTER_A8 = 1 << 2,
SPICE_STRING_FLAGS_RASTER_TOP_DOWN = 1 << 3,
};
typedef struct SPICE_ATTR_PACKED String {
typedef struct SPICE_ATTR_PACKED SpiceString {
uint16_t length;
uint16_t flags;
uint8_t data[0];
} String;
} SpiceString;
typedef struct SPICE_ATTR_PACKED Text {
ADDRESS str;
Rect back_area;
Brush fore_brush;
Brush back_brush;
typedef struct SPICE_ATTR_PACKED SpiceText {
SPICE_ADDRESS str;
SpiceRect back_area;
SpiceBrush fore_brush;
SpiceBrush back_brush;
uint16_t fore_mode;
uint16_t back_mode;
} Text;
} SpiceText;
enum {
CURSOR_TYPE_ALPHA,
CURSOR_TYPE_MONO,
CURSOR_TYPE_COLOR4,
CURSOR_TYPE_COLOR8,
CURSOR_TYPE_COLOR16,
CURSOR_TYPE_COLOR24,
CURSOR_TYPE_COLOR32,
SPICE_CURSOR_TYPE_ALPHA,
SPICE_CURSOR_TYPE_MONO,
SPICE_CURSOR_TYPE_COLOR4,
SPICE_CURSOR_TYPE_COLOR8,
SPICE_CURSOR_TYPE_COLOR16,
SPICE_CURSOR_TYPE_COLOR24,
SPICE_CURSOR_TYPE_COLOR32,
};
typedef struct SPICE_ATTR_PACKED CursorHeader {
typedef struct SPICE_ATTR_PACKED SpiceCursorHeader {
uint64_t unique;
uint16_t type;
uint16_t width;
uint16_t height;
uint16_t hot_spot_x;
uint16_t hot_spot_y;
} CursorHeader;
} SpiceCursorHeader;
#include <spice/end-packed.h>

View File

@ -68,7 +68,7 @@
#define RING_DECLARE(name, el_type, size) \
#define SPICE_RING_DECLARE(name, el_type, size) \
typedef struct SPICE_ATTR_PACKED name##_ring_el { \
union { \
el_type el; \
@ -86,7 +86,7 @@ typedef struct SPICE_ATTR_PACKED name { \
} name;
#define RING_INIT(r) \
#define SPICE_RING_INIT(r) \
(r)->num_items = sizeof((r)->items) >> \
PAWER2_TO_SHIFT(sizeof((r)->items[0])); \
(r)->prod = (r)->cons = 0; \
@ -94,39 +94,39 @@ typedef struct SPICE_ATTR_PACKED name { \
(r)->notify_on_cons = 0;
#define RING_INDEX_MASK(r) ((r)->num_items - 1)
#define SPICE_RING_INDEX_MASK(r) ((r)->num_items - 1)
#define RING_IS_PACKED(r) (sizeof((r)->items[0]) == sizeof((r)->items[0]).el)
#define SPICE_RING_IS_PACKED(r) (sizeof((r)->items[0]) == sizeof((r)->items[0]).el)
#define RING_IS_EMPTY(r) ((r)->cons == (r)->prod)
#define SPICE_RING_IS_EMPTY(r) ((r)->cons == (r)->prod)
#define RING_IS_FULL(r) (((r)->prod - (r)->cons) == (r)->num_items)
#define SPICE_RING_IS_FULL(r) (((r)->prod - (r)->cons) == (r)->num_items)
#define RING_PROD_ITEM(r) (&(r)->items[(r)->prod & RING_INDEX_MASK(r)].el)
#define SPICE_RING_PROD_ITEM(r) (&(r)->items[(r)->prod & SPICE_RING_INDEX_MASK(r)].el)
#define RING_PROD_WAIT(r, wait) \
if (((wait) = RING_IS_FULL(r))) { \
#define SPICE_RING_PROD_WAIT(r, wait) \
if (((wait) = SPICE_RING_IS_FULL(r))) { \
(r)->notify_on_cons = (r)->cons + 1; \
spice_mb(); \
(wait) = RING_IS_FULL(r); \
(wait) = SPICE_RING_IS_FULL(r); \
}
#define RING_PUSH(r, notify) \
#define SPICE_RING_PUSH(r, notify) \
(r)->prod++; \
spice_mb(); \
(notify) = (r)->prod == (r)->notify_on_prod;
#define RING_CONS_ITEM(r) (&(r)->items[(r)->cons & RING_INDEX_MASK(r)].el)
#define SPICE_RING_CONS_ITEM(r) (&(r)->items[(r)->cons & SPICE_RING_INDEX_MASK(r)].el)
#define RING_CONS_WAIT(r, wait) \
if (((wait) = RING_IS_EMPTY(r))) { \
#define SPICE_RING_CONS_WAIT(r, wait) \
if (((wait) = SPICE_RING_IS_EMPTY(r))) { \
(r)->notify_on_prod = (r)->prod + 1; \
spice_mb(); \
(wait) = RING_IS_EMPTY(r); \
(wait) = SPICE_RING_IS_EMPTY(r); \
}
#define RING_POP(r, notify) \
#define SPICE_RING_POP(r, notify) \
(r)->cons++; \
spice_mb(); \
(notify) = (r)->cons == (r)->notify_on_cons;

View File

@ -110,7 +110,7 @@ typedef struct SPICE_ATTR_PACKED QXLModes {
QXLMode modes[0];
} QXLModes;
typedef uint64_t PHYSICAL;
typedef uint64_t QXLPHYSICAL;
typedef uint32_t QXLFIXED; //fixed 28.4
enum QXLCmdType {
@ -122,7 +122,7 @@ enum QXLCmdType {
};
typedef struct SPICE_ATTR_PACKED QXLCommand {
PHYSICAL data;
QXLPHYSICAL data;
uint32_t type;
uint32_t ped;
} QXLCommand;
@ -148,13 +148,13 @@ typedef struct SPICE_ATTR_PACKED QXLSurfaceCreate {
uint32_t mouse_mode;
uint32_t flags;
uint32_t type;
PHYSICAL mem;
QXLPHYSICAL mem;
} QXLSurfaceCreate;
RING_DECLARE(QXLCommandRing, QXLCommand, 32);
RING_DECLARE(QXLCursorRing, QXLCommand, 32);
SPICE_RING_DECLARE(QXLCommandRing, QXLCommand, 32);
SPICE_RING_DECLARE(QXLCursorRing, QXLCommand, 32);
RING_DECLARE(QXLReleaseRing, uint64_t, 8);
SPICE_RING_DECLARE(QXLReleaseRing, uint64_t, 8);
#define QXL_LOG_BUF_SIZE 4096
@ -169,7 +169,7 @@ typedef struct SPICE_ATTR_PACKED QXLRam {
QXLCommandRing cmd_ring;
QXLCursorRing cursor_ring;
QXLReleaseRing release_ring;
Rect update_area;
SpiceRect update_area;
QXLMemSlot mem_slot;
QXLSurfaceCreate create_surface;
uint64_t flags;
@ -187,8 +187,8 @@ typedef struct QXLReleaseInfoExt {
typedef struct SPICE_ATTR_PACKED QXLDataChunk {
uint32_t data_size;
PHYSICAL prev_chunk;
PHYSICAL next_chunk;
QXLPHYSICAL prev_chunk;
QXLPHYSICAL next_chunk;
uint8_t data[0];
} QXLDataChunk;
@ -199,12 +199,12 @@ typedef struct SPICE_ATTR_PACKED QXLMessage {
typedef struct SPICE_ATTR_PACKED QXLUpdateCmd {
QXLReleaseInfo release_info;
Rect area;
SpiceRect area;
uint32_t update_id;
} QXLUpdateCmd;
typedef struct SPICE_ATTR_PACKED QXLCursor {
CursorHeader header;
SpiceCursorHeader header;
uint32_t data_size;
QXLDataChunk chunk;
} QXLCursor;
@ -223,15 +223,15 @@ typedef struct SPICE_ATTR_PACKED QXLCursorCmd {
uint8_t type;
union {
struct SPICE_ATTR_PACKED {
Point16 position;
SpicePoint16 position;
uint8_t visible;
PHYSICAL shape;
QXLPHYSICAL shape;
} set;
struct SPICE_ATTR_PACKED {
uint16_t length;
uint16_t frequency;
} trail;
Point16 position;
SpicePoint16 position;
} u;
uint8_t device_data[QXL_CURSUR_DEVICE_DATA_SIZE]; //todo: dynamic size from rom
} QXLCursorCmd;
@ -261,7 +261,7 @@ typedef struct SPICE_ATTR_PACKED QXLString {
} QXLString;
typedef struct SPICE_ATTR_PACKED QXLCopyBits {
Point src_pos;
SpicePoint src_pos;
} QXLCopyBits;
#define QXL_EFFECT_BLEND 0
@ -278,24 +278,24 @@ typedef struct SPICE_ATTR_PACKED QXLDrawable {
uint8_t effect;
uint8_t type;
uint8_t self_bitmap;
Rect self_bitmap_area;
Rect bbox;
Clip clip;
SpiceRect self_bitmap_area;
SpiceRect bbox;
SpiceClip clip;
uint32_t mm_time;
union {
Fill fill;
Opaque opaque;
Copy copy;
Transparent transparent;
AlphaBlnd alpha_blend;
SpiceFill fill;
SpiceOpaque opaque;
SpiceCopy copy;
SpiceTransparent transparent;
SpiceAlphaBlnd alpha_blend;
QXLCopyBits copy_bits;
Blend blend;
Rop3 rop3;
Stroke stroke;
Text text;
Blackness blackness;
Invers invers;
Whiteness whiteness;
SpiceBlend blend;
SpiceRop3 rop3;
SpiceStroke stroke;
SpiceText text;
SpiceBlackness blackness;
SpiceInvers invers;
SpiceWhiteness whiteness;
} u;
} QXLDrawable;
@ -335,7 +335,7 @@ enum {
enum {
QXL_BITMAP_DIRECT = (1 << 0),
QXL_BITMAP_UNSTABLE = (1 << 1),
QXL_BITMAP_TOP_DOWN = (1 << 2), // == BITMAP_TOP_DOWN
QXL_BITMAP_TOP_DOWN = (1 << 2), // == SPICE_BITMAP_FLAGS_TOP_DOWN
};
#define QXL_SET_IMAGE_ID(image, _group, _unique) { \
@ -346,10 +346,10 @@ enum {
}
typedef struct SPICE_ATTR_PACKED QXLImage {
ImageDescriptor descriptor;
SpiceImageDescriptor descriptor;
union { // variable length
Bitmap bitmap;
QUICData quic;
SpiceBitmap bitmap;
SpiceQUICData quic;
};
} QXLImage;

File diff suppressed because it is too large Load Diff

View File

@ -33,36 +33,36 @@
#include <spice/types.h>
#define REDS_STAT_SHM_NAME "spice.%u"
#define REDS_STAT_NODE_NAME_MAX_LENGTH 20
#define REDS_STAT_MAGIC (*(uint32_t*)"STAT")
#define REDS_STAT_VERSION 1
#define SPICE_STAT_SHM_NAME "spice.%u"
#define SPICE_STAT_NODE_NAME_MAX 20
#define SPICE_STAT_MAGIC (*(uint32_t*)"STAT")
#define SPICE_STAT_VERSION 1
enum {
STAT_NODE_FLAG_ENABLED = (1 << 0),
STAT_NODE_FLAG_VISIBLE = (1 << 1),
STAT_NODE_FLAG_VALUE = (1 << 2),
SPICE_STAT_NODE_FLAG_ENABLED = (1 << 0),
SPICE_STAT_NODE_FLAG_VISIBLE = (1 << 1),
SPICE_STAT_NODE_FLAG_VALUE = (1 << 2),
};
#define STAT_NODE_MASK_SHOW (STAT_NODE_FLAG_ENABLED | STAT_NODE_FLAG_VISIBLE)
#define STAT_NODE_MASK_SHOW_VALUE (STAT_NODE_MASK_SHOW | STAT_NODE_FLAG_VALUE)
#define SPICE_STAT_NODE_MASK_SHOW (SPICE_STAT_NODE_FLAG_ENABLED | SPICE_STAT_NODE_FLAG_VISIBLE)
#define SPICE_STAT_NODE_MASK_SHOW_VALUE (SPICE_STAT_NODE_MASK_SHOW | SPICE_STAT_NODE_FLAG_VALUE)
typedef struct StatNode {
typedef struct SpiceStatNode {
uint64_t value;
uint32_t flags;
uint32_t next_sibling_index;
uint32_t first_child_index;
char name[REDS_STAT_NODE_NAME_MAX_LENGTH];
} StatNode;
char name[SPICE_STAT_NODE_NAME_MAX];
} SpiceStatNode;
typedef struct RedsStat {
typedef struct SpiceStat {
uint32_t magic;
uint32_t version;
uint32_t generation;
uint32_t num_of_nodes;
uint32_t root_index;
StatNode nodes[];
} RedsStat;
SpiceStatNode nodes[];
} SpiceStat;
#endif

View File

@ -53,7 +53,7 @@ typedef struct SPICE_ATTR_PACKED VDIPortPacket {
uint8_t data[512 - 2 * sizeof(uint32_t)];
} VDIPortPacket;
RING_DECLARE(VDIPortRing, VDIPortPacket, 32);
SPICE_RING_DECLARE(VDIPortRing, VDIPortPacket, 32);
enum {
VDI_PORT_IO_RANGE_INDEX,