Proxmox/spiceterm
5
0
Fork 0
mirror of git://git.proxmox.com/git/spiceterm.git synced 2025-01-31 01:48:06 +03:00
Code Releases Activity

updates for debian jessie

Browse Source
This commit is contained in:
Dietmar Maurer 2015-02-27 16:40:45 +01:00
parent f801ff196c
commit b52b953498
5 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,8 +1,8 @@
RELEASE=3.1 RELEASE=4.0
PACKAGE=spiceterm PACKAGE=spiceterm
VERSION=1.0 VERSION=2.0
PACKAGERELEASE=2 PACKAGERELEASE=1
ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
GITVERSION:=$(shell cat .git/refs/heads/master) GITVERSION:=$(shell cat .git/refs/heads/master)

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
spiceterm (2.0-1) unstable; urgency=medium
* update for debian jessie
-- Proxmox Support Team <support@proxmox.com> Fri, 27 Feb 2015 16:39:55 +0100
spiceterm (1.0-2) unstable; urgency=low spiceterm (1.0-2) unstable; urgency=low
* fix ALTGR handling for windows clients * fix ALTGR handling for windows clients

34
screen.c
View File

@ -152,10 +152,10 @@ push_command(SpiceScreen *spice_screen, QXLCommandExt *ext)
{ {
int need_wakeup = 1; int need_wakeup = 1;
g_mutex_lock(spice_screen->command_mutex); g_mutex_lock(&spice_screen->command_mutex);
while (spice_screen->commands_end - spice_screen->commands_start >= COMMANDS_SIZE) { while (spice_screen->commands_end - spice_screen->commands_start >= COMMANDS_SIZE) {
g_cond_wait(spice_screen->command_cond, spice_screen->command_mutex); g_cond_wait(&spice_screen->command_cond, &spice_screen->command_mutex);
} }
g_assert(spice_screen->commands_end - spice_screen->commands_start < COMMANDS_SIZE); g_assert(spice_screen->commands_end - spice_screen->commands_start < COMMANDS_SIZE);
@ -168,10 +168,11 @@ push_command(SpiceScreen *spice_screen, QXLCommandExt *ext)
spice_screen->commands_end++; spice_screen->commands_end++;
if (need_wakeup) { if (need_wakeup) {
spice_screen->qxl_worker->wakeup(spice_screen->qxl_worker); spice_qxl_wakeup(&spice_screen->qxl_instance);
//spice_screen->qxl_worker->wakeup(spice_screen->qxl_worker);
} }
g_mutex_unlock(spice_screen->command_mutex); g_mutex_unlock(&spice_screen->command_mutex);
} }
@ -379,7 +380,6 @@ static void
create_primary_surface(SpiceScreen *spice_screen, uint32_t width, create_primary_surface(SpiceScreen *spice_screen, uint32_t width,
uint32_t height) uint32_t height)
{ {
QXLWorker *qxl_worker = spice_screen->qxl_worker;
QXLDevSurfaceCreate surface = { 0, }; QXLDevSurfaceCreate surface = { 0, };
g_assert(height > 0); g_assert(height > 0);
@ -407,7 +407,7 @@ create_primary_surface(SpiceScreen *spice_screen, uint32_t width,
spice_screen->cursor_set = 0; spice_screen->cursor_set = 0;
qxl_worker->create_primary_surface(qxl_worker, 0, &surface); spice_qxl_create_primary_surface(&spice_screen->qxl_instance, 0, &surface);
} }
QXLDevMemSlot slot = { QXLDevMemSlot slot = {
@ -430,9 +430,9 @@ attache_worker(QXLInstance *qin, QXLWorker *_qxl_worker)
} }
spice_screen->qxl_worker = _qxl_worker; spice_screen->qxl_worker = _qxl_worker;
spice_screen->qxl_worker->add_memslot(spice_screen->qxl_worker, &slot); spice_qxl_add_memslot(&spice_screen->qxl_instance, &slot);
create_primary_surface(spice_screen, spice_screen->width, spice_screen->height); create_primary_surface(spice_screen, spice_screen->width, spice_screen->height);
spice_screen->qxl_worker->start(spice_screen->qxl_worker); spice_server_vm_start(spice_screen->server);
} }
static void static void
@ -465,7 +465,7 @@ get_command(QXLInstance *qin, struct QXLCommandExt *ext)
SpiceScreen *spice_screen = SPICE_CONTAINEROF(qin, SpiceScreen, qxl_instance); SpiceScreen *spice_screen = SPICE_CONTAINEROF(qin, SpiceScreen, qxl_instance);
int res = FALSE; int res = FALSE;
g_mutex_lock(spice_screen->command_mutex); g_mutex_lock(&spice_screen->command_mutex);
if ((spice_screen->commands_end - spice_screen->commands_start) == 0) { if ((spice_screen->commands_end - spice_screen->commands_start) == 0) {
res = FALSE; res = FALSE;
@ -475,12 +475,12 @@ get_command(QXLInstance *qin, struct QXLCommandExt *ext)
*ext = *spice_screen->commands[spice_screen->commands_start % COMMANDS_SIZE]; *ext = *spice_screen->commands[spice_screen->commands_start % COMMANDS_SIZE];
g_assert(spice_screen->commands_start < spice_screen->commands_end); g_assert(spice_screen->commands_start < spice_screen->commands_end);
spice_screen->commands_start++; spice_screen->commands_start++;
g_cond_signal(spice_screen->command_cond); g_cond_signal(&spice_screen->command_cond);
res = TRUE; res = TRUE;
ret: ret:
g_mutex_unlock(spice_screen->command_mutex); g_mutex_unlock(&spice_screen->command_mutex);
return res; return res;
} }
@ -489,12 +489,12 @@ discard_pending_commands(SpiceScreen *spice_screen)
{ {
int pos; int pos;
g_mutex_lock(spice_screen->command_mutex); g_mutex_lock(&spice_screen->command_mutex);
for (pos = spice_screen->commands_start; pos < spice_screen->commands_end; pos++) { for (pos = spice_screen->commands_start; pos < spice_screen->commands_end; pos++) {
release_qxl_command_ext(spice_screen->commands[pos % COMMANDS_SIZE]); release_qxl_command_ext(spice_screen->commands[pos % COMMANDS_SIZE]);
} }
spice_screen->commands_start = spice_screen->commands_end; spice_screen->commands_start = spice_screen->commands_end;
g_mutex_unlock(spice_screen->command_mutex); g_mutex_unlock(&spice_screen->command_mutex);
} }
static int static int
@ -767,8 +767,8 @@ spice_screen_new(SpiceCoreInterface *core, uint32_t width, uint32_t height,
spice_screen->width = width; spice_screen->width = width;
spice_screen->height = height; spice_screen->height = height;
spice_screen->command_cond = g_cond_new(); g_cond_init(&spice_screen->command_cond);
spice_screen->command_mutex = g_mutex_new(); g_mutex_init(&spice_screen->command_mutex);
spice_screen->on_client_connected = client_connected, spice_screen->on_client_connected = client_connected,
spice_screen->on_client_disconnected = client_disconnected, spice_screen->on_client_disconnected = client_disconnected,
@ -833,15 +833,13 @@ void
spice_screen_resize(SpiceScreen *spice_screen, uint32_t width, spice_screen_resize(SpiceScreen *spice_screen, uint32_t width,
uint32_t height) uint32_t height)
{ {
QXLWorker *qxl_worker = spice_screen->qxl_worker;
if (spice_screen->width == width && spice_screen->height == height) { if (spice_screen->width == width && spice_screen->height == height) {
return; return;
} }
discard_pending_commands(spice_screen); discard_pending_commands(spice_screen);
qxl_worker->destroy_primary_surface(qxl_worker, 0); spice_qxl_destroy_primary_surface(&spice_screen->qxl_instance, 0);
create_primary_surface(spice_screen, width, height); create_primary_surface(spice_screen, width, height);

2
spiceterm.c
View File

@ -1632,8 +1632,6 @@ main (int argc, char** argv)
.sasl = FALSE, .sasl = FALSE,
}; };
g_thread_init(NULL);
static struct option long_options[] = { static struct option long_options[] = {
{ "timeout", required_argument, 0, 't' }, { "timeout", required_argument, 0, 't' },
{ "authpath", required_argument, 0, 'A' }, { "authpath", required_argument, 0, 'A' },

4
spiceterm.h
View File

@ -58,8 +58,8 @@ struct SpiceScreen {
int width; int width;
int height; int height;
GCond* command_cond; GCond command_cond;
GMutex* command_mutex; GMutex command_mutex;
int commands_end; int commands_end;
int commands_start; int commands_start;