diff options
| -rw-r--r-- | sys/arch/amd64/isa/i8042.c | 43 | ||||
| -rw-r--r-- | usr.bin/Makefile | 1 | ||||
| -rw-r--r-- | usr.bin/osh/osh.c | 10 | ||||
| -rw-r--r-- | usr.bin/reboot/reboot.c | 10 | ||||
| -rw-r--r-- | usr.bin/screensave/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/screensave/screensave.c | 116 |
6 files changed, 157 insertions, 29 deletions
diff --git a/sys/arch/amd64/isa/i8042.c b/sys/arch/amd64/isa/i8042.c index 3ae645d..5bc7751 100644 --- a/sys/arch/amd64/isa/i8042.c +++ b/sys/arch/amd64/isa/i8042.c @@ -271,6 +271,31 @@ i8042_en_intr(void) } /* + * Toggle the capslock and LED + */ +static void +capslock_toggle(void) +{ + /* + * In case we are holding the caps lock button down, + * we don't want it to be spam toggled as that would + * be pretty strange looking and probably annoying. + */ + if (!capslock_released) { + return; + } + + capslock_released = false; + capslock = !capslock; + + if (!capslock) { + kbd_set_leds(0); + } else { + kbd_set_leds(I8042_LED_CAPS); + } +} + +/* * Convert scancode to character * * @sc: Scancode @@ -289,23 +314,7 @@ i8042_kb_getc(uint8_t sc, char *chr) return 0; /* Caps lock [press] */ case 0x3A: - /* - * In case we are holding the caps lock button down, - * we don't want it to be spam toggled as that would - * be pretty strange looking and probably annoying. - */ - if (!capslock_released) { - return -EAGAIN; - } - - capslock_released = false; - capslock = !capslock; - - if (!capslock) { - kbd_set_leds(0); - } else { - kbd_set_leds(I8042_LED_CAPS); - } + capslock_toggle(); return -EAGAIN; /* Caps lock [release] */ case 0xBA: diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 542b143..2bbc185 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -28,3 +28,4 @@ all: make -C dmidump/ $(ARGS) make -C sysctl/ $(ARGS) make -C reboot/ $(ARGS) + make -C screensave/ $(ARGS) diff --git a/usr.bin/osh/osh.c b/usr.bin/osh/osh.c index 1c9f508..71ca6de 100644 --- a/usr.bin/osh/osh.c +++ b/usr.bin/osh/osh.c @@ -29,7 +29,6 @@ #include <sys/types.h> #include <sys/cdefs.h> -#include <sys/reboot.h> #include <sys/errno.h> #include <sys/spawn.h> #include <sys/wait.h> @@ -58,7 +57,6 @@ "help - Display this help message\n" \ "echo - Print the arguments to the console\n" \ "reboot - Reboot the machine\n" \ - "shutdown - Power off the machine\n" \ "kmsg - Print kernel message buffer\n" \ "fetch - System information\n" \ "kfg - Start up kfgwm\n" \ @@ -78,7 +76,6 @@ static bool bs_bell = true; /* Beep on backspace */ static void cmd_help(int argc, char *argv[]); static void cmd_echo(int argc, char *argv[]); static void cmd_exit(int argc, char *argv[]); -static void cmd_shutdown(int argc, char *argv[]); static void cmd_bell(int argc, char *argv[]); static void cmd_clear(int argc, char *argv[]); @@ -99,7 +96,6 @@ struct parse_state { static struct builtin_cmd cmds[] = { {"help",cmd_help}, {"exit",cmd_exit}, - {"shutdown", cmd_shutdown}, {"bell", cmd_bell}, {"clear", cmd_clear}, {NULL, NULL} @@ -118,12 +114,6 @@ cmd_exit(int argc, char *argv[]) } static void -cmd_shutdown(int argc, char *argv[]) -{ - cpu_reboot(REBOOT_POWEROFF | REBOOT_HALT); -} - -static void cmd_clear(int argc, char *argv[]) { fputs("\033[2J", stdout); diff --git a/usr.bin/reboot/reboot.c b/usr.bin/reboot/reboot.c index 7fa37f9..ac9785a 100644 --- a/usr.bin/reboot/reboot.c +++ b/usr.bin/reboot/reboot.c @@ -31,9 +31,10 @@ #include <stdio.h> #include <unistd.h> -#define REBOOT_FLAGS "rh" +#define REBOOT_FLAGS "rhp" #define REBOOT_FLAG_RB 'r' /* Reboot */ #define REBOOT_FLAG_HLT 'h' /* Halt */ +#define REBOOT_FLAG_PWR 'p' /* Power off */ static void help(void) @@ -43,6 +44,7 @@ help(void) "flags:\n" " [-r] Reboot\n" " [-h] Halt\n" + " [-p] Power off\n" ); } @@ -68,9 +70,13 @@ main(int argc, char **argv) printf("REBOOT failed\n"); /* Fall through */ case REBOOT_FLAG_HLT: - cpu_reboot(REBOOT_FLAG_HLT); + cpu_reboot(REBOOT_HALT); printf("HALT failed\n"); /* Fall through */ + case REBOOT_FLAG_PWR: + cpu_reboot(REBOOT_POWEROFF); + printf("POWEROFF failed\n"); + /* Fall through */ default: printf("got bad flag '%c'\n", c); break; diff --git a/usr.bin/screensave/Makefile b/usr.bin/screensave/Makefile new file mode 100644 index 0000000..a005346 --- /dev/null +++ b/usr.bin/screensave/Makefile @@ -0,0 +1,6 @@ +include user.mk + +CFILES = $(shell find . -name "*.c") + +$(ROOT)/base/usr/bin/screensave: + gcc $(CFILES) -lgfx -o $@ $(INTERNAL_CFLAGS) diff --git a/usr.bin/screensave/screensave.c b/usr.bin/screensave/screensave.c new file mode 100644 index 0000000..172ab8b --- /dev/null +++ b/usr.bin/screensave/screensave.c @@ -0,0 +1,116 @@ +/* + * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include <sys/types.h> +#include <stdio.h> +#include <time.h> +#include <unistd.h> +#include <fcntl.h> +#include <libgfx/draw.h> +#include <libgfx/gfx.h> + +static struct gfx_ctx ctx; + +static ssize_t +rand_bytes(char *buf, size_t len) +{ + ssize_t retval; + int fd; + + fd = open("/dev/random", O_RDONLY); + if (fd < 0) { + return fd; + } + + if ((retval = read(fd, buf, len)) < 0) { + close(fd); + return retval; + } + + close(fd); + return retval; +} + +static void +screensave(void) +{ + size_t n_iter = 0; /* Monotonic */ + struct timespec ts; + char randbuf[2]; + color_t curpix, nextpix; + uint8_t step = 0; + + ts.tv_sec = 0; + ts.tv_nsec = 70000000; + + /* Begin the radiation ::) */ + for (;;) { + rand_bytes(randbuf, sizeof(randbuf)); + for (size_t i = 0; i < (ctx.fb_size / 4) - 1; i += step + 1) { + curpix = ctx.io[i]; + nextpix = ctx.io[i + 1]; + + /* If a multiple of 15, AND, otherwise XOR */ + if ((n_iter & 15) != 0) { + curpix ^= randbuf[0] & 3; + nextpix ^= (curpix | (nextpix << 1)); + nextpix ^= step; + } else { + curpix &= randbuf[0] & 3; + nextpix &= (curpix | (nextpix << 1)); + nextpix &= step; + } + + ctx.io[i] = curpix; + ctx.io[i + 1] = nextpix; + } + + sleep(&ts, &ts); + if ((++step) > 50) { + step = 0; + } + ++n_iter; + } +} + +int +main(void) +{ + int error; + + error = gfx_init(&ctx); + if (error < 0) { + printf("could not init libgfx\n"); + return error; + } + + screensave(); + gfx_cleanup(&ctx); + return 0; +} |