fine tuned complex wm detections

This commit is contained in:
Harald Hope 2024-01-21 17:29:43 -08:00
parent 8c74e48a64
commit ec104a9ab0

12
pinxi
View file

@ -29503,7 +29503,7 @@ sub de_xfce_env_data {
sub de_env_data {
eval $start if $b_log;
if (!$desktop->[0]){
# 0: 0/1 regex/eq; 1: env var search; 2: PD data; 3: [PD version];
# 0: 0/1 regex/eq; 1: env var search; 2: PD full; 3: [PD version cmd];
# 4: gtk tk; 5: qt tk; 6: ps search
my @desktops =(
[1,'unity','unity','',0,0],
@ -29582,7 +29582,7 @@ sub de_env_xprop_misc_data {
# detections. de_ps_data() and wm_data() will handle alternate wm detections.
# I believe all these will be X only wm, so xprop tests fine here.
if ($b_xprop && !$desktop->[0]){
# 0 check program; 1 xprop search; 2: PD data; 3: [PD version cmd];
# 0 check program; 1 xprop search; 2: PD full; 3: [PD version cmd];
# 4: [ps_gui search]
my @desktops =(
['icewm','icewm','icewm'],
@ -29622,12 +29622,12 @@ sub de_ps_data {
push(@working,@{$ps_data{'wm-main'}}) if @{$ps_data{'wm-main'}};
if (@working){
# order matters, these have alternate search patterns from default name
# 0: check program; 1: ps_gui search; 2: PD data; 3: [PD version cmd]
# 0: check program; 1: ps_gui search; 2: PD full; 3: [PD version cmd]
my @wms =(
['WindowMaker','WindowMaker','wmaker',''],
['cwm','(openbsd-)?cwm','cwm',''],
['flwm','flwm(_topside)?','flwm',''],
['fvwm-crystal','fvwm.*-crystal','fvwm-crystal','fvwm'],
['fvwm-crystal','fvwm.*-crystal\S*','fvwm-crystal','fvwm'],
['hyprland','[Hh]yprland','hyprctl',''],
['xfdesktop','xfdesktop','xfdesktop',''],
);
@ -35342,14 +35342,14 @@ sub set_gui {
razor-desktop razor-session lxsession lxqt-session
tdelauncher tdeinit_phase1)));
# order matters!
process_gui(\@{$ps_data{'wm-parent'}},join('|', qw(xfdesktop icewm fluxbox)));
process_gui(\@{$ps_data{'wm-parent'}},join('|', qw(xfdesktop icewm fluxbox
fvwm.*-crystal\S* fvwm1 fvwm2 fvwm3 fvwm95 fvwm )));
# regular wm
# unverfied: 2bwm catwm mcwm penrose snapwm uwm wmfs wmfs2 wingo wmii2
process_gui(\@{$ps_data{'wm-main'}},join('|', qw(2bwm 9wm
afterstep aewm aewm\+\+ amiwm antiwm awesome
blackbox bspwm calmwm catwm cde clfswm ctwm (openbsd-)?cwm
dawn dusk dwm echinus evilwm flwm flwm_topside
fvwm.*-crystal fvwm1 fvwm2 fvwm3 fvwm95 fvwm
hackedbox herbstluftwm i3 instantwm ion3 jbwm jwm larswm leftwm lwm
matchbox-window-manager mcwm mini monsterwm musca mvwm mwm nawm notion
openbox nscde pekwm penrose qvwm ratpoison