From 3d644e9550395a0635332ce044a4b6453cf694f8 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sun, 25 Oct 2020 21:28:21 +0800 Subject: [PATCH 1/2] set WaitMessage when windows is min --- src/Window.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Window.cpp b/src/Window.cpp index b0370ea..f8f3d20 100644 --- a/src/Window.cpp +++ b/src/Window.cpp @@ -58,7 +58,8 @@ namespace hgl if(is_close) return(false); - if(!active||is_min) +// if(!active||is_min) + if(is_min) this->WaitMessage(); return(true); From 72b54414ac9148fc0adb7606f15932f388901dc9 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 27 Oct 2020 14:28:16 +0800 Subject: [PATCH 2/2] use new Mouse/KeyboardButton event names. --- inc/hgl/platform/Window.h | 34 ++++++++++++++++----------------- src/Win/WinMessage.cpp | 40 +++++++++++++++++++-------------------- src/Window.cpp | 10 +++++----- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/inc/hgl/platform/Window.h b/inc/hgl/platform/Window.h index 5270d14..4e9a8ed 100644 --- a/inc/hgl/platform/Window.h +++ b/inc/hgl/platform/Window.h @@ -30,17 +30,17 @@ namespace hgl virtual void ProcMouseMove (int x,int y) {SafeCallEvent(OnMouseMove, (x,y));} virtual void ProcMouseWheel (int v,int h,uint mb) {SafeCallEvent(OnMouseWheel, (v,h,mb));} - virtual void ProcMouseDown (int x,int y,uint mb) {SafeCallEvent(OnMouseDown, (x,y,mb));} - virtual void ProcMouseUp (int x,int y,uint mb) {SafeCallEvent(OnMouseUp, (x,y,mb));} - virtual void ProcMouseDblClick (int x,int y,uint mb) {SafeCallEvent(OnMouseDblClick, (x,y,mb));} + virtual void ProcMousePressed (int x,int y,uint mb) {SafeCallEvent(OnMousePressed, (x,y,mb));} + virtual void ProcMouseReleased (int x,int y,uint mb) {SafeCallEvent(OnMouseReleased, (x,y,mb));} + virtual void ProcMouseDblClicked(int x,int y,uint mb) {SafeCallEvent(OnMouseDblClicked, (x,y,mb));} - //virtual void ProcJoystickDown (uint); - //virtual void ProcJoystickPress (uint); - //virtual void ProcJoystickUp (uint); + //virtual void ProcJoystickPressed (uint); + //virtual void ProcJoystickRepeat (uint); + //virtual void ProcJoystickReleased(uint); - virtual void ProcKeyDown (KeyboardButton); - virtual void ProcKeyPress (KeyboardButton kb){SafeCallEvent(OnKeyPress,(kb));} - virtual void ProcKeyUp (KeyboardButton); + virtual void ProcKeyPressed (KeyboardButton); + virtual void ProcKeyRepeat (KeyboardButton kb){SafeCallEvent(OnKeyRepeat,(kb));} + virtual void ProcKeyReleased(KeyboardButton); virtual void ProcChar (os_char ch){SafeCallEvent(OnChar,(ch));} @@ -56,19 +56,19 @@ namespace hgl public: - DefEvent(void,OnMouseMove ,(int,int)); - DefEvent(void,OnMouseWheel ,(int,int,uint)); - DefEvent(void,OnMouseDown ,(int,int,uint)); - DefEvent(void,OnMouseUp ,(int,int,uint)); - DefEvent(void,OnMouseDblClick ,(int,int,uint)); + DefEvent(void,OnMouseMove, (int,int)); + DefEvent(void,OnMouseWheel, (int,int,uint)); + DefEvent(void,OnMousePressed, (int,int,uint)); + DefEvent(void,OnMouseReleased, (int,int,uint)); + DefEvent(void,OnMouseDblClicked,(int,int,uint)); //DefEvent(void,OnJoystickDown ,(uint)); //DefEvent(void,OnJoystickPress ,(uint)); //DefEvent(void,OnJoystickUp ,(uint)); - DefEvent(void,OnKeyDown ,(KeyboardButton)); - DefEvent(void,OnKeyPress,(KeyboardButton)); - DefEvent(void,OnKeyUp ,(KeyboardButton)); + DefEvent(void,OnKeyPressed, (KeyboardButton)); + DefEvent(void,OnKeyRepeat, (KeyboardButton)); + DefEvent(void,OnKeyReleased,(KeyboardButton)); DefEvent(void,OnChar ,(os_char)); diff --git a/src/Win/WinMessage.cpp b/src/Win/WinMessage.cpp index 4388d24..a9e4c25 100644 --- a/src/Win/WinMessage.cpp +++ b/src/Win/WinMessage.cpp @@ -205,17 +205,17 @@ namespace hgl win->ProcMouse##action(x,y,mb##button|GetMouseKeyFlags(wParam)); \ } - WMEF_MOUSE(Left,Down); - WMEF_MOUSE(Left,Up); - WMEF_MOUSE(Left,DblClick); + WMEF_MOUSE(Left,Pressed); + WMEF_MOUSE(Left,Released); + WMEF_MOUSE(Left,DblClicked); - WMEF_MOUSE(Mid,Down); - WMEF_MOUSE(Mid,Up); - WMEF_MOUSE(Mid,DblClick); + WMEF_MOUSE(Mid,Pressed); + WMEF_MOUSE(Mid,Released); + WMEF_MOUSE(Mid,DblClicked); - WMEF_MOUSE(Right,Down); - WMEF_MOUSE(Right,Up); - WMEF_MOUSE(Right,DblClick); + WMEF_MOUSE(Right,Pressed); + WMEF_MOUSE(Right,Released); + WMEF_MOUSE(Right,DblClicked); void WMProcMouseMove(WinWindow *win,uint32 wParam,uint32 lParam) { @@ -249,12 +249,12 @@ namespace hgl #define WMEF1(name) void name(WinWindow *win,uint32 wParam,uint32) WMEF1(WMProcKeyDown) { - win->ProcKeyDown(ConvertOSKey(wParam)); + win->ProcKeyPressed(ConvertOSKey(wParam)); } WMEF1(WMProcKeyUp) { - win->ProcKeyUp(ConvertOSKey(wParam)); + win->ProcKeyReleased(ConvertOSKey(wParam)); } WMEF1(WMProcChar) @@ -283,15 +283,15 @@ namespace hgl #define WM_MAP(wm,func) WMProc[wm]=func; WM_MAP(WM_CLOSE ,WMProcDestroy); - WM_MAP(WM_LBUTTONDOWN ,WMProcMouseLeftDown); - WM_MAP(WM_LBUTTONUP ,WMProcMouseLeftUp); - WM_MAP(WM_LBUTTONDBLCLK ,WMProcMouseLeftDblClick); - WM_MAP(WM_MBUTTONDOWN ,WMProcMouseMidDown); - WM_MAP(WM_MBUTTONUP ,WMProcMouseMidUp); - WM_MAP(WM_MBUTTONDBLCLK ,WMProcMouseMidDblClick); - WM_MAP(WM_RBUTTONDOWN ,WMProcMouseRightDown); - WM_MAP(WM_RBUTTONUP ,WMProcMouseRightUp); - WM_MAP(WM_RBUTTONDBLCLK ,WMProcMouseRightDblClick); + WM_MAP(WM_LBUTTONDOWN ,WMProcMouseLeftPressed); + WM_MAP(WM_LBUTTONUP ,WMProcMouseLeftReleased); + WM_MAP(WM_LBUTTONDBLCLK ,WMProcMouseLeftDblClicked); + WM_MAP(WM_MBUTTONDOWN ,WMProcMouseMidPressed); + WM_MAP(WM_MBUTTONUP ,WMProcMouseMidReleased); + WM_MAP(WM_MBUTTONDBLCLK ,WMProcMouseMidDblClicked); + WM_MAP(WM_RBUTTONDOWN ,WMProcMouseRightPressed); + WM_MAP(WM_RBUTTONUP ,WMProcMouseRightReleased); + WM_MAP(WM_RBUTTONDBLCLK ,WMProcMouseRightDblClicked); WM_MAP(WM_MOUSEWHEEL ,WMProcMouseWheel); WM_MAP(WM_MOUSEHWHEEL ,WMProcMouseHWheel); WM_MAP(WM_MOUSEMOVE ,WMProcMouseMove); diff --git a/src/Window.cpp b/src/Window.cpp index f8f3d20..fe17ff6 100644 --- a/src/Window.cpp +++ b/src/Window.cpp @@ -2,21 +2,21 @@ namespace hgl { - void Window::ProcKeyDown(KeyboardButton kb) + void Window::ProcKeyPressed(KeyboardButton kb) { if(key_push[kb]) - ProcKeyPress(kb); + ProcKeyRepeat(kb); else key_push[kb]=true; - SafeCallEvent(OnKeyDown,(kb)); + SafeCallEvent(OnKeyPressed,(kb)); } - void Window::ProcKeyUp(KeyboardButton kb) + void Window::ProcKeyReleased(KeyboardButton kb) { key_push[kb]=false; - SafeCallEvent(OnKeyUp,(kb)); + SafeCallEvent(OnKeyReleased,(kb)); } void Window::ProcResize(uint w,uint h)