Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 14:57:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] app: cleanup clipboard option logic

Browse Source
This commit is contained in:
Geoffrey McRae 2021-06-02 22:09:09 +10:00
parent b657b57016
commit b2974c38ef
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/app.c
View File

@ -128,6 +128,9 @@ void app_clipboardRelease(void)
void app_clipboardNotifyTypes(const LG_ClipboardData types[], int count) void app_clipboardNotifyTypes(const LG_ClipboardData types[], int count)
{ {
if (!g_params.clipboardToVM)
return;
if (count == 0) if (count == 0)
{ {
spice_clipboard_release(); spice_clipboard_release();

13
client/src/config.c
View File

@ -568,11 +568,14 @@ bool config_load(int argc, char * argv[])
if (g_params.useSpiceClipboard) if (g_params.useSpiceClipboard)
{ {
g_params.clipboardToVM = option_get_bool("spice", "clipboardToVM" ); g_params.clipboardToVM = option_get_bool("spice", "clipboardToVM" );
g_params.clipboardToLocal = option_get_bool("spice", "clipboardToLocal"); g_params.clipboardToLocal = option_get_bool("spice", "clipboardToLocal");
g_params.useSpiceClipboard = g_params.clipboardToVM || g_params.clipboardToLocal;
if (!g_params.clipboardToVM && !g_params.clipboardToLocal) }
g_params.useSpiceClipboard = false; else
{
g_params.clipboardToVM = false;
g_params.clipboardToLocal = false;
} }
g_params.scaleMouseInput = option_get_bool("spice", "scaleCursor"); g_params.scaleMouseInput = option_get_bool("spice", "scaleCursor");

11
client/src/main.c
View File

@ -684,11 +684,12 @@ static int lg_run(void)
// try to connect to the spice server // try to connect to the spice server
if (g_params.useSpiceInput || g_params.useSpiceClipboard) if (g_params.useSpiceInput || g_params.useSpiceClipboard)
{ {
spice_set_clipboard_cb( if (g_params.useSpiceClipboard)
cb_spiceNotice, spice_set_clipboard_cb(
cb_spiceData, cb_spiceNotice,
cb_spiceRelease, cb_spiceData,
cb_spiceRequest); cb_spiceRelease,
cb_spiceRequest);
if (!spice_connect(g_params.spiceHost, g_params.spicePort, "")) if (!spice_connect(g_params.spiceHost, g_params.spicePort, ""))
{ {