diff --git a/wms_usher.sh b/wms_usher.sh index 8efd97d..93e8894 100755 --- a/wms_usher.sh +++ b/wms_usher.sh @@ -32,19 +32,18 @@ monocule() { # tiling. Master and stack tiling() { - sw=$((RW - 2 * GAP - 2 * BW)) # screen widht width gaps added - msh=$((RH - 2 * GAP - 2 * BW)) # master screen height - ssh=$((RH - GAP)) # stack screen height ((- BW))? - swcount=$((CMW - 1)) # stack windows count - mperc=$(atomx WM_MP $RID) # master area percent - mwidth=$((sw * mperc / 100 - 2 * BW)) # master area width - mheight=$msh # master area height - mx=$GAP # master x coordinate - my=$GAP # master y coordinate + sw=$((RW - 2 * GAP - 2 * BW)) # screen widht width gaps added + msh=$((RH - 2 * GAP - 2 * BW)) # master screen height + ssh=$((RH - GAP)) # stack screen height ((- BW))? + swcount=$((CMW - 1)) # stack windows count + mwidth=$((sw * MP / 100 - 2 * BW)) # master area width + mheight=$msh # master area height + mx=$GAP # master x coordinate + my=$GAP # master y coordinate swidth=$((sw - mwidth - GAP - 2 * BW)) # stack width sheight=$((ssh / swcount - GAP - 2 * BW)) # stack height - sx=$((mwidth + 2 * GAP + 2 * BW)) # stack x coordinate - sy=$GAP # stack y coordinate + sx=$((mwidth + 2 * GAP + 2 * BW)) # stack x coordinate + sy=$GAP # stack y coordinate # put focused window as master wtp $mx $my $mwidth $mheight $FW @@ -58,9 +57,8 @@ tiling() { # widespread widespread() { - wp=$(atomx WM_WP $RID) # window percentage from atom - ww=$((SW * wp / 100)) # windows width - wh=$((SH * wp / 100)) # windows height + ww=$((SW * WP / 100)) # windows width + wh=$((SH * WP / 100)) # windows height x=$(((RW - ww) / (CMW * 2))) # initial X coordinate y=$(((RH - wh) / (CMW * 2))) # initial Y coordinate xmax=$(((RW - ww) / CMW)) # function X value