hmn
/
orca
5
Fork 2
Code Issues 21 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request '[win32] Use wheel scroll lines system setting to determine how much to scroll' (#7) from ilidemi/milepost:win32-scroll-lines into main 

Reviewed-on: MartinFouilleul/milepost#7
This commit is contained in:
MartinFouilleul 2023-08-09 08:22:45 +00:00
parent d01dc832fb 60083c1f2e
commit b6462ca5f8
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/win32_app.c
View File

@ -155,14 +155,18 @@ void mp_init()
mp_init_keys(); mp_init_keys();
__mpApp.win32.savedConsoleCodePage = GetConsoleOutputCP(); __mpApp.win32.savedConsoleCodePage = GetConsoleOutputCP();
SetConsoleOutputCP(CP_UTF8); SetConsoleOutputCP(CP_UTF8);
DWORD mode; DWORD mode;
GetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), &mode); GetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), &mode);
mode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING; mode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
SetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), mode); SetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), mode);
SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2); SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
u32 wheelScrollLines = 3;
SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &wheelScrollLines, 0);
__mpApp.win32.wheelScrollLines = wheelScrollLines;
} }
} }
@ -241,8 +245,10 @@ static void process_wheel_event(mp_window_data* window, f32 x, f32 y)
mp_event event = {0}; mp_event event = {0};
event.window = mp_window_handle_from_ptr(window); event.window = mp_window_handle_from_ptr(window);
event.type = MP_EVENT_MOUSE_WHEEL; event.type = MP_EVENT_MOUSE_WHEEL;
event.mouse.deltaX = x/30.0f; // Borrowed from https://source.chromium.org/chromium/chromium/src/+/3e1a26c44c024d97dc9a4c09bbc6a2365398ca2c:ui/events/blink/web_input_event_builders_win.cc;l=318-330
event.mouse.deltaY = -y/30.0f; f32 scrollMultiplier = __mpApp.win32.wheelScrollLines * 100.0 / 3.0;
event.mouse.deltaX = x / WHEEL_DELTA * scrollMultiplier;
event.mouse.deltaY = -y / WHEEL_DELTA * scrollMultiplier;
event.mouse.mods = mp_get_mod_keys(); event.mouse.mods = mp_get_mod_keys();
mp_queue_event(&event); mp_queue_event(&event);
@ -500,6 +506,17 @@ LRESULT WinProc(HWND windowHandle, UINT message, WPARAM wParam, LPARAM lParam)
} }
} break; } break;
case WM_SETTINGCHANGE:
{
if((u32)wParam == SPI_SETWHEELSCROLLLINES)
{
u32 wheelScrollLines;
if(SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &wheelScrollLines, 0) != 0) {
__mpApp.win32.wheelScrollLines = wheelScrollLines;
}
}
} break;
case WM_DROPFILES: case WM_DROPFILES:
{ {
//TODO //TODO

1
src/win32_app.h
View File

@ -40,6 +40,7 @@ typedef struct win32_app_data
int mouseCaptureMask; int mouseCaptureMask;
bool mouseTracked; bool mouseTracked;
vec2 lastMousePos; vec2 lastMousePos;
u32 wheelScrollLines;
} win32_app_data; } win32_app_data;