From d8c58677de89e5c3fb74fe7115cd8cc553ab7947 Mon Sep 17 00:00:00 2001 From: trasz Date: Sat, 29 Aug 2009 19:42:01 +0000 Subject: [PATCH] Add Dvorak layout support. Submitted by: Michael Watts git-svn-id: svn://svn.code.sf.net/p/jack-keyboard/code/trunk@10 1fa2bf75-7d80-4145-9e94-f9b4e25a1cb2 --- src/jack-keyboard.c | 4 ++-- src/pianokeyboard.c | 53 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/src/jack-keyboard.c b/src/jack-keyboard.c index e436c26..9b70dae 100644 --- a/src/jack-keyboard.c +++ b/src/jack-keyboard.c @@ -1691,7 +1691,7 @@ usage(void) fprintf(stderr, " where is MIDI channel to use for output, from 1 to 16,\n"); fprintf(stderr, " is MIDI bank to use, from 0 to 16383,\n"); fprintf(stderr, " is MIDI program to use, from 0 to 127,\n"); - fprintf(stderr, " and is either QWERTY, QWERTZ or AZERTY.\n"); + fprintf(stderr, " and is QWERTY, QWERTZ, AZERTY or DVORAK.\n"); fprintf(stderr, "See manual page for details.\n"); exit(EX_USAGE); @@ -1829,7 +1829,7 @@ main(int argc, char *argv[]) int ret = piano_keyboard_set_keyboard_layout(keyboard, keyboard_layout); if (ret) { - g_critical("Invalid layout, proper choices are QWERTY, QWERTZ and AZERTY."); + g_critical("Invalid layout, proper choices are QWERTY, QWERTZ, AZERTY and DVORAK."); exit(EX_USAGE); } } diff --git a/src/pianokeyboard.c b/src/pianokeyboard.c index b8dde34..afa6d8a 100644 --- a/src/pianokeyboard.c +++ b/src/pianokeyboard.c @@ -328,6 +328,56 @@ bind_keys_azerty(PianoKeyboard *pk) bind_key(pk, "p", 40); } +static void +bind_keys_dvorak(PianoKeyboard *pk) +{ + clear_notes(pk); + + /* Lower keyboard row - ";qjkxbm". */ + bind_key(pk, "semicolon", 12); /* C0 */ + bind_key(pk, "o", 13); + bind_key(pk, "q", 14); + bind_key(pk, "e", 15); + bind_key(pk, "j", 16); + bind_key(pk, "k", 17); + bind_key(pk, "i", 18); + bind_key(pk, "x", 19); + bind_key(pk, "d", 20); + bind_key(pk, "b", 21); + bind_key(pk, "h", 22); + bind_key(pk, "m", 23); + bind_key(pk, "w", 24); /* overlaps with upper row */ + bind_key(pk, "n", 25); + bind_key(pk, "v", 26); + bind_key(pk, "s", 27); + bind_key(pk, "z", 28); + + /* Upper keyboard row, first octave - "',.pyfg". */ + bind_key(pk, "apostrophe", 24); + bind_key(pk, "2", 25); + bind_key(pk, "comma", 26); + bind_key(pk, "3", 27); + bind_key(pk, "period", 28); + bind_key(pk, "p", 29); + bind_key(pk, "5", 30); + bind_key(pk, "y", 31); + bind_key(pk, "6", 32); + bind_key(pk, "f", 33); + bind_key(pk, "7", 34); + bind_key(pk, "g", 35); + + /* Upper keyboard row, the rest - "crl". */ + bind_key(pk, "c", 36); + bind_key(pk, "9", 37); + bind_key(pk, "r", 38); + bind_key(pk, "0", 39); + bind_key(pk, "l", 40); + bind_key(pk, "slash", 41); /* extra F */ + bind_key(pk, "bracketright", 42); + bind_key(pk, "equal", 43); + +} + static gint keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer notused) { @@ -683,6 +733,9 @@ piano_keyboard_set_keyboard_layout(PianoKeyboard *pk, const char *layout) } else if (!strcasecmp(layout, "AZERTY")) { bind_keys_azerty(pk); + } else if (!strcasecmp(layout, "DVORAK")) { + bind_keys_dvorak(pk); + } else { /* Unknown layout name. */ return (TRUE);