display compositor fix, android

This commit is contained in:
Harald Hope 2023-11-06 17:14:26 -08:00
parent 6a71cc3067
commit 754976e7de

12
pinxi
View file

@ -51,7 +51,7 @@ use POSIX qw(ceil uname strftime ttyname);
my $self_name='pinxi'; my $self_name='pinxi';
my $self_version='3.3.31'; my $self_version='3.3.31';
my $self_date='2023-11-06'; my $self_date='2023-11-06';
my $self_patch='06'; my $self_patch='07';
## END INXI INFO ## ## END INXI INFO ##
my ($b_pledge,@pledges); my ($b_pledge,@pledges);
@ -15322,7 +15322,7 @@ sub display_output(){
# print "$server_string\n"; # print "$server_string\n";
} }
if (!$graphics{'protocol'} && !$server_string && !$graphics{'x-server'} && if (!$graphics{'protocol'} && !$server_string && !$graphics{'x-server'} &&
!@$x_drivers){ !@$x_drivers && !$graphics{'compositors'}){
$server_string = main::message('display-server'); $server_string = main::message('display-server');
push(@$rows,{ push(@$rows,{
main::key($num++,1,1,'Display') => '', main::key($num++,1,1,'Display') => '',
@ -19139,7 +19139,7 @@ sub get_compositors {
# notes: compiz: debian package compiz-core; # notes: compiz: debian package compiz-core;
# enlightenment: as of version 20 wayland compositor # enlightenment: as of version 20 wayland compositor
my @compositors = qw(budgie-wm compiz compton enlightenment gnome-shell 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 # these are more obscure, so check for them after primary common ones
push (@compositors,qw(3dwm cosmic-comp dcompmgr gala kmscon push (@compositors,qw(3dwm cosmic-comp dcompmgr gala kmscon
metisse mir moblin monsterwm picom ukwm unagi unity-system-compositor metisse mir moblin monsterwm picom ukwm unagi unity-system-compositor
@ -34287,12 +34287,12 @@ sub set_ps_gui {
xfce[45]?-panel xmobar yambar yabar); xfce[45]?-panel xmobar yambar yabar);
push(@match,@temp); 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 # for wayland always show, so always load these
if ($show{'graphic'}){ if ($show{'graphic'}){
@temp=qw(3dwm budgie-wm cairo compiz compton cosmic-comp deepin-wm dcompmgr @temp=qw(3dwm budgie-wm cairo compiz compton cosmic-comp deepin-wm dcompmgr
enlightenment gala gnome-shell kmscon kwin_wayland kwin_x11 kwinft kwin 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]?); ukwm unagi unity-system-compositor wayland xcompmgr xfwm[45]?);
push(@match,@temp); push(@match,@temp);
$b_wl = 1; $b_wl = 1;
@ -34308,7 +34308,7 @@ sub set_ps_gui {
hikari hopalong hyprland inaban japokwm kiwmi labwc laikawm lipstick liri hikari hopalong hyprland inaban japokwm kiwmi labwc laikawm lipstick liri
mahogany marina maze motorcar newm nucleus mahogany marina maze motorcar newm nucleus
orbital orbment perceptia phoc pywm qtile river rootston rustland 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 tabby taiwins tinybox tinywl trinkster velox vimway vivarium
wavy waybox way-?cooler wayfire wayhouse waymonad westeros westford wavy waybox way-?cooler wayfire wayhouse waymonad westeros westford
weston wio\+? wxr[cd] xuake)); weston wio\+? wxr[cd] xuake));