Mabox
/
mb-jgtools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tryung to fix multimonitor behaviuor

master
Daniel Napora 2020-02-01 16:40:35 +01:00
parent 2b62f6da40
commit 4f6edc2236
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bin/mb-jgtools
View File

@ -92,14 +92,27 @@ trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT
#Liczba onitorów #Liczba onitorów
#xrandr --listmonitors | grep Monitors |awk '{print $2}' #xrandr --listmonitors | grep Monitors |awk '{print $2}'
if [ $(xrandr --listmonitors | grep Monitors |awk '{print $2}') -gt "1" ]
then
{ read WIDTH1; read WIDTH2; } <<< "$(xrandr --current | grep '*' | uniq | awk '{print $0}' | cut -d 'x' -f1)"
MOUSEPOS=$(xdotool getmouselocation | awk '{print $1}'|cut -d ':' -f2)
if [ "$MOUSEPOS" -gt "$WIDTH1" ]
then
POSX=$((WIDTH2 - JGWIDTH))
else
POSX=$((WIDTH1 - JGWIDTH))
fi
else
POSX=$((SCREENWIDTH - JGWIDTH))
fi
#Pozycja myszy #Pozycja myszy
#xdotool getmouselocation | awk '{print $1}'|cut -d ':' -f2 #xdotool getmouselocation | awk '{print $1}'|cut -d ':' -f2
#WIDTH1 i WIDTH2 #WIDTH1 i WIDTH2
#{ read WIDTH1; read WIDTH2; } <<< "$(xrandr --current | grep '*' | uniq | awk '{print $0}' | cut -d 'x' -f1)"no to jest wszystko co potrzeba #{ read WIDTH1; read WIDTH2; } <<< "$(xrandr --current | grep '*' | uniq | awk '{print $0}' | cut -d 'x' -f1)"
POSX=$((SCREENWIDTH - JGWIDTH))
echo "JGWIDTH: $JGWIDTH SCREENWIDTH: $SCREENWIDTH POSX: $POSX" echo "JGWIDTH: $JGWIDTH SCREENWIDTH: $SCREENWIDTH POSX: $POSX"
MENU_HEIGHT_MIN=$(xdpyinfo | awk '/^ +dimensions/ {print $2}' | cut -d 'x' -f2) MENU_HEIGHT_MIN=$(xdpyinfo | awk '/^ +dimensions/ {print $2}' | cut -d 'x' -f2)
@ -354,30 +367,29 @@ MENU_ITEMS=$(mktemp)
trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT
#Lokalne zmienne; #Lokalne zmienne;
JGWIDTH="500" JGWIDTH="300"
MENU_HALIGN="center" MENU_HALIGN="center"
MENU_VALIGN="center" MENU_VALIGN="center"
MENU_HEIGHT_MIN="210" MENU_HEIGHT_MIN="210"
MENU_HEIGHT_MAX="210" #MENU_HEIGHT_MAX="210"
TABS="280" TABS="280"
ITEM_HEIGHT="50" ITEM_HEIGHT="50"
FONT="Noto Sans Medium 12" FONT="Noto Sans Medium 12"
COLUMNS="2" COLUMNS="1"
mkconfigfile mkconfigfile
cat <<EOF > ${MENU_ITEMS} cat <<EOF > ${MENU_ITEMS}
@icon,,10,20,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/mbcc.png @icon,,10,20,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/mbcc.png
@text,,70,10,220,20,4,left,top,#EEEEEE,#111111,$OSNAME $OSVERSION <sup> $OSCODE</sup> @text,,70,10,220,20,4,left,top,#EEEEEE,#111111,$OSNAME $OSVERSION <sup> $OSCODE</sup>
@text,,70,30,240,20,4,left,top,#666666,#444444,<small>Jądro: $KERNEL $HOSTTYPE</small> @text,,70,30,240,20,4,left,top,#666666,#444444,<small>$USER@$HOSTNAME</small>
@text,,70,50,200,20,4,left,top,#666666,#444444,<small>$USER@$HOSTNAME</small> @text,,70,50,200,20,4,left,top,#666666,#444444,<i>Panele dla Maboxa</i>
 Szybka nawigacja,mb-jgtools places  Szybka nawigacja,mb-jgtools places
 coś tu będzie,
 System panel,mb-jgtools right  System panel,mb-jgtools right
 Wylogowanie,mb-jgtools mblogout  Menu główne,mb-jgtools main
 Zrzuty ekranu,mb-jgtools screenshot  Zrzuty ekranu,mb-jgtools screenshot
 Wylogowanie,mb-jgtools mblogout
EOF EOF
jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null
} }