Skip to content

N
nx-libs
Unverified Commit 3dea5a88 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

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
parents 61d0fbea 5e17d05a
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
nx-X11/programs/Xserver/hw/nxagent/Events.c
View file @ 3dea5a88
......@@ -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))
......
nx-X11/programs/Xserver/hw/nxagent/Pointer.c
View file @ 3dea5a88
......@@ -186,6 +186,6 @@ void nxagentInitPointerMap(void)
for (i = 1; i <= numButtons; i++)
{
nxagentReversePointerMap[pointerMap[i - 1] - 1] = i;
nxagentReversePointerMap[pointerMap[i - 1]] = i;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment