wm: add keyboard events

ffwff · Sep 9, 2019 · dad1f14 · dad1f14
1 parent c81f306
commit dad1f14
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 12 deletions.
diff --git a/pkgs/wm/cterm.c b/pkgs/wm/cterm.c
@@ -131,8 +131,8 @@ void cterm_draw(struct cterm_state *state) {
     state->root_height = state->sprite.height - state->root_y - 1;
 
     // calculate characters and buffer
-    state->cwidth  = (state->root_width + FONT_WIDTH) / FONT_WIDTH;
-    state->cheight = (state->root_height + FONT_HEIGHT) / FONT_HEIGHT;
+    state->cwidth  = state->root_width / FONT_WIDTH;
+    state->cheight = state->root_height / FONT_HEIGHT;
     size_t new_len = state->cwidth * state->cheight;
     if(new_len != state->buffer_len) {
         state->buffer = realloc(state->buffer, new_len);
@@ -217,7 +217,7 @@ int main(int argc, char **argv) {
     char *spawn_argv[] = {"/hd0/main", NULL};
     spawnxv(&s_info, "/hd0/main", (char **)spawn_argv);
 
-    wmc_connection_obtain(&state.wmc_conn, ATOM_MOUSE_EVENT_MASK);
+    wmc_connection_obtain(&state.wmc_conn, ATOM_MOUSE_EVENT_MASK | ATOM_KEYBOARD_EVENT_MASK);
 
     // event loop
     int mouse_drag = 0;
@@ -280,6 +280,12 @@ int main(int argc, char **argv) {
                 wmc_send_atom(&state.wmc_conn, &respond_atom);
                 break;
             }
+            case ATOM_KEYBOARD_EVENT_TYPE: {
+                cterm_add_character(&state, atom.keyboard_event.ch);
+                needs_redraw = 1;
+                wmc_send_atom(&state.wmc_conn, &respond_atom);
+                break;
+            }
         }
     wait:
         wmc_wait_atom(&state.wmc_conn);

diff --git a/pkgs/wm/wm.c b/pkgs/wm/wm.c
@@ -4,6 +4,7 @@
 #include <sys/gfx.h>
 #include <sys/ioctl.h>
 #include <sys/mouse.h>
+#include <sys/kbd.h>
 #include <syscalls.h>
 
 #include "wm.h"
@@ -66,6 +67,7 @@ struct wm_state {
     int needs_redraw;
     int mouse_fd;
     struct wm_window *mouse_win; // weakref
+    int kbd_fd;
     struct wm_atom last_mouse_atom;
     struct wm_window *windows;
     int nwindows;
@@ -242,6 +244,11 @@ int main(int argc, char **argv) {
         wm.mouse_win->z_index = (size_t)-1;
     }
 
+    // keyboard
+    {
+        wm.kbd_fd = open("/kbd/raw", 0);
+    }
+
     wm_sort_windows_by_z(&wm);
 
     // sample win
@@ -318,6 +325,18 @@ int main(int argc, char **argv) {
 
             wm.last_mouse_atom = mouse_atom;
         }
+        {
+            // keyboard
+            struct keyboard_packet keyboard_packet = { 0 };
+            read(wm.kbd_fd, (char *)&keyboard_packet, sizeof(keyboard_packet));
+            if(keyboard_packet.ch) {
+                struct wm_atom keyboard_atom = { 0 };
+                keyboard_atom.type = ATOM_KEYBOARD_EVENT_TYPE;
+                keyboard_atom.keyboard_event.ch = keyboard_packet.ch;
+                keyboard_atom.keyboard_event.modifiers = keyboard_packet.modifiers;
+                wm_add_queue(&wm, &keyboard_atom);
+            }
+        }
         for (int i = 0; i < wm.nwindows; i++) {
             struct wm_window *win = &wm.windows[i];
             switch (win->type) {

diff --git a/pkgs/wm/wm.h b/pkgs/wm/wm.h
@@ -41,25 +41,35 @@ struct wm_atom_mouse_event {
     int delta_x, delta_y;
 };
 
+// Keyboard event
+
+struct wm_atom_keyboard_event {
+    int ch;
+    int modifiers;
+};
+
 struct wm_atom {
     int type;
     union {
         struct wm_atom_redraw redraw;
         struct wm_atom_move move;
         struct wm_atom_respond respond;
         struct wm_atom_mouse_event mouse_event;
+        struct wm_atom_keyboard_event keyboard_event;
     };
 };
 
-#define ATOM_REDRAW_TYPE        0
-#define ATOM_RESPOND_TYPE       1
-#define ATOM_MOVE_TYPE          2
-#define ATOM_MOUSE_EVENT_TYPE   3
+#define ATOM_REDRAW_TYPE           0
+#define ATOM_RESPOND_TYPE          1
+#define ATOM_MOVE_TYPE             2
+#define ATOM_MOUSE_EVENT_TYPE      3
+#define ATOM_KEYBOARD_EVENT_TYPE   4
 
-#define ATOM_REDRAW_MASK        (1 << ATOM_REDRAW_TYPE)
-#define ATOM_RESPOND_MASK       (1 << ATOM_RESPOND_TYPE)
-#define ATOM_MOVE_MASK          (1 << ATOM_MOVE_TYPE)
-#define ATOM_MOUSE_EVENT_MASK   (1 << ATOM_MOUSE_EVENT_TYPE)
+#define ATOM_REDRAW_MASK          (1 << ATOM_REDRAW_TYPE)
+#define ATOM_RESPOND_MASK         (1 << ATOM_RESPOND_TYPE)
+#define ATOM_MOVE_MASK            (1 << ATOM_MOVE_TYPE)
+#define ATOM_MOUSE_EVENT_MASK     (1 << ATOM_MOUSE_EVENT_TYPE)
+#define ATOM_KEYBOARD_EVENT_MASK  (1 << ATOM_KEYBOARD_EVENT_TYPE)
 
 static inline int wm_atom_eq(struct wm_atom *a, struct wm_atom *b) {
     if(a->type != b->type)

diff --git a/userspace/libc/src/include/sys/kbd.h b/userspace/libc/src/include/sys/kbd.h
@@ -1,6 +1,6 @@
 #pragma once
 
-struct mouse_packet {
+struct keyboard_packet {
     int ch;
     int modifiers;
 } __attribute__((packed));