aboutsummaryrefslogtreecommitdiffstats
path: root/unix/xserver/hw/vnc/vncExtInit.cc
diff options
context:
space:
mode:
Diffstat (limited to 'unix/xserver/hw/vnc/vncExtInit.cc')
-rw-r--r--unix/xserver/hw/vnc/vncExtInit.cc143
1 files changed, 64 insertions, 79 deletions
diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc
index 367481ac..e9924d70 100644
--- a/unix/xserver/hw/vnc/vncExtInit.cc
+++ b/unix/xserver/hw/vnc/vncExtInit.cc
@@ -27,18 +27,17 @@
#include <sys/types.h>
#include <pwd.h>
-#include <set>
#include <string>
-#include <rfb/Configuration.h>
-#include <rfb/Logger_stdio.h>
-#include <rfb/LogWriter.h>
+#include <core/Configuration.h>
+#include <core/Logger_stdio.h>
+#include <core/LogWriter.h>
+#include <core/Region.h>
+
#include <rfb/ServerCore.h>
#include <rdr/HexOutStream.h>
-#include <rfb/LogWriter.h>
-#include <rfb/Hostname.h>
-#include <rfb/Region.h>
#include <rfb/ledStates.h>
+
#include <network/TcpSocket.h>
#include <network/UnixSocket.h>
@@ -55,9 +54,7 @@ extern "C" {
void vncSetGlueContext(int screenIndex);
}
-using namespace rfb;
-
-static rfb::LogWriter vlog("vncext");
+static core::LogWriter vlog("vncext");
// We can't safely get this from Xorg
#define MAXSCREENS 16
@@ -70,38 +67,43 @@ int vncFbstride[MAXSCREENS];
int vncInetdSock = -1;
-struct CaseInsensitiveCompare {
- bool operator() (const std::string &a, const std::string &b) const {
- return strcasecmp(a.c_str(), b.c_str()) < 0;
- }
-};
-
-typedef std::set<std::string, CaseInsensitiveCompare> ParamSet;
-static ParamSet allowOverrideSet;
-
static const char* defaultDesktopName();
-rfb::IntParameter rfbport("rfbport", "TCP port to listen for RFB protocol",0);
-rfb::StringParameter rfbunixpath("rfbunixpath", "Unix socket to listen for RFB protocol", "");
-rfb::IntParameter rfbunixmode("rfbunixmode", "Unix socket access mode", 0600);
-rfb::StringParameter desktopName("desktop", "Name of VNC desktop", defaultDesktopName());
-rfb::BoolParameter localhostOnly("localhost",
- "Only allow connections from localhost",
- false);
-rfb::StringParameter interface("interface",
- "Listen on the specified network address",
- "all");
-rfb::BoolParameter avoidShiftNumLock("AvoidShiftNumLock",
- "Avoid fake Shift presses for keys affected by NumLock.",
- true);
-rfb::StringParameter allowOverride("AllowOverride",
- "Comma separated list of parameters that can be modified using VNC extension.",
- "desktop,AcceptPointerEvents,SendCutText,AcceptCutText,SendPrimary,SetPrimary");
-rfb::BoolParameter setPrimary("SetPrimary", "Set the PRIMARY as well "
- "as the CLIPBOARD selection", true);
-rfb::BoolParameter sendPrimary("SendPrimary",
- "Send the PRIMARY as well as the CLIPBOARD selection",
- true);
+core::IntParameter
+ rfbport("rfbport",
+ "TCP port to listen for RFB protocol", 0, -1, 65535);
+core::StringParameter
+ rfbunixpath("rfbunixpath",
+ "Unix socket to listen for RFB protocol", "");
+core::IntParameter
+ rfbunixmode("rfbunixmode",
+ "Unix socket access mode", 0600, 0000, 0777);
+core::StringParameter
+ desktopName("desktop", "Name of VNC desktop", defaultDesktopName());
+core::BoolParameter
+ localhostOnly("localhost",
+ "Only allow connections from localhost", false);
+core::StringParameter
+ interface("interface",
+ "Listen on the specified network address", "all");
+core::BoolParameter
+ avoidShiftNumLock("AvoidShiftNumLock",
+ "Avoid fake Shift presses for keys affected by "
+ "NumLock.", true);
+core::StringListParameter
+ allowOverride("AllowOverride",
+ "Comma separated list of parameters that can be "
+ "modified using VNC extension.",
+ {"desktop", "AcceptPointerEvents", "SendCutText",
+ "AcceptCutText", "SendPrimary", "SetPrimary"});
+core::BoolParameter
+ setPrimary("SetPrimary",
+ "Set the PRIMARY as well as the CLIPBOARD selection",
+ true);
+core::BoolParameter
+ sendPrimary("SendPrimary",
+ "Send the PRIMARY as well as the CLIPBOARD selection",
+ true);
static const char* defaultDesktopName()
{
@@ -128,7 +130,7 @@ static const char* defaultDesktopName()
return name;
}
-static PixelFormat vncGetPixelFormat(int scrIdx)
+static rfb::PixelFormat vncGetPixelFormat(int scrIdx)
{
int depth, bpp;
int trueColour, bigEndian;
@@ -152,22 +154,9 @@ static PixelFormat vncGetPixelFormat(int scrIdx)
greenMax = greenMask >> greenShift;
blueMax = blueMask >> blueShift;
- return PixelFormat(bpp, depth, bigEndian, trueColour,
- redMax, greenMax, blueMax,
- redShift, greenShift, blueShift);
-}
-
-static void parseOverrideList(const char *text, ParamSet &out)
-{
- for (const char* iter = text; ; ++iter) {
- if (*iter == ',' || *iter == '\0') {
- out.insert(std::string(text, iter));
- text = iter + 1;
-
- if (*iter == '\0')
- break;
- }
- }
+ return rfb::PixelFormat(bpp, depth, bigEndian, trueColour,
+ redMax, greenMax, blueMax,
+ redShift, greenShift, blueShift);
}
void vncExtensionInit(void)
@@ -189,9 +178,8 @@ void vncExtensionInit(void)
try {
if (!initialised) {
- rfb::initStdIOLoggers();
+ core::initStdIOLoggers();
- parseOverrideList(allowOverride, allowOverrideSet);
allowOverride.setImmutable();
initialised = true;
@@ -252,7 +240,7 @@ void vncExtensionInit(void)
if (!inetd && listeners.empty())
throw std::runtime_error("No path or port configured for incoming connections");
- PixelFormat pf = vncGetPixelFormat(scr);
+ rfb::PixelFormat pf = vncGetPixelFormat(scr);
vncSetGlueContext(scr);
desktop[scr] = new XserverDesktop(scr,
@@ -358,7 +346,7 @@ int vncConnectClient(const char *addr, int viewOnly)
std::string host;
int port;
- getHostAndPort(addr, &host, &port, 5500);
+ network::getHostAndPort(addr, &host, &port, 5500);
try {
network::Socket* sock = new network::TcpSocket(host.c_str(), port);
@@ -403,11 +391,11 @@ void vncSetLEDState(unsigned long leds)
state = 0;
if (leds & (1 << 0))
- state |= ledCapsLock;
+ state |= rfb::ledCapsLock;
if (leds & (1 << 1))
- state |= ledNumLock;
+ state |= rfb::ledNumLock;
if (leds & (1 << 2))
- state |= ledScrollLock;
+ state |= rfb::ledScrollLock;
for (int scr = 0; scr < vncGetScreenCount(); scr++)
desktop[scr]->setLEDState(state);
@@ -417,8 +405,8 @@ void vncAddChanged(int scrIdx, int nRects,
const struct UpdateRect *rects)
{
for (int i = 0;i < nRects;i++) {
- desktop[scrIdx]->add_changed(Region(Rect(rects[i].x1, rects[i].y1,
- rects[i].x2, rects[i].y2)));
+ desktop[scrIdx]->add_changed({{rects[i].x1, rects[i].y1,
+ rects[i].x2, rects[i].y2}});
}
}
@@ -427,9 +415,9 @@ void vncAddCopied(int scrIdx, int nRects,
int dx, int dy)
{
for (int i = 0;i < nRects;i++) {
- desktop[scrIdx]->add_copied(Region(Rect(rects[i].x1, rects[i].y1,
- rects[i].x2, rects[i].y2)),
- Point(dx, dy));
+ desktop[scrIdx]->add_copied({{rects[i].x1, rects[i].y1,
+ rects[i].x2, rects[i].y2}},
+ {dx, dy});
}
}
@@ -471,7 +459,7 @@ void vncPostScreenResize(int scrIdx, int success, int width, int height)
if (success) {
// Mark entire screen as changed
- desktop[scrIdx]->add_changed(Region(Rect(0, 0, width, height)));
+ desktop[scrIdx]->add_changed({{0, 0, width, height}});
}
}
@@ -511,15 +499,12 @@ void vncAbortMsc(int scrIdx, uint64_t id)
}
}
-int vncOverrideParam(const char *nameAndValue)
+int vncOverrideParam(const char *param, const char *value)
{
- const char* equalSign = strchr(nameAndValue, '=');
- if (!equalSign)
- return 0;
-
- std::string key(nameAndValue, equalSign);
- if (allowOverrideSet.find(key) == allowOverrideSet.end())
- return 0;
+ for (const char* allowed : allowOverride) {
+ if (strcasecmp(allowed, param) == 0)
+ return core::Configuration::setParam(param, value);
+ }
- return rfb::Configuration::setParam(nameAndValue);
+ return 0;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-11 13:12:18 +0000