From ce4722f3cdae6a3446b15dd52ade93ca6f49dca6 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Wed, 8 Nov 2017 16:00:05 +0100 Subject: [PATCH] Move XDesktop specific parameters in to same file --- unix/x0vncserver/XDesktop.cxx | 7 +++++-- unix/x0vncserver/x0vncserver.cxx | 5 ----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/unix/x0vncserver/XDesktop.cxx b/unix/x0vncserver/XDesktop.cxx index 07b3a9c1..4a989d3f 100644 --- a/unix/x0vncserver/XDesktop.cxx +++ b/unix/x0vncserver/XDesktop.cxx @@ -42,8 +42,11 @@ extern const unsigned int code_map_qnum_to_xorgevdev_len; extern const unsigned short code_map_qnum_to_xorgkbd[]; extern const unsigned int code_map_qnum_to_xorgkbd_len; -extern rfb::BoolParameter useShm; -extern rfb::BoolParameter rawKeyboard; +BoolParameter useShm("UseSHM", "Use MIT-SHM extension if available", true); +BoolParameter rawKeyboard("RawKeyboard", + "Send keyboard events straight through and " + "avoid mapping them to the current keyboard " + "layout", false); static rfb::LogWriter vlog("XDesktop"); diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx index 22525d5e..c8098f70 100644 --- a/unix/x0vncserver/x0vncserver.cxx +++ b/unix/x0vncserver/x0vncserver.cxx @@ -56,7 +56,6 @@ IntParameter pollingCycle("PollingCycle", "Milliseconds per one polling " "adjusted to satisfy MaxProcessorUsage setting", 30); IntParameter maxProcessorUsage("MaxProcessorUsage", "Maximum percentage of " "CPU time to be consumed", 35); -BoolParameter useShm("UseSHM", "Use MIT-SHM extension if available", true); StringParameter displayname("display", "The X display", ""); IntParameter rfbport("rfbport", "TCP port to listen for RFB protocol",5900); IntParameter queryConnectTimeout("QueryConnectTimeout", @@ -64,10 +63,6 @@ IntParameter queryConnectTimeout("QueryConnectTimeout", "rejecting the connection", 10); StringParameter hostsFile("HostsFile", "File with IP access control rules", ""); -BoolParameter rawKeyboard("RawKeyboard", - "Send keyboard events straight through and " - "avoid mapping them to the current keyboard " - "layout", false); // // Allow the main loop terminate itself gracefully on receiving a signal. -- 2.39.5