X shm implementation

PIwebVNC.cpp

@@ -34,9 +34,9 @@ XInputs *xinputs;    // XInputs object
 /**
  * main loop to send frames to the client
  */
-void frameLoop(Websocket *ws)
+void frameLoop()
 {
-    vncServer.start_service(*ws);
+    vncServer.start_service(*wss);
 }
 
 void firstFrame(int sid)
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
     xinputs = &input;
     signal(SIGINT, handle_sigint);
     std::thread t1 = ws.begin(SERVER_PORT);
-    std::thread t2(frameLoop, &ws);
+    std::thread t2(frameLoop);
     ws.onMessage(onMessageCLBK);
     ws.onConnect(firstFrame);
 

compile.sh

@@ -1,6 +1,6 @@
 apt install -y libx11-dev libxdamage-dev libxfixes-dev libxtst-dev liblz4-dev g++
 
-g++ PIwebVNC.cpp -lX11 -lXdamage -lXfixes -pthread -lXtst -llz4 -o PiWebVNC
+g++ PIwebVNC.cpp -lX11 -lXdamage -lXfixes -pthread -lXtst -lXext -llz4 -o PiWebVNC
 
 echo "Compile Successful."
 

libs/appConfigs.hpp

@@ -15,7 +15,7 @@
 #define MAX_BUFFER_SIZE 1024
 
 //   =======display=========
-#define FPS 10   // for pi zero set 5 [max 10 for pi4]
+#define FPS 15   // for pi zero set 5 [max 10 for pi4]
 #define FRAME_SEGMENTS_DELAY_MS 20    // for pi zero set 100
 
 #endif

libs/display.hpp

@@ -47,6 +47,7 @@ class XDisplay
     ScreenInfo getScreenInfo();
     std::string getCursorName();
     int getBitPerLine();
+    int depth;
 
 private:
     Display *display = 0;
@@ -59,23 +60,23 @@ XDisplay::XDisplay()
     try
     {
         std::string envDisplay = std::string(getenv("DISPLAY"));
-        display = XOpenDisplay(envDisplay.c_str());
+        this->display = XOpenDisplay(envDisplay.c_str());
     }
     catch (std::exception &e)
     {
         #if LOG || DEBUG
             std::cout << "[LOG] No env set for display. Trying default.[0 to 9]." << std::endl;
         #endif
         int displayNumber = 0;
-        while (display == 0 && displayNumber < 10)
+        while (this->display == 0 && displayNumber < 10)
         {
             std::string displayNumberStr = ":" + std::to_string(displayNumber);
             std::cout << "[LOG] Trying display number " << displayNumberStr << std::endl;
-            display = XOpenDisplay(displayNumberStr.c_str());
+            this->display = XOpenDisplay(displayNumberStr.c_str());
             displayNumber++;
         }
     }
-    if (display == 0)
+    if (this->display == 0)
     {
         #if ERROR || DEBUG
             std::cout << "[ERROR][EXIT APP] Could not open display. Please pass --display [id].\n\t eg: --display 18." << std::endl;
@@ -89,31 +90,31 @@ XDisplay::XDisplay()
 XDisplay::~XDisplay()
 {
     // free display
-    if(display != 0) {
+    if(this->display != 0) {
         #if LOG
             std::cout << "[LOG] Closing display." << std::endl;
         #endif
-        XCloseDisplay(display);
-        display = 0;
+        XCloseDisplay(this->display);
+        this->display = 0;
     }
 }
 
 Display * XDisplay::getDisplay()
 {
-    return display;
+    return this->display;
 }
 
 int XDisplay::getBitPerLine()
 {
-    return bitPerLine;
+    return this->bitPerLine;
 }
 
 std::string XDisplay::getDisplayConfig()
 {
     ScreenInfo screenInfo = getScreenInfo();
     int width = screenInfo.width;
     int height = screenInfo.height;
-    XImage * img = XGetImage(display, DefaultRootWindow(display), 0, 0, width, height, AllPlanes, ZPixmap);
+    XImage * img = XGetImage(this->display, DefaultRootWindow(this->display), 0, 0, width, height, AllPlanes, ZPixmap);
     std::string config = "{ 'bytePerLine':" + std::to_string(img->bytes_per_line) +
                          ",'redMask':" + std::to_string(img->red_mask) +
                          ",'greenMask':" + std::to_string(img->green_mask) +
@@ -124,14 +125,15 @@ std::string XDisplay::getDisplayConfig()
                          ",'fps':" + std::to_string(FPS) +
                          +" }";
     this->bitPerLine = img->bytes_per_line;
+    this->depth = img->depth;
     XDestroyImage(img);
     return config;
 }
 
 std::string XDisplay::getCursorName()
 {
     // get cursor name using xfixes
-    XFixesCursorImage *cursorImage = XFixesGetCursorImage(display);
+    XFixesCursorImage *cursorImage = XFixesGetCursorImage(this->display);
     if (cursorImage == 0)
     {
         #if ERROR || DEBUG
@@ -147,9 +149,9 @@ ScreenInfo XDisplay::getScreenInfo()
 {
     ScreenInfo screenInfo;
     // get screen info from root window
-    screenInfo.root = DefaultRootWindow(display);
-    screenInfo.width = DisplayWidth(display, DefaultScreen(display));
-    screenInfo.height = DisplayHeight(display, DefaultScreen(display));
+    screenInfo.root = DefaultRootWindow(this->display);
+    screenInfo.width = DisplayWidth(this->display, DefaultScreen(this->display));
+    screenInfo.height = DisplayHeight(this->display, DefaultScreen(this->display));
     return screenInfo;
 }
 

libs/httpPage.hpp

@@ -12,7 +12,7 @@ struct HttpHTMLPage
 
 void parseHttpPage()
 {
-    htmlPage.index_html = std::string("HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=utf-8\r\n\r\n") + R"html(
+    htmlPage.index_html = std::string("HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nServer: PIwebVNC (by Jishan)\r\n\r\n") + R"html(
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -9742,7 +9742,7 @@ void parseHttpPage()
                     var y = Math.floor(e.offsetY / canvas.offsetHeight * canvas.height)
                     data = "M" + x + " " + y + " ";
                     ws.send(data);
-                }, 200);
+                }, 100);
             }
             canvas.onwheel = function(e){
                 e.preventDefault();

libs/input.hpp

@@ -36,7 +36,7 @@ class XInputs
         void dispatchEvents();
     private:
         Display *display;
-        char* events[30] = {0};
+        char events[30][100] = {0};
         int eventCount = 0;
 };
 
@@ -47,20 +47,22 @@ XInputs::XInputs(Display * display)
 
 void XInputs::queueInputs(char *data, int clinetSD)
 {
-    if (eventCount < 30)
+    if (this->eventCount < 30)
     {
-        events[eventCount] = data;
-        eventCount++;
+        strcpy(this->events[this->eventCount], data);
+        this->eventCount++;
     }
 }
 
 void XInputs::dispatchEvents(){
-    for(int i = 0; i < eventCount; i++){
-        if(events[i] != NULL){
-            processInputs(events[i], 0);
+    for(int i = 0; i < this->eventCount; i++){
+        if (events[i][0] != 0)
+        {
+            processInputs(this->events[i], 0);
+            this->events[i][0] = 0;
         }
     }
-    eventCount = 0;
+    this->eventCount = 0;
 }
 
 void XInputs::processInputs(char *data, int clientSD)
@@ -74,12 +76,12 @@ void XInputs::processInputs(char *data, int clientSD)
         i++;
         while (data[i] != 32 && i < len)
             y = y * 10 + data[i++] - 48;
-        if (display == 0)
+        if (this->display == 0)
             return;
-        XTestFakeMotionEvent(display, -1, x, y, CurrentTime);
-        XTestFakeButtonEvent(display, 1, True, CurrentTime);
-        XTestFakeButtonEvent(display, 1, False, CurrentTime);
-        XFlush(display);
+        XTestFakeMotionEvent(this->display, -1, x, y, CurrentTime);
+        XTestFakeButtonEvent(this->display, 1, True, CurrentTime);
+        XTestFakeButtonEvent(this->display, 1, False, CurrentTime);
+        XFlush(this->display);
     }
     else if (data[0] == 'M')
     {
@@ -88,10 +90,10 @@ void XInputs::processInputs(char *data, int clientSD)
         i++;
         while (data[i] != 32 && i < len)
             y = y * 10 + data[i++] - 48;
-        if (display == 0)
+        if (this->display == 0)
             return;
-        XTestFakeMotionEvent(display, -1, x, y, CurrentTime);
-        XFlush(display);
+        XTestFakeMotionEvent(this->display, -1, x, y, CurrentTime);
+        XFlush(this->display);
     }
     else if (data[0] == 'R')
     {
@@ -100,12 +102,12 @@ void XInputs::processInputs(char *data, int clientSD)
         i++;
         while (data[i] != 32 && i < len)
             y = y * 10 + data[i++] - 48;
-        if (display == 0)
+        if (this->display == 0)
             return;
-        XTestFakeMotionEvent(display, -1, x, y, CurrentTime);
-        XTestFakeButtonEvent(display, 3, True, CurrentTime);
-        XTestFakeButtonEvent(display, 3, False, CurrentTime);
-        XFlush(display);
+        XTestFakeMotionEvent(this->display, -1, x, y, CurrentTime);
+        XTestFakeButtonEvent(this->display, 3, True, CurrentTime);
+        XTestFakeButtonEvent(this->display, 3, False, CurrentTime);
+        XFlush(this->display);
     }
     else if (data[0] == 'D')
     {
@@ -120,34 +122,34 @@ void XInputs::processInputs(char *data, int clientSD)
         i++;
         while (data[i] != 32 && i < len)
             y2 = y2 * 10 + data[i++] - 48;
-        if (display == 0)
+        if (this->display == 0)
             return;
-        XTestFakeMotionEvent(display, -1, x, y, CurrentTime);
-        XTestFakeButtonEvent(display, 1, True, CurrentTime);
-        XTestFakeMotionEvent(display, -1, x2, y2, CurrentTime);
-        XFlush(display);
+        XTestFakeMotionEvent(this->display, -1, x, y, CurrentTime);
+        XTestFakeButtonEvent(this->display, 1, True, CurrentTime);
+        XTestFakeMotionEvent(this->display, -1, x2, y2, CurrentTime);
+        XFlush(this->display);
     }
     else if (data[0] == 'S')
     {
         if (data[1] == 'U')
         {
-            XTestFakeButtonEvent(display, 4, 1, 0);
-            XTestFakeButtonEvent(display, 4, 0, 70);
+            XTestFakeButtonEvent(this->display, 4, 1, 0);
+            XTestFakeButtonEvent(this->display, 4, 0, 70);
         }
         else
         {
-            XTestFakeButtonEvent(display, 5, 1, 0);
-            XTestFakeButtonEvent(display, 5, 0, 70);
+            XTestFakeButtonEvent(this->display, 5, 1, 0);
+            XTestFakeButtonEvent(this->display, 5, 0, 70);
         }
     }
     else if (data[0] == 'K')
     {
         if (data[1] == 49)
         {
-            int keycode = XKeysymToKeycode(display, XStringToKeysym(data + 2));
-            XTestFakeKeyEvent(display, keycode, True, CurrentTime);
-            XTestFakeKeyEvent(display, keycode, False, CurrentTime);
-            XFlush(display);
+            int keycode = XKeysymToKeycode(this->display, XStringToKeysym(data + 2));
+            XTestFakeKeyEvent(this->display, keycode, True, CurrentTime);
+            XTestFakeKeyEvent(this->display, keycode, False, CurrentTime);
+            XFlush(this->display);
         }
         else if (data[1] == 50)
         {
@@ -159,17 +161,16 @@ void XInputs::processInputs(char *data, int clientSD)
                 i++;
             }
             i++;
-            int keycode1 = XKeysymToKeycode(display, XStringToKeysym(buffer));
-            int keycode2 = XKeysymToKeycode(display, XStringToKeysym(data + i));
-            XTestFakeKeyEvent(display, keycode1, True, 0);
-            XTestFakeKeyEvent(display, keycode2, True, 0);
-            XTestFakeKeyEvent(display, keycode2, False, 0);
-            XTestFakeKeyEvent(display, keycode1, False, 0);
-            XFlush(display);
+            int keycode1 = XKeysymToKeycode(this->display, XStringToKeysym(buffer));
+            int keycode2 = XKeysymToKeycode(this->display, XStringToKeysym(data + i));
+            XTestFakeKeyEvent(this->display, keycode1, True, 0);
+            XTestFakeKeyEvent(this->display, keycode2, True, 0);
+            XTestFakeKeyEvent(this->display, keycode2, False, 0);
+            XTestFakeKeyEvent(this->display, keycode1, False, 0);
+            XFlush(this->display);
         }
     }
-    XFlush(display);
-    free(data);
+    XFlush(this->display);
 }
 
 #endif

libs/sha1.hpp

@@ -248,7 +248,8 @@ int char2int(char input)
 std::string hex2bin(std::string src)
 {
     std::string target = "";
-    for (int i = 0; i < src.length(); i += 2)
+    int len = src.length();
+    for (int i = 0; i < len; i += 2)
     {
         target += char2int(src[i]) * 16 + char2int(src[i + 1]);
     }