14 files changed, 700 insertions, 11 deletions

diff --git a/lib/libc/include/ctype.h b/lib/libc/include/ctype.h
index 2348852..0ff9a43 100644
--- a/lib/libc/include/ctype.h
+++ b/lib/libc/include/ctype.h
@@ -72,6 +72,7 @@ __isspace(int c)
         return 1;
 
     return 0;
+    }
 }
 
 __END_DECLS
diff --git a/lib/libc/include/unistd.h b/lib/libc/include/unistd.h
index b9c9f5e..21206ad 100644
--- a/lib/libc/include/unistd.h
+++ b/lib/libc/include/unistd.h
@@ -47,6 +47,9 @@ __BEGIN_DECLS
 int sysconf(int name);
 int setuid(uid_t new);
 
+int gethostname(char *name, size_t size);
+int sethostname(const char *name, size_t size);
+
 uid_t getuid(void);
 char *getlogin(void);
 
@@ -60,6 +63,11 @@ off_t lseek(int fildes, off_t offset, int whence);
 pid_t getpid(void);
 pid_t getppid(void);
 
+extern char *optarg;
+extern int optind, opterr, optopt;
+
+int getopt(int argc, char *argv[], const char *optstring);
+
 __END_DECLS
 
 #endif  /* !_UNISTD_H */
diff --git a/lib/libc/src/hyra/socket.c b/lib/libc/src/hyra/socket.c
index b3039f6..2a62541 100644
--- a/lib/libc/src/hyra/socket.c
+++ b/lib/libc/src/hyra/socket.c
@@ -71,3 +71,16 @@ connect(int socket, const struct sockaddr *address, socklen_t len)
 {
     return syscall(SYS_connect, socket, (uintptr_t)address, len);
 }
+
+int
+setsockopt(int sockfd, int level, int name, const void *v, socklen_t len)
+{
+    return syscall(
+        SYS_setsockopt,
+        sockfd,
+        level,
+        name,
+        (uintptr_t)v,
+        len
+    );
+}
diff --git a/lib/libc/src/hyra/sysctl.c b/lib/libc/src/hyra/sysctl.c
new file mode 100644
index 0000000..2903e6f
--- /dev/null
+++ b/lib/libc/src/hyra/sysctl.c
@@ -0,0 +1,38 @@
+/*
+ * 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 <sys/syscall.h>
+#include <sys/sysctl.h>
+
+int
+sysctl(struct sysctl_args *args)
+{
+    return syscall(SYS_sysctl, (uintptr_t)args);
+}
diff --git a/lib/libc/src/main.c b/lib/libc/src/main.c
index 02a648b..68f9bdb 100644
--- a/lib/libc/src/main.c
+++ b/lib/libc/src/main.c
@@ -30,6 +30,7 @@
 #include <sys/exec.h>
 #include <stdint.h>
 #include <stddef.h>
+#include <unistd.h>
 
 extern int __libc_stdio_init(void);
 extern int __malloc_mem_init(void);
@@ -51,6 +52,7 @@ __libc_entry(uint64_t *ctx)
     char **argv;
     char **envp;
 
+    optind = 1;
     argc = *ctx;
     argv = (char **)(ctx + 1);
     envp = (char **)(argv + argc + 1);
diff --git a/lib/libc/src/posix/getopt.c b/lib/libc/src/posix/getopt.c
new file mode 100644
index 0000000..d3cd530
--- /dev/null
+++ b/lib/libc/src/posix/getopt.c
@@ -0,0 +1,100 @@
+/*
+ * 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/errno.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <string.h>
+#include <stdio.h>
+
+char *optarg;
+int optind, opterr, optopt;
+
+int
+getopt(int argc, char *argv[], const char *optstring)
+{
+    size_t optstr_len;
+    char *arg;
+    bool has_arg = false;
+
+    if (argc == 0 || optstring == NULL) {
+        opterr = -EINVAL;
+        return -1;
+    }
+
+    if (optind >= argc) {
+        return -1;
+    }
+
+    arg = argv[optind];
+    optstr_len = strlen(optstring);
+
+    /* Non option argument? */
+    if (arg[0] != '-') {
+        return -1;
+    }
+
+    /*
+     * We will look through each possible flag/option
+     * in the optstring and match it against our arg.
+     */
+    for (size_t i = 0; i < optstr_len; ++i) {
+        if (arg[1] != optstring[i]) {
+            continue;
+        }
+
+        /*
+         * If this option has a ':' right next to it,
+         * it also has an argument.
+         */
+        if (i < optstr_len - 1) {
+            if (optstring[i + 1] == ':') {
+                has_arg = true;
+            }
+        }
+
+        break;
+    }
+
+    /*
+     * Handle cases where the option has an argument
+     * with it (-opt=arg)
+     */
+    if (has_arg && optind < argc ) {
+        if (arg[2] != '=') {
+            opterr = -EINVAL;
+            return -1;
+        }
+        optarg = &arg[3];
+        ++optind;
+    }
+
+    ++optind;
+    return arg[1];
+}
diff --git a/lib/libc/src/unistd/hostname.c b/lib/libc/src/unistd/hostname.c
new file mode 100644
index 0000000..60df9a0
--- /dev/null
+++ b/lib/libc/src/unistd/hostname.c
@@ -0,0 +1,125 @@
+/*
+ * 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/sysctl.h>
+#include <unistd.h>
+
+/*
+ * Internal helper to grab a sysctl
+ * variable.
+ *
+ * @name: Name definition of sysctl variable
+ * @buf: Buffer to read data in
+ * @buflen: Length of buffer
+ *
+ * Returns zero on success, otherwise a less than
+ * zero value.
+ */
+static int
+__sysctl_get(int name, char *buf, size_t buflen)
+{
+    struct sysctl_args args;
+    int error;
+
+    args.name = &name;
+    args.nlen = 1;
+    args.oldp = buf;
+    args.oldlenp = &buflen;
+    args.newp = NULL;
+    args.newlen = 0;
+
+    if ((error = sysctl(&args)) != 0) {
+        return -1;
+    }
+
+    return 0;
+}
+
+/*
+ * Internal helper to set a sysctl
+ * variable.
+ *
+ * @name: Name definition of sysctl variable
+ * @buf: Buffer with data to set
+ * @buflen: Length of buffer
+ *
+ * Returns zero on success, otherwise a less than
+ * zero value.
+ */
+static int
+__sysctl_set(int name, const char *buf, size_t buflen)
+{
+    struct sysctl_args args;
+    int error;
+
+    args.name = &name;
+    args.nlen = 1;
+    args.oldp = NULL;
+    args.oldlenp = NULL;
+    args.newp = (void *)buf;
+    args.newlen = buflen;
+
+    if ((error = sysctl(&args)) != 0) {
+        return -1;
+    }
+
+    return 0;
+}
+
+/*
+ * Get the system hostname
+ *
+ * @name: Buffer to read name into
+ * @size: Length of name to read
+ */
+int
+gethostname(char *name, size_t size)
+{
+    if (name == NULL || size == 0) {
+        return -1;
+    }
+
+    return __sysctl_get(KERN_HOSTNAME, name, size);
+}
+
+/*
+ * Set the system hostname
+ *
+ * @name: Name to set
+ * @size: Size of name to set
+ */
+int
+sethostname(const char *name, size_t size)
+{
+    if (name == NULL || size == 0) {
+        return -1;
+    }
+
+    return __sysctl_set(KERN_HOSTNAME, name, size);
+}
diff --git a/lib/libgfx/include/libgfx/draw.h b/lib/libgfx/include/libgfx/draw.h
index 9f56f6c..4140593 100644
--- a/lib/libgfx/include/libgfx/draw.h
+++ b/lib/libgfx/include/libgfx/draw.h
@@ -34,7 +34,8 @@
 #include <libgfx/gfx.h>
 
 /* Shape types */
-#define SHAPE_SQUARE  0x00000000
+#define SHAPE_SQUARE        0x00000000
+#define SHAPE_SQUARE_BORDER 0x00000001
 
 /* Basic color defines */
 #define GFX_BLACK   0x000000
@@ -101,9 +102,26 @@ struct gfx_point {
     color_t rgb;
 };
 
+/*
+ * Represents a rectangular region on
+ * the screen.
+ *
+ * @x,y: Position of this region on the screen
+ * @width: Region width
+ * @heght: Region height
+ */
+struct gfx_region {
+    scrpos_t x, y;
+    dimm_t width;
+    dimm_t height;
+};
+
 int gfx_draw_shape(struct gfx_ctx *ctx, const struct gfx_shape *shape);
 int gfx_plot_point(struct gfx_ctx *ctx, const struct gfx_point *point);
 
+int gfx_copy_region(struct gfx_ctx *ctx, struct gfx_region *r, scrpos_t x, scrpos_t y);
+color_t gfx_get_pix(struct gfx_ctx *ctx, uint32_t x, uint32_t y);
+
 __always_inline static inline size_t
 gfx_io_index(struct gfx_ctx *ctx, scrpos_t x, scrpos_t y)
 {
diff --git a/lib/libgfx/src/draw.c b/lib/libgfx/src/draw.c
index 9ef8630..4df64a8 100644
--- a/lib/libgfx/src/draw.c
+++ b/lib/libgfx/src/draw.c
@@ -58,7 +58,7 @@ gfx_pixel_bounds(struct gfx_ctx *ctx, uint32_t x, uint32_t y)
     scr_width = fbdev.width;
     scr_height = fbdev.height;
 
-    if (x >= scr_height || y >= scr_width) {
+    if (x >= scr_width || y >= scr_height) {
         return -1;
     }
 
@@ -75,6 +75,7 @@ static int
 gfx_draw_square(struct gfx_ctx *ctx, const struct gfx_shape *shape)
 {
     struct fbattr fbdev;
+    struct gfx_point p;
     off_t idx;
     scrpos_t x, y;
 
@@ -84,14 +85,67 @@ gfx_draw_square(struct gfx_ctx *ctx, const struct gfx_shape *shape)
 
     for (x = shape->x; x < shape->x + shape->width; ++x) {
         for (y = shape->y; y < shape->y + shape->height; ++y) {
-            if (gfx_pixel_bounds(ctx, x, y) < 0) {
-                break;
+            p.x = x;
+            p.y = y;
+            p.rgb = shape->color;
+            gfx_plot_point(ctx, &p);
+        }
+    }
+    return 0;
+}
+
+/*
+ * Draw a bordered square onto the screen.
+ *
+ * @ctx: Graphics context pointer
+ * @shape: Bordered square to draw
+ */
+static int
+gfx_draw_bsquare(struct gfx_ctx *ctx, const struct gfx_shape *shape)
+{
+    struct gfx_point p;
+    scrpos_t x_i, y_i;
+    scrpos_t x_f, y_f;
+    scrpos_t x, y;
+
+    if (ctx == NULL || shape == NULL) {
+        return -EINVAL;
+    }
+
+    x_i = shape->x;
+    y_i = shape->y;
+    x_f = shape->x + shape->width;
+    y_f = shape->y + shape->height;
+
+    /*
+     * Draw an unfilled square.
+     *
+     * If we are at the `y_i' or `y_f' position, draw
+     * pixels from 'x_i' to 'x_f'. If we are away
+     * from the `y_i' position, draw two pixels,
+     * one at `x_i' and the other at `x_f' for that
+     * current 'y' value.
+     */
+    for (y = y_i; y < y_f; ++y) {
+        for (x = x_i; x < x_f; ++x) {
+            p.x = x;
+            p.y = y;
+            p.rgb = shape->color;
+
+            /* Origin y, draw entire width */
+            if (y == y_i || y == y_f - 1) {
+                gfx_plot_point(ctx, &p);
+                continue;
             }
 
-            idx = gfx_io_index(ctx, x, y);
-            ctx->io[idx] = shape->color;
+            p.x = x_i;
+            gfx_plot_point(ctx, &p);
+
+            p.x = x_f - 1;
+            gfx_plot_point(ctx, &p);
         }
     }
+
     return 0;
 }
 
@@ -129,6 +183,34 @@ gfx_plot_point(struct gfx_ctx *ctx, const struct gfx_point *point)
 }
 
 /*
+ * Grab the RGB value of a single pixel on
+ * the scren.
+ *
+ * @ctx: Graphics context pointer
+ * @x: X position to sample
+ * @y: Y position to sample
+ */
+color_t
+gfx_get_pix(struct gfx_ctx *ctx, uint32_t x, uint32_t y)
+{
+    const color_t ERROR_COLOR = GFX_BLACK;
+    uint32_t index;
+
+    /* The 'ctx' argument is required */
+    if (ctx == NULL) {
+        return ERROR_COLOR;
+    }
+
+    /* Are we within bounds of the screen */
+    if (gfx_pixel_bounds(ctx, x, y) < 0) {
+        return ERROR_COLOR;
+    }
+
+    index = gfx_io_index(ctx, x, y);
+    return ctx->io[index];
+}
+
+/*
  * Draw a shape onto the screen
  *
  * @ctx: libgfx graphics context
@@ -150,7 +232,51 @@ gfx_draw_shape(struct gfx_ctx *ctx, const struct gfx_shape *shape)
     switch (shape->type) {
     case SHAPE_SQUARE:
         return gfx_draw_square(ctx, shape);
+    case SHAPE_SQUARE_BORDER:
+        return gfx_draw_bsquare(ctx, shape);
     }
 
     return -1;
 }
+
+/*
+ * Copy a region on one part of a screen to
+ * another part of a screen.
+ *
+ * @ctx: Graphics context pointer
+ * @r: Region to copy
+ * @x: X position for copy dest
+ * @y: Y position for copy dest
+ */
+int
+gfx_copy_region(struct gfx_ctx *ctx, struct gfx_region *r, scrpos_t x, scrpos_t y)
+{
+    struct gfx_point point;
+    color_t pixel;
+    scrpos_t src_cx, src_cy;
+    dimm_t w, h;
+
+    if (ctx == NULL || r == NULL) {
+        return -EINVAL;
+    }
+
+    w = r->width;
+    h = r->height;
+
+    for (int xoff = 0; xoff < w; ++xoff) {
+        for (int yoff = 0; yoff < h; ++yoff) {
+            /* Source position */
+            src_cx = r->x + xoff;
+            src_cy = r->y + yoff;
+
+            /* Plot the new pixel */
+            pixel = gfx_get_pix(ctx, src_cx, src_cy);
+            point.x = x + xoff;
+            point.y = y + yoff;
+            point.rgb = pixel;
+            gfx_plot_point(ctx, &point);
+        }
+    }
+
+    return 0;
+}
diff --git a/lib/liboda/include/liboda/input.h b/lib/liboda/include/liboda/input.h
index 9906329..c74a304 100644
--- a/lib/liboda/include/liboda/input.h
+++ b/lib/liboda/include/liboda/input.h
@@ -30,7 +30,6 @@
 #ifndef LIBODA_INPUT_H
 #define LIBODA_INPUT_H
 
-#include <sys/ascii.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -42,12 +41,22 @@
 #define ODA_KEYCHAR(KEY) ((char )(KEY) & 0xFF)
 
 /*
+ * Key defines
+ */
+#define ODA_KEY_OTHER       0x0000
+#define ODA_KEY_ESCAPE      0x0001
+#define ODA_KEY_TAB         0x0002
+#define ODA_KEY_BACKSPACE   0x0003
+
+/*
  * Represents a key press
  *
+ * @type: Key types (see ODA_KEY_*)
  * @scancode: Scancode
  * @ch: Character
  */
 struct oda_key {
+    uint16_t type;
     uint8_t scancode;
     char ch;
 };
diff --git a/lib/liboda/include/liboda/oda.h b/lib/liboda/include/liboda/oda.h
index 10738a9..9d96f2f 100644
--- a/lib/liboda/include/liboda/oda.h
+++ b/lib/liboda/include/liboda/oda.h
@@ -40,10 +40,12 @@
 /*
  * ODA representation of a window.
  *
+ * @wid: Window ID (identifies the window)
  * @surface: Window surface descriptor
  * @session: Session this window belongs to
  */
 struct oda_window {
+    odawid_t wid;
     struct gfx_shape surface;
     struct oda_state *session;
     TAILQ_ENTRY(oda_window) link;
@@ -81,6 +83,22 @@ struct oda_wattr {
 };
 
 /*
+ * Arguments for oda_movewin() are stored
+ * within this structure to minimize the
+ * number of arguments within the function
+ * signature.
+ *
+ * @wp: Window to be moved
+ * @to_x: X position to move window to
+ * @to_y: Y position to move window to
+ */
+struct oda_movewin {
+    struct oda_window *wp;
+    odapos_t to_x;
+    odapos_t to_y;
+};
+
+/*
  * A pixel point that can be plotted
  * onto a window.
  *
@@ -99,9 +117,12 @@ struct oda_point {
 
 int oda_reqwin(struct oda_wattr *params, struct oda_window **res);
 int oda_termwin(struct oda_state *state, struct oda_window *win);
-int oda_plotwin(struct oda_state *state, const struct oda_point *point);
 
+int oda_plotwin(struct oda_state *state, const struct oda_point *point);
+int oda_movewin(struct oda_state *state, struct oda_movewin *params);
 int oda_start_win(struct oda_state *state, struct oda_window *win);
+
 int oda_init(struct oda_state *res);
+int oda_shutdown(struct oda_state *state);
 
 #endif  /* !LIBODA_ODA_H */
diff --git a/lib/liboda/include/liboda/types.h b/lib/liboda/include/liboda/types.h
index 8b77aa7..ec12330 100644
--- a/lib/liboda/include/liboda/types.h
+++ b/lib/liboda/include/liboda/types.h
@@ -36,5 +36,6 @@ typedef uint32_t odapos_t;      /* X/Y positions */
 typedef uint32_t odapix_t;      /* RGB pixel */
 typedef odapix_t odacolor_t;    /* RGB color */
 typedef uint32_t odadimm_t;     /* Dimensions */
+typedef uint32_t odawid_t;      /* Window ID */
 
 #endif  /* !LIBODA_TYPE_H */
diff --git a/lib/liboda/src/input.c b/lib/liboda/src/input.c
index 88c4256..797a9d4 100644
--- a/lib/liboda/src/input.c
+++ b/lib/liboda/src/input.c
@@ -27,13 +27,39 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/ascii.h>
 #include <sys/errno.h>
+#include <sys/param.h>
 #include <liboda/oda.h>
 #include <liboda/input.h>
 #include <stdint.h>
 #include <stdio.h>
 
 /*
+ * Convert key scancode/char values to fixed
+ * ODA key constants
+ */
+static inline uint16_t
+oda_map_key(const struct oda_key *key)
+{
+    uint16_t type = ODA_KEY_OTHER;
+
+    switch (key->ch) {
+    case ASCII_ESC:
+        type = ODA_KEY_ESCAPE;
+        break;
+    case ASCII_HT:
+        type = ODA_KEY_TAB;
+        break;
+    case ASCII_BS:
+        type = ODA_KEY_BACKSPACE;
+        break;
+    }
+
+    return type;
+}
+
+/*
  * Dispatch keyboard events. This is typically
  * called in an event loop so that keyboard events
  * are handled per iteration.
@@ -57,5 +83,6 @@ oda_kbd_dispatch(struct oda_kbd *kbd)
 
     key.scancode = ODA_SCANCODE(input);
     key.ch = ODA_KEYCHAR(input);
+    key.type = oda_map_key(&key);
     return kbd->handle_keyev(kbd, &key);
 }
diff --git a/lib/liboda/src/window.c b/lib/liboda/src/window.c
index 9a8b799..216b106 100644
--- a/lib/liboda/src/window.c
+++ b/lib/liboda/src/window.c
@@ -28,12 +28,121 @@
  */
 
 #include <sys/errno.h>
+#include <sys/queue.h>
 #include <stdlib.h>
 #include <string.h>
 #include <liboda/oda.h>
 #include <liboda/odavar.h>
 #include <liboda/types.h>
 #include <libgfx/gfx.h>
+#include <libgfx/draw.h>
+
+/*
+ * The window cache is used to reduce how many
+ * calls to malloc() and free() are made during
+ * window creation and destruction.
+ */
+static TAILQ_HEAD(, oda_window) wcache;
+static uint32_t wcache_cookie = 0;
+static odawid_t next_wid = 1;
+
+/*
+ * Pop a window from the window cache.
+ * Returns NULL there are no more windows.
+ */
+static struct oda_window *
+oda_window_pop(void)
+{
+    struct oda_window *wdp;
+
+    if (wcache_cookie != ODA_COOKIE) {
+        TAILQ_INIT(&wcache);
+        wcache_cookie = ODA_COOKIE;
+        return NULL;
+    }
+
+    wdp = TAILQ_FIRST(&wcache);
+    TAILQ_REMOVE(&wcache, wdp, link);
+    return wdp;
+}
+
+/*
+ * Place a window into the window cache.
+ */
+static void
+oda_window_cache(struct oda_window *wdp)
+{
+    /* Ensure arg is valid */
+    if (wdp == NULL) {
+        return;
+    }
+
+    if (wcache_cookie != ODA_COOKIE) {
+        TAILQ_INIT(&wcache);
+        wcache_cookie = ODA_COOKIE;
+    }
+
+    TAILQ_INSERT_TAIL(&wcache, wdp, link);
+}
+
+/*
+ * Allocate an ODP window
+ *
+ * Returns NULL on failure
+ */
+static struct oda_window *
+oda_window_alloc(void)
+{
+    struct oda_window *wdp;
+
+    /*
+     * First check if there are any entries
+     * we can grab from the window cache.
+     */
+    wdp = oda_window_pop();
+    if (wdp != NULL) {
+        return wdp;
+    }
+
+    /* Allocate a new window */
+    wdp = malloc(sizeof(*wdp));
+    if (wdp == NULL) {
+        return NULL;
+    }
+
+    memset(wdp, 0, sizeof(*wdp));
+    wdp->wid = next_wid++;
+    return wdp;
+}
+
+/*
+ * Release a given ODA window descriptor
+ *
+ * @wdp: Window to free
+ */
+static void
+oda_window_release(struct oda_state *state, struct oda_window *wdp)
+{
+    if (wdp == NULL) {
+        return;
+    }
+
+    /*
+     * It is probably a good idea to ensure previous
+     * state other than the old window ID is reset
+     * and zeroed.
+     */
+    wdp->session = NULL;
+    memset(&wdp->surface, 0, sizeof(wdp->surface));
+
+    /*
+     * Now we can remove this window from the list
+     * of windows we are tracking and add it to the
+     * cache.
+     */
+    TAILQ_REMOVE(&state->winq, wdp, link);
+    oda_window_cache(wdp);
+}
 
 /*
  * Check if a point is within the bounds of
@@ -78,6 +187,34 @@ oda_check_point(struct oda_window *wp, struct oda_point *point)
 }
 
 /*
+ * Clean up after ourselves and release
+ * each entry of the wcache.
+ *
+ * Returns 0 on success.
+ */
+static int
+oda_free_wcache(void)
+{
+    struct oda_window *wdp, *next;
+
+    if (wcache_cookie != ODA_COOKIE) {
+        return -1;
+    }
+
+    /*
+     * Go through each entry and call free()
+     * on them.
+     */
+    wdp = TAILQ_FIRST(&wcache);
+    while (wdp != NULL) {
+        next = TAILQ_NEXT(wdp, link);
+        free(wdp);
+        wdp = next;
+    }
+    return 0;
+}
+
+/*
  * Plot a pixel onto a window
  *
  * @state: ODA state pointer
@@ -176,7 +313,7 @@ oda_reqwin(struct oda_wattr *params, struct oda_window **res)
     }
 
     /* Allocate a new window */
-    wp = malloc(sizeof(*wp));
+    wp = oda_window_alloc();
     if (wp == NULL) {
         return -ENOMEM;
     }
@@ -205,6 +342,61 @@ oda_reqwin(struct oda_wattr *params, struct oda_window **res)
 }
 
 /*
+ * Move a window to a new position on the
+ * screen.
+ *
+ * @state: ODA state pointer
+ * @params: Arguments to this function
+ */
+int
+oda_movewin(struct oda_state *state, struct oda_movewin *params)
+{
+    struct oda_window *win;
+    struct gfx_shape *wsurf;
+    struct gfx_region r;
+    odadimm_t w, h;
+    odapos_t x, y, x_f, y_f;
+    odapos_t to_x, to_y;
+    uint32_t i = 0;
+    int error;
+
+    /* Make sure arguments are valid */
+    if (state == NULL || params == NULL) {
+        return -EINVAL;
+    }
+
+    /* We need the window */
+    if ((win = params->wp) == NULL) {
+        return -EINVAL;
+    }
+
+    /* Verify state cookie */
+    if ((error = oda_cookie_verify(state)) != 0) {
+        return error;
+    }
+
+    wsurf = &win->surface;
+    to_x = params->to_x;
+    to_y = params->to_y;
+
+    r.x = wsurf->x;
+    r.y = wsurf->y;
+    r.width = wsurf->width;
+    r.height = wsurf->height;
+
+    /*
+     * We will copy the window to the new location and
+     * fill where the old window was with GFX_BLACK.
+     *
+     * TODO: Handle overlapping of windows
+     */
+    gfx_copy_region(&state->gctx, &r, to_x, to_y);
+    wsurf->x = to_x;
+    wsurf->y = to_y;
+    return 0;
+}
+
+/*
  * Register a window into the current ODA state.
  * Everytime a compositor requests a window, we
  * must keep track of it.
@@ -255,7 +447,15 @@ oda_termwin(struct oda_state *state, struct oda_window *win)
         return error;
     }
 
-    TAILQ_REMOVE(&state->winq, win, link);
-    free(win);
+    oda_window_release(state, win);
     return 0;
 }
+
+/*
+ * Shutdown the ODA library
+ */
+int
+oda_shutdown(struct oda_state *state)
+{
+    return oda_free_wcache();
+}