mir/spiceterm
2
0
Fork 0
mirror of git://git.proxmox.com/git/spiceterm.git synced 2025-08-29 21:27:58 +00:00
Code Issues Releases Wiki Activity

iinclude glyphs.h (from vncterm), simplify drawing code

Browse Source
This commit is contained in:
Dietmar Maurer 2013-08-05 11:33:57 +02:00
parent 26c649411f
commit 4219b121fd
3 changed files with 80848 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,6 +1,6 @@
PROGRAMS=test_display_no_ssl PROGRAMS=test_display_no_ssl
HEADERS=test_display_base.h basic_event_loop.h ring.h HEADERS=test_display_base.h basic_event_loop.h ring.h glyphs.h
SOURCES=test_display_base.c test_display_no_ssl.c basic_event_loop.c SOURCES=test_display_base.c test_display_no_ssl.c basic_event_loop.c
all: ${PROGRAMS} all: ${PROGRAMS}

80843
glyphs.h Normal file
View File

File diff suppressed because it is too large Load Diff

22
test_display_base.c
View File

@ -9,6 +9,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <getopt.h> #include <getopt.h>
#include "glyphs.h"
#include <spice.h> #include <spice.h>
#include <spice/macros.h> #include <spice/macros.h>
#include <spice/qxl_dev.h> #include <spice/qxl_dev.h>
@ -77,9 +78,7 @@ static void simple_set_release_info(QXLReleaseInfo *info, intptr_t ptr)
/* bitmap and rects are freed, so they must be allocated with malloc */ /* bitmap and rects are freed, so they must be allocated with malloc */
SimpleSpiceUpdate *test_spice_create_update_from_bitmap(uint32_t surface_id, SimpleSpiceUpdate *test_spice_create_update_from_bitmap(uint32_t surface_id,
QXLRect bbox, QXLRect bbox,
uint8_t *bitmap, uint8_t *bitmap)
uint32_t num_clip_rects,
QXLRect *clip_rects)
{ {
SimpleSpiceUpdate *update; SimpleSpiceUpdate *update;
QXLDrawable *drawable; QXLDrawable *drawable;
@ -97,22 +96,7 @@ SimpleSpiceUpdate *test_spice_create_update_from_bitmap(uint32_t surface_id,
drawable->surface_id = surface_id; drawable->surface_id = surface_id;
drawable->bbox = bbox; drawable->bbox = bbox;
if (num_clip_rects == 0) {
drawable->clip.type = SPICE_CLIP_TYPE_NONE; drawable->clip.type = SPICE_CLIP_TYPE_NONE;
} else {
QXLClipRects *cmd_clip;
cmd_clip = calloc(sizeof(QXLClipRects) + num_clip_rects*sizeof(QXLRect), 1);
cmd_clip->num_rects = num_clip_rects;
cmd_clip->chunk.data_size = num_clip_rects*sizeof(QXLRect);
cmd_clip->chunk.prev_chunk = cmd_clip->chunk.next_chunk = 0;
memcpy(cmd_clip + 1, clip_rects, cmd_clip->chunk.data_size);
drawable->clip.type = SPICE_CLIP_TYPE_RECTS;
drawable->clip.data = (intptr_t)cmd_clip;
free(clip_rects);
}
drawable->effect = QXL_EFFECT_OPAQUE; drawable->effect = QXL_EFFECT_OPAQUE;
simple_set_release_info(&drawable->release_info, (intptr_t)update); simple_set_release_info(&drawable->release_info, (intptr_t)update);
drawable->type = QXL_DRAW_COPY; drawable->type = QXL_DRAW_COPY;
@ -178,7 +162,7 @@ static SimpleSpiceUpdate *test_spice_create_update_draw(Test *test, uint32_t sur
bbox.left = left; bbox.top = top; bbox.left = left; bbox.top = top;
bbox.right = left + bw; bbox.bottom = top + bh; bbox.right = left + bw; bbox.bottom = top + bh;
return test_spice_create_update_from_bitmap(surface_id, bbox, bitmap, 0, NULL); return test_spice_create_update_from_bitmap(surface_id, bbox, bitmap);
} }