Fixed bug in mpv_ipc.sh with cursor-autohide property.

hoangquanr890 · Oct 21, 2018 · d7133fb · d7133fb
1 parent 258dbaa
commit d7133fb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -1,3 +1,14 @@
+——— v 2.3.3 ——————————————————————————————————————————————————————————————————
+
+Nadeshiko-mpv-2.3.1
+
+1. Fixed a bug in mpv_ipc.sh – number values in mpv’s cursor-autohide property
+   weren’t considered as a valid value.
+
+
+
+
+
 ——— v 2.3.2 ——————————————————————————————————————————————————————————————————
 
 Nadeshiko-do-postponed-2.1.3

diff --git a/lib/mpv_ipc.sh b/lib/mpv_ipc.sh
@@ -143,7 +143,7 @@ declare -r -A properties=(
 	[track-list/count]='test_number  false'
 
 	#  Hide cursor over the window
-	[cursor-autohide]='test_yes_true_on  test_no_false_off'
+	[cursor-autohide]='test_cursor_autohide_true  test_cursor_autohide_false'
 
 	#  Hide cursor over the window
 	[cursor-autohide-fs-only]='test_yes_true_on  test_no_false_off'
@@ -187,6 +187,12 @@ test_mpv_version() {
 test_time_pos() {
 	[[ "$1" =~ ^[0-9]+\.[0-9]{1,6}$ ]]
 }
+test_cursor_autohide_true() {
+	[[ "$1" =~ ^always$  || "$1" =~ ^[0-9]{1,5}$ ]]
+}
+test_cursor_autohide_false() {
+	[[ "$1" =~ ^no$ ]]
+}
 
 
  # Choose a socket from predefined in the associative array mpv_sockets.

diff --git a/nadeshiko-mpv.sh b/nadeshiko-mpv.sh
@@ -24,7 +24,7 @@ set -f
 set_exampleconfdir 'nadeshiko'
 prepare_confdir 'nadeshiko'
 
-declare -r version="2.3"
+declare -r version="2.3.1"
 declare -r rcfile_minver='2.3'
 RCFILE_BOOLEAN_VARS=(
 	show_preview

diff --git a/nadeshiko.sh b/nadeshiko.sh
@@ -37,7 +37,7 @@ set -f
 set_exampleconfdir
 prepare_confdir
 
-declare -r version='2.3.2'
+declare -r version='2.3.3'
 info "Nadeshiko v$version" >>"$LOG"
 declare -r release_notes_url="http://github.com/deterenkelt/Nadeshiko/blob/master/RELEASE_NOTES"
 declare -r rcfile_minver='2.0.1'