From ea3989a4c17bc6acd739342b7c5bed2b5bc0622d Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 16 Mar 2009 17:41:37 +0100 Subject: [PATCH] ZynAddSubFX: follow recent changes in CVS repository Follow recent changes in ZynAddSubFX CVS repository - ChangeLog says: 07 Mar 2009 (Mark McCurry) - Incorperated QUERTZ layout by Achim Settelmeier --- plugins/zynaddsubfx/src/AUTHORS.txt | 13 +++++++++++++ plugins/zynaddsubfx/src/ChangeLog | 11 ++++++++--- plugins/zynaddsubfx/src/UI/ConfigUI.cc | 1 + plugins/zynaddsubfx/src/UI/ConfigUI.fl | 4 ++++ plugins/zynaddsubfx/src/UI/VirKeyboard.cc | 13 +++++++++---- plugins/zynaddsubfx/src/UI/VirKeyboard.fl | 15 +++++++++++---- 6 files changed, 46 insertions(+), 11 deletions(-) create mode 100644 plugins/zynaddsubfx/src/AUTHORS.txt diff --git a/plugins/zynaddsubfx/src/AUTHORS.txt b/plugins/zynaddsubfx/src/AUTHORS.txt new file mode 100644 index 000000000..a1ffa13d1 --- /dev/null +++ b/plugins/zynaddsubfx/src/AUTHORS.txt @@ -0,0 +1,13 @@ +Main author: + Nasca Octavian Paul + +Developers: + Mark McCurry + +Contributors: + Gerald Folcher (legato, mono notes memory) + Lars Luthman (zombie fix,jack midi, LASH support) + Daniel Clemente (with a workaround of X11 repeated key bug) + Emmanuel Saracco (fix for JACK output) + Achim Settelmeier (QUERTZ keyboard layout for virtual keyboard) + diff --git a/plugins/zynaddsubfx/src/ChangeLog b/plugins/zynaddsubfx/src/ChangeLog index b82f8e36e..9b2665390 100644 --- a/plugins/zynaddsubfx/src/ChangeLog +++ b/plugins/zynaddsubfx/src/ChangeLog @@ -842,7 +842,12 @@ - Standardized the code, so it could compile with pedantic without errors +22 Feb 2009 (Mark McCurry) + - Fix improper deallocation in PresetsStore + - Fixed errors with drawing of the Oscillator as reported with + valgrind - - - +07 Mar 2009 (Mark McCurry) + - Added start of DocBook documentation + - Incorperated JACK output patch by Emmanuel Saracco + - Incorperated QUERTZ layout by Achim Settelmeier diff --git a/plugins/zynaddsubfx/src/UI/ConfigUI.cc b/plugins/zynaddsubfx/src/UI/ConfigUI.cc index d6562ff0b..be6d20eab 100644 --- a/plugins/zynaddsubfx/src/UI/ConfigUI.cc +++ b/plugins/zynaddsubfx/src/UI/ConfigUI.cc @@ -154,6 +154,7 @@ Fl_Menu_Item ConfigUI::menu_Virtual[] = { {" ", 0, 0, 0, 1, FL_NORMAL_LABEL, 1, 11, 0}, {"QWERTY", 0, 0, 0, 0, FL_NORMAL_LABEL, 1, 11, 0}, {"Dvorak", 0, 0, 0, 0, FL_NORMAL_LABEL, 1, 11, 0}, + {"QWERTZ", 0, 0, 0, 0, FL_NORMAL_LABEL, 1, 11, 0}, {0,0,0,0,0,0,0,0,0} }; diff --git a/plugins/zynaddsubfx/src/UI/ConfigUI.fl b/plugins/zynaddsubfx/src/UI/ConfigUI.fl index a5289c3b1..a17872f40 100644 --- a/plugins/zynaddsubfx/src/UI/ConfigUI.fl +++ b/plugins/zynaddsubfx/src/UI/ConfigUI.fl @@ -268,6 +268,10 @@ midiinputnamebox->label(config.winmididevices[config.cfg.WindowsMidiInId].name); label Dvorak xywh {25 25 100 20} labelfont 1 labelsize 11 } + menuitem {} { + label QWERTZ + xywh {35 35 100 20} labelfont 1 labelsize 11 + } } } Fl_Group {} { diff --git a/plugins/zynaddsubfx/src/UI/VirKeyboard.cc b/plugins/zynaddsubfx/src/UI/VirKeyboard.cc index 3f979ab98..e32a7cd8e 100644 --- a/plugins/zynaddsubfx/src/UI/VirKeyboard.cc +++ b/plugins/zynaddsubfx/src/UI/VirKeyboard.cc @@ -4,10 +4,12 @@ //Copyright (c) 2002-2005 Nasca Octavian Paul //License: GNU GPL version 2 or later static const int keyspos[12]={0,-1,1,-2,2,3,-4,4,-5,5,-6,6}; -static const int keysoct1qw[]={'q','2','w','3','e','r','5','t','6','y','7','u','i','9','o','0','p','[','=',']','\\',FL_Enter,0}; -static const int keysoct2qw[]={'z','s','x','d','c','v','g','b','h','n','j','m',',','l','.',';','/',0}; +static const int keysoct1qwerty[]={'q','2','w','3','e','r','5','t','6','y','7','u','i','9','o','0','p','[','=',']','\\',FL_Enter,0}; +static const int keysoct2qwerty[]={'z','s','x','d','c','v','g','b','h','n','j','m',',','l','.',';','/',0}; static const int keysoct1dw[]={'\'','2',',','3','.','p','5','y','6','f','7','g','c','9','r','0','l','/',']','=','\\',FL_Enter,0}; static const int keysoct2dw[]={';','o','q','e','j','k','i','x','d','b','h','m','w','n','v','s','z',0}; +static const int keysoct1qwertz[]={'q','2','w','3','e','r','5','t','6','z','7','u','i','9','o','0','p',252,'\'','+','\\',FL_Enter,0}; +static const int keysoct2qwertz[]={'y','s','x','d','c','v','g','b','h','n','j','m',',','l','.',246,'-',0}; VirKeys::VirKeys(int x,int y, int w, int h, const char *label):Fl_Box(x,y,w,h,label) { master=NULL; @@ -114,12 +116,15 @@ if ((event==FL_PUSH)||(event==FL_DRAG)||(event==FL_RELEASE)){ }; -const int *keysoct1=keysoct1qw; -const int *keysoct2=keysoct2qw; +const int *keysoct1=keysoct1qwerty; +const int *keysoct2=keysoct2qwerty; if (config.cfg.VirKeybLayout==2) { keysoct1=keysoct1dw; keysoct2=keysoct2dw; +}else if (config.cfg.VirKeybLayout==3) { + keysoct1=keysoct1qwertz; + keysoct2=keysoct2qwertz; }; if ((event==FL_KEYDOWN)||(event==FL_KEYUP)){ diff --git a/plugins/zynaddsubfx/src/UI/VirKeyboard.fl b/plugins/zynaddsubfx/src/UI/VirKeyboard.fl index 4c7fba54f..0b1b8c575 100644 --- a/plugins/zynaddsubfx/src/UI/VirKeyboard.fl +++ b/plugins/zynaddsubfx/src/UI/VirKeyboard.fl @@ -29,14 +29,18 @@ decl {\#include "WidgetPDial.h"} {public decl {const int keyspos[12]={0,-1,1,-2,2,3,-4,4,-5,5,-6,6};} {} -decl {const int keysoct1qw[]={'q','2','w','3','e','r','5','t','6','y','7','u','i','9','o','0','p','[','=',']','\\\\',FL_Enter,0};} {} +decl {const int keysoct1qwerty[]={'q','2','w','3','e','r','5','t','6','y','7','u','i','9','o','0','p','[','=',']','\\\\',FL_Enter,0};} {} -decl {const int keysoct2qw[]={'z','s','x','d','c','v','g','b','h','n','j','m',',','l','.',';','/',0};} {} +decl {const int keysoct2qwerty[]={'z','s','x','d','c','v','g','b','h','n','j','m',',','l','.',';','/',0};} {} decl {const int keysoct1dw[]={'\\'','2',',','3','.','p','5','y','6','f','7','g','c','9','r','0','l','/',']','=','\\\\',FL_Enter,0};} {} decl {const int keysoct2dw[]={';','o','q','e','j','k','i','x','d','b','h','m','w','n','v','s','z',0};} {} +decl {const int keysoct1qwertz[]={'q','2','w','3','e','r','5','t','6','z','7','u','i','9','o','0','p',252,'\\\'','+','\\\\',FL_Enter,0};} {} + +decl {const int keysoct2qwertz[]={'y','s','x','d','c','v','g','b','h','n','j','m',',','l','.',246,'-',0};} {} + class VirKeys {open : {public Fl_Box} } { decl {static const int N_OCT=6;} {} @@ -145,12 +149,15 @@ if ((event==FL_PUSH)||(event==FL_DRAG)||(event==FL_RELEASE)){ }; -const int *keysoct1=keysoct1qw; -const int *keysoct2=keysoct2qw; +const int *keysoct1=keysoct1qwerty; +const int *keysoct2=keysoct2qwerty; if (config.cfg.VirKeybLayout==2) { keysoct1=keysoct1dw; keysoct2=keysoct2dw; +}else if (config.cfg.VirKeybLayout==3) { + keysoct1=keysoct1qwertz; + keysoct2=keysoct2qwertz; }; if ((event==FL_KEYDOWN)||(event==FL_KEYUP)){