Add capture multi screen support and update return, and remove unused…

… files
go-vgo · Jan 2, 2022 · 28fd0b9 · 28fd0b9
1 parent 48f1adc
commit 28fd0b9
Show file tree

Hide file tree

Showing 15 changed files with 123 additions and 636 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,11 +11,13 @@ jobs:
       - checkout
       # specify any bash command here prefixed with `run: `
       - run: apt update
-      - run: apt -y install gcc libc6-dev
-          libx11-dev xorg-dev libxtst-dev libpng++-dev
-          xcb libxcb-xkb-dev x11-xkb-utils libx11-xcb-dev libxkbcommon-x11-dev
-          libxkbcommon-dev
+      - run:
+          apt -y install gcc libc6-dev
+          libx11-dev xorg-dev libxtst-dev
           xsel xclip
+          # libpng++-dev
+          # xcb libxcb-xkb-dev x11-xkb-utils libx11-xcb-dev libxkbcommon-x11-dev
+          # libxkbcommon-dev
       - run: apt -y install xvfb
       #
       #  override:

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -22,10 +22,6 @@ jobs:
       - name: Get dependencies
         run: |
           go get -v -t -d ./...
-          # if [ -f Gopkg.toml ]; then
-          #     curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-          #     dep ensure
-          # fi
 
       - name: Build
         run: go build -v .

diff --git a/base/bitmap_free_c.h b/base/bitmap_free_c.h
@@ -0,0 +1,41 @@
+#include "MMBitmap.h"
+#include <assert.h>
+#include <string.h>
+
+MMBitmapRef createMMBitmap_c(
+	uint8_t *buffer,
+    size_t width,
+    size_t height,
+    size_t bytewidth,
+    uint8_t bitsPerPixel,
+    uint8_t bytesPerPixel
+){
+	MMBitmapRef bitmap = malloc(sizeof(MMBitmap));
+	if (bitmap == NULL) { return NULL; }
+
+	bitmap->imageBuffer = buffer;
+	bitmap->width = width;
+	bitmap->height = height;
+	bitmap->bytewidth = bytewidth;
+	bitmap->bitsPerPixel = bitsPerPixel;
+	bitmap->bytesPerPixel = bytesPerPixel;
+
+	return bitmap;
+}
+
+void destroyMMBitmap(MMBitmapRef bitmap) {
+	assert(bitmap != NULL);
+
+	if (bitmap->imageBuffer != NULL) {
+		free(bitmap->imageBuffer);
+		bitmap->imageBuffer = NULL;
+	}
+
+	free(bitmap);
+}
+
+void destroyMMBitmapBuffer(char * bitmapBuffer, void * hint) {
+	if (bitmapBuffer != NULL) {
+		free(bitmapBuffer);
+	}
+}
diff --git a/bitmap/bitmap_class.h b/bitmap/bitmap_class.h
diff --git a/bitmap/bitmap_find.h b/bitmap/bitmap_find.h