pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-11 08:07:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'a3a3b34a46f57ce86da444532e1db292638a74cd' into 0.10

Browse Source
This commit is contained in:
Hans de Goede 2012-01-18 11:17:21 +01:00
commit 35d35634a9
8 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/red_client.cpp
View File

@ -274,7 +274,6 @@ void* Migrate::worker_main(void *data)
void Migrate::start(const SpiceMsgMainMigrationBegin* migrate)
{
std::string cert_subject;
uint32_t peer_major;
uint32_t peer_minor;

2
client/red_window.h
View File

@ -66,7 +66,7 @@ public:
void set_cursor(LocalCursor* local_cursor);
void hide_cursor();
void show_cursor();
void cupture_mouse();
void capture_mouse();
void release_mouse();
void start_key_interception();
void stop_key_interception();

2
client/screen.cpp
View File

@ -538,7 +538,7 @@ void RedScreen::capture_mouse()
_mouse_captured = true;
_window.hide_cursor();
reset_mouse_pos();
_window.cupture_mouse();
_window.capture_mouse();
}
void RedScreen::relase_mouse()

2
client/windows/red_window.cpp
View File

@ -695,7 +695,7 @@ bool RedWindow::get_mouse_anchor_point(SpicePoint& pt)
return true;
}
void RedWindow::cupture_mouse()
void RedWindow::capture_mouse()
{
RECT client_rect;
POINT origin;

2
client/x11/red_window.cpp
View File

@ -1867,7 +1867,7 @@ void RedWindow::release_mouse()
sync(true);
}
void RedWindow::cupture_mouse()
void RedWindow::capture_mouse()
{
int grab_retries = MOUSE_GRAB_RETRIES;
XLockDisplay(x_display);

6
server/red_parse_qxl.c
View File

@ -7,10 +7,10 @@
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.

18
server/red_parse_qxl.h
View File

@ -2,18 +2,18 @@
/*
Copyright (C) 2009,2010 Red Hat, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef RED_ABI_TRANSLATE_H

6
server/spicevmc.c
View File

@ -99,7 +99,11 @@ static void spicevmc_red_channel_client_on_disconnect(RedChannelClient *rcc)
sin = state->chardev_sin;
sif = SPICE_CONTAINEROF(sin->base.sif, SpiceCharDeviceInterface, base);
red_channel_client_destroy(rcc);
/* Don't destroy the rcc if the entire client is disconnecting, as then
red_client_destroy will already do this! */
if (!rcc->client->disconnecting)
red_channel_client_destroy(rcc);
state->rcc = NULL;
if (sif->state) {
sif->state(sin, 0);