[Bf-blender-cvs] [0a3f279] pie-menus: Remove X11 hack.

Antony Riakiotakis noreply at git.blender.org
Thu Jul 31 17:38:18 CEST 2014


Commit: 0a3f279855df17f12723557b96931fc8a4a823b8
Author: Antony Riakiotakis
Date:   Thu Jul 31 17:38:08 2014 +0200
Branches: pie-menus
https://developer.blender.org/rB0a3f279855df17f12723557b96931fc8a4a823b8

Remove X11 hack.

Cannot reproduce original issue on studio pc anymore, will try on other
pcs too to make sure it is unneeded now (maybe issue was fixed upstream
or pie interaction system now hides this better.)

===================================================================

M	intern/ghost/intern/GHOST_SystemX11.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 2a8aa2e..4d9fd56 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -773,21 +773,6 @@ GHOST_SystemX11::processEvent(XEvent *xe)
 			
 			GHOST_TKey gkey;
 
-			/* first, determine if we have a valid event. Sometimes, X11 fires fake events on key release, see
-			 * for instance http://en.sfml-dev.org/forums/index.php?topic=10156.0 */
-			if (xke->keycode < 256)
-			{
-				char keys[32];
-				XQueryKeymap(m_display, keys);
-				bool down = (keys[xke->keycode / 8] & (1 << (xke->keycode % 8))) != 0;
-
-				if (down && xe->type == KeyRelease)
-					break;
-
-				if (!down && xe->type == KeyPress)
-					break;
-			}
-
 			/* In keyboards like latin ones,
 			 * numbers needs a 'Shift' to be accessed but key_sym
 			 * is unmodified (or anyone swapping the keys with xmodmap).




More information about the Bf-blender-cvs mailing list