Skip to content

Commit

Permalink
Force detect EDID information from xrandr --verbose
Browse files Browse the repository at this point in the history
  • Loading branch information
eloaders committed Jan 4, 2014
1 parent 2154cd0 commit c97ede3
Show file tree
Hide file tree
Showing 9 changed files with 121 additions and 49 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ INSTALL_SELF_SCRIPT = ./install-self
ifeq ($(ARCH),x86)
additional_confflags := --disable-sse2
endif
dependency_build ?= bzr \
dependency_build ?= git \
devscripts \
pkg-config \
dpkg-dev \
Expand Down
52 changes: 26 additions & 26 deletions pixmaps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ make:
${MKDIR_P} 64x64
${MKDIR_P} 72x72
${MKDIR_P} 96x96
convert i-nex.xpm -resize 128x128 128x128/i-nex.xpm
convert i-nex.xpm -resize 16x16 16x16/i-nex.xpm
convert i-nex.xpm -resize 192x192 192x192/i-nex.xpm
convert i-nex.xpm -resize 22x22 22x22/i-nex.xpm
convert i-nex.xpm -resize 24x24 24x24/i-nex.xpm
convert i-nex.xpm -resize 256x256 256x256/i-nex.xpm
convert i-nex.xpm -resize 32x32 32x32/i-nex.xpm
convert i-nex.xpm -resize 36x36 36x36/i-nex.xpm
convert i-nex.xpm -resize 48x48 48x48/i-nex.xpm
convert i-nex.xpm -resize 512x512 512x512/i-nex.xpm
convert i-nex.xpm -resize 64x64 64x64/i-nex.xpm
convert i-nex.xpm -resize 72x72 72x72/i-nex.xpm
convert i-nex.xpm -resize 96x96 96x96/i-nex.xpm
convert i-nex.xpm -resize 128x128 128x128/i-nex.png
convert i-nex.xpm -resize 16x16 16x16/i-nex.png
convert i-nex.xpm -resize 192x192 192x192/i-nex.png
convert i-nex.xpm -resize 22x22 22x22/i-nex.png
convert i-nex.xpm -resize 24x24 24x24/i-nex.png
convert i-nex.xpm -resize 256x256 256x256/i-nex.png
convert i-nex.xpm -resize 32x32 32x32/i-nex.png
convert i-nex.xpm -resize 36x36 36x36/i-nex.png
convert i-nex.xpm -resize 48x48 48x48/i-nex.png
convert i-nex.xpm -resize 512x512 512x512/i-nex.png
convert i-nex.xpm -resize 64x64 64x64/i-nex.png
convert i-nex.xpm -resize 72x72 72x72/i-nex.png
convert i-nex.xpm -resize 96x96 96x96/i-nex.png

install:
${MKDIR_P} ${DESTDIR}${datarootdir}/icons/hicolor/22x22/apps
Expand All @@ -45,19 +45,19 @@ install:
${MKDIR_P} ${DESTDIR}${datarootdir}/icons/hicolor/512x512/apps
#${MKDIR_P} ${DESTDIR}${datarootdir}/icons/hicolor/scalable/apps

${INSTALL} -m 644 22x22/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/22x22/apps/"
${INSTALL} -m 644 32x32/i-nex.xpm "${DESTDIR}${datarootdir}/pixmaps/"
${INSTALL} -m 644 24x24/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/24x24/apps/"
${INSTALL} -m 644 32x32/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/32x32/apps/"
${INSTALL} -m 644 36x36/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/36x36/apps/"
${INSTALL} -m 644 48x48/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps/"
${INSTALL} -m 644 64x64/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/64x64/apps/"
${INSTALL} -m 644 72x72/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/72x72/apps/"
${INSTALL} -m 644 96x96/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/96x96/apps/"
${INSTALL} -m 644 128x128/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/128x128/apps/"
${INSTALL} -m 644 256x256/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/256x256/apps/"
${INSTALL} -m 644 192x192/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/192x192/apps/"
${INSTALL} -m 644 512x512/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/512x512/apps/"
${INSTALL} -m 644 22x22/i-nex.png "${DESTDIR}${datarootdir}/icons/hicolor/22x22/apps/"
${INSTALL} -m 644 32x32/i-nex.png "${DESTDIR}${datarootdir}/pixmaps/"
${INSTALL} -m 644 24x24/i-nex.png "${DESTDIR}${datarootdir}/icons/hicolor/24x24/apps/"
${INSTALL} -m 644 32x32/i-nex.png "${DESTDIR}${datarootdir}/icons/hicolor/32x32/apps/"
${INSTALL} -m 644 36x36/i-nex.png "${DESTDIR}${datarootdir}/icons/hicolor/36x36/apps/"
${INSTALL} -m 644 48x48/i-nex.png "${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps/"
${INSTALL} -m 644 64x64/i-nex.png "${DESTDIR}${datarootdir}/icons/hicolor/64x64/apps/"
${INSTALL} -m 644 72x72/i-nex.png "${DESTDIR}${datarootdir}/icons/hicolor/72x72/apps/"
${INSTALL} -m 644 96x96/i-nex.png "${DESTDIR}${datarootdir}/icons/hicolor/96x96/apps/"
${INSTALL} -m 644 128x128/i-nex.png "${DESTDIR}${datarootdir}/icons/hicolor/128x128/apps/"
${INSTALL} -m 644 256x256/i-nex.png "${DESTDIR}${datarootdir}/icons/hicolor/256x256/apps/"
${INSTALL} -m 644 192x192/i-nex.png "${DESTDIR}${datarootdir}/icons/hicolor/192x192/apps/"
${INSTALL} -m 644 512x512/i-nex.png "${DESTDIR}${datarootdir}/icons/hicolor/512x512/apps/"

uninstall:
if test -f "${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps/i-nex.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps/i-nex.xpm" ; fi
Expand Down
40 changes: 21 additions & 19 deletions src/i-nex/.settings
Original file line number Diff line number Diff line change
Expand Up @@ -21,45 +21,46 @@ SearchComment=False
SearchString=True

[OpenFile]
Active=1
File[1]=".src/Finfosys.form"
File[2]=".src/Global.class:149.56"
File[3]=".src/About.form"
File[4]=".src/About.class:73.3"
File[4]=".src/About.class:7.35"
File[5]=".src/battery.module:70.77"
File[6]=".src/Disk_Drives.module:33.0"
File[6]=".src/Disk_Drives.module:200.7"
File[7]=".src/ScreenShot.form"
File[8]=".src/ScreenShot.class:38.45"
File[8]=".src/ScreenShot.class:13.34"
File[9]=".src/ScreenShotM.module:7.0"
File[10]=".src/USB_Drives.module:13.0"
File[10]=".src/USB_Drives.module:35.17"
File[11]=".src/Asound_Drives.module:34.12"
File[12]=".src/FReport_Gen.form"
File[13]=".src/FReport_Gen.class:165.3"
File[13]=".src/FReport_Gen.class:34.34"
File[14]=".src/Start_App_Args.form"
File[15]=".src/Start_App_Args.class:2.0"
File[16]=".src/ChkPrm.module:21.19"
File[17]=".src/thermal_zone.module:21.25"
File[18]=".src/FModules.form"
File[19]=".src/FModules.class:20.10"
File[20]=".src/Input_Devices.module:8.1"
File[21]=".src/net.module:104.1"
File[22]="Data/report-ng.sh:5.36"
File[23]=".src/Distribution_Detect.module:2.17"
File[21]=".src/net.module:116.28"
File[22]="Data/report-ng.sh:5.3"
File[23]=".src/Distribution_Detect.module:11.29"
File[24]=".src/FFlags.module:90.19"
File[25]=".src/Finfosys.class:653.3"
File[25]=".src/Finfosys.class:229.60"
File[26]=".src/FDF.form"
File[27]=".src/FDF.class:28.69"
File[28]=".src/FNET_R_T.form"
File[29]=".src/FNET_R_T.class:28.32"
File[30]=".src/FGraphic.module:36.1"
File[30]=".src/FGraphic.module:49.3"
File[31]="logo/fb.png"
File[32]=".src/FCPU.module:3.4"
File[33]=".src/FUdisks.form"
File[34]=".src/FUdisks.class:242.28"
File[35]=".src/FCpudb.module:16.35"
File[36]=".src/JSON.module:108.2"
File[37]=".src/Settings.class:464.34"
File[35]=".src/FCpudb.module:10.3"
File[36]=".src/JSON.module:68.59"
File[37]=".src/Settings.class:2.13"
File[38]=".src/Main.module:7.29"
File[39]=".src/_Settings_Keys.class:50.0"
File[39]=".src/_Settings_Keys.class:20.28"
File[40]=".src/FDirDialog.form"
File[41]=".src/FFileDialog.form"
File[42]=".src/Dialog.class:0.0"
Expand All @@ -68,15 +69,16 @@ File[44]=".src/Reports/MCPU_REPORT.module:48.53"
File[45]=".src/Reports/MMOBO_REPORT.module:20.60"
File[46]=".src/Reports/MGPU_REPORT.module:47.77"
File[47]=".src/Reports/MSOUND_REPORT.module:13.14"
File[48]=".src/Reports/MPastebinit.module:16.14"
File[49]=".src/Reports/MSYSTEM_REPORT.module:22.35"
File[48]=".src/Reports/MPastebinit.module:22.35"
File[49]=".src/Reports/MSYSTEM_REPORT.module:39.1"
File[50]=".src/Reports/MKERNEL_REPORT.module:19.1"
File[51]=".src/Reports/MInclude.module:72.15"
File[52]=".src/Reports/MDRIVES_REPORT.module:12.40"
File[53]=".src/FInputDate.form"
Active=54
File[54]=".src/MInit.module:12.40"
Count=54
File[54]=".src/MInit.module:30.65"
File[55]=".src/FEDID.form"
File[56]=".src/FEDID.class:11.0"
Count=56

[Watches]
Count=0
Expand Down
17 changes: 17 additions & 0 deletions src/i-nex/.src/FEDID.class
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
' Gambas class file


Public Sub Form_Open()
Me.Center
Me.X = Settings["Window/X", Me.X]
Me.Y = Settings["Window/Y", Me.Y]
Exec ["/bin/bash", "" & User.Home & "/.i-nex/edid"] Wait
TextArea1.Text = File.Load("" & User.Home & "/.i-nex/edid.conf")

End

Public Sub Button1_Click()

Me.Close

End
25 changes: 25 additions & 0 deletions src/i-nex/.src/FEDID.form
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Gambas Form File 3.0

{ Form Form
MoveScaled(0,0,67,75)
Font = Font["8"]
Resizable = False
{ VBox1 VBox
MoveScaled(0,0,67,71)
Expand = True
{ TextArea1 TextArea
MoveScaled(0,0,62,62)
#Translate = False
Font = Font["8"]
Expand = True
Text = "TextArea1"
ReadOnly = True
}
}
{ Button1 Button
MoveScaled(55,71,11,4)
Font = Font["Bold,8"]
Text = ("Close")
Picture = Picture["icon:/16/quit"]
}
}
6 changes: 6 additions & 0 deletions src/i-nex/.src/Finfosys.class
Original file line number Diff line number Diff line change
Expand Up @@ -733,3 +733,9 @@ Public Sub Form_Move()
Settings["Window/Y"] = Me.Y

End

Public Sub Button11_Click()

FEDID.Show

End
9 changes: 8 additions & 1 deletion src/i-nex/.src/Finfosys.form
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@
Border = False
}
{ ComboBox8 ComboBox
Move(7,7,84,28)
Move(7,7,91,28)
#Translate = False
ReadOnly = True
Text = "ComboBox8"
Expand Down Expand Up @@ -561,6 +561,13 @@
Text = ("Label156")
Border = Border.Raised
}
{ Button11 Button
Move(98,7,77,28)
Font = Font["Bold,8"]
ToolTip = ("Force detect EDID information from xrandr --verbose")
Text = ("Force")
Picture = Picture["icon:/16/make"]
}
Index = 2
Text = ("Mobo")
{ Frame1 Frame
Expand Down
6 changes: 4 additions & 2 deletions src/i-nex/.src/MInit.module
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ Public Sub _inits()
Print "Try to remove files"
Try Kill User.Home & "/.i-nex/screenfetch-dev"
Try Kill User.Home & "/.i-nex/report-ng.sh"

Try Kill User.Home & "/.i-nex/edid"

Else
Print "i-nex in home folder not exist"
Try Mkdir User.Home & "/.i-nex/"
Expand All @@ -22,9 +23,10 @@ Public Sub _inits()
Copy "Data/screenfetch-dev" To User.Home &/ ".i-nex/screenfetch-dev"
Print "Copy report-ng.sh from Data/report-ng.sh to " & User.Home &/ ".i-nex/report-ng.sh"
Copy "Data/report-ng.sh" To User.Home &/ ".i-nex/report-ng.sh"
Print "Copy edid from Data/edid to " & User.Home &/ ".i-nex/edid"
Copy "Data/edid" To User.Home &/ ".i-nex/edid"
Print "Execute copied files"

Exec ["/bin/bash", "" & User.Home & "/.i-nex/screenfetch-dev"] Wait
Exec ["/bin/bash", "" & User.Home & "/.i-nex/report-ng.sh"] Wait

End
13 changes: 13 additions & 0 deletions src/i-nex/Data/edid
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
xrandr --verbose | perl -ne '
if ((/EDID:/.../:/) && !/:/) {
s/^\s+//;
chomp;
$hex .= $_;
} elsif ($hex) {
# Use "|strings" if you dont have read-edid package installed
# and just want to see (or grep) the human-readable parts.
open FH, "|inex-edid";
print FH pack("H*", $hex);
$hex = "";
}' > ~/.i-nex/edid.conf

0 comments on commit c97ede3

Please sign in to comment.