Skip to content

Added border and background color customization #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheKoTech wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added border and background color customization #68

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3786428
added border and background color customizations
TheKoTech Sep 15, 2024
c544817
added the border width option
TheKoTech Sep 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions hyprshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ Options:
-r, --raw output raw image data to stdout
-t, --notif-timeout notification timeout in milliseconds (default 5000)
--clipboard-only copy screenshot to clipboard and don't save image in disk
--border-width width of the selection border in pixels (default 2)
Copy link
Contributor

@ProMix0 ProMix0 Sep 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You added an option to --help, but it's not implemented?

Copy link
Author

@TheKoTech TheKoTech Sep 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup. I absolutely did. Added the border width option because it's not that difficult.

--border-color color of the selection border (default #000000ff)
--background-color color around the selection (default #ffffff88)
-- [command] open screenshot with a command of your choosing. e.g. hyprshot -m window -- mirage

Modes:
Expand All @@ -45,8 +48,8 @@ function Print() {
if [ $DEBUG -eq 0 ]; then
return 0
fi
1>&2 printf "$@"

1>&2 printf "$@"
}

function send_notification() {
Expand Down Expand Up @@ -176,7 +179,7 @@ function begin_grab() {
}

function grab_output() {
slurp -or
slurp -or -b $BACKGROUND_COLOR -c $BORDER_COLOR -w $BORDER_WIDTH
}

function grab_active_output() {
Expand All @@ -196,7 +199,7 @@ function grab_selected_output() {
}

function grab_region() {
slurp -d
slurp -d -b $BACKGROUND_COLOR -c $BORDER_COLOR -w $BORDER_WIDTH
}

function grab_window() {
Expand All @@ -208,7 +211,7 @@ function grab_window() {
# through stdin
local boxes="$(echo $clients | jq -r '.[] | "\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1]) \(.title)"' | cut -f1,2 -d' ')"
Print "Boxes:\n%s\n" "$boxes"
slurp -r <<< "$boxes"
slurp -r -b $BACKGROUND_COLOR -c $BORDER_COLOR -w $BORDER_WIDTH <<< "$boxes"
}

function grab_active_window() {
Expand Down Expand Up @@ -236,7 +239,7 @@ function parse_mode() {
}

function args() {
local options=$(getopt -o hf:o:m:D:dszr:t: --long help,filename:,output-folder:,mode:,delay:,clipboard-only,debug,silent,freeze,raw,notif-timeout: -- "$@")
local options=$(getopt -o hf:o:m:D:dszr:t: --long help,filename:,output-folder:,mode:,delay:,clipboard-only,debug,silent,freeze,raw,notif-timeout:,border-color:,background-color:,border-width: -- "$@")
eval set -- "$options"

while true; do
Expand Down Expand Up @@ -280,6 +283,18 @@ function args() {
shift;
NOTIF_TIMEOUT=$1
;;
--border-color)
shift;
BORDER_COLOR=$1
;;
--background-color)
shift;
BACKGROUND_COLOR=$1
;;
--border-width)
shift;
BORDER_WIDTH=$1
;;
--)
shift # Skip -- argument
COMMAND=${@:2}
Expand All @@ -306,6 +321,10 @@ RAW=0
NOTIF_TIMEOUT=5000
CURRENT=0
FREEZE=0
BORDER_COLOR=\#000000ff
BACKGROUND_COLOR=\#ffffff88
BORDER_WIDTH=2

[ -z "$XDG_PICTURES_DIR" ] && type xdg-user-dir &> /dev/null && XDG_PICTURES_DIR=$(xdg-user-dir PICTURES)
FILENAME="$(date +'%Y-%m-%d-%H%M%S_hyprshot.png')"
[ -z "$HYPRSHOT_DIR" ] && SAVEDIR=${XDG_PICTURES_DIR:=~} || SAVEDIR=${HYPRSHOT_DIR}
Expand Down