Commit f9652ebb authored by Jeremy White's avatar Jeremy White

Correct the XSpice AgentMouse configuration options.

Since the introduction of vdagent support in commit
294daff7, the
SpiceAgentMouse setting has not really operated correctly.

That is, if SpiceVdagentEnabled was true, the value
of SpiceAgentMouse was overridden.

This patch corrects that.

It also shifts the default; that matches qemu, and effectively
preserves the current default behavior.
parent 6fa56701
......@@ -126,9 +126,9 @@ Section "Device"
# defaults to 16
#Option "FrameBufferSize" "16"
# Set Spice Agent Mouse
# defaults to false
#Option "SpiceAgentMouse" "False"
# Set Spice Agent Mouse - Use Agent mouse if an agent connects
# defaults to true
#Option "SpiceAgentMouse" "True"
# Set Spice Playback compression
# defaults to true
......
......@@ -98,9 +98,8 @@ const OptionInfoRec DefaultOptions[] =
"SpiceX509Dir", OPTV_STRING, {0}, FALSE},
{ OPTION_SPICE_SASL,
"SpiceSasl", OPTV_BOOLEAN, {0}, FALSE},
/* VVV qemu defaults to 1 - not implemented in xspice yet */
{ OPTION_SPICE_AGENT_MOUSE,
"SpiceAgentMouse", OPTV_BOOLEAN, {0}, FALSE},
"SpiceAgentMouse", OPTV_BOOLEAN, {0}, TRUE },
{ OPTION_SPICE_DISABLE_TICKETING,
"SpiceDisableTicketing", OPTV_BOOLEAN, {0}, FALSE},
{ OPTION_SPICE_PASSWORD,
......
......@@ -122,7 +122,6 @@ void spiceqxl_uinput_init(qxl_screen_t *qxl)
uinput_filename, strerror(errno));
return;
}
spice_server_set_agent_mouse(qxl->spice_server, 1);
}
void spiceqxl_uinput_watch(qxl_screen_t *qxl, Bool on)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment