X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=hw_keyboard.c;h=428971d5a6a6ecfcb51c0e19e88d3ed024c23ab6;hb=8b552fe61db48874f043bccfb589e5444509444c;hp=71e016f652e2e6acf703077e3357b3b6009c6380;hpb=0a1b4588f79e3719af9431a98da44350030df754;p=dcpu16 diff --git a/hw_keyboard.c b/hw_keyboard.c index 71e016f..428971d 100644 --- a/hw_keyboard.c +++ b/hw_keyboard.c @@ -2,36 +2,112 @@ #include #include +#ifdef HAVE_LIBVNCSERVER +#include +#include +#endif /* HAVE_LIBVNCSERVER */ + #include "dcpu16.h" #include "hw_keyboard.h" #define BUF_SZ 32 -static dcpu16_hw_signal_t keyboard_reset_; -static dcpu16_hw_signal_t keyboard_cycle_; -static dcpu16_hw_signal_t keyboard_hwi_; -static struct dcpu16_hw hw_ = { - .name_ = "Generic Keyboard (compatible)", - .id_l = 0x7406, - .id_h = 0x30cf, - .ver = 0x0001, - .mfg_l = 0x0000, - .mfg_h = 0x0000, - .hwi = keyboard_hwi_, - .cycle = keyboard_cycle_, - .reset = keyboard_reset_, - .data = (struct keyboard_ *)NULL -}; +#ifdef WANT_VARIADIC_VOIDP_CAST +#define VOIDP(__x__) ((void *)(__x__)) +#else +#define VOIDP(__x__) (__x__) +#endif struct keyboard_ { char *buf; size_t buf_sz; + size_t buf_head; + size_t buf_tail; DCPU16_WORD interrupt_message; + unsigned char keys_pressed[256]; }; +#ifdef HAVE_LIBVNCSERVER + +static const struct keysym_map_ { + unsigned int rfb_start; + unsigned int rfb_end; + DCPU16_WORD dcpu_start; +} keymap_[] = { + { XK_space, XK_asciitilde, 0x20 }, /* ASCII range */ + { XK_Delete, XK_Delete, 0x7f }, /* ASCII del */ + { XK_BackSpace, XK_BackSpace, 0x10 }, /* bs */ + { XK_Return, XK_Return, 0x11 }, /* ret */ + { XK_Insert, XK_Insert, 0x12 }, /* ins */ + { XK_Delete, XK_Delete, 0x13 }, /* del */ + { XK_Up, XK_Up, 0x80 }, /* arrow up */ + { XK_Down, XK_Down, 0x81 }, /* arrow down */ + { XK_Left, XK_Left, 0x82 }, /* arrow left */ + { XK_Right, XK_Right, 0x83 }, /* arrow right */ + { XK_Shift_L, XK_Shift_R, 0x90 }, /* shift range */ + { XK_Control_L, XK_Control_R, 0x91 }, /* control range */ + { 0, 0, 0x0 } +}; + +static int keysym_rfbtodcpu(unsigned int rfb, DCPU16_WORD *dcpu) { + const struct keysym_map_ *map; + + for (map = keymap_; map->rfb_start; map++) { + if (rfb >= map->rfb_start + && rfb <= map->rfb_end) { + *dcpu = (map->dcpu_start + (rfb - map->rfb_start)); + return 0; + } + } + + *dcpu = 0x00; + return -1; +} + +static +void keyboard_rfbevent_(rfbBool down, rfbKeySym key, rfbClientPtr cl) { + DCPU16_WORD dcpu_key; + struct dcpu16_hw *hw = (struct dcpu16_hw *)cl->screen->screenData; + struct keyboard_ *keyboard = (struct keyboard_ *)hw->data; + + keysym_rfbtodcpu(key, &dcpu_key); + + fprintf(stderr, "%s: down:%u key:0x%04x dcpu_key:0x%04x\n", + __func__, + down, + key, + dcpu_key); + + fprintf(stderr, "%s: hw:%p name:%s vm:%p\n", + __func__, + VOIDP(hw), + hw->name_, + VOIDP(hw->vm)); + + keyboard->keys_pressed[dcpu_key] = (down ? 1 : 0); + if (down) { + if ((keyboard->buf_tail + 1) % keyboard->buf_sz == keyboard->buf_head) { + hw->vm->warn_cb_("keyboard buffer overflow"); + return; + } + keyboard->buf[keyboard->buf_tail] = dcpu_key; + keyboard->buf_tail += 1; + keyboard->buf_tail %= keyboard->buf_sz; + } + if (keyboard->interrupt_message) { + dcpu16_interrupt(hw->vm, keyboard->interrupt_message); + } +} + +void keyboard_vnc_associate(struct dcpu16_hw *hw, rfbScreenInfoPtr rfbScreen) { + rfbScreen->screenData = hw; + rfbScreen->kbdAddEvent = keyboard_rfbevent_; +} +#endif /* HAVE_LIBVNCSERVER */ + static -void keyboard_reset_(struct dcpu16 *vm, void *data) { - struct keyboard_ *keyboard = (struct keyboard_ *)data; +void keyboard_reset_(struct dcpu16 *vm, struct dcpu16_hw *hw) { + struct keyboard_ *keyboard = (struct keyboard_ *)hw->data; (void)vm; @@ -40,36 +116,35 @@ void keyboard_reset_(struct dcpu16 *vm, void *data) { } static -void keyboard_cycle_(struct dcpu16 *vm, void *data) { - struct keyboard_ *keyboard = (struct keyboard_ *)data; +void keyboard_cycle_(struct dcpu16 *vm, struct dcpu16_hw *hw) { + struct keyboard_ *keyboard = (struct keyboard_ *)hw->data; (void)vm, (void)keyboard; } static -void keyboard_hwi_(struct dcpu16 *vm, void *data) { - struct keyboard_ *keyboard = (struct keyboard_ *)data; +void keyboard_hwi_(struct dcpu16 *vm, struct dcpu16_hw *hw) { + struct keyboard_ *keyboard = (struct keyboard_ *)hw->data; DCPU16_WORD reg_a = vm->reg[DCPU16_REG_A]; DCPU16_WORD reg_b = vm->reg[DCPU16_REG_B]; - size_t i; switch (reg_a) { case 0: /* clear keyboard buffer */ memset(keyboard->buf, 0, keyboard->buf_sz); + keyboard->buf_head = 0; + keyboard->buf_tail = 0; break; case 1: /* get next key from buffer as C */ - vm->reg[DCPU16_REG_C] = keyboard->buf[0]; - for (i = 1; i < keyboard->buf_sz; i++) { - keyboard->buf[i-1] = keyboard->buf[i]; - } - keyboard->buf[i] = '\0'; + if (keyboard->buf_head == keyboard->buf_tail) + break; + vm->reg[DCPU16_REG_C] = keyboard->buf[keyboard->buf_head]; + keyboard->buf_head += 1; + keyboard->buf_head %= keyboard->buf_sz; break; case 2: /* get currently-pressed-state of key in B as C */ - vm->warn_cb_("IMPLEMENT"); - (void)reg_b; - vm->reg[DCPU16_REG_C] = 0; + vm->reg[DCPU16_REG_C] = keyboard->keys_pressed[reg_b & 0x00ff]; break; case 3: /* set interrupt state */ @@ -79,45 +154,59 @@ void keyboard_hwi_(struct dcpu16 *vm, void *data) { } } -struct dcpu16_hw *keyboard_new(struct dcpu16 *vm) { - struct dcpu16_hw *hw; - char *b; +static +int keyboard_data_init_(struct dcpu16_hw *hw, void *data) { + size_t buf_sz = data ? *(size_t *)data : BUF_SZ; - hw = calloc(1, sizeof *hw); - if (hw == NULL) { - vm->warn_cb_("%s():%s", "calloc", strerror(errno)); - return NULL; - } - memcpy(hw, &hw_, sizeof *hw); - hw->data = calloc(1, sizeof hw->data); + hw->data = calloc(1, sizeof(struct keyboard_)); if (hw->data == NULL) { - vm->warn_cb_("%s():%s", "calloc", strerror(errno)); - free(hw); - return NULL; + hw->vm->warn_cb_("%s():%s", "calloc", strerror(errno)); + return -1; } - b = calloc(BUF_SZ, sizeof *b); - if (b == NULL) { - vm->warn_cb_("%s():%s", "calloc", strerror(errno)); + ((struct keyboard_ *)(hw->data))->buf = malloc(buf_sz * sizeof *((struct keyboard_ *)(hw->data))->buf); + if (((struct keyboard_ *)(hw->data))->buf == NULL) { + hw->vm->warn_cb_("%s():%s", "malloc", strerror(errno)); free(hw->data); - free(hw); - return NULL; + hw->data = NULL; + return -1; } - ((struct keyboard_ *)(hw->data))->buf = b; - ((struct keyboard_ *)(hw->data))->buf_sz = BUF_SZ; - return hw; + ((struct keyboard_ *)(hw->data))->buf_sz = buf_sz; + + return 0; } -void keyboard_del(struct dcpu16_hw **hw) { +static +void keyboard_data_free_(struct dcpu16_hw *hw) { if (hw) { - free(((struct keyboard_ *)((*hw)->data))->buf); - ((struct keyboard_ *)((*hw)->data))->buf = NULL; - - free((*hw)->data); - (*hw)->data = NULL; - - free(*hw); - *hw = NULL; + if (hw->data) { + if (((struct keyboard_ *)(hw->data))->buf) { + free(((struct keyboard_ *)(hw->data))->buf); + ((struct keyboard_ *)(hw->data))->buf = NULL; + } + free(hw->data); + hw->data = NULL; + } } } + +static struct dcpu16_hw hw_ = { + .vm = NULL, + .name_ = "Generic Keyboard (compatible)", + .id_l = 0x7406, + .id_h = 0x30cf, + .ver = 0x0001, + .mfg_l = 0x0000, + .mfg_h = 0x0000, + .hwi = keyboard_hwi_, + .cycle = keyboard_cycle_, + .reset = keyboard_reset_, + .data = (struct keyboard_ *)NULL +}; + +struct dcpu16_hw_module dcpu16_hw_module_keyboard = { + .template = &hw_, + .data_init = keyboard_data_init_, + .data_free = keyboard_data_free_, +};