Skip to content

Fix wrong XBUTTON handle #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Argentoz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix wrong XBUTTON handle #166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions src/java/org/lwjgl/opengl/WindowsDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,37 +1011,37 @@ private long doHandleMessage(long hwnd, int msg, long wParam, long lParam, long
handleMouseScrolled(dwheel, millis);
return 0L;
case WM_LBUTTONDOWN:
handleMouseButton(0, 1, millis);
return 0L;
case WM_LBUTTONUP:
handleMouseButton(0, 0, millis);
return 0L;
case WM_RBUTTONDOWN:
handleMouseButton(1, 1, millis);
return 0L;
case WM_RBUTTONUP:
handleMouseButton(1, 0, millis);
return 0L;
case WM_MBUTTONDOWN:
handleMouseButton(2, 1, millis);
return 0L;
case WM_XBUTTONDOWN:
case WM_LBUTTONUP:
case WM_RBUTTONUP:
case WM_MBUTTONUP:
handleMouseButton(2, 0, millis);
return 0L;
case WM_XBUTTONUP:
if((wParam >> 16) == XBUTTON1) {
handleMouseButton(3, 0, millis);
} else {
handleMouseButton(4, 0, millis);
}
return 1;
case WM_XBUTTONDOWN:
if((wParam & 0xFF) == MK_XBUTTON1) {
handleMouseButton(3, 1, millis);
} else {
handleMouseButton(4, 1, millis);
}
return 1;
{
int button;

if (msg == WM_LBUTTONDOWN || msg == WM_LBUTTONUP)
button = 0;
else if (msg == WM_RBUTTONDOWN || msg == WM_RBUTTONUP)
button = 1;
else if (msg == WM_MBUTTONDOWN || msg == WM_MBUTTONUP)
button = 2;
else if ((wParam >> 16) == XBUTTON1)
button = 3;
else
button = 4;

int action = msg == WM_LBUTTONDOWN || msg == WM_RBUTTONDOWN ||
msg == WM_MBUTTONDOWN || msg == WM_XBUTTONDOWN ? 1 : 0;

handleMouseButton(button, action, millis);

if (msg == WM_XBUTTONDOWN || msg == WM_XBUTTONUP)
return 1L;

return 0L;
}
case WM_SYSCHAR:
case WM_CHAR:
handleChar(wParam, lParam, millis);
Expand Down