From a5deb6978829035e060420e2cabd0fe3fe83fec0 Mon Sep 17 00:00:00 2001
From: Massaki Archambault <badjware@massaki.ca>
Date: Wed, 31 Oct 2018 09:08:42 -0400
Subject: [PATCH] fixed lockscreen color in database

---
 files/.Xresources     |  5 +++++
 files/.local/bin/lock | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/files/.Xresources b/files/.Xresources
index b3fa849..c12170c 100644
--- a/files/.Xresources
+++ b/files/.Xresources
@@ -83,6 +83,11 @@ i3wm*active: #f0544c
 
 ! lock
 lock.font: F_SANS
+lock.color.foreground: C_FG_ENABLED
+lock.color.background: C_BG_ENABLED
+lock.color.primary: C_PRIMARY
+lock.color.secondary: C_SECONDARY
+lock.color.error: C_ERROR
 
 ! xterm
 xterm.termName: xterm-256color
diff --git a/files/.local/bin/lock b/files/.local/bin/lock
index 7170eed..a75f99f 100755
--- a/files/.local/bin/lock
+++ b/files/.local/bin/lock
@@ -3,7 +3,7 @@
 unset LD_PRELOAD
 
 query_color() {
-    xrdb -query | grep -m 1 "color.$1" | sed -E 's/^.+:\s*#?//g'
+    xrdb -query | grep -m 1 "lock.color.$1" | sed -E 's/^.+:\s*#?//g'
 }
 
 query_prop() {
@@ -13,15 +13,15 @@ query_prop() {
 # flush gpg-agent cache
 echo RELOADAGENT | gpg-connect-agent
 
-exec i3lock --image="$HOME/.local/share/wallpaper.jpg" --indicator  --force-clock \
+exec i3lock --image="$HOME/.local/share/wallpaper" --indicator  --force-clock --color "$(query_color background)" \
     --veriftext="" --wrongtext="" --noinputtext="" --layoutcolor="00000000" --insidevercolor="00000000" --insidewrongcolor="00000000" --insidecolor="00000000" \
-    --ringvercolor="$(query_color primary)FF" --ringwrongcolor="$(query_color error)FF" --ringcolor="$(query_color fg-enabled)FF" \
+    --ringvercolor="$(query_color primary)FF" --ringwrongcolor="$(query_color error)FF" --ringcolor="$(query_color foreground)FF" \
     --keyhlcolor="$(query_color primary)FF" --bshlcolor="$(query_color secondary)FF" \
     --modifpos="w:h" \
     --separatorcolor="00000000" --line-uses-inside \
     --radius=50 --indpos="x+100:h-150" \
-    --timecolor="00000000" --time-font="$(query_prop font)" --timecolor="$(query_color fg-enabled)FF" --timesize=72 \
+    --timecolor="00000000" --time-font="$(query_prop font)" --timecolor="$(query_color foreground)FF" --timesize=72 \
     --time-align=1 --timepos="ix+r+20:iy+50" --timestr="%H:%M" \
-    --date-font="$(query_prop font)" --datecolor="$(query_color fg-enabled)FF" --datesize=48 \
+    --date-font="$(query_prop font)" --datecolor="$(query_color foreground)FF" --datesize=48 \
     --date-align=1 --datepos="tx:ty-70" --datestr="%A, %b %e"