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

[win32, wip] Remove input state from win32_app code

This commit is contained in:
martinfouilleul 2023-05-12 11:42:35 +02:00
parent 2bf6a4f007
commit 62b8b3323e
2 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/win32_app.c
View File

@ -216,7 +216,6 @@ static void process_mouse_event(mp_window_data* window, mp_key_action action, mp
} }
} }
mp_update_key_state(&__mpApp.inputState.mouse.buttons[button], action);
//TODO click/double click //TODO click/double click
mp_event event = {0}; mp_event event = {0};
@ -385,15 +384,12 @@ LRESULT WinProc(HWND windowHandle, UINT message, WPARAM wParam, LPARAM lParam)
event.move.x = LOWORD(lParam) / scaling; event.move.x = LOWORD(lParam) / scaling;
event.move.y = HIWORD(lParam) / scaling; event.move.y = HIWORD(lParam) / scaling;
if(__mpApp.inputState.mouse.posValid) if(__mpApp.win32.mouseTracked || __mpApp.win32.mouseCaptureMask)
{ {
event.move.deltaX = event.move.x - __mpApp.inputState.mouse.pos.x; event.move.deltaX = event.move.x - __mpApp.win32.lastMousePos.x;
event.move.deltaY = event.move.y - __mpApp.inputState.mouse.pos.y; event.move.deltaY = event.move.y - __mpApp.win32.lastMousePos.y;
}
else
{
__mpApp.inputState.mouse.posValid = true;
} }
__mpApp.win32.lastMousePos = (vec2){event.move.x, event.move.y};
if(!__mpApp.win32.mouseTracked) if(!__mpApp.win32.mouseTracked)
{ {
@ -413,8 +409,6 @@ LRESULT WinProc(HWND windowHandle, UINT message, WPARAM wParam, LPARAM lParam)
mp_queue_event(&enter); mp_queue_event(&enter);
} }
mp_update_mouse_move(event.move.x, event.move.y, event.move.deltaX, event.move.deltaY);
mp_queue_event(&event); mp_queue_event(&event);
} break; } break;
@ -422,11 +416,6 @@ LRESULT WinProc(HWND windowHandle, UINT message, WPARAM wParam, LPARAM lParam)
{ {
__mpApp.win32.mouseTracked = false; __mpApp.win32.mouseTracked = false;
if(!__mpApp.win32.mouseCaptureMask)
{
__mpApp.inputState.mouse.posValid = false;
}
mp_event event = {0}; mp_event event = {0};
event.window = mp_window_handle_from_ptr(mpWindow); event.window = mp_window_handle_from_ptr(mpWindow);
event.type = MP_EVENT_MOUSE_LEAVE; event.type = MP_EVENT_MOUSE_LEAVE;
@ -453,9 +442,6 @@ LRESULT WinProc(HWND windowHandle, UINT message, WPARAM wParam, LPARAM lParam)
event.key.code = mp_convert_win32_key(HIWORD(lParam) & 0x1ff); event.key.code = mp_convert_win32_key(HIWORD(lParam) & 0x1ff);
event.key.mods = mp_get_mod_keys(); event.key.mods = mp_get_mod_keys();
mp_queue_event(&event); mp_queue_event(&event);
mp_update_key_mods(event.key.mods);
mp_update_key_state(&__mpApp.inputState.keyboard.keys[event.key.code], event.key.action);
} break; } break;
case WM_KEYUP: case WM_KEYUP:
@ -468,10 +454,6 @@ LRESULT WinProc(HWND windowHandle, UINT message, WPARAM wParam, LPARAM lParam)
event.key.code = mp_convert_win32_key(HIWORD(lParam) & 0x1ff); event.key.code = mp_convert_win32_key(HIWORD(lParam) & 0x1ff);
event.key.mods = mp_get_mod_keys(); event.key.mods = mp_get_mod_keys();
mp_queue_event(&event); mp_queue_event(&event);
mp_update_key_mods(event.key.mods);
mp_update_key_state(&__mpApp.inputState.keyboard.keys[event.key.code], event.key.action);
} break; } break;
case WM_CHAR: case WM_CHAR:
@ -485,8 +467,6 @@ LRESULT WinProc(HWND windowHandle, UINT message, WPARAM wParam, LPARAM lParam)
str8 seq = utf8_encode(event.character.sequence, event.character.codepoint); str8 seq = utf8_encode(event.character.sequence, event.character.codepoint);
event.character.seqLen = seq.len; event.character.seqLen = seq.len;
mp_queue_event(&event); mp_queue_event(&event);
mp_update_text(event.character.codepoint);
} }
} break; } break;
@ -525,8 +505,6 @@ void mp_request_quit()
void mp_pump_events(f64 timeout) void mp_pump_events(f64 timeout)
{ {
__mpApp.inputState.frameCounter++;
MSG message; MSG message;
while(PeekMessage(&message, 0, 0, 0, PM_REMOVE)) while(PeekMessage(&message, 0, 0, 0, PM_REMOVE))
{ {

1
src/win32_app.h
View File

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