Merge branch 'master' of openslx.org:pvs

Conflicts:
	src/gui/mainWindow.cpp

1 files changed, 15 insertions, 5 deletions

diff --git a/src/pvs.cpp b/src/pvs.cpp
index 5469eaa..18b3570 100755
--- a/src/pvs.cpp
+++ b/src/pvs.cpp
@@ -20,7 +20,7 @@
 #include "src/net/pvsServiceDiscovery.h"
 #include "src/net/pvsDiscoveredServer.h"
 #include "src/input/inputEvent.h"
-#include "src/input/inputHandlerChain.h"
+#include "src/input/inputHandlerChains.h"
 #include "src/input/x11InputUtils.h"
 #include "src/net/mcast/McastConfiguration.h"
 #include "src/net/pvsOutgoingMulticastTransfer.h"
@@ -199,8 +199,11 @@ void PVS::onCommand(PVSMsg cmdMessage)
     if (ident.compare("INPUTEVENT") == 0)
     {
     	InputEvent evt;
-    	eventFromString(message, evt);
-    	handleInputEvent(evt);
+    	if(inputEventsAllowed())
+    	{
+			eventFromString(message, evt);
+			handleInputEvent(evt);
+    	}
     }
     if (ident.compare("MCASTFTRETRY") == 0)
     {
@@ -758,16 +761,23 @@ bool PVS::createMulticastTransfer(QString const& objectPath, quint64& transferID
 
 // Input handling
 
+bool PVS::inputEventsAllowed()
+{
+	QString lecturer = getConfigValue("Permissions/vnc_lecturer");
+	return lecturer == "rw";
+}
+
 void PVS::handleInputEvent(InputEvent const& evt)
 {
-	std::string s = evt.toString();
-	ConsoleLog writeLine(QString("Received input event: %1").arg(s.c_str()));
+	QString s = evt.toString();
+	ConsoleLog writeLine(QString("Received input event: %1").arg(s.toLocal8Bit().constData()));
 	_inputEventHandlers.handle(evt);
 }
 
 void PVS::initializeInputEventHandling()
 {
 	X11InputUtils::setDisplay(X11Info::display());
+	_inputEventHandlers = makeUnprivilegedInputEventHandlerChain();
 	_inputEventHandlers.initialize();
 }