From 754976e7deacb0b974f9a341cbc4c5367bdddbd4 Mon Sep 17 00:00:00 2001 From: Harald Hope Date: Mon, 6 Nov 2023 17:14:26 -0800 Subject: [PATCH] display compositor fix, android --- pinxi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pinxi b/pinxi index 9f47c16..119b0e8 100755 --- a/pinxi +++ b/pinxi @@ -51,7 +51,7 @@ use POSIX qw(ceil uname strftime ttyname); my $self_name='pinxi'; my $self_version='3.3.31'; my $self_date='2023-11-06'; -my $self_patch='06'; +my $self_patch='07'; ## END INXI INFO ## my ($b_pledge,@pledges); @@ -15322,7 +15322,7 @@ sub display_output(){ # print "$server_string\n"; } if (!$graphics{'protocol'} && !$server_string && !$graphics{'x-server'} && - !@$x_drivers){ + !@$x_drivers && !$graphics{'compositors'}){ $server_string = main::message('display-server'); push(@$rows,{ main::key($num++,1,1,'Display') => '', @@ -19139,7 +19139,7 @@ sub get_compositors { # notes: compiz: debian package compiz-core; # enlightenment: as of version 20 wayland compositor my @compositors = qw(budgie-wm compiz compton enlightenment gnome-shell - kwin_wayland kwin_x11 kwinft marco muffin mutter); + kwin_wayland kwin_x11 kwinft marco muffin mutter surfaceflinger); # these are more obscure, so check for them after primary common ones push (@compositors,qw(3dwm cosmic-comp dcompmgr gala kmscon metisse mir moblin monsterwm picom ukwm unagi unity-system-compositor @@ -34287,12 +34287,12 @@ sub set_ps_gui { xfce[45]?-panel xmobar yambar yabar); push(@match,@temp); } - # compositors (for wayland these are also the server, note. + # compositors (for wayland these are also the server, note). # for wayland always show, so always load these if ($show{'graphic'}){ @temp=qw(3dwm budgie-wm cairo compiz compton cosmic-comp deepin-wm dcompmgr enlightenment gala gnome-shell kmscon kwin_wayland kwin_x11 kwinft kwin - marco metisse mir moblin muffin mutter picom steamcompmgr + marco metisse mir moblin muffin mutter picom steamcompmgr surfaceflinger ukwm unagi unity-system-compositor wayland xcompmgr xfwm[45]?); push(@match,@temp); $b_wl = 1; @@ -34308,7 +34308,7 @@ sub set_ps_gui { hikari hopalong hyprland inaban japokwm kiwmi labwc laikawm lipstick liri mahogany marina maze motorcar newm nucleus orbital orbment perceptia phoc pywm qtile river rootston rustland - simulavr skylight smithay sommelier surfaceflinger sway swc swvkc + simulavr skylight smithay sommelier sway swc swvkc tabby taiwins tinybox tinywl trinkster velox vimway vivarium wavy waybox way-?cooler wayfire wayhouse waymonad westeros westford weston wio\+? wxr[cd] xuake));