termrc: setup mouse when we have a framebuffer

previously, we setup mouse only when vgasize= was specifid in
plan9.ini. with efi systems, the framebuffer is already setup
for us and theres no requirement for going thru aux/vga setup,
but we still want to setup the mouse.

so do the mouseport= check once theres a framebuffer by testing
the existence of '#i/winname' (which fails when thers no
framebuffer).
This commit is contained in:
cinap_lenrek 2014-11-05 20:42:47 +01:00
parent 3f09d4b623
commit 0560d1d6b6

View file

@ -75,6 +75,7 @@ if(! ~ $terminal *vx32*){
aux/timesync $TIMESYNCARGS aux/timesync $TIMESYNCARGS
} }
# setup mouse and graphics
fn ask { fn ask {
if(~ $"$1 ask){ if(~ $"$1 ask){
echo -n $1 echo -n $1
@ -92,29 +93,29 @@ fn ask {
ask $* ask $*
} }
} }
if(test -f /dev/vgactl){
ask vgasize ' is (text, 640x480x8, 1024x768x16, ...)' 1024x768x16 ask vgasize ' is (text, 640x480x8, 1024x768x16, ...)' 1024x768x16
if(! ~ $"vgasize '' text none){ if(! ~ $"vgasize '' text none){
ask monitor ' is (vesa, xga, lcd, ...)' vesa ask monitor ' is (vesa, xga, lcd, ...)' vesa
if(! ~ $"monitor ''){ if(! ~ $"monitor ''){
if(test -f /dev/mousectl) @{
ask mouseport ' is (ps2, ps2intellimouse, 0, 1, 2)' ps2 rfork n
if not if(~ $monitor vesa)
mouseport=none aux/realemu
@{ aux/vga -l $vgasize
rfork n }
if(~ $monitor vesa)
aux/realemu
aux/vga -l $vgasize
}
switch($mouseport){
case ps2 ps2intellimouse 0 1 2
aux/mouse $mouseport
if(~ $accupoint 1)
pipefile -dr /bin/aux/accupoint /dev/mouse
} }
} }
} }
if(test -f /dev/mousectl && test -f '#i/winname'){
ask mouseport ' is (ps2, ps2intellimouse, 0, 1, 2)' ps2
switch($mouseport){
case ps2 ps2intellimouse 0 1 2
aux/mouse $mouseport
if(~ $accupoint 1)
pipefile -dr /bin/aux/accupoint /dev/mouse
}
}
rm -f '/env/fn#ask' rm -f '/env/fn#ask'
if(test -f /dev/apm) if(test -f /dev/apm)