m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rewrite Move_cursor_with_constraints() to clip negative coordinates

Browse Source 
also introduce Handle_mouse_btn_change() so we don't bother to
check everything when only the mouse button state changed
This commit is contained in:
Thomas Bernard
2019-02-08 10:32:48 +01:00
parent 546a6fecd2
commit a633bd88dd
3 changed files with 174 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/win32screen.c
View File

@@ -187,50 +187,35 @@ static LRESULT CALLBACK Win32_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
break;
case WM_MOUSEMOVE:
{
int mouse_clip = 0;
int x, y;
x = GET_X_LPARAM(lParam);
y = GET_Y_LPARAM(lParam);
if (x < 0)
{
mouse_clip = 1;
Input_new_mouse_X = 0;
}
else
Input_new_mouse_X = x / Pixel_width;
if (y < 0)
{
mouse_clip = 1;
Input_new_mouse_Y = 0;
}
else
Input_new_mouse_Y = y / Pixel_height;
user_feedback_required = Move_cursor_with_constraints(mouse_clip);
x = GET_X_LPARAM(lParam) / Pixel_width;
y = GET_Y_LPARAM(lParam) / Pixel_height;
user_feedback_required = Move_cursor_with_constraints(x, y);
}
return 0;
case WM_LBUTTONDOWN:
SetCapture(hwnd); // capture mouse when the button is pressed
Input_new_mouse_K |= 1;
Move_cursor_with_constraints(0);
Handle_mouse_btn_change();
user_feedback_required = 1;
return 0;
case WM_LBUTTONUP:
ReleaseCapture(); // Release mouse when the button is released
Input_new_mouse_K &= ~1;
Move_cursor_with_constraints(0);
Handle_mouse_btn_change();
user_feedback_required = 1;
return 0;
// WM_LBUTTONDBLCLK
case WM_RBUTTONDOWN:
SetCapture(hwnd); // capture mouse when the button is pressed
Input_new_mouse_K |= 2;
Move_cursor_with_constraints(0);
Handle_mouse_btn_change();
user_feedback_required = 1;
return 0;
case WM_RBUTTONUP:
ReleaseCapture(); // Release mouse when the button is released
Input_new_mouse_K &= ~2;
Move_cursor_with_constraints(0);
Handle_mouse_btn_change();
user_feedback_required = 1;
return 0;
// WM_RBUTTONDBLCLK
@@ -655,4 +640,4 @@ void Set_mouse_position(void)
if (!SetCursorPos(pt.x, pt.y))
GFX2_Log(GFX2_WARNING, "SetCursorPos(%ld, %ld) failed\n", pt.x, pt.y);
}
}
}