Miroirs/pinxi
1
0
Fork 0
mirror of https://codeberg.org/smxi/pinxi.git synced 2024-09-28 15:20:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

kde detections debuggers

Browse source
This commit is contained in:
Harald Hope 2024-01-19 21:02:45 -08:00
parent 184b26716b
commit 0ebfc6af1d
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

@ -29177,8 +29177,8 @@ sub set_dboot_data {
# 8: screensavers/lockers: all not running, installed
{
package DesktopData;
my ($b_gtk,$b_qt,$b_xprop,$desktop_session,$gdmsession,$kde_session_version,
$xdg_desktop,@data,@xprop);
my ($b_gtk,$b_qt,$b_xprop,$desktop_session,$gdmsession,$kde_full_session,
$kde_session_version,$xdg_desktop,@data,@xprop);
my $desktop = [];
sub get {
@ -29222,11 +29222,13 @@ sub set_desktop_values {
# most desktops are not using it as of 2014-01-13 (KDE, UNITY, LXDE. Not Gnome)
$desktop_session = ($ENV{'DESKTOP_SESSION'}) ? prep_desktop_value($ENV{'DESKTOP_SESSION'}) : '';
$xdg_desktop = ($ENV{'XDG_CURRENT_DESKTOP'}) ? prep_desktop_value($ENV{'XDG_CURRENT_DESKTOP'}) : '';
$kde_full_session = ($ENV{'KDE_FULL_SESSION'}) ? $ENV{'KDE_FULL_SESSION'} : '';
$kde_session_version = ($ENV{'KDE_SESSION_VERSION'}) ? $ENV{'KDE_SESSION_VERSION'} : '';
# for fallback to fallback protections re false gnome id
$gdmsession = ($ENV{'GDMSESSION'}) ? prep_desktop_value($ENV{'GDMSESSION'}) : '';
de_wm_debugger('desktop-scalars',['$desktop_session: ' . $desktop_session,
'$xdg_desktop: ' . $xdg_desktop,
'$kde_full_session: ' . $kde_full_session,
'$kde_session_version: ' . $kde_session_version,
'$gdmsession: ' . $gdmsession]) if $dbg[63];
}
@ -29243,7 +29245,6 @@ sub prep_desktop_value {
sub get_kde_trinity_data {
eval $start if $b_log;
my ($kded,$kded_name,$program,@version_data,@version_data2);
my $kde_full_session = ($ENV{'KDE_FULL_SESSION'}) ? $ENV{'KDE_FULL_SESSION'} : '';
# we can't rely on 3 using kded3, it could be kded
if ($kde_full_session && ($program = main::check_program('kded' . $kde_full_session))){
$kded = $program;
@ -29266,14 +29267,14 @@ sub get_kde_trinity_data {
$desktop->[2] = 'Qt';
$desktop->[3] = main::awk(\@version_data,'^Qt:',2,'\s+') if @version_data;
}
de_wm_debugger('kde test 1 $desktop',$desktop) if $dbg[63];
de_wm_debugger('kde trinity $desktop',$desktop) if $dbg[63];
}
# works on 4, assume 5 will id the same, why not, no need to update in future
# KDE_SESSION_VERSION is the integer version of the desktop
# NOTE: as of plasma 5, the tool: about-distro MAY be available, that will show
# actual desktop data, so once that's in debian/ubuntu, if it gets in, add that test
elsif ($desktop_session eq 'kde-plasma' || $xdg_desktop eq 'kde' ||
$kde_session_version){
elsif ($desktop_session eq 'kde-plasma' || $desktop_session eq 'plasma' ||
$xdg_desktop eq 'kde' || $kde_session_version){
if ($kde_session_version && $kde_session_version <= 4){
@data = ($kded_name) ? ProgramData::values($kded_name) : ();
if (@data){
@ -29285,6 +29286,7 @@ sub get_kde_trinity_data {
}
}
$desktop->[0] = 'KDE' if !$desktop->[0];
de_wm_debugger('kde test 1 $desktop',$desktop) if $dbg[63];
}
else {
# NOTE: this command string is almost certain to change, and break, with next
@ -29309,7 +29311,7 @@ sub get_kde_trinity_data {
$desktop->[1] = main::awk(\@version_data2,'^plasmashell',-1,'\s+');
}
$desktop->[0] = 'KDE Plasma';
de_wm_debugger('kde test 3 $desktop',$desktop) if $dbg[63];
de_wm_debugger('kde test 2 $desktop',$desktop) if $dbg[63];
}
if (!$desktop->[1]){
$desktop->[1] = ($kde_session_version) ?
@ -29328,8 +29330,8 @@ sub get_kde_trinity_data {
($desktop->[2],$desktop->[3]) = ProgramData::full('qmake');
}
$desktop->[2] ||= 'Qt';
de_wm_debugger('kde qt 1 $desktop',$desktop) if $dbg[63];
}
de_wm_debugger('kde test 2 $desktop',$desktop) if $dbg[63];
}
# KDE_FULL_SESSION property is only available since KDE 3.5.5.
elsif ($kde_full_session eq 'true'){
@ -29343,7 +29345,7 @@ sub get_kde_trinity_data {
$desktop->[2] = 'Qt';
$desktop->[3] = main::awk(\@version_data,'^Qt:',2,'\s+') if @version_data;
}
de_wm_debugger('kde test 3 $desktop',$desktop) if $dbg[63];
de_wm_debugger('kde de+qt 2 $desktop',$desktop) if $dbg[63];
}
eval $end if $b_log;
}