Skip to content

Commit

Permalink
Merge pull request #77 from ColleagueRiley/mouse-button-review
Browse files Browse the repository at this point in the history 
add support for extra mouse buttons
  • Loading branch information
@ColleagueRiley
ColleagueRiley authored Jan 25, 2025
2 parents 3570838 + b43fbe6 commit 52de7ba
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 88 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Current Version: RGFW 1.5.5-dev
- RGFW_window_maximize uses `toggleFullScreen` if the window has no border (macOS)
- skip x11 mouse button events if the mouse button > 5
- fix RGFW_window_eventWait, make sure RGFW_eventWaitNext is converted if it needs to be, ensure the correct time is used, (winapi, cocoa), make waitMS unsigned
- add support for extra mouse buttons RGFW_mouseMisc1 - RGFW_mouseMisc5

Release: RGFW 1.5 (Jan 14, 2024)
-----------------------------------------------
Expand Down
136 changes: 48 additions & 88 deletions RGFW.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,12 @@ typedef RGFW_ENUM(u8, RGFW_eventType) {
/*! mouse button codes (RGFW_event.button) */
typedef RGFW_ENUM(u8, RGFW_mouseButton) {
RGFW_mouseLeft = 0, /*!< left mouse button is pressed*/
RGFW_mouseMiddle, /*!< mouse-wheel-button is pressed*/
RGFW_mouseMiddle, /* !< mouse-wheel-button is pressed*/
RGFW_mouseRight, /*!< right mouse button is pressed*/
RGFW_mouseScrollUp, /*!< mouse wheel is scrolling up*/
RGFW_mouseScrollDown /*!< mouse wheel is scrolling down*/
RGFW_mouseScrollDown, /*!< mouse wheel is scrolling down*/
RGFW_mouseMisc1, RGFW_mouseMisc2, RGFW_mouseMisc3, RGFW_mouseMisc4, RGFW_mouseMisc5,
RGFW_mouseFinal
};

#ifndef RGFW_MAX_PATH
Expand Down Expand Up @@ -1763,7 +1765,7 @@ void RGFW_setClassName(const char* name) {
RGFW_className = name;
}

RGFW_keyState RGFW_mouseButtons[5] = { {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0} };
RGFW_keyState RGFW_mouseButtons[RGFW_mouseFinal] = { {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0} };

RGFW_bool RGFW_isMousePressed(RGFW_window* win, RGFW_mouseButton button) {
return RGFW_mouseButtons[button].current && (win == NULL || win->event.inFocus);
Expand Down Expand Up @@ -3872,7 +3874,7 @@ RGFW_event* RGFW_window_checkEvent(RGFW_window* win) {
}
case ButtonPress:
case ButtonRelease:
if (E.xbutton.button > 5) { /* skip this event */
if (E.xbutton.button > RGFW_mouseFinal) { /* skip this event */
XFlush(win->src.display);
return RGFW_window_checkEvent(win);
}
Expand Down Expand Up @@ -6384,29 +6386,27 @@ RGFW_event* RGFW_window_checkEvent(RGFW_window* win) {
win->_lastMousePoint.y += win->event.point.y;
break;
}

case WM_LBUTTONDOWN:
win->event.button = RGFW_mouseLeft;
RGFW_mouseButtons[win->event.button].prev = RGFW_mouseButtons[win->event.button].current;
RGFW_mouseButtons[win->event.button].current = 1;
win->event.type = RGFW_mouseButtonPressed;
RGFW_mouseButtonCallback(win, win->event.button, win->event.scroll, 1);
break;
case WM_RBUTTONDOWN:
win->event.button = RGFW_mouseRight;
win->event.type = RGFW_mouseButtonPressed;
case WM_LBUTTONDOWN: case WM_RBUTTONDOWN: case WM_MBUTTONDOWN: case WM_XBUTTONDOWN:
if (msg.message == WM_XBUTTONDOWN)
win->event.button = RGFW_mouseMisc1 + (GET_XBUTTON_WPARAM(msg.wParam) == XBUTTON2);
else win->event.button = (msg.message == WM_LBUTTONDOWN) ? RGFW_mouseLeft :
(msg.message == WM_RBUTTONDOWN) ? RGFW_mouseRight : RGFW_mouseMiddle;

win->event.type = RGFW_mouseButtonPressed;
RGFW_mouseButtons[win->event.button].prev = RGFW_mouseButtons[win->event.button].current;
RGFW_mouseButtons[win->event.button].current = 1;
RGFW_mouseButtonCallback(win, win->event.button, win->event.scroll, 1);
break;
case WM_MBUTTONDOWN:
win->event.button = RGFW_mouseMiddle;
win->event.type = RGFW_mouseButtonPressed;
case WM_LBUTTONUP: case WM_RBUTTONUP: case WM_MBUTTONUP: case WM_XBUTTONUP:
if (msg.message == WM_XBUTTONUP)
win->event.button = RGFW_mouseMisc1 + (GET_XBUTTON_WPARAM(msg.wParam) == XBUTTON2);
else win->event.button = (msg.message == WM_LBUTTONUP) ? RGFW_mouseLeft :
(msg.message == WM_RBUTTONUP) ? RGFW_mouseRight : RGFW_mouseMiddle;
win->event.type = RGFW_mouseButtonReleased;
RGFW_mouseButtons[win->event.button].prev = RGFW_mouseButtons[win->event.button].current;
RGFW_mouseButtons[win->event.button].current = 1;
RGFW_mouseButtonCallback(win, win->event.button, win->event.scroll, 1);
RGFW_mouseButtons[win->event.button].current = 0;
RGFW_mouseButtonCallback(win, win->event.button, win->event.scroll, 0);
break;

case WM_MOUSEWHEEL:
if (msg.wParam > 0)
win->event.button = RGFW_mouseScrollUp;
Expand All @@ -6421,32 +6421,6 @@ RGFW_event* RGFW_window_checkEvent(RGFW_window* win) {
win->event.type = RGFW_mouseButtonPressed;
RGFW_mouseButtonCallback(win, win->event.button, win->event.scroll, 1);
break;

case WM_LBUTTONUP:

win->event.button = RGFW_mouseLeft;
win->event.type = RGFW_mouseButtonReleased;

RGFW_mouseButtons[win->event.button].prev = RGFW_mouseButtons[win->event.button].current;
RGFW_mouseButtons[win->event.button].current = 0;
RGFW_mouseButtonCallback(win, win->event.button, win->event.scroll, 0);
break;
case WM_RBUTTONUP:
win->event.button = RGFW_mouseRight;
win->event.type = RGFW_mouseButtonReleased;

RGFW_mouseButtons[win->event.button].prev = RGFW_mouseButtons[win->event.button].current;
RGFW_mouseButtons[win->event.button].current = 0;
RGFW_mouseButtonCallback(win, win->event.button, win->event.scroll, 0);
break;
case WM_MBUTTONUP:
win->event.button = RGFW_mouseMiddle;
win->event.type = RGFW_mouseButtonReleased;

RGFW_mouseButtons[win->event.button].prev = RGFW_mouseButtons[win->event.button].current;
RGFW_mouseButtons[win->event.button].current = 0;
RGFW_mouseButtonCallback(win, win->event.button, win->event.scroll, 0);
break;
case WM_DROPFILES: {
win->event.type = RGFW_DNDInit;

Expand Down Expand Up @@ -8286,7 +8260,8 @@ RGFW_window* RGFW_createWindowPtr(const char* name, RGFW_rect rect, RGFW_windowF
win->event.droppedFilesCount = 0;
win->event.type = 0;

switch (objc_msgSend_uint(e, sel_registerName("type"))) {
u32 type = objc_msgSend_uint(e, sel_registerName("type"));
switch (type) {
case NSEventTypeMouseEntered: {
win->event.type = RGFW_mouseEnter;
NSPoint p = ((NSPoint(*)(id, SEL)) objc_msgSend)(e, sel_registerName("locationInWindow"));
Expand Down Expand Up @@ -8399,54 +8374,35 @@ RGFW_window* RGFW_createWindowPtr(const char* name, RGFW_rect rect, RGFW_windowF
RGFW_mousePosCallback(win, win->event.point);
break;
}
case NSEventTypeLeftMouseDown:
win->event.button = RGFW_mouseLeft;
win->event.type = RGFW_mouseButtonPressed;
RGFW_mouseButtons[win->event.button].prev = RGFW_mouseButtons[win->event.button].current;
RGFW_mouseButtons[win->event.button].current = 1;
RGFW_mouseButtonCallback(win, win->event.button, win->event.scroll, 1);
break;

case NSEventTypeOtherMouseDown:
win->event.button = RGFW_mouseMiddle;
win->event.type = RGFW_mouseButtonPressed;
RGFW_mouseButtons[win->event.button].prev = RGFW_mouseButtons[win->event.button].current;
RGFW_mouseButtons[win->event.button].current = 1;
RGFW_mouseButtonCallback(win, win->event.button, win->event.scroll, 1);
break;
case NSEventTypeLeftMouseDown: case NSEventTypeRightMouseDown: case NSEventTypeOtherMouseDown: {
u32 buttonNumber = objc_msgSend_uint(e, sel_registerName("buttonNumber"));
switch (buttonNumber) {
case 0: win->event.button = RGFW_mouseLeft; break;
case 1: win->event.button = RGFW_mouseRight; break;
case 2: win->event.button = RGFW_mouseMiddle; break;
default: win->event.button = buttonNumber;
}

case NSEventTypeRightMouseDown:
win->event.button = RGFW_mouseRight;
win->event.type = RGFW_mouseButtonPressed;
RGFW_mouseButtons[win->event.button].prev = RGFW_mouseButtons[win->event.button].current;
RGFW_mouseButtons[win->event.button].current = 1;
RGFW_mouseButtonCallback(win, win->event.button, win->event.scroll, 1);
break;

case NSEventTypeLeftMouseUp:
win->event.button = RGFW_mouseLeft;
win->event.type = RGFW_mouseButtonReleased;
RGFW_mouseButtons[win->event.button].prev = RGFW_mouseButtons[win->event.button].current;
RGFW_mouseButtons[win->event.button].current = 0;
RGFW_mouseButtonCallback(win, win->event.button, win->event.scroll, 0);
break;

case NSEventTypeOtherMouseUp:
win->event.button = RGFW_mouseMiddle;
RGFW_mouseButtons[win->event.button].prev = RGFW_mouseButtons[win->event.button].current;
RGFW_mouseButtons[win->event.button].current = 0;
win->event.type = RGFW_mouseButtonReleased;
RGFW_mouseButtonCallback(win, win->event.button, win->event.scroll, 0);
break;

case NSEventTypeRightMouseUp:
win->event.button = RGFW_mouseRight;
}
case NSEventTypeLeftMouseUp: case NSEventTypeRightMouseUp: case NSEventTypeOtherMouseUp: {
u32 buttonNumber = objc_msgSend_uint(e, sel_registerName("buttonNumber"));
switch (buttonNumber) {
case 0: win->event.button = RGFW_mouseLeft; break;
case 1: win->event.button = RGFW_mouseRight; break;
case 2: win->event.button = RGFW_mouseMiddle; break;
default: win->event.button = buttonNumber;
}
RGFW_mouseButtons[win->event.button].prev = RGFW_mouseButtons[win->event.button].current;
RGFW_mouseButtons[win->event.button].current = 0;
win->event.type = RGFW_mouseButtonReleased;
RGFW_mouseButtonCallback(win, win->event.button, win->event.scroll, 0);
break;

}
case NSEventTypeScrollWheel: {
double deltaY = ((CGFloat(*)(id, SEL))abi_objc_msgSend_fpret)(e, sel_registerName("deltaY"));

Expand Down Expand Up @@ -9029,8 +8985,10 @@ EM_BOOL Emscripten_on_mousedown(int eventType, const EmscriptenMouseEvent* e, vo

RGFW_events[RGFW_eventLen].type = RGFW_mouseButtonPressed;
RGFW_events[RGFW_eventLen].point = RGFW_POINT(e->targetX, e->targetY);
RGFW_events[RGFW_eventLen].button = e->button % 2;
RGFW_events[RGFW_eventLen].button = e->button;
RGFW_events[RGFW_eventLen].scroll = 0;
if (RGFW_events[RGFW_eventLen].button > 2)
RGFW_events[RGFW_eventLen].button += 2;

RGFW_mouseButtons[RGFW_events[RGFW_eventLen].button].prev = RGFW_mouseButtons[RGFW_events[RGFW_eventLen].button].current;
RGFW_mouseButtons[RGFW_events[RGFW_eventLen].button].current = 1;
Expand All @@ -9043,11 +9001,13 @@ EM_BOOL Emscripten_on_mousedown(int eventType, const EmscriptenMouseEvent* e, vo

EM_BOOL Emscripten_on_mouseup(int eventType, const EmscriptenMouseEvent* e, void* userData) {
RGFW_UNUSED(eventType); RGFW_UNUSED(userData);

RGFW_events[RGFW_eventLen].type = RGFW_mouseButtonReleased;
RGFW_events[RGFW_eventLen].point = RGFW_POINT(e->targetX, e->targetY);
RGFW_events[RGFW_eventLen].point = RGFW_POINT(e->targetX, e->targetY);
RGFW_events[RGFW_eventLen].button = e->button;
RGFW_events[RGFW_eventLen].scroll = 0;
if (RGFW_events[RGFW_eventLen].button > 2)
RGFW_events[RGFW_eventLen].button += 2;

RGFW_mouseButtons[RGFW_events[RGFW_eventLen].button].prev = RGFW_mouseButtons[RGFW_events[RGFW_eventLen].button].current;
RGFW_mouseButtons[RGFW_events[RGFW_eventLen].button].current = 0;
Expand Down

0 comments on commit 52de7ba

Please sign in to comment.