diff --git a/bin/rc/workspace.main b/bin/rc/workspace.main index 9ddf3d1..76a505d 100755 --- a/bin/rc/workspace.main +++ b/bin/rc/workspace.main @@ -13,7 +13,7 @@ fn ScrDim{ # determine screen dimension (W H) if not { dim=(`{echo $vgasize | awk -Fx '{printf("%d %d", $1, $2)}'}) w=$dim(1) - h=$dim(1) + h=$dim(2) } echo $w $h } @@ -54,31 +54,27 @@ fn BotRow{ window -r ($x(1) $y(5) $x(2) $y(6)) vdir window -r ($x(3) $y(5) $x(4) $y(6)) faces } - -# -- VARS -# Dim..screen dimension (W x H) -Dim=(`{ScrDim}) -W=$Dim(1) -H=$Dim(2) - -# s..space from border -s=5 -# w..window width ratio -w=`{echo $W | awk '{print $1/2}'} -# h..window height ratio -h=`{echo $H | awk '{print $1/10}'} -# x..list of x point pairs (2 columns -> 2 pairs) -x=(`{echo $w $s | awk '{printf("%d %d %d %d", - (0*$1)+$2 , (1*$1)-$2, - (1*$1)+$2 , (2*$1)-$2)}'}) -# y..list of y point pairs (3 rows -> 3 pairs) -y=(`{echo $h $s | awk '{printf("%d %d %d %d %d %d", - (0*$1)+$2 , ( 1*$1)-$2, - (1*$1)+$2 , ( 9*$1)-$2, - (9*$1)+$2 , (10*$1)-$2)}'}) +fn TileScreen{ + Dim=(`{ScrDim}) # screen dimension (W x H) + W=$Dim(1) + H=$Dim(2) + s=5 # space from border + w=`{echo $W | awk '{print $1/2}'} # window width ratio + h=`{echo $H | awk '{print $1/10}'} # window height ratio + # x..list of x point pairs (2 columns -> 2 pairs) + x=(`{echo $w $s | awk '{printf("%d %d %d %d", + (0*$1)+$2 , (1*$1)-$2, + (1*$1)+$2 , (2*$1)-$2)}'}) + # y..list of y point pairs (3 rows -> 3 pairs) + y=(`{echo $h $s | awk '{printf("%d %d %d %d %d %d", + (0*$1)+$2 , ( 1*$1)-$2, + (1*$1)+$2 , ( 9*$1)-$2, + (9*$1)+$2 , (10*$1)-$2)}'}) + TopRow $#x ($x) $#y ($y) + MidRow $#x ($x) $#y ($y) + BotRow $#x ($x) $#y ($y) +} # -- MAIN >$home/tmp/w0.dim >$home/tmp/w1.dim -TopRow $#x ($x) $#y ($y) -MidRow $#x ($x) $#y ($y) -BotRow $#x ($x) $#y ($y) +TileScreen diff --git a/bin/rc/workspace.w0 b/bin/rc/workspace.w0 index 507847a..f4420e8 100755 --- a/bin/rc/workspace.w0 +++ b/bin/rc/workspace.w0 @@ -23,30 +23,27 @@ fn BotRow{ { y=$*(1-$ylen) ; shift $ylen } # param 4: list y window -r ($x(1) $y(5) $x(4) $y(6)) rc } +fn TileScreen{ + Dim=(`{read -m $home/tmp/w0.dim}) # screen dimension (W x H) + W=$Dim(1) + H=$Dim(2) + s=4 # space from border + w=`{echo $W | awk '{print $1/2}'} # window width ratio + h=`{echo $H | awk '{print $1/10}'} # window height ratio + # x..list of x point pairs (2 columns -> 2 pairs) + x=(`{echo $w $s | awk '{printf("%d %d %d %d", + (0*$1)+$2 , (1*$1)-$2, + (1*$1)+$2 , (2*$1)-$2)}'}) + # y..list of y point pairs (3 rows -> 3 pairs) + y=(`{echo $h $s | awk '{printf("%d %d %d %d %d %d", + (0*$1)+$2 , ( 1*$1)-$2, + (1*$1)+$2 , ( 9*$1)-$2, + (9*$1)+$2 , (10*$1)-$2)}'}) + TopRow $#x ($x) $#y ($y) + MidRow $#x ($x) $#y ($y) + BotRow $#x ($x) $#y ($y) +} -# -- VARS -# Dim..screen dimension (W x H) -Dim=(`{read -m $home/tmp/w0.dim}) -W=$Dim(1) -H=$Dim(2) - -# s..space from border -s=2 -# w..window width ratio -w=`{echo $W | awk '{print $1/2}'} -# h..window height ratio -h=`{echo $H | awk '{print $1/10}'} -# x..list of x point pairs (2 columns -> 2 pairs) -x=(`{echo $w $s | awk '{printf("%d %d %d %d", - (0*$1)+$2 , (1*$1)-$2, - (1*$1)+$2 , (2*$1)-$2)}'}) -# y..list of y point pairs (3 rows -> 3 pairs) -y=(`{echo $h $s | awk '{printf("%d %d %d %d %d %d", - (0 *$1)+$2 , (1 *$1)-$2, - (1 *$1)+$2 , (9 *$1)-$2, - (9 *$1)+$2 , (10 *$1)-$2)}'}) # -- MAIN label w0:terms -TopRow $#x ($x) $#y ($y) -MidRow $#x ($x) $#y ($y) -BotRow $#x ($x) $#y ($y) +TileScreen diff --git a/bin/rc/workspace.w1 b/bin/rc/workspace.w1 index d880e39..0a42c71 100755 --- a/bin/rc/workspace.w1 +++ b/bin/rc/workspace.w1 @@ -23,30 +23,26 @@ fn BotRow{ { y=$*(1-$ylen) ; shift $ylen } # param 4: list y window -scroll -r ($x(1) $y(5) $x(4) $y(6)) wircrc } - -# -- VARS -# Dim..screen dimension (W x H) -Dim=(`{read -m $home/tmp/w1.dim}) -W=$Dim(1) -H=$Dim(2) - -# s..space from border -s=4 -# w..window width ratio -w=`{echo $W | awk '{print $1/2}'} -# h..window height ratio -h=`{echo $H | awk '{print $1/10}'} -# x..list of x point pairs (2 columns -> 2 pairs) -x=(`{echo $w $s | awk '{printf("%d %d %d %d", - (0*$1)+$2 , (1*$1)-$2, - (1*$1)+$2 , (2*$1)-$2)}'}) -# y..list of y point pairs (3 rows -> 3 pairs) -y=(`{echo $h $s | awk '{printf("%d %d %d %d %d %d", - (0 *$1)+$2 , (1 *$1)-$2, - (1 *$1)+$2 , (9 *$1)-$2, - (9 *$1)+$2 , (10 *$1)-$2)}'}) +fn TileScreen{ + Dim=(`{read -m $home/tmp/w1.dim}) # screen dimension (W x H) + W=$Dim(1) + H=$Dim(2) + s=4 # space from border + w=`{echo $W | awk '{print $1/2}'} # window width ratio + h=`{echo $H | awk '{print $1/10}'} # window height ratio + # x..list of x point pairs (2 columns -> 2 pairs) + x=(`{echo $w $s | awk '{printf("%d %d %d %d", + (0*$1)+$2 , (1*$1)-$2, + (1*$1)+$2 , (2*$1)-$2)}'}) + # y..list of y point pairs (3 rows -> 3 pairs) + y=(`{echo $h $s | awk '{printf("%d %d %d %d %d %d", + (0*$1)+$2 , ( 1*$1)-$2, + (1*$1)+$2 , ( 9*$1)-$2, + (9*$1)+$2 , (10*$1)-$2)}'}) + TopRow $#x ($x) $#y ($y) + MidRow $#x ($x) $#y ($y) + BotRow $#x ($x) $#y ($y) +} # -- MAIN label w1:irc -TopRow $#x ($x) $#y ($y) -MidRow $#x ($x) $#y ($y) -BotRow $#x ($x) $#y ($y) +TileScreen