dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-17 00:31:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

finetuning monitor port id mapping

Browse source
This commit is contained in:
Harald Hope 2023-11-06 16:26:28 -08:00
parent 537ce3c31e
commit 6a71cc3067
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pinxi
View file

@ -19008,7 +19008,7 @@ sub map_monitor_ids {
foreach my $d_id (@$display_ids){ foreach my $d_id (@$display_ids){
push(@unmatched_display,$d_id->[0]); push(@unmatched_display,$d_id->[0]);
} }
foreach my $key (keys %$monitor_ids){ foreach my $key (sort keys %$monitor_ids){
if ($monitor_ids->{$key}{'status'} eq 'connected'){ if ($monitor_ids->{$key}{'status'} eq 'connected'){
push(@sys_ids,[$key,$monitor_ids->{$key}{'connector-id'}]); push(@sys_ids,[$key,$monitor_ids->{$key}{'connector-id'}]);
push(@unmatched_sys,$key); push(@unmatched_sys,$key);
@ -19020,8 +19020,6 @@ sub map_monitor_ids {
print 'sys: ', Data::Dumper::Dumper \@sys_ids if $dbg[45]; print 'sys: ', Data::Dumper::Dumper \@sys_ids if $dbg[45];
print 'display: ', Data::Dumper::Dumper $display_ids if $dbg[45]; print 'display: ', Data::Dumper::Dumper $display_ids if $dbg[45];
return if scalar @sys_ids != scalar @$display_ids; return if scalar @sys_ids != scalar @$display_ids;
@sys_ids = sort {lc($a->[0]) cmp lc($b->[0])} @sys_ids;
@unmatched_sys = sort {lc($a) cmp lc($b)} @unmatched_sys;
$monitor_map = {}; $monitor_map = {};
# known patterns: s: DP-1 d: DisplayPort-0; s: DP-1 d: DP1-1; s: DP-2 d: DP1-2; # known patterns: s: DP-1 d: DisplayPort-0; s: DP-1 d: DP1-1; s: DP-2 d: DP1-2;
# s: HDMI-A-2 d: HDMI-A-1; s: HDMI-A-2 d: HDMI-2; s: DVI-1 d: DVI1; s: HDMI-1 d: HDMI1 # s: HDMI-A-2 d: HDMI-A-1; s: HDMI-A-2 d: HDMI-2; s: DVI-1 d: DVI1; s: HDMI-1 d: HDMI1
@ -19037,12 +19035,16 @@ sub map_monitor_ids {
print "s: $sys_ids[$i]->[0] d: $display_ids->[$i][0]\n" if $dbg[45]; print "s: $sys_ids[$i]->[0] d: $display_ids->[$i][0]\n" if $dbg[45];
my $b_match; my $b_match;
# we're going for the connector match first # we're going for the connector match first
if ($display_ids->[$i][1] && $sys_ids[$i]->[1]){ if ($display_ids->[$i][1]){
if ($sys_ids[$i]->[1] == $display_ids->[$i][1]){ # for off case where they did not sort to same order
$b_match = 1; foreach my $sys (@sys_ids){
$monitor_map->{$display_ids->[$i][0]} = $sys_ids[$i]->[0]; if (defined $sys->[1] && $sys->[1] == $display_ids->[$i][1]){
@unmatched_display = grep {$_ ne $display_ids->[$i][0]} @unmatched_display; $b_match = 1;
@unmatched_sys = grep {$_ ne $sys_ids[$i]->[0]} @unmatched_sys; $monitor_map->{$display_ids->[$i][0]} = $sys->[0];
@unmatched_display = grep {$_ ne $display_ids->[$i][0]} @unmatched_display;
@unmatched_sys = grep {$_ ne $sys->[0]} @unmatched_sys;
last;
}
} }
} }
# try 1: /^([A-Z]+)(-[AB]|-[ADI]|-[ADI]-\d+?|-\d+?)?(-)?(\d+)$/i # try 1: /^([A-Z]+)(-[AB]|-[ADI]|-[ADI]-\d+?|-\d+?)?(-)?(\d+)$/i