diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c56bc4..4dbdc3b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,17 +16,14 @@ jobs: 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 + # xcb libxcb-xkb-dev x11-xkb-utils libx11-xcb-dev libxkbcommon-x11-dev libxkbcommon-dev - run: apt -y install xvfb # # override: - # './...' is a relative pattern which means all subdirectories # - run: go get -u github.com/go-vgo/robotgo - # - run: go get -u golang.org/x/sys/unix - # - run: go get -u github.com/shirou/gopsutil - run: go get -v -t -d ./... - run: xvfb-run go test -v ./... + # # codecov.io # - run: xvfb-run go test -v -covermode=count -coverprofile=coverage.out # - run: bash <(curl -s https://codecov.io/bash) diff --git a/.circleci/images/primary/Dockerfile b/.circleci/images/primary/Dockerfile index d9909c2..5b20e3d 100644 --- a/.circleci/images/primary/Dockerfile +++ b/.circleci/images/primary/Dockerfile @@ -5,18 +5,15 @@ FROM golang:1.17.5-stretch AS build RUN apt update && apt install -y --no-install-recommends \ # customize dependencies libx11-dev xorg-dev \ - # libgtkglextmm-x11-dev - # libghc6-x11-dev - # libgl1-mesa-swx11-dev - # xorg-dev - libxtst-dev libpng++-dev \ + libxtst-dev \ + # Bitmap + libpng++-dev \ # Event: xcb libxcb-xkb-dev \ x11-xkb-utils libx11-xcb-dev \ libxkbcommon-x11-dev libxkbcommon-dev \ # Clipboard: xsel xclip && \ - # RUN apt install -y xclip # apt remove --purge --auto-remove && \ apt clean && \ diff --git a/examples/screen/main.go b/examples/screen/main.go index 2b8dee1..d6d7ff3 100644 --- a/examples/screen/main.go +++ b/examples/screen/main.go @@ -23,8 +23,8 @@ func bitmap() { gbit := robotgo.ToBitmap(abitMap) fmt.Println("bitmap...", gbit.Width) - gbitMap := robotgo.GoCaptureScreen() - fmt.Println("GoCaptureScreen...", gbitMap.Width) + gbitMap := robotgo.CaptureGo() + fmt.Println("Go CaptureScreen...", gbitMap.Width) // fmt.Println("...", gbitmap.Width, gbitmap.BytesPerPixel) // robotgo.SaveCapture("saveCapture.png", 10, 20, 100, 100) diff --git a/robotgo.go b/robotgo.go index 5a9cd80..9598d60 100644 --- a/robotgo.go +++ b/robotgo.go @@ -326,8 +326,8 @@ func CaptureScreen(args ...int) CBitmap { return CBitmap(bit) } -// GoCaptureScreen capture the screen and return bitmap(go struct) -func GoCaptureScreen(args ...int) Bitmap { +// CaptureGo capture the screen and return bitmap(go struct) +func CaptureGo(args ...int) Bitmap { bit := CaptureScreen(args...) defer FreeBitmap(bit)