tylernguyen/one-key-hidpi
1
0
Fork 0
Code Issues Pull requests Releases Activity

fix irregular productID problam like 0000, more resolution can choose

Browse source
This commit is contained in:
xzhih 2019-11-19 04:47:08 +08:00
parent b55ecde645
commit 46f7dcf1db
3 changed files with 30 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README-zh.md
View file

@ -23,7 +23,7 @@ macOS 的 DPI 机制和 Windows 下不一样，比如 1080p 的屏幕在 Windows
在终端输入以下命令回车即可 在终端输入以下命令回车即可
```bash ```bash
sh -c "$(curl -fsSL https://raw.githubusercontent.com/xzhih/one-key-hidpi/dev/hidpi.sh)" bash -c "$(curl -fsSL https://raw.githubusercontent.com/xzhih/one-key-hidpi/dev/hidpi.sh)"
``` ```
![运行](./img/run-zh.jpg) ![运行](./img/run-zh.jpg)

2
README.md
View file

@ -21,7 +21,7 @@ System Preferences
Run this script in Terminal Run this script in Terminal
```bash ```bash
sh -c "$(curl -fsSL https://raw.githubusercontent.com/xzhih/one-key-hidpi/dev/hidpi.sh)" bash -c "$(curl -fsSL https://raw.githubusercontent.com/xzhih/one-key-hidpi/dev/hidpi.sh)"
``` ```
![RUN](./img/run.jpg) ![RUN](./img/run.jpg)

128
hidpi.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
sipChecker=($(csrutil status | awk '{ print $5 }')) sipChecker=($(csrutil status | awk '{ print $5 }'))
systemVersion=($(sw_vers -productVersion | cut -d "." -f 2)) systemVersion=($(sw_vers -productVersion | cut -d "." -f 2))
@ -103,13 +103,13 @@ function get_edid()
let index++ let index++
MonitorName=("$(echo ${display:190:24} | xxd -p -r)") MonitorName=("$(echo ${display:190:24} | xxd -p -r)")
VendorID=${display:16:4} VendorID=${display:16:4}
ProductID=${display:20:4} ProductID=${gMonitor:22:2}${gMonitor:20:2}
if [[ $VendorID == 0610 ]]; then if [[ ${VendorID} == 0610 ]]; then
MonitorName="Apple Display" MonitorName="Apple Display"
fi fi
if [[ $VendorID == 1e6d ]]; then if [[ ${VendorID} == 1e6d ]]; then
MonitorName="LG Display" MonitorName="LG Display"
fi fi
@ -141,38 +141,11 @@ function get_edid()
gMonitor=${gDisplayInf} gMonitor=${gDisplayInf}
fi fi
if [[ ${gMonitor:16:1} == 0 ]]; then EDID=${gMonitor}
# get rid of the prefix 0 VendorID=$((0x${gMonitor:16:4}))
gDisplayVendorID_RAW=${gMonitor:17:3} ProductID=$((0x${gMonitor:22:2}${gMonitor:20:2}))
else Vid=($(printf '%x\n' ${VendorID}))
gDisplayVendorID_RAW=${gMonitor:16:4} Pid=($(printf '%x\n' ${ProductID}))
fi
# convert from hex to dec
gDisplayVendorID=$((0x$gDisplayVendorID_RAW))
gDisplayProductID_RAW=${gMonitor:20:4}
# Exchange two bytes
# Fix an issue that will cause wrong name of DisplayProductID
if [[ ${gDisplayProductID_RAW:2:1} == 0 ]]; then
# get rid of the prefix 0
gDisplayProduct_pr=${gDisplayProductID_RAW:3:1}
else
gDisplayProduct_pr=${gDisplayProductID_RAW:2:2}
fi
gDisplayProduct_st=${gDisplayProductID_RAW:0:2}
gDisplayProductID_reverse="${gDisplayProduct_pr}${gDisplayProduct_st}"
if [[ ${gDisplayProduct_pr} == 0 ]]; then
gDisplayProductID_reverse="${gDisplayProduct_st}"
fi
gDisplayProductID=$((0x$gDisplayProduct_pr$gDisplayProduct_st))
EDID=$gMonitor
VendorID=$gDisplayVendorID
ProductID=$gDisplayProductID
Vid=$gDisplayVendorID_RAW
Pid=$gDisplayProductID_reverse
# echo ${Vid} # echo ${Vid}
# echo ${Pid} # echo ${Pid}
# echo $EDID # echo $EDID
@ -215,9 +188,7 @@ EEF
fi fi
fi fi
if [[ ! -f ${thatDir}/HIDPI/disable ]]; then
generate_restore_cmd generate_restore_cmd
fi
} }
# #
@ -229,61 +200,34 @@ mkdir -p ${thisDir}/tmp/
cat > "${thisDir}/tmp/disable" <<-\CCC cat > "${thisDir}/tmp/disable" <<-\CCC
#!/bin/sh #!/bin/sh
systemVersion=($(sw_vers -productVersion | cut -d "." -f 2))
if [[ "${systemVersion}" -ge "15" ]]; then
sudo mount -uw / && killall Finder
fi
function get_edid() function get_edid()
{ {
local index=0 local index=0
local selection=0 local selection=0
gDisplayInf=($(ioreg -lw0 | grep -i "IODisplayEDID" | sed -e "/[^<]*</s///" -e "s/\>//")) gDisplayInf=($(ioreg -lw0 | grep -i "IODisplayEDID" | sed -e "/[^<]*</s///" -e "s/\>//"))
if [[ "${#gDisplayInf[@]}" -ge 2 ]]; then if [[ "${#gDisplayInf[@]}" -ge 2 ]]; then
# Multi monitors detected. Choose target monitor.
echo ''
echo ' Monitors ' echo ' Monitors '
echo '----------------------------------------------------' echo '------------------------------------'
echo ' Index | VendorID | ProductID | MonitorName ' echo ' Index | VendorID | ProductID '
echo '----------------------------------------------------' echo '------------------------------------'
for display in "${gDisplayInf[@]}" for display in "${gDisplayInf[@]}"
do do
let index++ let index++
MonitorName=("$(echo ${display:190:24} | xxd -p -r)") printf " %d | ${display:16:4} | ${gMonitor:22:2}${gMonitor:20:2}\n" $index
VendorID=${display:16:4}
ProductID=${display:20:4}
if [[ $VendorID == 0610 ]]; then
MonitorName="Apple Display"
fi
if [[ $VendorID == 1e6d ]]; then
MonitorName="LG Display"
fi
printf " %d | $VendorID | $ProductID | $MonitorName\n" $index
done done
echo '------------------------------------'
echo '----------------------------------------------------'
read -p "Choose the display: " selection read -p "Choose the display: " selection
case $selection in case $selection in
[[:digit:]]* ) [[:digit:]]* )
if ((selection < 1 || selection > index)); then if ((selection < 1 || selection > index)); then
echo "Enter error. bye"; echo "Enter error, bye";
exit 0 exit 0
fi fi
let selection-=1 let selection-=1
gMonitor=${gDisplayInf[$selection]} gMonitor=${gDisplayInf[$selection]}
;; ;;
* ) * )
echo "Enter error. bye"; echo "Enter error, bye";
exit 0 exit 0
;; ;;
esac esac
@ -291,42 +235,22 @@ function get_edid()
gMonitor=${gDisplayInf} gMonitor=${gDisplayInf}
fi fi
if [[ ${gMonitor:16:1} == 0 ]]; then
gDisplayVendorID_RAW=${gMonitor:17:3}
else
gDisplayVendorID_RAW=${gMonitor:16:4}
fi
gDisplayVendorID=$((0x$gDisplayVendorID_RAW))
gDisplayProductID_RAW=${gMonitor:20:4}
if [[ ${gDisplayProductID_RAW:2:1} == 0 ]]; then
gDisplayProduct_pr=${gDisplayProductID_RAW:3:1}
else
gDisplayProduct_pr=${gDisplayProductID_RAW:2:2}
fi
gDisplayProduct_st=${gDisplayProductID_RAW:0:2}
gDisplayProductID_reverse="${gDisplayProduct_pr}${gDisplayProduct_st}"
gDisplayProductID=$((0x$gDisplayProduct_pr$gDisplayProduct_st))
EDID=$gMonitor EDID=$gMonitor
Vid=$gDisplayVendorID_RAW VendorID=$((0x${gMonitor:16:4}))
Pid=$gDisplayProductID_reverse ProductID=$((0x${gMonitor:22:2}${gMonitor:20:2}))
# echo ${Vid} Vid=($(printf '%x\n' ${VendorID}))
# echo ${Pid} Pid=($(printf '%x\n' ${ProductID}))
# echo $EDID
} }
get_edid get_edid
if [[ -d ../DisplayVendorID-${Vid} ]]; then if [[ -d ../DisplayVendorID-${Vid} ]]; then
sudo rm -rf ../DisplayVendorID-${Vid} rm -rf ../DisplayVendorID-${Vid}
fi fi
sudo rm -rf ../Icons.plist rm -rf ../Icons.plist
sudo cp -r ./backup/* ../ cp -r ./backup/* ../
sudo rm -rf ./disable rm -rf ./disable
echo "HIDPI Disabled" echo "HIDPI Disabled"
CCC CCC
@ -599,8 +523,8 @@ function enable_hidpi_with_patch()
version=${EDID:38:2} version=${EDID:38:2}
basicparams=${EDID:40:2} basicparams=${EDID:40:2}
checksum=${EDID:254:2} checksum=${EDID:254:2}
newchecksum=$(printf '%x' $((0x$checksum + 0x$version +0x$basicparams - 0x04 - 0x90)) | tail -c 2) newchecksum=$(printf '%x' $((0x${checksum} + 0x${version} +0x${basicparams} - 0x04 - 0x90)) | tail -c 2)
newedid=${EDID:0:38}0490${EDID:42:212}${newchecksum} newedid=${EDID:0:38}0490${EDID:42:6}e6${EDID:50:204}${newchecksum}
EDid=$(printf ${newedid} | xxd -r -p | base64) EDid=$(printf ${newedid} | xxd -r -p | base64)
/usr/bin/sed -i "" "s:EDid:${EDid}:g" ${dpiFile} /usr/bin/sed -i "" "s:EDid:${EDid}:g" ${dpiFile}