diff --git a/pinxi b/pinxi index d2e2f82..22df6e2 100755 --- a/pinxi +++ b/pinxi @@ -29088,7 +29088,7 @@ sub get { } if ($extra > 2 && @$desktop){ set_info_data(); # panels, docks, bars, etc - set_screensaver_data(); # and lockers + set_tools_data(); # screensavers, lockers } if ($b_display && !$force{'display'} && $extra > 1){ get_wm(); @@ -29687,7 +29687,7 @@ sub set_info_data { eval $end if $b_log; } -sub set_screensaver_data { +sub set_tools_data { eval $start if $b_log; # these are running/active if (@{$gui{'tools-active'}}){ @@ -30913,18 +30913,18 @@ sub get_display_manager { } push(@$found,[@dm_info]); } - if (!@$found){ + if (!@$found && @{$gui{'dm-active'}}){ # ly does not have a run/pid file - if (grep {$_ eq 'ly'} @ps_gui){ + if (grep {$_ eq 'ly'} @{$gui{'dm-active'}}){ @data = program_data('ly','ly',3); $dm_info[0] = $data[0]; $dm_info[1] = $data[1]; $found->[0] = [@dm_info]; } - elsif (grep {/startx$/} @ps_gui){ + elsif (grep {/startx$/} @{$gui{'dm-active'}}){ $found->[0] = ['startx']; } - elsif (grep {$_ eq 'xinit'} @ps_gui){ + elsif (grep {$_ eq 'xinit'} @{$gui{'dm-active'}}){ $found->[0] = ['xinit']; } } @@ -34500,8 +34500,7 @@ sub set_gui { ukwm xfwm[45]?); push(@match,@temp); # startx: /bin/sh /usr/bin/startx - @temp=qw(ly startx xinit); # possible dm values - push(@match,@temp); + process_gui(\@{$gui{'dm-active'}},qw(ly startx xinit)); # possible dm values } # info: NOTE: glx-dock is cairo-dock if ($show{'system'} && $extra > 2){