hyzboy/CMPlatform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

InputEvent改名为EventDispatch

Browse Source
This commit is contained in:
hyzboy
2025-06-27 03:11:54 +08:00
parent b283cb4bef
commit fd0929d89c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inc/hgl/platform/Window.h
View File

@@ -27,7 +27,7 @@ namespace hgl
* 本事件传递器会呼叫io::WindowEvent的对象指针，在本类中指向的是自己。<br> * 本事件传递器会呼叫io::WindowEvent的对象指针，在本类中指向的是自己。<br>
* 注：仅当前类会如此设计，本身此Event是要放在外面的，不该在此级别。 * 注：仅当前类会如此设计，本身此Event是要放在外面的，不该在此级别。
*/ */
io::InputEvent input_event; io::EventDispatch input_event;
void OnResize(uint,uint) override; void OnResize(uint,uint) override;
void OnActive(bool) override; void OnActive(bool) override;

14
src/Win/WinMessage.cpp
View File

@@ -17,7 +17,7 @@ namespace hgl
#define PROP_DPIISOLATION L"PROP_ISOLATION" #define PROP_DPIISOLATION L"PROP_ISOLATION"
static KeyboardButton KeyConvert[256]; static KeyboardButton KeyConvert[256];
static void (*WMProc[2048])(InputEvent *,uint32,uint32); //消息处理队列 static void (*WMProc[2048])(EventDispatch *,uint32,uint32); //消息处理队列
void InitKeyConvert() void InitKeyConvert()
{ {
@@ -182,7 +182,7 @@ namespace hgl
static EventHeader event_header; static EventHeader event_header;
static WindowEventData window_event_data; static WindowEventData window_event_data;
void WMProcDestroy(InputEvent *ie,uint32,uint32) void WMProcDestroy(EventDispatch *ie,uint32,uint32)
{ {
event_header.type =InputEventSource::Window; event_header.type =InputEventSource::Window;
event_header.index =0; event_header.index =0;
@@ -194,7 +194,7 @@ namespace hgl
static MouseEventData mouse_event_data; static MouseEventData mouse_event_data;
#define WMEF_MOUSE(mouse_button,action) void WMProcMouse##mouse_button##action(InputEvent *ie,uint32 wParam,uint32 lParam) \ #define WMEF_MOUSE(mouse_button,action) void WMProcMouse##mouse_button##action(EventDispatch *ie,uint32 wParam,uint32 lParam) \
{ \ { \
mouse_event_data.x=LOWORD(lParam); \ mouse_event_data.x=LOWORD(lParam); \
mouse_event_data.y=HIWORD(lParam); \ mouse_event_data.y=HIWORD(lParam); \
@@ -219,7 +219,7 @@ namespace hgl
WMEF_MOUSE(Right,Released); WMEF_MOUSE(Right,Released);
WMEF_MOUSE(Right,DblClicked); WMEF_MOUSE(Right,DblClicked);
void WMProcMouseMove(InputEvent *ie,uint32 wParam,uint32 lParam) void WMProcMouseMove(EventDispatch *ie,uint32 wParam,uint32 lParam)
{ {
mouse_event_data.x=LOWORD(lParam); mouse_event_data.x=LOWORD(lParam);
mouse_event_data.y=HIWORD(lParam); mouse_event_data.y=HIWORD(lParam);
@@ -233,7 +233,7 @@ namespace hgl
} }
#undef WMEF_MOUSE #undef WMEF_MOUSE
#define WMEF2(name) void name(InputEvent *ie,uint32 wParam,uint32 lParam) #define WMEF2(name) void name(EventDispatch *ie,uint32 wParam,uint32 lParam)
WMEF2(WMProcMouseWheel) WMEF2(WMProcMouseWheel)
{ {
const int zDelta=GET_WHEEL_DELTA_WPARAM(wParam); const int zDelta=GET_WHEEL_DELTA_WPARAM(wParam);
@@ -281,7 +281,7 @@ namespace hgl
static KeyboardEventData keyboard_event_data; static KeyboardEventData keyboard_event_data;
#define WMEF1(name) void name(InputEvent *ie,uint32 wParam,uint32) #define WMEF1(name) void name(EventDispatch *ie,uint32 wParam,uint32)
WMEF1(WMProcKeyDown) WMEF1(WMProcKeyDown)
{ {
event_header.type =InputEventSource::Keyboard; event_header.type =InputEventSource::Keyboard;
@@ -371,7 +371,7 @@ namespace hgl
if(uMsg<2048) if(uMsg<2048)
if(WMProc[uMsg]) if(WMProc[uMsg])
{ {
InputEvent *ie=(InputEvent *)GetWindowLongPtrW(hWnd,GWLP_USERDATA); EventDispatch *ie=(EventDispatch *)GetWindowLongPtrW(hWnd,GWLP_USERDATA);
if(ie) if(ie)
WMProc[uMsg](ie,wParam,lParam); WMProc[uMsg](ie,wParam,lParam);