Merge branch 'dev' into patch-1

Author: kRHYME7

CHANGELOG.md

@@ -4,6 +4,28 @@ All notable changes to `HyDE` will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to _Modified_ [CalVer](https://calver.org/). See [Versioning](https://github.com/HyDE-Project/HyDE/blob/master/RELEASE_POLICY.md#versioning-yymq) For more info
 
+## v25.9.3 (Unreleased)
+
+### Changed
+
+- OCR: `imagemagick` screenshot preprocessing tuned for better recognition results
+
+### Added
+
+- Turkish documentation.
+- No changes have been made to other codes.
+- OCR: `tesseract` now supports explicit language settings via `hyde/config.toml`:
+    ```toml
+    [screenshot.ocr]
+    tesseract_languages = ["eng"]
+    ```
+    To use text recognition bind `hyde-shell screenshot sc` to any hotkey.
+- Hyprlock: Added hyprlock preview
+
+### Fixed
+
+- Hyprlock: fix hyprlock crashing by handling it as a systemd scope unit
+
 ## v25.9.1
 
 This release delivers a new gesture syntax for hyprland v0.51.0. This is a breaking change for users of the previous gesture syntax. Please update HyDE before opening an issue.
@@ -24,7 +46,6 @@ gesture = 3, vertical, workspace
 - Gestures: Chase hyprland v0.51.0 gesture syntax
 
 ### Added
-
 - pinch gesture to toggle tile and floating
 
 ## v25.8.3

CONTRIBUTORS.md

@@ -28,6 +28,8 @@ _These contributors help with quality assurance and testing._
 - [@Prof-Shiba](https://github.com/Prof-Shiba)
 - [@UnaTried](https://github.com/UnaTried)
 
+- [@Vu4ll](https://github.com/Vu4ll)
+
 ---
 
 ## How to add yourself to this list

Configs/.config/hypr/windowrules.conf

@@ -116,6 +116,9 @@ windowrule = float, title:^(Library)(.*)$
 windowrule = float,class:^(.*dialog.*)$
 windowrule = float,title:^(.*dialog.*)$
 
+# workaround for jetbrains IDEs dropdowns/popups cause flickering
+windowrule = noinitialfocus,class:^(.*jetbrains.*)$,title:^(win[0-9]+)$
+
 # █░░ ▄▀█ █▄█ █▀▀ █▀█   █▀█ █░█ █░░ █▀▀ █▀
 # █▄▄ █▀█ ░█░ ██▄ █▀▄   █▀▄ █▄█ █▄▄ ██▄ ▄█
 

Configs/.config/zsh/plugin.zsh

@@ -1,6 +1,6 @@
 # Use your plugin system here
 
-return 1 # <--- Comment this line to disable HyDE's plugin loader // same as HYDE_ZSH_NO_PLUGINS
+return 1 # <--- Comment this line to disable HyDE's oh-my-zsh plugins and use the zinit examples below
 
 #! This file will not load, remove the return 1 line above to enable this file.
 #? Below is an example of how to set up Zsh plugins using Zinit

Configs/.local/lib/hyde/hyprlock.sh

@@ -11,6 +11,8 @@ scrDir=${scrDir:-$HOME/.local/lib/hyde}
 confDir="${confDir:-$XDG_CONFIG_HOME}"
 cacheDir="${HYDE_CACHE_HOME:-"${XDG_CACHE_HOME}/hyde"}"
 WALLPAPER="${cacheDir}/wall.set"
+HYPRLOCK_SCOPE_NAME="hyde-${XDG_SESSION_DESKTOP:-unknown}-lockscreen.scope"
+
 
 USAGE() {
   cat <<EOF
@@ -74,12 +76,12 @@ fn_mpris() {
     if [ -f "$HOME/.face.icon" ]; then
       if ! cmp -s "$HOME/.face.icon" "${THUMB}.png"; then
         cp -f "$HOME/.face.icon" "${THUMB}.png"
-        pkill -USR2 hyprlock >/dev/null 2>&1 # updates the mpris thumbnail
+        reload_hyprlock
       fi
     else
       if ! cmp -s "$XDG_DATA_HOME/icons/Wallbash-Icon/hyde.png" "${THUMB}.png"; then
         cp "$XDG_DATA_HOME/icons/Wallbash-Icon/hyde.png" "${THUMB}.png"
-        pkill -USR2 hyprlock >/dev/null 2>&1 # updates the mpris thumbnail
+        reload_hyprlock
       fi
     fi
     exit 1
@@ -116,7 +118,7 @@ mpris_thumb() { # Generate thumbnail for mpris
   echo "${artUrl}" >"${THUMB}".lnk
   curl -Lso "${THUMB}".art "$artUrl"
   magick "${THUMB}.art" -quality 50 "${THUMB}.png"
-  pkill -USR2 hyprlock >/dev/null 2>&1 # updates the mpris thumbnail
+  reload_hyprlock
 }
 
 fn_cava() {
@@ -133,6 +135,17 @@ fn_art() {
   echo "${cacheDir}/landing/mpris.art"
 }
 
+find_filepath() {
+  local filename="${*:-$1}"
+  local search_dirs=(
+    "${XDG_CONFIG_HOME:-$HOME/.config}/hypr/hyprlock"
+    "${XDG_CONFIG_HOME:-$HOME/.config}/hyde/hyprlock"
+    "${HYPRLOCK_CONF_DIR}"
+  )
+  print_log -sec "hyprlock" -stat "Searching for layout" "$filename"
+  find "${search_dirs[@]}" -type f -name "${filename}*" 2>/dev/null | head -n 1
+}
+
 # hyprlock selector
 fn_select() {
   # Set rofi scaling
@@ -164,7 +177,7 @@ fn_select() {
   fi
 
   layout_items="Theme Preference
-$layout_items"
+${layout_items}"
 
   selected_layout=$(awk -F/ '{print $NF}' <<<"$layout_items" |
     rofi -dmenu -i -select "${HYPRLOCK_LAYOUT}" \
@@ -173,29 +186,128 @@ $layout_items"
       -theme-str "${font_override}" \
       -theme-str "${r_override}" \
       -theme-str "$(get_rofi_pos)" \
-      -theme "${ROFI_HYPRLOCK_STYLE:-clipboard}")
+      -on-selection-changed "hyde-shell hyprlock.sh --test-preview  \"{entry}\"" \
+      -theme "${ROFI_HYPRLOCK_STYLE:-clipboard}" )
+  
   if [ -z "$selected_layout" ]; then
     echo "No selection made"
     exit 0
   fi
-  set_conf "HYPRLOCK_LAYOUT" "${selected_layout}"
+
+    set_conf "HYPRLOCK_LAYOUT" "${selected_layout}"
   if [ "$selected_layout" == "Theme Preference" ]; then
     selected_layout="theme"
   fi
-  generate_conf "${layout_dir}/${selected_layout}.conf"
-  "${scrDir}/font.sh" resolve "${layout_dir}/${selected_layout}.conf"
+  local hyprlock_conf_path
+  hyprlock_conf_path=$(find_filepath "${selected_layout}")
+  generate_conf "$hyprlock_conf_path"
+  "${scrDir}/font.sh" resolve "$hyprlock_conf_path"
   fn_profile
 
   # Notify the user
   notify-send -i "system-lock-screen" "Hyprlock layout:" "${selected_layout}"
 
+}
+
+check_and_sanitize_process() {
+  local unit_name="${1:-${HYPRLOCK_SCOPE_NAME}}"
+  if systemctl --user is-active "${unit_name}" > /dev/null 2>&1; then
+    systemctl --user stop "${unit_name}" > /dev/null 2>&1
+  fi
+}
+
+reload_hyprlock() {
+  local unit_name="${2:-${HYPRLOCK_SCOPE_NAME}}"
+
+  if systemctl --user is-active "${unit_name}" > /dev/null 2>&1; then
+    systemctl --user kill -s USR2 "${HYPRLOCK_SCOPE_NAME}" >/dev/null 2>&1
+  else
+    pkill -USR2 hyprlock >/dev/null 2>&1
+  fi
+
+}
+
+append_label_to_file() {
+  local file="${1}"
+
+cat <<EOF >>"${file}"
+label {
+  text = PREVIEW! Press a key or swipe to exit.
+  color = rgba(\$wallbash_txt122)
+  font_size = 50
+  position = 0, 0
+  halign = center
+  valign = top
+  zindex = 6
+}
+
+label {
+  text = PREVIEW! Press a key or swipe to exit.
+  color = rgba(\$wallbash_txt122)
+  font_size = 50
+  position = 0, 0
+  halign = center
+  valign = bottom
+  zindex = 6
+}
+
+label {
+  text = PREVIEW! Press a key or swipe to exit.
+  color = rgba(\$wallbash_txt122)
+  font_size = 50
+  position = 0, 0
+  halign = center
+  valign = center
+  zindex = 6
+}
+
+EOF
+
+}
+
+
+layout_test() {
+  print_log -sec "hyprlock" -stat "Test"  "Please swipe,press a key or click to exit."
+  local hyprlock_conf_name="${*:-${1}}"
+  if [[ "${hyprlock_conf_name}" == "Theme Preference" ]]; then
+    hyprlock_conf_name="theme"
+  fi
+  check_and_sanitize_process
+  hyprlock_conf_path=$(find_filepath "${hyprlock_conf_name}")
+  if [ -z "${hyprlock_conf_path}" ]; then
+    print_log -sec "hyprlock" -stat "Error" "Layout ${hyprlock_conf_name} not found."
+    exit 1
+  fi
+  sleep 2
+  local temp_path="${XDG_RUNTIME_DIR}/hyde/hyprlock-test.conf"
+  generate_conf "${hyprlock_conf_path}" "${temp_path}" 
+  append_label_to_file "${temp_path}"
+  app2unit.sh -S both -u "${HYPRLOCK_SCOPE_NAME}" -t scope -- hyprlock --no-fade-in --immediate-render --grace 99999999 -c "${temp_path}"
+  rm -f "${temp_path}"
+}
+
+rofi_test_preview() {
+#? this function provides an anti spam mechanism for the rofi preview 
+local hyprlock_conf_name="${*:-${1}}"
+if [[ "${hyprlock_conf_name}" == "Theme Preference" ]]; then
+  hyprlock_conf_name="theme"
+fi
+local unit_name="hyde-${XDG_SESSION_DESKTOP:-unknown}-lockscreen-preview.scope"
+check_and_sanitize_process "${unit_name}"
+  send_notifs "Hyprlock layout: ${hyprlock_conf_name}" "Please swipe, press a key or click to exit." \
+    -i "system-lock-screen" -t 3000 \
+    -r 9
+app2unit.sh -S both -u "${unit_name}" -t scope -- hyprlock.sh --test "${hyprlock_conf_name}"
+  
+
 }
 
 generate_conf() {
   local path="${1:-$confDir/hypr/hyprlock/theme.conf}"
+  local target_file="${2:-$confDir/hypr/hyprlock.conf}"
   local hyde_hyprlock_conf=${SHARE_DIR:-$XDG_DATA_HOME}/hyde/hyprlock.conf
 
-  cat <<CONF >"$confDir/hypr/hyprlock.conf"
+  cat <<CONF >"${target_file}"
 #! █░█ █▄█ █▀█ █▀█ █░░ █▀█ █▀▀ █▄▀
 #! █▀█ ░█░ █▀▀ █▀▄ █▄▄ █▄█ █▄▄ █░█
 
@@ -316,12 +428,13 @@ if [ -z "${*}" ]; then
     print_log -sec "hyprlock" -stat "setting" " $HYDE_CACHE_HOME/wallpapers/hyprlock.png"
     "${scrDir}/wallpaper.sh" -s "$(readlink "${HYDE_THEME_DIR}/wall.set")" --backend hyprlock
   fi
-  pidof hyprlock || hyprlock
+  check_and_sanitize_process
+  app2unit.sh -u "${HYPRLOCK_SCOPE_NAME}" -t scope -- hyprlock
   exit 0
 fi
 
 # Define long options
-LONGOPTS="select,background,profile,mpris:,cava,art,help"
+LONGOPTS="select,background,profile,mpris:,cava,art,help,test:,test-preview:"
 
 # Parse options
 PARSED=$(
@@ -335,6 +448,14 @@ eval set -- "$PARSED"
 
 while true; do
   case "$1" in
+  --test)
+    layout_test "${2}"
+    exit 0
+    ;;
+    --test-preview)
+    rofi_test_preview "${2}"
+    exit 0
+    ;;
   select | -S | --select)
     fn_select
     exit 0

Configs/.local/lib/hyde/screenshot.sh

@@ -51,6 +51,9 @@ save_dir="${2:-$XDG_PICTURES_DIR/Screenshots}"
 save_file=$(date +'%y%m%d_%Hh%Mm%Ss_screenshot.png')
 annotation_tool=${SCREENSHOT_ANNOTATION_TOOL}
 annotation_args=("-o" "${save_dir}/${save_file}" "-f" "${temp_screenshot}")
+tesseract_default_language=("eng")
+tesseract_languages=("${SCREENSHOT_OCR_TESSERACT_LANGUAGES[@]:-${tesseract_default_language[@]}}")
+tesseract_languages+=("osd")
 
 if [[ -z "$annotation_tool" ]]; then
 	pkg_installed "swappy" && annotation_tool="swappy"
@@ -90,6 +93,54 @@ take_screenshot() {
 	fi
 }
 
+ocr_screenshot() {
+	local mode=$1
+	shift
+	local extra_args=("$@")
+
+	# execute grimblast with given args
+	if "$LIB_DIR/hyde/grimblast" "${extra_args[@]}" copysave "$mode" "$temp_screenshot"; then
+		if pkg_installed imagemagick; then
+			magick "${temp_screenshot}" \
+				-colorspace gray \
+				-contrast-stretch 0 \
+				-level 15%,85% \
+				-resize 400% \
+				-sharpen 0x1 \
+				-auto-threshold triangle \
+				-morphology close diamond:1 \
+				-deskew 40% \
+				"${temp_screenshot}"
+		else
+			notify-send -a "HyDE Alert" "OCR: imagemagick is not installed, recognition accuracy is reduced" -e -i "dialog-warning"
+		fi
+		tesseract_package_prefix="tesseract-data-"
+		tesseract_packages=("${tesseract_languages[@]/#/$tesseract_package_prefix}")
+		tesseract_packages+=("tesseract")
+		for pkg in "${tesseract_packages[@]}"; do
+			if ! pkg_installed "${pkg}"; then
+				notify-send -a "HyDE Alert" "$(echo -e "OCR: required package is not installed\n ${pkg}")" -e -i "dialog-error"
+				return 1
+			fi
+		done
+		tesseract_languages_prepared=$(IFS=+; echo "${tesseract_languages[*]}")
+		tesseract_output=$(tesseract \
+			--psm 6 \
+			--oem 3 \
+			-l ${tesseract_languages_prepared} \
+			"${temp_screenshot}" \
+			stdout
+			2>/dev/null
+		)
+		printf "%s" "$tesseract_output" | wl-copy
+		notify-send -a "HyDE Alert" "$(echo -e "OCR: ${#tesseract_output} symbols recognized\n\nLanguages used ${tesseract_languages[@]/#/'\n '}")" -i "${temp_screenshot}" -e
+		rm -f "${temp_screenshot}"
+	else
+		notify-send -a "HyDE Alert" "OCR: screenshot error" -e -i "dialog-error"
+		return 1
+	fi
+}
+
 pre_cmd
 
 case $1 in
@@ -106,23 +157,14 @@ m) # print focused monitor
 	take_screenshot "output"
 	;;
 sc) #? 󱉶 Use 'tesseract' to scan image then add to clipboard
-	check_package tesseract-data-eng tesseract
-	if ! GEOM=$(slurp); then
-		notify-send -a "HyDE Alert" "OCR preview: Invalid geometry" -e -i "dialog-error"
-		exit 1
-	fi
-	grim -g "${GEOM}" "${temp_screenshot}"
-	pkg_installed imagemagick && magick "${temp_screenshot}" -sigmoidal-contrast 10,50% "${temp_screenshot}"
-	tesseract "${temp_screenshot}" - | wl-copy
-	notify-send -a "HyDE Alert" "OCR preview" -i "${temp_screenshot}" -e
-	rm -f "${temp_screenshot}"
+	ocr_screenshot "area" "--freeze"
 	;;
 *) # invalid option
 	USAGE
 	;;
 esac
 
-[ -f "$temp_screenshot" ] && rm "$temp_screenshot"
+[ -f "${temp_screenshot}" ] && rm "${temp_screenshot}"
 
 if [ -f "${save_dir}/${save_file}" ]; then
 	notify-send -a "HyDE Alert" -i "${save_dir}/${save_file}" "saved in ${save_dir}"