checkpoint

2 files changed, 39 insertions, 65 deletions

diff --git a/bin/guiscripts/clipo b/bin/guiscripts/clipo
index e554c24..866e99e 100755
--- a/bin/guiscripts/clipo
+++ b/bin/guiscripts/clipo
@@ -1,6 +1,9 @@
 #!/bin/sh
-[ "$1" = "-p" ] && i='primary' j="-p"
+[ "$1" = "-p" ] &&
+    i='primary' ||
+    j="c"
+
 if [ "$WAYLAND_DISPLAY" ]
 then wl-paste -n "$1"
-else xsel -o ${j:--b}
+else xclip -o -sel ${j:-p}
 fi
diff --git a/bin/guiscripts/dmclip b/bin/guiscripts/dmclip
index cd5c928..71ccd34 100755
--- a/bin/guiscripts/dmclip
+++ b/bin/guiscripts/dmclip
@@ -1,79 +1,50 @@
 #!/bin/sh
 
-# Display Clipboard Length
-DICL_LEN=48
 tmp="/tmp/dmclip"
 
-NotImage () {
-    echo -n "" | dmenu -p "NOT AN IMAGE"
-    exit
-}
+choice="$(printf 'swap\nimage\nload\nsave\nreplace\n' | dmenu -c -g 5 -l 1)"
+[ "$choice" ] || exit 1
 
-selection="$(echo "primary\nclipboard\nswap" | 
-	dmenu -l 1 -g 3 -p "selection:")"
-if [ "$selection" = "swap" ]
-then
-    clipboard="$(xclip -o)"
-    xclip -o | xclip -sel c
-    echo -n "$clipboard" | xclip -sel c
-    exit
-elif [ "$selection" = "" ]
-then
-    exit 1
-elif  [ "$selection" = "primary" ]
-then
-    selection2="clipboard"
-else
-    selection2="primary"
-fi
+clipboard="$(printf 'primary\nclipboard\n' | dmenu -c -g 2 -l 1)"
+[ "$clipboard" ] || exit 1
 
-if xclip -sel $selection -o -t TARGETS | grep "image/png"
-then
-   disp_clip="IMAGE"
+# For clipo and clipp
+if [ "$clipboard" = 'primary' ]; then
+    clipopt='-p'
 else
-	clipboard="$(xclip -out -sel "$selection" -r)"
-    disp_clip="$(echo -n "$clipboard" | 
-		tr -d '\n' | 
-		cut -c -"$DICL_LEN")"
+    clipopt=''
 fi
 
-menu_option="$(echo "save\nload\nimage\nreplace" | 
-	dmenu -l 1 -g 4 -p "'$disp_clip'")"
-[ "${menu_option}" ] || exit
+case "$choice" in
+    swap) swclip ;;
+    image) 
+        mime="$(clipo "$clipopt" | file --brief --mime-type -)"
+        [ "${mime%%/*}" != "image" ] && exit 1
 
-case "$menu_option" in
-    replace)
-        replace_text="$(echo -n "" | 
-			dmenu -l 0 -p "replace:")"
-        [ "$replace_text" ] || exit
-        replace_by_text="$(echo -n "" | 
-			dmenu -l 0 -p "by:")"
-        [ "$replace_by_text" ] || exit 
-        echo "$clipboard" | 
-			sed "s/$replace_text/$replace_by_text/g" |
-			xclip -r -sel "$selection"
-        ;;
+        clipo "$clipopt" | tesseract - stdout | sed '/^$/d' > "$tmp"
 
-    save)
-        echo "$clipboard" >> /tmp/tmpclip.txt
+        # preview the text, prepend by empty line and allow to exit without copying
+        yes="$(sed "1i\ " "$tmp" | dmenu -c -l 10 -g 1 -p "PREVIEW:")"
+        [ "$yes" ] || exit 1
+
+        clipp "$clipopt" < "$tmp"
         ;;
-    load)
-        choice="$(sort "${tmp}.txt" | 
-			uniq | 
-			dmenu -g 1 -l 5)"
-		[ "$choice" ] || exit 1
-        echo -n "$choice" | xclip -sel "$selection"
+    load) 
+        choice="$(sort "${tmp}.txt" | uniq |
+            dmenu -c -g 1 -l 5)"
+        [ "$choice" ] || exit 1
+        printf '%s' "$choice" | clipp "$clipopt"
         ;;
+    save) clipo "$clipopt" >> "${tmp}.txt" ;;
+    replace) 
+        match="$(dmenu -c -l 0 -p "replace:" < /dev/null)"
+        [ "$match" ] || exit 1
+
+        replacement="$(dmenu -c -l 0 -p "by:" < /dev/null)"
+        [ "$replacement" ] || exit 1
 
-    image)
-        xclip -o -sel c > "${tmp}.png"
-        file -bi "${tmp}.png" |
-            grep "image/png" || NotImage
-        # sed so that dmenu doesn't skip if one line
-        tesseract "${tmp}.png" stdout > "$tmp"
-        sed "1i\ " "$tmp" | 
-			dmenu -l 10 -g 1 -p "PREVIEW:" -l 20 || 
-			exit
-        xclip -sel "$selection" -i "$tmp"
+        clipo  "$clipopt" |
+			sed "s/$match/$replacement/g" |
+			clipp "$clipopt"
         ;;
 esac