SF.net SVN: pure-data: [9774] branches/pd-extended/v0-40/pd/src - Pd-cvs

9 May 2008

Revision: 9774
          http://pure-data.svn.sourceforge.net/pure-data/?rev=9774&view=rev
Author:   eighthave
Date:     2008-05-09 11:53:05 -0700 (Fri, 09 May 2008)
Log Message:
-----------
cleaned up canvas_key handling code to fix backspace and delete
Modified Paths:
--------------
    branches/pd-extended/v0-40/pd/src/g_editor.c
    branches/pd-extended/v0-40/pd/src/u_main.tk
Modified: branches/pd-extended/v0-40/pd/src/g_editor.c
===================================================================

--- branches/pd-extended/v0-40/pd/src/g_editor.c	2008-05-09 16:06:18 UTC (rev 9773)
+++ branches/pd-extended/v0-40/pd/src/g_editor.c	2008-05-09 18:53:05 UTC (rev 9774)
@@ -1474,9 +1474,16 @@
         gotkeysym = av[1].a_w.w_symbol;
     else if (av[1].a_type == A_FLOAT)
     {
-        char buf[3];
-        sprintf(buf, "%c", (int)(av[1].a_w.w_float));
-        gotkeysym = gensym(buf);
+        if ((int)(av[1].a_w.w_float) == 8)
+            gotkeysym = gensym("BackSpace");
+        else if ((int)(av[1].a_w.w_float) == 127)
+            gotkeysym = gensym("Delete");
+        else
+        {
+            char buf[3];
+            sprintf(buf, "%c", (int)(av[1].a_w.w_float));
+            gotkeysym = gensym(buf);
+        }
     }
     else gotkeysym = gensym("?");
     fflag = (av[0].a_type == A_FLOAT ? av[0].a_w.w_float : 0);
Modified: branches/pd-extended/v0-40/pd/src/u_main.tk
===================================================================
--- branches/pd-extended/v0-40/pd/src/u_main.tk	2008-05-09 16:06:18 UTC (rev 9773)
+++ branches/pd-extended/v0-40/pd/src/u_main.tk	2008-05-09 18:53:05 UTC (rev 9774)
@@ -1507,9 +1507,9 @@
         bind $name.c <Mod1-Key> {pdtk_canvas_ctrlkey %W %K 0}
         bind $name.c <Mod1-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1}
     }
-    bind $name.c <Key> {pdtk_canvas_key %W %K %A 0}
-    bind $name.c <Shift-Key> {pdtk_canvas_key %W %K %A 1}
-    bind $name.c <KeyRelease> {pdtk_canvas_keyup %W %K %A}
+    bind $name.c <Key> {pdtk_canvas_sendkey %W 1 %K %A 0}
+    bind $name.c <Shift-Key> {pdtk_canvas_sendkey %W 1 %K %A 1}
+    bind $name.c <KeyRelease> {pdtk_canvas_sendkey %W 0 %K %A 0}
     bind $name.c <Motion> {pdtk_canvas_motion %W %x %y 0}
     bind $name.c <Control-Motion> {pdtk_canvas_motion %W %x %y 2}
     if {$pd_nt == 2} {
@@ -1889,44 +1889,21 @@
     pdtk_canvas_checkgeometry [canvastosym $name]
 }
-proc pdtk_canvas_key {name key iso shift} {
-    #    puts stderr [concat down key= $key iso= $iso]
-    #    .controls.switches.meterbutton configure -text $key
-    #  HACK for MAC OSX -- backspace seems different; I don't understand why.
-    #  invesigate this LATER...
+proc pdtk_canvas_sendkey {name state key iso shift} {
     global pd_nt
-    if {$pd_nt == 2} {
-        if {$key == "BackSpace"} {
-            set key 8
-            set keynum 8
-        }
-        if {$key == "Delete"} {
-            set key 8
-            set keynum 8
-        }
+	if {$key == "BackSpace"} {
+		set iso ""
+		set key 8
+	} elseif {$key == "Delete" || $key == "KP_Delete"} {
+        set iso ""
+		set key 127
     }
-    if {$key == "KP_Delete"} {
-        set key 127
-        set keynum 127
-    }
     if {$iso != ""} {
-        scan $iso %c keynum 
-        pd [canvastosym $name] key 1 $keynum $shift;
-    } else {
-        pd [canvastosym $name] key 1 $key $shift;
+        scan $iso %c key
     }
+	pd [canvastosym $name] key $state $key $shift ;
 }
-proc pdtk_canvas_keyup {name key iso} {
-    #    puts stderr [concat up key= $key iso= $iso]
-    if {$iso != ""} {
-        scan $iso %c keynum 
-        pd [canvastosym $name] key 0 $keynum 0 ;
-    } else {
-        pd [canvastosym $name] key 0 $key 0 ;
-    }
-}
-
 proc pdtk_canvas_ctrlkey {name key shift} {
     global pd_nt
     # first get rid of ".c" suffix; we'll refer to the toplevel instead
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

    