diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2017-03-18 16:58:27 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2017-03-18 16:58:27 +0100 |
| commit | 1a2aefcf119e21345e41466d3d28bddcd6d6488a (patch) | |
| tree | a912921ae86a62984257ac4cbe8c950a68682775 /sys/src/9/pc/devvga.c | |
| parent | 08453422b1b8ac1daaba8000fb07d6551fb155b8 (diff) | |
devmouse: refactor screen blanking logic
devmouse controls the screen blanking timeout, so move the
code there avoiding cross calls between modules. the only
function that needs to be provided is blankscreen(), which
gets called with drawlock locked.
the blank timeout is set thru /dev/mousectl now, so kernels
without devvga can set it.
blanking now only happens while /dev/mouse is read. so this
avoids accidentally blanking the screen on cpu servers that
do not have a mouse to unblank it.
Diffstat (limited to 'sys/src/9/pc/devvga.c')
| -rw-r--r-- | sys/src/9/pc/devvga.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/sys/src/9/pc/devvga.c b/sys/src/9/pc/devvga.c index e980011d8..2ed322cb4 100644 --- a/sys/src/9/pc/devvga.c +++ b/sys/src/9/pc/devvga.c @@ -33,8 +33,6 @@ static Dirtab vgadir[] = { enum { CMactualsize, - CMblank, - CMblanktime, CMdrawinit, CMhwaccel, CMhwblank, @@ -45,15 +43,12 @@ enum { CMsize, CMtextmode, CMtype, - CMunblank, CMsoftscreen, CMpcidev, }; static Cmdtab vgactlmsg[] = { CMactualsize, "actualsize", 2, - CMblank, "blank", 1, - CMblanktime, "blanktime", 2, CMdrawinit, "drawinit", 1, CMhwaccel, "hwaccel", 2, CMhwblank, "hwblank", 2, @@ -64,7 +59,6 @@ static Cmdtab vgactlmsg[] = { CMsize, "size", 3, CMtextmode, "textmode", 1, CMtype, "type", 2, - CMunblank, "unblank", 1, CMsoftscreen, "softscreen", 2, CMpcidev, "pcidev", 2, }; @@ -212,8 +206,6 @@ vgaread(Chan* c, void* a, long n, vlong off) physgscreenr.max.x, physgscreenr.max.y); } - len += snprint(p+len, READSTR-len, "blank time %lud idle %d state %s\n", - blanktime, drawidletime(), scr->isblank ? "off" : "on"); len += snprint(p+len, READSTR-len, "hwaccel %s\n", hwaccel ? "on" : "off"); len += snprint(p+len, READSTR-len, "hwblank %s\n", hwblank ? "on" : "off"); len += snprint(p+len, READSTR-len, "panning %s\n", panning ? "on" : "off"); @@ -432,18 +424,6 @@ vgactl(Cmdbuf *cb) error("not enough free address space"); return; - case CMblank: - drawblankscreen(1); - return; - - case CMunblank: - drawblankscreen(0); - return; - - case CMblanktime: - blanktime = strtoul(cb->f[1], 0, 0); - return; - case CMpanning: if(strcmp(cb->f[1], "on") == 0){ if(scr == nil || scr->cur == nil) |