From 4e6368d019e2543e6bf792f182486732d6f5a3f5 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 29 Apr 2012 02:53:47 +0000
Subject: Proper key press and release support on X11. Clearer mouse callback
 API.

---
 pugl/pugl_x11.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'pugl/pugl_x11.c')

diff --git a/pugl/pugl_x11.c b/pugl/pugl_x11.c
index 33f0b42..5844f2d 100644
--- a/pugl/pugl_x11.c
+++ b/pugl/pugl_x11.c
@@ -104,7 +104,8 @@ puglCreate(PuglNativeWindow parent, const char* title, int width, int height)
 	attr.border_pixel = 0;
 
 	attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask
-		| ButtonPressMask | PointerMotionMask | StructureNotifyMask;
+		| ButtonPressMask | ButtonReleaseMask
+		| PointerMotionMask | StructureNotifyMask;
 
 	impl->win = XCreateWindow(
 		impl->display, xParent,
@@ -194,20 +195,40 @@ puglProcessEvents(PuglWindow* win)
 			}
 			break;
 		case ButtonPress:
+		case ButtonRelease:
 			if (win->mouseFunc) {
 				win->mouseFunc(win,
-				               event.xbutton.button, event.xbutton.state,
+				               event.xbutton.button, event.type == ButtonPress,
 				               event.xbutton.x, event.xbutton.y);
 			}
 			break;
 		case KeyPress:
-		case KeyRelease:
 			if (win->keyboardFunc) {
 				KeySym sym = XKeycodeToKeysym(
 					win->impl->display, event.xkey.keycode, 0);
 				win->keyboardFunc(win, event.type == KeyPress, sym);
 			}
 			break;
+		case KeyRelease: {
+			bool retriggered = false;
+			if (XEventsQueued(win->impl->display, QueuedAfterReading)) {
+				XEvent next;
+				XPeekEvent(win->impl->display, &next);
+				if (next.type == KeyPress &&
+				    next.xkey.time == event.xkey.time &&
+				    next.xkey.keycode == event.xkey.keycode) {
+					// Key repeat, ignore fake KeyPress event
+					XNextEvent(win->impl->display, &event);
+					retriggered = true;
+				}
+			}
+
+			if (!retriggered && win->keyboardFunc) {
+				KeySym sym = XKeycodeToKeysym(
+					win->impl->display, event.xkey.keycode, 0);
+				win->keyboardFunc(win, false, sym);
+			}
+		}
 		case ClientMessage:
 			if (!strcmp(XGetAtomName(win->impl->display,
 			                         event.xclient.message_type),
-- 
cgit v1.2.3