interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uiTimer() Refactor TimerHandler for Windows timer IDs

This commit is contained in:
cody271 2017-08-22 21:52:02 -07:00
parent 4e6adca08c
commit c9d11a85cc
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
windows/uipriv_windows.hpp
View File

@ -77,17 +77,6 @@ extern void setWindowInsertAfter(HWND hwnd, HWND insertAfter);
extern HWND getDlgItem(HWND hwnd, int id); extern HWND getDlgItem(HWND hwnd, int id);
extern void invalidateRect(HWND hwnd, RECT *r, BOOL erase); extern void invalidateRect(HWND hwnd, RECT *r, BOOL erase);
struct TimerHandler {
int(*f)(void *data);
void *data;
TimerHandler() {}
TimerHandler(int(*f)(void *data), void *data) {
this->f = f;
this->data = data;
}
};
extern std::map<UINT_PTR, TimerHandler> timerHandlers;
// text.cpp // text.cpp
extern WCHAR *windowTextAndLen(HWND hwnd, LRESULT *len); extern WCHAR *windowTextAndLen(HWND hwnd, LRESULT *len);
extern WCHAR *windowText(HWND hwnd); extern WCHAR *windowText(HWND hwnd);
@ -106,8 +95,25 @@ extern const char *initUtilWindow(HICON hDefaultIcon, HCURSOR hDefaultCursor);
extern void uninitUtilWindow(void); extern void uninitUtilWindow(void);
// main.cpp // main.cpp
struct TimerHandler {
public:
TimerHandler() : TimerHandler(NULL, NULL) {}
TimerHandler(int(*f)(void *data), void *data)
{
this->f = f;
this->data = data;
}
int operator()()
{
return this->f(this->data);
}
private:
int(*f)(void *data);
void *data;
};
extern int registerMessageFilter(void); extern int registerMessageFilter(void);
extern void unregisterMessageFilter(void); extern void unregisterMessageFilter(void);
extern std::map<UINT_PTR, TimerHandler> timerHandlers;
// parent.cpp // parent.cpp
extern void paintContainerBackground(HWND hwnd, HDC dc, RECT *paintRect); extern void paintContainerBackground(HWND hwnd, HDC dc, RECT *paintRect);

3
windows/utilwin.cpp
View File

@ -39,8 +39,7 @@ static LRESULT CALLBACK utilWindowWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, L
return 0; return 0;
case WM_TIMER: case WM_TIMER:
id = (UINT_PTR)wParam; id = (UINT_PTR)wParam;
TimerHandler timer = timerHandlers[id]; if (!timerHandlers[id]()) {
if (!timer.f(timer.data)) {
if (!KillTimer(utilWindow, id)) if (!KillTimer(utilWindow, id))
logLastError(L"KillTimer()"); logLastError(L"KillTimer()");
timerHandlers.erase(id); timerHandlers.erase(id);