zynaddsubfx

commit 4054dd1e3983515a99aba629fc20b66f9cdca63d
parent cccaec447aa3777cd0acc19d291d1245365cbaa7
Author: paulnasca <paulnasca>
Date:   Mon, 19 Mar 2007 19:30:32 +0000

*** empty log message ***

Diffstat:
M
AUTHORS.txt
 | 
1
+
M
ChangeLog
 | 
4
++++
M
src/Makefile.inc
 | 
4
++--
M
src/UI/VirKeyboard.fl
 | 
37
+++++++++++++++++++++----------------

4 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -4,4 +4,5 @@ Main author:
 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)
 
diff --git a/ChangeLog b/ChangeLog
@@ -816,6 +816,10 @@
 10 Nov 2006 - Aplicat un patch "zyn-extendedmono_v4_update-061110.diff.gz" de Gerald Folcher
 14 Nov 2006 - Aplicat un patch "zyn-CVS-extendedmono_v5_update-061113.diff.gz" de Gerald Folcher
 
+*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
+
+19 Mar 2007 - Aplicat un patch mic de la Daniel Clemente care este un workaround la bug-ul X11 cand tin tastele apasate mai mult timp
+
 
 
 
diff --git a/src/Makefile.inc b/src/Makefile.inc
@@ -43,8 +43,8 @@ LINUX_DSSI=NO
 #LINUX_DSSI=YES
 
 #Next line sets if the LASH session handler will be used
-LINUX_USE_LASH=YES
-#LINUX_USE_LASH=NO
+#LINUX_USE_LASH=YES
+LINUX_USE_LASH=NO
 
 # W I N D O W S   C O N F I G U R A T I O N
 
diff --git a/src/UI/VirKeyboard.fl b/src/UI/VirKeyboard.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0106 
+version 1.0107 
 header_name {.h} 
 code_name {.cc}
 decl {//Copyright (c) 2002-2005 Nasca Octavian Paul} {} 
@@ -37,7 +37,7 @@ decl {const int keysoct1dw[]={'\\'','2',',','3','.','p','5','y','6','f','7','g',
 
 decl {const int keysoct2dw[]={';','o','q','e','j','k','i','x','d','b','h','m','w','n','v','s','z',0};} {} 
 
-class VirKeys {: {public Fl_Box}
+class VirKeys {open : {public Fl_Box}
 } {
   decl {static const int N_OCT=6;} {}
   decl {static const int SIZE_WHITE=14;} {}
@@ -159,14 +159,19 @@ if ((event==FL_KEYDOWN)||(event==FL_KEYUP)){
    for (i=0;keysoct1[i]!=0;i++) if (key==keysoct1[i]) kpos=i+12*keyoct1;
    for (i=0;keysoct2[i]!=0;i++) if (key==keysoct2[i]) kpos=i+12*keyoct2;
 
+
+
+
    if (kpos==-1) return(0);
+   if ((event==FL_KEYUP) && (Fl::event_key(key)==0) && (Fl::get_key(key)!=0)) return(0);
    if (event==FL_KEYDOWN) presskey(kpos,0,2);
       else relasekey(kpos,2);
 };
 
 return(1);} {}
   }
-  Function {presskey(int nk,int exclusive,int type)} {} {
+  Function {presskey(int nk,int exclusive,int type)} {selected
+  } {
     code {if (nk>=N_OCT*12) return;
 if ((nk<0)&&(exclusive==0)) {
   relaseallkeys(type);
@@ -216,7 +221,7 @@ pthread_mutex_unlock(&master->mutex);} {}
   }
 } 
 
-class VirKeyboard {selected
+class VirKeyboard {open
 } {
   Function {make_window()} {} {
     Fl_Window virkeyboardwindow {
@@ -303,51 +308,51 @@ virkeys->take_focus();}
         xywh {435 105 100 15} down_box BORDER_BOX labelsize 10 align 5 when 6 textfont 1 textsize 10
         code0 {midictl=C_filtercutoff;o->value(7);}
       } {
-        menuitem {} {
+        MenuItem {} {
           label {01: Mod.Wheel}
           xywh {0 0 100 20} labelfont 1 labelsize 10
         }
-        menuitem {} {
+        MenuItem {} {
           label {07: Volume}
           xywh {10 10 100 20} labelfont 1 labelsize 10
         }
-        menuitem {} {
+        MenuItem {} {
           label {10: Panning}
           xywh {20 20 100 20} labelfont 1 labelsize 10
         }
-        menuitem {} {
+        MenuItem {} {
           label {11: Expression}
           xywh {30 30 100 20} labelfont 1 labelsize 10
         }
-        menuitem {} {
+        MenuItem {} {
           label {64: Sustain}
           xywh {40 40 100 20} labelfont 1 labelsize 10
         }
-        menuitem {} {
+        MenuItem {} {
           label {65: Portamento}
           xywh {50 50 100 20} labelfont 1 labelsize 10
         }
-        menuitem {} {
+        MenuItem {} {
           label {71: Filter Q}
           xywh {60 60 100 20} labelfont 1 labelsize 10
         }
-        menuitem {} {
+        MenuItem {} {
           label {74: Filter Freq.}
           xywh {70 70 100 20} labelfont 1 labelsize 10
         }
-        menuitem {} {
+        MenuItem {} {
           label {75: Bandwidth}
           xywh {80 80 100 20} labelfont 1 labelsize 10
         }
-        menuitem {} {
+        MenuItem {} {
           label {76: FM Gain}
           xywh {90 90 100 20} labelfont 1 labelsize 10
         }
-        menuitem {} {
+        MenuItem {} {
           label {77: Res. c. freq}
           xywh {100 100 100 20} labelfont 1 labelsize 10
         }
-        menuitem {} {
+        MenuItem {} {
           label {78: Res. bw.}
           xywh {110 110 100 20} labelfont 1 labelsize 10
         }