diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-15 00:39:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-15 00:39:04 +0200 |
| commit | 3dea5a88cad4ee51b2240bb95693ccb4c43047b5 (patch) | |
| tree | 432e42041ba0311eb07dbe838cf9b8ebe943d002 /nx-X11 | |
| parent | 61d0fbea7a27de4d6667b8ee35ca948105efaa2f (diff) | |
| parent | 5e17d05aa5bfd2f409725f743f5eb345ea73402f (diff) | |
| download | nx-libs-3dea5a88cad4ee51b2240bb95693ccb4c43047b5.tar.gz nx-libs-3dea5a88cad4ee51b2240bb95693ccb4c43047b5.tar.bz2 nx-libs-3dea5a88cad4ee51b2240bb95693ccb4c43047b5.zip | |
Merge branch 'sunweaver-pr/nxagentReversePointerMapping-negative-index' into 3.6.x
Attributes GH PR #138: https://github.com/ArcticaProject/nx-libs/pull/138
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Tue, 14 Jun 2016 06:12:49 -0700
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Events.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Pointer.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index ffb593750..0a6540fa3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -1252,7 +1252,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was X.xbutton.subwindow == None)) { x.u.u.type = ButtonPress; - x.u.u.detail = inputInfo.pointer -> button -> map[nxagentReversePointerMap[X.xbutton.button - 1]]; + x.u.u.detail = inputInfo.pointer -> button -> map[nxagentReversePointerMap[X.xbutton.button]]; x.u.keyButtonPointer.time = nxagentLastEventTime = GetTimeInMillis(); if (nxagentOption(Rootless)) @@ -1325,7 +1325,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was if (minimize != True) { x.u.u.type = ButtonRelease; - x.u.u.detail = inputInfo.pointer -> button -> map[nxagentReversePointerMap[X.xbutton.button - 1]]; + x.u.u.detail = inputInfo.pointer -> button -> map[nxagentReversePointerMap[X.xbutton.button]]; x.u.keyButtonPointer.time = nxagentLastEventTime = GetTimeInMillis(); if (nxagentOption(Rootless)) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c index ce2b37a90..8a8ed85b1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c @@ -186,6 +186,6 @@ void nxagentInitPointerMap(void) for (i = 1; i <= numButtons; i++) { - nxagentReversePointerMap[pointerMap[i - 1] - 1] = i; + nxagentReversePointerMap[pointerMap[i - 1]] = i; } } |