spice*.proto: Replace tabs with the appropriate number of spaces

Plus a few other indentation fixes.

Signed-off-by: Lukáš Hrázký <lhrazky@redhat.com>
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
This commit is contained in:
Lukáš Hrázký 2018-07-18 17:05:13 +02:00
parent f82a6c5349
commit 83e1229417
2 changed files with 527 additions and 527 deletions

File diff suppressed because it is too large Load Diff

View File

@ -98,52 +98,52 @@ struct ChannelWait {
channel BaseChannel {
server:
message {
migrate_flags flags;
migrate_flags flags;
} migrate;
Data migrate_data;
message {
uint32 generation;
uint32 window;
uint32 generation;
uint32 window;
} set_ack;
message {
uint32 id;
uint64 timestamp;
uint8 data[] @ctype(uint8_t) @as_ptr(data_len);
uint32 id;
uint64 timestamp;
uint8 data[] @ctype(uint8_t) @as_ptr(data_len);
} ping;
message {
uint8 wait_count;
ChannelWait wait_list[wait_count] @end;
uint8 wait_count;
ChannelWait wait_list[wait_count] @end;
} wait_for_channels;
message {
uint64 time_stamp;
link_err reason;
uint64 time_stamp;
link_err reason;
} @ctype(SpiceMsgDisconnect) disconnecting;
message {
uint64 time_stamp;
notify_severity severity;
notify_visibility visibilty;
uint32 what; /* error_code/warn_code/info_code */
uint32 message_len;
uint8 message[message_len] @end @nomarshal;
uint8 zero @end @ctype(uint8_t) @nomarshal;
uint64 time_stamp;
notify_severity severity;
notify_visibility visibilty;
uint32 what; /* error_code/warn_code/info_code */
uint32 message_len;
uint8 message[message_len] @end @nomarshal;
uint8 zero @end @ctype(uint8_t) @nomarshal;
} notify;
client:
message {
uint32 generation;
uint32 generation;
} ack_sync;
Empty ack;
message {
uint32 id;
uint64 timestamp;
uint32 id;
uint64 timestamp;
} @ctype(SpiceMsgPing) pong;
Empty migrate_flush_mark;
@ -151,8 +151,8 @@ channel BaseChannel {
Data migrate_data;
message {
uint64 time_stamp;
link_err reason;
uint64 time_stamp;
link_err reason;
} @ctype(SpiceMsgDisconnect) disconnecting;
};
@ -162,15 +162,15 @@ struct ChannelId {
};
struct DstInfo {
uint16 port;
uint16 sport;
uint32 host_offset @zero;
uint32 host_size;
pubkey_type pub_key_type @minor(1);
uint32 pub_key_offset @minor(1) @zero;
uint32 pub_key_size @minor(1);
uint8 host_data[host_size] @as_ptr @zero_terminated;
uint8 pub_key_data[pub_key_size] @minor(1) @as_ptr @zero_terminated;
uint16 port;
uint16 sport;
uint32 host_offset @zero;
uint32 host_size;
pubkey_type pub_key_type @minor(1);
uint32 pub_key_offset @minor(1) @zero;
uint32 pub_key_size @minor(1);
uint8 host_data[host_size] @as_ptr @zero_terminated;
uint8 pub_key_data[pub_key_size] @minor(1) @as_ptr @zero_terminated;
} @ctype(SpiceMigrationDstInfo);
channel MainChannel : BaseChannel {
@ -182,40 +182,40 @@ channel MainChannel : BaseChannel {
Empty migrate_cancel;
message {
uint32 session_id;
uint32 display_channels_hint;
uint32 supported_mouse_modes;
uint32 current_mouse_mode;
uint32 agent_connected;
uint32 agent_tokens;
uint32 multi_media_time;
uint32 ram_hint;
uint32 session_id;
uint32 display_channels_hint;
uint32 supported_mouse_modes;
uint32 current_mouse_mode;
uint32 agent_connected;
uint32 agent_tokens;
uint32 multi_media_time;
uint32 ram_hint;
} init;
message {
uint32 num_of_channels;
ChannelId channels[num_of_channels] @end;
uint32 num_of_channels;
ChannelId channels[num_of_channels] @end;
} @ctype(SpiceMsgChannels) channels_list;
message {
mouse_mode supported_modes;
mouse_mode current_mode @unique_flag;
mouse_mode supported_modes;
mouse_mode current_mode @unique_flag;
} mouse_mode;
message {
uint32 time;
uint32 time;
} @ctype(SpiceMsgMainMultiMediaTime) multi_media_time;
Empty agent_connected;
message {
link_err error_code;
link_err error_code;
} @ctype(SpiceMsgMainAgentDisconnect) agent_disconnected;
Data agent_data;
message {
uint32 num_tokens;
uint32 num_tokens;
} @ctype(SpiceMsgMainAgentTokens) agent_token;
message {
@ -231,7 +231,7 @@ channel MainChannel : BaseChannel {
client:
message {
uint64 cache_size;
uint64 cache_size;
} @ctype(SpiceMsgcClientInfo) client_info = 101;
Empty migrate_connected;
@ -241,11 +241,11 @@ channel MainChannel : BaseChannel {
Empty attach_channels;
message {
mouse_mode mode;
mouse_mode mode;
} mouse_mode_request;
message {
uint32 num_tokens;
uint32 num_tokens;
} agent_start;
Data agent_data;
@ -423,9 +423,9 @@ struct BitmapData {
uint32 stride;
switch (flags) {
case PAL_FROM_CACHE:
uint64 palette_id;
uint64 palette_id;
default:
Palette *palette @outvar(bitmap);
Palette *palette @outvar(bitmap);
} pal @anon;
uint8 *data[image_size(8, stride, y)] @chunk; /* pointer to array, not array of pointers as in C */
} @ctype(SpiceBitmap);
@ -440,9 +440,9 @@ struct LZPLTData {
uint32 data_size;
switch (flags) {
case PAL_FROM_CACHE:
uint64 palette_id;
uint64 palette_id;
default:
Palette *palette @nonnull @outvar(lzplt);
Palette *palette @nonnull @outvar(lzplt);
} pal @anon;
uint8 data[data_size] @nomarshal @chunk;
};
@ -529,209 +529,209 @@ struct String {
string_flags flags; /* Special: Only one of a1/a4/a8 set */
switch (flags) {
case RASTER_A1:
RasterGlyphA1 glyphs[length] @ctype(SpiceRasterGlyph) @ptr_array;
RasterGlyphA1 glyphs[length] @ctype(SpiceRasterGlyph) @ptr_array;
case RASTER_A4:
RasterGlyphA4 glyphs[length] @ctype(SpiceRasterGlyph) @ptr_array;
RasterGlyphA4 glyphs[length] @ctype(SpiceRasterGlyph) @ptr_array;
case RASTER_A8:
RasterGlyphA8 glyphs[length] @ctype(SpiceRasterGlyph) @ptr_array;
RasterGlyphA8 glyphs[length] @ctype(SpiceRasterGlyph) @ptr_array;
} u @anon;
};
struct StreamDataHeader {
uint32 id;
uint32 multi_media_time;
uint32 id;
uint32 multi_media_time;
};
channel DisplayChannel : BaseChannel {
server:
message {
uint32 x_res;
uint32 y_res;
uint32 bits;
uint32 x_res;
uint32 y_res;
uint32 bits;
} mode = 101;
Empty mark;
Empty reset;
message {
DisplayBase base;
Point src_pos;
DisplayBase base;
Point src_pos;
} copy_bits;
message {
uint16 count;
ResourceID resources[count] @end;
uint16 count;
ResourceID resources[count] @end;
} @ctype(SpiceResourceList) inval_list;
message {
uint8 wait_count;
WaitForChannel wait_list[wait_count] @end;
uint8 wait_count;
WaitForChannel wait_list[wait_count] @end;
} @ctype(SpiceMsgWaitForChannels) inval_all_pixmaps;
message {
uint64 id;
uint64 id;
} @ctype(SpiceMsgDisplayInvalOne) inval_palette;
Empty inval_all_palettes;
message {
uint32 surface_id @virtual(0);
uint32 id;
stream_flags flags;
video_codec_type codec_type;
uint64 stamp;
uint32 stream_width;
uint32 stream_height;
uint32 src_width;
uint32 src_height;
Rect dest;
Clip clip;
uint32 surface_id @virtual(0);
uint32 id;
stream_flags flags;
video_codec_type codec_type;
uint64 stamp;
uint32 stream_width;
uint32 stream_height;
uint32 src_width;
uint32 src_height;
Rect dest;
Clip clip;
} stream_create = 122;
message {
StreamDataHeader base;
uint32 data_size;
uint32 pad_size @zero;
uint8 data[data_size] @end @nomarshal;
/* Ignore: uint8 padding[pad_size] */
StreamDataHeader base;
uint32 data_size;
uint32 pad_size @zero;
uint8 data[data_size] @end @nomarshal;
/* Ignore: uint8 padding[pad_size] */
} stream_data;
message {
uint32 id;
Clip clip;
uint32 id;
Clip clip;
} stream_clip;
message {
uint32 id;
uint32 id;
} stream_destroy;
Empty stream_destroy_all;
message {
DisplayBase base;
struct Fill {
Brush brush @outvar(brush);
uint16 rop_descriptor;
QMask mask @outvar(mask);
} data;
DisplayBase base;
struct Fill {
Brush brush @outvar(brush);
uint16 rop_descriptor;
QMask mask @outvar(mask);
} data;
} draw_fill = 302;
message {
DisplayBase base;
struct Opaque {
Image *src_bitmap;
Rect src_area;
Brush brush;
ropd rop_descriptor;
image_scale_mode scale_mode;
QMask mask @outvar(mask);
} data;
DisplayBase base;
struct Opaque {
Image *src_bitmap;
Rect src_area;
Brush brush;
ropd rop_descriptor;
image_scale_mode scale_mode;
QMask mask @outvar(mask);
} data;
} draw_opaque;
message {
DisplayBase base;
struct Copy {
Image *src_bitmap;
Rect src_area;
ropd rop_descriptor;
image_scale_mode scale_mode;
QMask mask @outvar(mask);
} data;
DisplayBase base;
struct Copy {
Image *src_bitmap;
Rect src_area;
ropd rop_descriptor;
image_scale_mode scale_mode;
QMask mask @outvar(mask);
} data;
} draw_copy;
message {
DisplayBase base;
struct Blend {
Image *src_bitmap;
Rect src_area;
ropd rop_descriptor;
image_scale_mode scale_mode;
QMask mask @outvar(mask);
} @ctype(SpiceCopy) data;
DisplayBase base;
struct Blend {
Image *src_bitmap;
Rect src_area;
ropd rop_descriptor;
image_scale_mode scale_mode;
QMask mask @outvar(mask);
} @ctype(SpiceCopy) data;
} draw_blend;
message {
DisplayBase base;
struct Blackness {
QMask mask @outvar(mask);
} data;
DisplayBase base;
struct Blackness {
QMask mask @outvar(mask);
} data;
} draw_blackness;
message {
DisplayBase base;
struct Whiteness {
QMask mask @outvar(mask);
} data;
DisplayBase base;
struct Whiteness {
QMask mask @outvar(mask);
} data;
} draw_whiteness;
message {
DisplayBase base;
struct Invers {
QMask mask @outvar(mask);
} data;
DisplayBase base;
struct Invers {
QMask mask @outvar(mask);
} data;
} draw_invers;
message {
DisplayBase base;
struct Rop3 {
Image *src_bitmap;
Rect src_area;
Brush brush;
uint8 rop3;
image_scale_mode scale_mode;
QMask mask @outvar(mask);
} data;
DisplayBase base;
struct Rop3 {
Image *src_bitmap;
Rect src_area;
Brush brush;
uint8 rop3;
image_scale_mode scale_mode;
QMask mask @outvar(mask);
} data;
} draw_rop3;
message {
DisplayBase base;
struct Stroke {
Path *path;
LineAttr attr;
Brush brush;
uint16 fore_mode;
uint16 back_mode;
} data;
DisplayBase base;
struct Stroke {
Path *path;
LineAttr attr;
Brush brush;
uint16 fore_mode;
uint16 back_mode;
} data;
} draw_stroke;
message {
DisplayBase base;
struct Text {
String *str;
Rect back_area;
Brush fore_brush @outvar(fore_brush);
Brush back_brush @outvar(back_brush);
uint16 fore_mode;
uint16 back_mode;
} data;
DisplayBase base;
struct Text {
String *str;
Rect back_area;
Brush fore_brush @outvar(fore_brush);
Brush back_brush @outvar(back_brush);
uint16 fore_mode;
uint16 back_mode;
} data;
} draw_text;
message {
DisplayBase base;
struct Transparent {
Image *src_bitmap;
Rect src_area;
uint32 src_color;
uint32 true_color;
} data;
DisplayBase base;
struct Transparent {
Image *src_bitmap;
Rect src_area;
uint32 src_color;
uint32 true_color;
} data;
} draw_transparent;
message {
DisplayBase base;
struct AlphaBlend {
int8 alpha_flags @virtual(0);
uint8 alpha;
Image *src_bitmap;
Rect src_area;
} data;
DisplayBase base;
struct AlphaBlend {
int8 alpha_flags @virtual(0);
uint8 alpha;
Image *src_bitmap;
Rect src_area;
} data;
} draw_alpha_blend;
client:
message {
uint8 pixmap_cache_id;
int64 pixmap_cache_size; //in pixels
uint8 glz_dictionary_id;
int32 glz_dictionary_window_size; // in pixels
uint8 pixmap_cache_id;
int64 pixmap_cache_size; //in pixels
uint8 glz_dictionary_id;
int32 glz_dictionary_window_size; // in pixels
} init = 101;
};
@ -759,47 +759,47 @@ flags32 mouse_button_mask {
channel InputsChannel : BaseChannel {
client:
message {
uint32 code;
uint32 code;
} @ctype(SpiceMsgcKeyDown) key_down = 101;
message {
uint32 code;
uint32 code;
} @ctype(SpiceMsgcKeyUp) key_up;
message {
keyboard_modifier_flags modifiers;
keyboard_modifier_flags modifiers;
} @ctype(SpiceMsgcKeyModifiers) key_modifiers;
message {
int32 dx;
int32 dy;
mouse_button_mask buttons_state;
int32 dx;
int32 dy;
mouse_button_mask buttons_state;
} @ctype(SpiceMsgcMouseMotion) mouse_motion = 111;
message {
uint32 x;
uint32 y;
mouse_button_mask buttons_state;
uint8 display_id;
uint32 x;
uint32 y;
mouse_button_mask buttons_state;
uint8 display_id;
} @ctype(SpiceMsgcMousePosition) mouse_position;
message {
mouse_button button;
mouse_button_mask buttons_state;
mouse_button button;
mouse_button_mask buttons_state;
} @ctype(SpiceMsgcMousePress) mouse_press;
message {
mouse_button button;
mouse_button_mask buttons_state;
mouse_button button;
mouse_button_mask buttons_state;
} @ctype(SpiceMsgcMouseRelease) mouse_release;
server:
message {
keyboard_modifier_flags keyboard_modifiers;
keyboard_modifier_flags keyboard_modifiers;
} init = 101;
message {
keyboard_modifier_flags modifiers;
keyboard_modifier_flags modifiers;
} key_modifiers;
Empty mouse_motion_ack = 111;
@ -839,34 +839,34 @@ struct Cursor {
channel CursorChannel : BaseChannel {
server:
message {
Point16 position;
uint16 trail_length;
uint16 trail_frequency;
uint8 visible;
Cursor cursor;
Point16 position;
uint16 trail_length;
uint16 trail_frequency;
uint8 visible;
Cursor cursor;
} init = 101;
Empty reset;
message {
Point16 position;
uint8 visible;
Cursor cursor;
Point16 position;
uint8 visible;
Cursor cursor;
} set;
message {
Point16 position;
Point16 position;
} move;
Empty hide;
message {
uint16 length;
uint16 frequency;
uint16 length;
uint16 frequency;
} trail;
message {
uint64 id;
uint64 id;
} @ctype(SpiceMsgDisplayInvalOne) inval_one;
Empty inval_all;
@ -887,14 +887,14 @@ enum32 audio_fmt {
channel PlaybackChannel : BaseChannel {
server:
message {
uint32 time;
uint8 data[] @as_ptr(data_size);
uint32 time;
uint8 data[] @as_ptr(data_size);
} @ctype(SpiceMsgPlaybackPacket) data = 101;
message {
uint32 time;
audio_data_mode mode;
uint8 data[] @as_ptr(data_size);
uint32 time;
audio_data_mode mode;
uint8 data[] @as_ptr(data_size);
} mode;
message {
@ -910,26 +910,26 @@ channel PlaybackChannel : BaseChannel {
channel RecordChannel : BaseChannel {
server:
message {
uint32 channels;
audio_fmt format;
uint32 frequency;
uint32 channels;
audio_fmt format;
uint32 frequency;
} start = 101;
Empty stop;
client:
message {
uint32 time;
uint8 data[] @nomarshal @as_ptr(data_size);
uint32 time;
uint8 data[] @nomarshal @as_ptr(data_size);
} @ctype(SpiceMsgcRecordPacket) data = 101;
message {
uint32 time;
audio_data_mode mode;
uint8 data[] @as_ptr(data_size);
uint32 time;
audio_data_mode mode;
uint8 data[] @as_ptr(data_size);
} mode;
message {
uint32 time;
uint32 time;
} start_mark;
};