From 4be965e89e579212a0d0a32cc1aadc949ddeb832 Mon Sep 17 00:00:00 2001
From: may <m4rch3n1ng@gmail.com>
Date: Thu, 4 May 2023 03:41:08 +0200
Subject: [PATCH 1/2] raw option

---
 hyprshot | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/hyprshot b/hyprshot
index e67b113..afc7717 100755
--- a/hyprshot
+++ b/hyprshot
@@ -19,6 +19,7 @@ Options:
   -f, --filename        the file name of the resulting screenshot
   -d, --debug           print debug information
   -s, --silent          don't send notification when screenshot is saved
+  --raw                 output raw image data to stdout
   --clipboard-only      copy screenshot to clipboard and don't save image in disk
   -- [command]          open screenshot with a command of your choosing. e.g. hyprshot -m window -- mirage
 
@@ -49,20 +50,24 @@ function send_notification() {
 function save_geometry() {
     Print "Geometry: %s\n" "${1}"
 
-    if [ $CLIPBOARD -eq 0 ]; then
-        mkdir -p "$SAVEDIR"
-        grim -g "${1}" "$SAVE_FULLPATH"
-        local output="$SAVE_FULLPATH"
-        # Trim transparent pixels, in case the window was floating and partially
-        # outside the monitor
-        convert $output -trim +repage $output
-        wl-copy < "$output"
-        send_notification $output
-        [ -z "$COMMAND" ] || {
-            "$COMMAND" "$output"
-        }
+    if [ $RAW -eq 0 ]; then
+        if [ $CLIPBOARD -eq 0 ]; then
+            mkdir -p "$SAVEDIR"
+            grim -g "${1}" "$SAVE_FULLPATH"
+            local output="$SAVE_FULLPATH"
+            # Trim transparent pixels, in case the window was floating and partially
+            # outside the monitor
+            convert $output -trim +repage $output
+            wl-copy < "$output"
+            send_notification $output
+            [ -z "$COMMAND" ] || {
+                "$COMMAND" "$output"
+            }
+        else
+            wl-copy < <(grim -g "${1}" - | convert - -trim +repage -)
+        fi
     else
-        wl-copy < <(grim -g "${1}" - | convert - -trim +repage -)
+        grim -g "${1}" - | convert - -trim +repage -
     fi
 }
 
@@ -103,7 +108,7 @@ function grab_window() {
 }
 
 function args() {
-    local options=$(getopt -o hf:o:m:ds --long help,filename:,output-folder:,mode:,clipboard-only,debug,silent -- "$@")
+    local options=$(getopt -o hf:o:m:ds --long help,filename:,output-folder:,mode:,clipboard-only,debug,silent,raw -- "$@")
     eval set -- "$options"
 
     while true; do
@@ -133,6 +138,9 @@ function args() {
             -s | --silent)
                 SILENT=1
                 ;;
+            --raw)
+                RAW=1
+                ;;
             --)
                 shift # Skip -- argument
                 COMMAND=${@:2}
@@ -155,6 +163,7 @@ fi
 CLIPBOARD=0
 DEBUG=0
 SILENT=0
+RAW=0
 FILENAME="$(date +'%Y-%m-%d-%H%M%S_hyprshot.png')"
 [ -z "$HYPRSHOT_DIR" ] && SAVEDIR=${XDG_PICTURES_DIR:=~} || SAVEDIR=${HYPRSHOT_DIR}
 

From 0ad6518a083e60e510d4265870da83795588945e Mon Sep 17 00:00:00 2001
From: Gustavo Parreira <gustavotcparreira@gmail.com>
Date: Thu, 15 Jun 2023 19:44:00 +0100
Subject: [PATCH 2/2] chore: cleanup code

---
 hyprshot | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/hyprshot b/hyprshot
index afc7717..ed4e677 100755
--- a/hyprshot
+++ b/hyprshot
@@ -19,7 +19,7 @@ Options:
   -f, --filename        the file name of the resulting screenshot
   -d, --debug           print debug information
   -s, --silent          don't send notification when screenshot is saved
-  --raw                 output raw image data to stdout
+  -r, --raw             output raw image data to stdout
   --clipboard-only      copy screenshot to clipboard and don't save image in disk
   -- [command]          open screenshot with a command of your choosing. e.g. hyprshot -m window -- mirage
 
@@ -47,27 +47,32 @@ function send_notification() {
                 -i "${1}" -a Hyprshot
 }
 
+function trim() {
+    convert "${1}" -trim +repage "${1}"
+}
+
 function save_geometry() {
     Print "Geometry: %s\n" "${1}"
 
-    if [ $RAW -eq 0 ]; then
-        if [ $CLIPBOARD -eq 0 ]; then
-            mkdir -p "$SAVEDIR"
-            grim -g "${1}" "$SAVE_FULLPATH"
-            local output="$SAVE_FULLPATH"
-            # Trim transparent pixels, in case the window was floating and partially
-            # outside the monitor
-            convert $output -trim +repage $output
-            wl-copy < "$output"
-            send_notification $output
-            [ -z "$COMMAND" ] || {
-                "$COMMAND" "$output"
-            }
-        else
-            wl-copy < <(grim -g "${1}" - | convert - -trim +repage -)
-        fi
+    if [ $RAW -eq 1 ]; then
+        grim -g "${1}" - | trim -
+        return 0
+    fi
+
+    if [ $CLIPBOARD -eq 0 ]; then
+        mkdir -p "$SAVEDIR"
+        grim -g "${1}" "$SAVE_FULLPATH"
+        local output="$SAVE_FULLPATH"
+        # Trim transparent pixels, in case the window was floating and partially
+        # outside the monitor
+        trim "${output}"
+        wl-copy < "$output"
+        send_notification $output
+        [ -z "$COMMAND" ] || {
+            "$COMMAND" "$output"
+        }
     else
-        grim -g "${1}" - | convert - -trim +repage -
+        wl-copy < <(grim -g "${1}" - | trim -)
     fi
 }
 
@@ -108,7 +113,7 @@ function grab_window() {
 }
 
 function args() {
-    local options=$(getopt -o hf:o:m:ds --long help,filename:,output-folder:,mode:,clipboard-only,debug,silent,raw -- "$@")
+    local options=$(getopt -o hf:o:m:dsr --long help,filename:,output-folder:,mode:,clipboard-only,debug,silent,raw -- "$@")
     eval set -- "$options"
 
     while true; do
@@ -138,7 +143,7 @@ function args() {
             -s | --silent)
                 SILENT=1
                 ;;
-            --raw)
+            -r | --raw)
                 RAW=1
                 ;;
             --)