diff options
| author | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2016-12-20 22:04:55 +0100 |
|---|---|---|
| committer | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2016-12-20 22:04:55 +0100 |
| commit | 0b018069a0d48090ce4d3a7c2b8ccc74090ffe3e (patch) | |
| tree | 9435843700c5b146b5bb8cb42fee2ac243f15e0f | |
| parent | f26fb77a10815d8c7e0a77c47a439b6d8a8c33a5 (diff) | |
| parent | aff82e0eb1a0c26e1704a0fed36d8bf1657ee95d (diff) | |
| download | sherlock.lv2-0b018069a0d48090ce4d3a7c2b8ccc74090ffe3e.tar.xz | |
Merge commit 'aff82e0eb1a0c26e1704a0fed36d8bf1657ee95d'
| -rw-r--r-- | nk_pugl/nk_pugl.h | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/nk_pugl/nk_pugl.h b/nk_pugl/nk_pugl.h index 817d065..4976f8c 100644 --- a/nk_pugl/nk_pugl.h +++ b/nk_pugl/nk_pugl.h @@ -491,65 +491,65 @@ _nk_pugl_other_key(struct nk_context *ctx, const PuglEventKey *ev, int down) { const bool control = ev->state & PUGL_MOD_CTRL; - if(control) + switch(ev->character) { - const uint32_t character = ev->character + 96; //FIXME why +96? - switch(character) + case '\r': { - case 'c': - { - nk_input_key(ctx, NK_KEY_COPY, down); - } break; - case 'v': - { - nk_input_key(ctx, NK_KEY_PASTE, down); - } break; - case 'x': - { - nk_input_key(ctx, NK_KEY_CUT, down); - } break; - case 'z': - { - nk_input_key(ctx, NK_KEY_TEXT_UNDO, down); - } break; - case 'r': - { - nk_input_key(ctx, NK_KEY_TEXT_REDO, down); - } break; + nk_input_key(ctx, NK_KEY_ENTER, down); + } break; + case '\t': + { + nk_input_key(ctx, NK_KEY_TAB, down); + } break; + case PUGL_CHAR_DELETE: + { + nk_input_key(ctx, NK_KEY_DEL, down); + } break; + case PUGL_CHAR_BACKSPACE: + { + nk_input_key(ctx, NK_KEY_BACKSPACE, down); + } break; + case PUGL_CHAR_ESCAPE: + { + nk_input_key(ctx, NK_KEY_TEXT_RESET_MODE, down); + } break; - default: - { - if(down && isalpha(character)) - nk_input_char(ctx, character); - } break; - } - } - else // !control - { - switch(ev->character) + default: { - case '\r': - { - nk_input_key(ctx, NK_KEY_ENTER, down); - } break; - case '\t': - { - nk_input_key(ctx, NK_KEY_TAB, down); - } break; - case PUGL_CHAR_DELETE: - { - nk_input_key(ctx, NK_KEY_DEL, down); - } break; - case PUGL_CHAR_BACKSPACE: - { - nk_input_key(ctx, NK_KEY_BACKSPACE, down); - } break; - case PUGL_CHAR_ESCAPE: + if(control) { - nk_input_key(ctx, NK_KEY_TEXT_RESET_MODE, down); - } break; + const uint32_t character = ev->character + 96; //FIXME why +96? + switch(character) + { + case 'c': + { + nk_input_key(ctx, NK_KEY_COPY, down); + } break; + case 'v': + { + nk_input_key(ctx, NK_KEY_PASTE, down); + } break; + case 'x': + { + nk_input_key(ctx, NK_KEY_CUT, down); + } break; + case 'z': + { + nk_input_key(ctx, NK_KEY_TEXT_UNDO, down); + } break; + case 'r': + { + nk_input_key(ctx, NK_KEY_TEXT_REDO, down); + } break; - default: + default: + { + if(down && isalpha(character)) + nk_input_char(ctx, character); + } break; + } + } + else // !control { switch(ev->character) { @@ -565,8 +565,8 @@ _nk_pugl_other_key(struct nk_context *ctx, const PuglEventKey *ev, int down) if(down) nk_input_glyph(ctx, (const char *)ev->utf8); - } break; - } + } + } break; } } |