From 4dfcccc9eb284424f5a684da152afbb74befbe05 Mon Sep 17 00:00:00 2001
From: Daniel Napora <napcok@gmail.com>
Date: Mon, 21 Nov 2022 12:31:17 +0100
Subject: [PATCH] conky context menu improvements

---
 bin/conkyctl | 50 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/bin/conkyctl b/bin/conkyctl
index f921eae..2f76204 100755
--- a/bin/conkyctl
+++ b/bin/conkyctl
@@ -271,7 +271,7 @@ resetcolorsall () {
     default_color_all '#309552'
     color0_all '#accdc7'
     color1_all '#61c4bc'
-    color2_all '#3dd425'
+    color2_all '#E8CB2D'
 }
 resetcolorsone () {
     transparent false "${1}"
@@ -279,7 +279,7 @@ resetcolorsone () {
     default_color '#309552' "${1}"
     color0 '#accdc7' "${1}"
     color1 '#61c4bc' "${1}"
-    color2 '#3dd425' "${1}"
+    color2 '#E8CB2D' "${1}"
 }
 
 languages () {
@@ -591,7 +591,7 @@ contextmenu () {
     # maybe split this to separate function?
     eval $(xdotool getmouselocation --shell)
     eval $(xdotool getwindowgeometry --shell ${WINDOW})
-    hexid=$(wmctrl -lpG | grep ${X} |grep ${Y}|cut -d' ' -f1)
+    hexid=$(wmctrl -lpG | grep ${X} |grep ${Y}|grep ${WIDTH}|grep ${HEIGHT} |cut -d' ' -f1)
     CONKYCFG=$(xprop -id ${hexid}|grep WM_COMMAND|cut -d'"' -f6)
     
     languages
@@ -646,14 +646,44 @@ contextmenu () {
     trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT
     POSITION_MODE=${1:-pointer}
     HIDE_BACK_ITEMS=1
+    menu_gradient_pos=none
+    jgtools_padding=4
     MENU_PADDING_TOP=${jgtools_padding:-0}
 
     TABS="90"
     jgmenu_icon_size=0
-    mkconfigfile
+
     
     single "${CONKYCFG}" "s"
-    
+
+    mkconfigfile
+        # if conky_contextmenu_colors = conky
+        echo "color_menu_bg=${WINCLR} 100" >> ${CONFIG_FILE}
+        echo "color_menu_bg_to=${WINCLR} 100" >> ${CONFIG_FILE}
+        TXTCOLOR=$(pastel textcolor ${WINCLR}|pastel format hex)
+        #notify-send.sh "TXTCOLOR" "${TXTCOLOR} ${menu_gradient_pos}"
+        if [ "$TXTCOLOR" == "#ffffff" ];then
+        TXTCOLOR_NORM="#cccccc"
+        echo "color_norm_fg=${TXTCOLOR_NORM} 100" >> ${CONFIG_FILE}
+        echo "color_sel_fg=${TXTCOLOR} 100" >> ${CONFIG_FILE}
+        echo "color_title_fg=${TXTCOLOR} 60" >> ${CONFIG_FILE}
+        SELBG=$(pastel darken 0.1 ${WINCLR}|pastel format hex)
+        echo "color_sel_bg=${SELBG} 80" >> ${CONFIG_FILE}
+        echo "color_title_bg=${SELBG} 30" >> ${CONFIG_FILE}
+        echo "color_title_border=${SELBG} 60" >> ${CONFIG_FILE}
+        else
+        TXTCOLOR_NORM="#333333"
+        echo "color_norm_fg=${TXTCOLOR_NORM} 100" >> ${CONFIG_FILE}
+        echo "color_sel_fg=${TXTCOLOR} 100" >> ${CONFIG_FILE}
+        echo "color_title_fg=${TXTCOLOR} 90" >> ${CONFIG_FILE}
+        SELBG=$(pastel darken 0.1 ${WINCLR}|pastel format hex)
+        echo "color_sel_bg=${SELBG} 80" >> ${CONFIG_FILE}
+        echo "color_title_bg=${SELBG} 90" >> ${CONFIG_FILE}
+        echo "color_title_border=${SELBG} 90" >> ${CONFIG_FILE}
+        fi
+       
+        echo "color_sep_fg=${CLR} 10" >> ${CONFIG_FILE}
+
     case "$LANG" in
         pl*)
         CUSTOM_COMMANDS_SEP="Własne polecenia"
@@ -668,11 +698,13 @@ if [ -f $HOME/.config/mabox/${name}.csv ]; then
 LINES=$(cat $HOME/.config/mabox/${name}.csv|wc -l)
 if [ "$LINES" -gt "0" ]; then
 cat <<EOF > ${MENU_ITEMS}
-${CUSTOMCOMMANDS}
-^sep()
-<small>$EDIT_CUSTOMCOMMANDS</small>,touch ~/.config/mabox/${name}.csv;sleep 1;xdg-open ~/.config/mabox/${name}.csv
+
 $(printf '%s\n' "${out[@]}")
  ⮜⮜⮜    Colorizer Conky,colorizer-conky -s
+^sep($CUSTOM_COMMANDS_SEP)
+<small>$EDIT_CUSTOMCOMMANDS</small>,touch ~/.config/mabox/${name}.csv;sleep 1;xdg-open ~/.config/mabox/${name}.csv
+^sep()
+${CUSTOMCOMMANDS}
 $(printf '%s\n' "${out2[@]}")
 $(printf '%s\n' "${out3[@]}")
 EOF
@@ -694,8 +726,8 @@ $(printf '%s\n' "${out[@]}")
 ^sep()
  ⮜⮜⮜    Colorizer Conky,colorizer-conky -s
 ^sep($CUSTOM_COMMANDS_SEP)
-${CUSTOMCOMMANDS}
 <small>$EDIT_CUSTOMCOMMANDS</small>,touch ~/.config/mabox/${name}.csv;sleep 1;xdg-open ~/.config/mabox/${name}.csv
+${CUSTOMCOMMANDS}
 $(printf '%s\n' "${out2[@]}")
 $(printf '%s\n' "${out3[@]}")
 EOF