feat: v1.1.3

Author: imf4ll

README.md

@@ -4,25 +4,7 @@
 </div>
 
 <br><br>
-## ANNOUNCEMENT:
-**I've decided to shutdown Windows compatibility, reason is, this tool is terminal friendly and Windows users usually don't, other user friendly tools are used, like the Windows 10 builtin "Win + Shift + S" command. The linux support will continue and I want to embrace Unix like OSs, hope you all understand me.**
-
-&nbsp;
 ## ❗️ Install:
-Arch based:
-```bash
-git clone https://aur.archlinux.org/ghost-git.git
-cd ghost-git
-makepkg -si
-```
-
-OR with a AUR Helper:
-```bash
-yay -S ghost-git
-```
-
-<br><br>
-Others:
 ```bash
 git clone https://github.com/z3oxs/ghost.git
 cd ghost

chans/keyEventsMulti.go

@@ -5,12 +5,12 @@ import (
 
     "fyne.io/fyne/v2"
     "fyne.io/fyne/v2/canvas"
-    "github.com/z3oxs/ghost/utils"
+    "github.com/imf4ll/ghost/types"
 )
 
 func KeyEventsMulti (
     event chan *fyne.KeyEvent, selectedDisplay int,
-    window fyne.Window, screenshots []*canvas.Raster, displays []utils.Display,
+    window fyne.Window, screenshots []*canvas.Raster, displays []types.Display,
 ) {
     for {
         select {

utils/getDisplays.go get/getDisplays.goutils/getDisplays.go renamed to get/getDisplays.go

@@ -1,4 +1,4 @@
-package utils
+package get
 
 /*
 #cgo LDFLAGS: -lXrandr -lX11
@@ -7,23 +7,20 @@ package utils
 */
 import "C"
 
-import "unsafe"
+import (
+    "unsafe"
 
-type Display struct {
-    X,
-    Y,
-    Width,
-    Height int
-}
+    "github.com/imf4ll/ghost/types"
+)
 
-func GetDisplays() []Display {
-    var validDisplays []Display
+func GetDisplays() []types.Display {
+    var validDisplays []types.Display
 
     displays := (*[1 << 10]C.struct_DisplayInfo)(unsafe.Pointer(C.getDisplays()))[0:10]
 
     for _, i := range displays {
         if (i.w != 0 && i.h != 0) {
-            validDisplays = append(validDisplays, Display {
+            validDisplays = append(validDisplays, types.Display {
                 X: int(i.x),
                 Y: int(i.y),
                 Width: int(i.w),

utils/getMouse.go get/getMouse.goutils/getMouse.go renamed to get/getMouse.go

@@ -1,4 +1,4 @@
-package utils
+package get
 
 /*
 #cgo LDFLAGS: -lX11

go.mod

@@ -1,4 +1,4 @@
-module github.com/z3oxs/ghost
+module github.com/imf4ll/ghost
 
 go 1.17
 

main.go

@@ -6,7 +6,7 @@ import (
     "fmt"
     "log"
 
-    "github.com/z3oxs/ghost/modes"
+    "github.com/imf4ll/ghost/modes"
 )
 
 var (
@@ -60,7 +60,7 @@ Flags:
 
 func main() {
     if version {
-        fmt.Println("\nCurrent version:\n    v1.1.2")
+        fmt.Println("\nCurrent version:\n    v1.1.3")
 
         os.Exit(3)
     }

modes/display.go

@@ -3,11 +3,13 @@ package modes
 import (
     "log"
 
-    "github.com/z3oxs/ghost/utils"
+    "github.com/imf4ll/ghost/get"
+    "github.com/imf4ll/ghost/save"
+    "github.com/imf4ll/ghost/utils"
 )
 
-func Display(save string, clipboard, output, upload, file bool, display int) {
-    displays := utils.GetDisplays()
+func Display(filename string, clipboard, output, upload, file bool, display int) {
+    displays := get.GetDisplays()
 
     if display > len(displays) {
         log.Fatal("Invalid screen selected.")
@@ -21,8 +23,8 @@ func Display(save string, clipboard, output, upload, file bool, display int) {
         displaySelected.Y,
         displaySelected.Width,
         displaySelected.Height,
-        save,
+        filename,
     )
 
-    utils.SaveHandler(clipboard, output, upload, file, screenshot)
+    save.SaveHandler(clipboard, output, upload, file, screenshot)
 }

modes/fullscreen.go

@@ -1,10 +1,13 @@
 package modes
 
-import "github.com/z3oxs/ghost/utils"
+import (
+    "github.com/imf4ll/ghost/save"
+    "github.com/imf4ll/ghost/utils"
+)
 
-func Fullscreen(save string, clipboard, output, upload, file bool) {
-    screenshot := utils.CaptureScreen(save)
+func Fullscreen(filename string, clipboard, output, upload, file bool) {
+    screenshot := utils.CaptureScreen(filename)
 
-    utils.SaveHandler(clipboard, output, upload, file, screenshot)
+    save.SaveHandler(clipboard, output, upload, file, screenshot)
 }
 

modes/selection.go

@@ -3,21 +3,23 @@ package modes
 import (
     "image"
 
-    "github.com/z3oxs/ghost/utils"
+    "github.com/imf4ll/ghost/get"
+    "github.com/imf4ll/ghost/save"
+    "github.com/imf4ll/ghost/utils"
 )
 
-func Selection(save string, clipboard, output, upload, file bool) {
+func Selection(filename string, clipboard, output, upload, file bool) {
     var screenshot image.Image 
 
-    m := utils.GetMouseAndKeyboard()
+    m := get.GetMouseAndKeyboard()
 
     if m.X1 < m.X2 {
         screenshot = utils.CaptureRect (
             m.X1,
             m.Y1,
             m.X2 - m.X1,
             m.Y2 - m.Y1,
-            save,
+            filename,
         )
 
     } else {
@@ -26,10 +28,10 @@ func Selection(save string, clipboard, output, upload, file bool) {
             m.Y2,
             m.X1 - m.X2,
             m.Y1 - m.Y2,
-            save,
+            filename,
         )
 
     }
 
-    utils.SaveHandler(clipboard, output, upload, file, screenshot)
+    save.SaveHandler(clipboard, output, upload, file, screenshot)
 }

modes/selectionGUI.go

@@ -7,11 +7,14 @@ import (
     "fyne.io/fyne/v2"
     "fyne.io/fyne/v2/app"
     "fyne.io/fyne/v2/canvas"
-    "github.com/z3oxs/ghost/chans"
-    "github.com/z3oxs/ghost/utils"
+
+    "github.com/imf4ll/ghost/chans"
+    "github.com/imf4ll/ghost/get"
+    "github.com/imf4ll/ghost/save"
+    "github.com/imf4ll/ghost/utils"
 )
 
-func SelectionGUI(save string, clipboard, output, upload, file bool) {
+func SelectionGUI(filename string, clipboard, output, upload, file bool) {
     var selectedDisplay int
     var multipleDisplay bool
     var screenshot image.Image
@@ -26,7 +29,7 @@ func SelectionGUI(save string, clipboard, output, upload, file bool) {
     window.SetPadded(false)
     window.SetFullScreen(true)
 
-    displays := utils.GetDisplays()
+    displays := get.GetDisplays()
 
     if len(displays) > 0 {
         multipleDisplay = true
@@ -37,7 +40,7 @@ func SelectionGUI(save string, clipboard, output, upload, file bool) {
                 display.Y,
                 display.Width,
                 display.Height,
-                save,
+                filename,
             )
 
             image := canvas.NewRasterFromImage(displayScreenshot)
@@ -57,7 +60,7 @@ func SelectionGUI(save string, clipboard, output, upload, file bool) {
         window.SetContent(screenshots[selectedDisplay])
 
     } else {
-        image := canvas.NewRasterFromImage(utils.CaptureScreen(save))
+        image := canvas.NewRasterFromImage(utils.CaptureScreen(filename))
 
         go chans.KeyEvents(event)
 
@@ -75,15 +78,15 @@ func SelectionGUI(save string, clipboard, output, upload, file bool) {
         defer wg.Done()
 
         for {
-            m := utils.GetMouse()
+            m := get.GetMouse()
 
             if m.X1 < m.X2 {
                 screenshot = utils.CaptureRect (
                     m.X1,
                     m.Y1,
                     m.X2 - m.X1,
                     m.Y2 - m.Y1,
-                    save,
+                    filename,
                 )
 
             } else {
@@ -92,15 +95,15 @@ func SelectionGUI(save string, clipboard, output, upload, file bool) {
                     m.Y2,
                     m.X1 - m.X2,
                     m.Y1 - m.Y2,
-                    save,
+                    filename,
                 )
 
             }
 
             break
         }
 
-        utils.SaveHandler(clipboard, output, upload, file, screenshot)
+        save.SaveHandler(clipboard, output, upload, file, screenshot)
 
         window.Close()
     }()