Updated the GTK+ implementation and test programs to reflect the new KeyEvent setup.

2 files changed, 3 insertions, 5 deletions

diff --git a/test/kbtest.go b/test/kbtest.go
index 600215e..747764e 100644
--- a/test/kbtest.go
+++ b/test/kbtest.go
@@ -49,10 +49,8 @@ func (a *keyboardArea) Key(e KeyEvent) (handled bool, repaint bool) {
 	defer a.lock.Unlock()
 
 	switch {
-//	case e.Key != 0:
-//		markkey(a.kbd, keypoints[e.Key], e.Modifiers)
-	case e.ASCII != 0:
-		markkey(a.kbd, keypoints[e.ASCII], e.Modifiers)
+	case e.Key != 0:
+		markkey(a.kbd, keypoints[e.Key], e.Modifiers)
 	case e.ExtKey != 0:
 		markkey(a.kbd, extkeypoints[e.ExtKey], e.Modifiers)
 	case e.Modifiers != 0:
diff --git a/test/main.go b/test/main.go
index 1e2b465..347060b 100644
--- a/test/main.go
+++ b/test/main.go
@@ -136,7 +136,7 @@ func (a *areaHandler) Mouse(e MouseEvent) bool {
 	return false
 }
 func (a *areaHandler) Key(e KeyEvent) (bool, bool) {
-	fmt.Printf("%#v\n", e)
+	fmt.Printf("%#v %q\n", e, e.Key)
 	return false, false
 }