From 3ce78e043929636cdfb83bdbcd6e922551ab5e87 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Sun, 1 Dec 2002 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 2002-12-01 --- pc/devvga.c | 3 ++- pc/screen.c | 1 + pc/screen.h | 2 ++ port/devdraw.c | 6 ++++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pc/devvga.c b/pc/devvga.c index 765eb83d673251e961c20ce54f8c258be5b614fc..7ebeebd2675e83eab1eaa3ac8dbbbada0de73a44 100644 --- a/pc/devvga.c +++ b/pc/devvga.c @@ -179,7 +179,8 @@ vgaread(Chan* c, void* a, long n, vlong off) physgscreenr.max.x, physgscreenr.max.y); } - len += snprint(p+len, READSTR-len, "blanktime %lud\n", blanktime); + 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"); diff --git a/pc/screen.c b/pc/screen.c index baa8f48494ffae134d307a23f434a45d9662e8e9..7a784bbee483c076d26b51ce2bd8ebf44180deb1 100644 --- a/pc/screen.c +++ b/pc/screen.c @@ -385,6 +385,7 @@ blankscreen(int blank) VGAscr *scr; scr = &vgascreen[0]; + scr->isblank = blank; if(hwblank){ if(scr->blank) scr->blank(scr, blank); diff --git a/pc/screen.h b/pc/screen.h index e6e2b151f69b5601ce8b0785ed30d9f0de1223d8..3d94c1846a2541ff55ec877c9f2cf8299d2e41d2 100644 --- a/pc/screen.h +++ b/pc/screen.h @@ -114,6 +114,7 @@ struct VGAscr { int (*scroll)(VGAscr*, Rectangle, Rectangle); void (*blank)(VGAscr*, int); ulong id; /* internal identifier for driver use */ + int isblank; }; extern VGAscr vgascreen[]; @@ -146,6 +147,7 @@ extern int drawhasclients(void); extern ulong blanktime; extern void setscreenimageclipr(Rectangle); extern void drawflush(void); +extern int drawidletime(void); /* vga.c */ extern void vgascreenwin(VGAscr*); diff --git a/port/devdraw.c b/port/devdraw.c index 2f2a6d8a33818a9f972439cafbe4249365554cee..0f0f6d4699871eedba430dc5102a46d4640f11bc 100644 --- a/port/devdraw.c +++ b/port/devdraw.c @@ -2028,3 +2028,9 @@ drawactive(int active) sdraw.blanktime++; } } + +int +drawidletime(void) +{ + return TK2SEC(sdraw.blanktime)/60; +}