From 07a877fa6e7144deb4b92e82de658c42d91c933a Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sat, 29 Mar 2014 12:33:36 -0400
Subject: [PATCH] Updated the GTK+ implementation and test programs to reflect
 the new KeyEvent setup.

---
 area_unix.go   | 22 ++++++++--------------
 test/kbtest.go |  6 ++----
 test/main.go   |  2 +-
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/area_unix.go b/area_unix.go
index b4a7600..14e91a4 100644
--- a/area_unix.go
+++ b/area_unix.go
@@ -180,27 +180,21 @@ func doKeyEvent(widget *C.GtkWidget, event *C.GdkEvent, data C.gpointer, up bool
 	var ke KeyEvent
 
 	e := (*C.GdkEventKey)(unsafe.Pointer(event))
-fmt.Println("$$", up, e.hardware_keycode)
 	s := (*sysData)(unsafe.Pointer(data))
 	keyval := e.keyval
 	if extkey, ok := extkeys[keyval]; ok {
 		ke.ExtKey = extkey
-	} else if predef, ok := predefkeys[keyval]; ok {
-		ke.ASCII = predef
+//	} else if predef, ok := predefkeys[keyval]; ok {
+//		ke.ASCII = predef
 	} else if mod, ok := modonlykeys[keyval]; ok {
 		// modifier keys don't seem to be set on their initial keypress; set them here
 		ke.Modifiers |= mod
-	} else {
-		cp := C.gdk_keyval_to_unicode(keyval)
-		// GDK keycodes in GDK 3.4 the ASCII plane map to their ASCII values
-		// (proof: https://git.gnome.org/browse/gtk+/tree/gdk/gdkkeysyms.h?h=gtk-3-4)
-		// this also handles the numeric keypad keys (proof: https://git.gnome.org/browse/gtk+/tree/gdk/gdkkeyuni.c?h=gtk-3-4#n846)
-		// the cp < 0x20 will also handle the case where the key is totally unknown to us (gdk_keyval_to_unicode() returns 0) and the space key
-		if cp < 0x20 || cp >= 0x7F {
-			// TODO really stop here? or should we handle modifiers?
-			return false		// pretend unhandled
-		}
-		ke.ASCII = byte(cp)
+	} else if key, ok := scancodeMap[uintptr(e.hardware_keycode) - 8]; ok {
+		// see events_notdarwin.go for details of the above map lookup
+		ke.Key = key
+	} else {		// no match
+		// TODO really stop here? [or should we handle modifiers?]
+		return false		// pretend unhandled
 	}
 	state := translateModifiers(e.state, e.window)
 	ke.Modifiers = makeModifiers(state, ke.Modifiers)
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
 }