diff options
author | yokota <yokota@FreeBSD.org> | 1997-07-15 14:49:39 +0000 |
---|---|---|
committer | yokota <yokota@FreeBSD.org> | 1997-07-15 14:49:39 +0000 |
commit | b00b16c7e8417280e1baf4fd2100eb0289c081ee (patch) | |
tree | acca8151fd578dce89fac8fd061b008e563e98c9 /sys/modules/syscons/snake | |
parent | 56b7c76d791c0e3042285bea5b2d6dd85c0da4ab (diff) | |
download | FreeBSD-src-b00b16c7e8417280e1baf4fd2100eb0289c081ee.zip FreeBSD-src-b00b16c7e8417280e1baf4fd2100eb0289c081ee.tar.gz |
Incorporated lots of fixes and suggestions from Bruce and changes to
facilitate the new saver loading/unloading notification interface
in syscons.
daemon_saver:
- M_NOWAIT was wrong, since NULL returns are not handled. Just use
M_WAITOK.
- use `ostype' instead of hard-coded "FreeBSD". Now there is no more
hard-coded string! (But, who will run this screen saver on other
OS?!)
- put macros and data declarations in a consistent order.
- -DDEAMON_ONLY and -DSHOW_HOSTNAME options added in the previous commit
are removed. Options of this kind can go stale and no one notices
because no one uses them. DEAMON_ONLY is just removed. SHOW_HOSTNAME
is made default.
snake_saver:
- use `ostype' and `osrelease' as in the daemon saver. The string changes
slightly - there was a hyphen after "FreeBSD"; now there is a space.
(It is consistent with uname -a, like the daemon server already is.)
all screen savers:
- Use the new add_scrn_saver()/remove_scrn_saver() in syscons.c
to declare loading/unloading of a screen saver. Removed reference
to `current_saver' and the variable `old_saver' as they are not
necessary anymore.
- The blank, fade and green screen savers manipulate VGA registers.
Module loading should fail for non-VGA cards.
- `scrn_blanked' is consistently treated as a number/counter rather
than boolean.
- Some savers touch `scp->start' and `scp->end' to force entire screen
update when stopping themselves. This is unnecessary now because
syscons.c takes care of that.
- cleared up many unused or unnecessary #include statements.
- Removed -DLKM from Makefiles.
YOU NEED TO RECOMPILE BOTH SCREEN SAVERS AND KERNEL AS OF THIS CHANGE.
Diffstat (limited to 'sys/modules/syscons/snake')
-rw-r--r-- | sys/modules/syscons/snake/Makefile | 4 | ||||
-rw-r--r-- | sys/modules/syscons/snake/snake_saver.c | 67 |
2 files changed, 44 insertions, 27 deletions
diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile index 38417ae..7288f2c 100644 --- a/sys/modules/syscons/snake/Makefile +++ b/sys/modules/syscons/snake/Makefile @@ -1,9 +1,9 @@ -# $Id$ +# $Id: Makefile,v 1.5 1997/02/22 12:49:18 peter Exp $ KMOD= snake_saver_mod SRCS= snake_saver.c NOMAN= -CFLAGS+= -DLKM -I${.CURDIR}/.. -I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../sys .include <bsd.kmod.mk> diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c index f0580ae..c5a9842 100644 --- a/sys/modules/syscons/snake/snake_saver.c +++ b/sys/modules/syscons/snake/snake_saver.c @@ -25,47 +25,52 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: snake_saver.c,v 1.13 1997/02/22 12:49:19 peter Exp $ + * $Id: snake_saver.c,v 1.14 1997/04/06 10:49:22 dufault Exp $ */ #include <sys/param.h> #include <sys/systm.h> -#include <sys/conf.h> #include <sys/exec.h> #include <sys/sysent.h> #include <sys/lkm.h> -#include <sys/errno.h> +#include <sys/malloc.h> +#include <sys/kernel.h> +#include <sys/sysctl.h> #include <machine/md_var.h> +#include <i386/include/pc/display.h> -#include "saver.h" +#include <saver.h> MOD_MISC(snake_saver); -void (*current_saver)(int blank); -void (*old_saver)(int blank); +static char *message; +static u_char **messagep; +static int messagelen; static void snake_saver(int blank) { - const char saves[] = {"FreeBSD-3.0-CURRENT"}; - static u_char *savs[sizeof(saves)-1]; static int dirx, diry; int f; scr_stat *scp = cur_console; +/* XXX hack for minimal changes. */ +#define save message +#define savs messagep + if (blank) { - if (!scrn_blanked) { + if (scrn_blanked <= 0) { fillw((FG_LIGHTGREY|BG_BLACK)<<8 | scr_map[0x20], Crtat, scp->xsize * scp->ysize); set_border(0); dirx = (scp->xpos ? 1 : -1); diry = (scp->ypos ? scp->xsize : -scp->xsize); - for (f=0; f< sizeof(saves)-1; f++) + for (f=0; f< messagelen; f++) savs[f] = (u_char *)Crtat + 2 * (scp->xpos+scp->ypos*scp->xsize); - *(savs[0]) = scr_map[*saves]; + *(savs[0]) = scr_map[*save]; f = scp->ysize * scp->xsize + 5; outb(crtc_addr, 14); outb(crtc_addr+1, f >> 8); @@ -76,8 +81,8 @@ snake_saver(int blank) if (scrn_blanked++ < 4) return; scrn_blanked = 1; - *(savs[sizeof(saves)-2]) = scr_map[0x20]; - for (f=sizeof(saves)-2; f > 0; f--) + *(savs[messagelen-1]) = scr_map[0x20]; + for (f=messagelen-1; f > 0; f--) savs[f] = savs[f-1]; f = (savs[0] - (u_char *)Crtat) / 2; if ((f % scp->xsize) == 0 || @@ -89,15 +94,13 @@ snake_saver(int blank) (random() % 20) == 0) diry = -diry; savs[0] += 2*dirx + 2*diry; - for (f=sizeof(saves)-2; f>=0; f--) - *(savs[f]) = scr_map[saves[f]]; + for (f=messagelen-1; f>=0; f--) + *(savs[f]) = scr_map[save[f]]; } else { - if (scrn_blanked) { + if (scrn_blanked > 0) { set_border(scp->border); scrn_blanked = 0; - scp->start = 0; - scp->end = scp->xsize * scp->ysize; } } } @@ -105,18 +108,32 @@ snake_saver(int blank) static int snake_saver_load(struct lkm_table *lkmtp, int cmd) { - (*current_saver)(0); - old_saver = current_saver; - current_saver = snake_saver; - return 0; + int err; + + messagelen = strlen(ostype) + 1 + strlen(osrelease); + message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK); + sprintf(message, "%s %s", ostype, osrelease); + messagep = malloc(messagelen * sizeof *messagep, M_DEVBUF, M_WAITOK); + + err = add_scrn_saver(snake_saver); + if (err != 0) { + free(message, M_DEVBUF); + free(messagep, M_DEVBUF); + } + return err; } static int snake_saver_unload(struct lkm_table *lkmtp, int cmd) { - (*current_saver)(0); - current_saver = old_saver; - return 0; + int err; + + err = remove_scrn_saver(snake_saver); + if (err == 0) { + free(message, M_DEVBUF); + free(messagep, M_DEVBUF); + } + return err; } int |