Skip to content

feat: 新增 INIT_EVENTLOOP 初始化模式，事件循环由主线程执行 #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
yixy-only wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: 新增 INIT_EVENTLOOP 初始化模式，事件循环由主线程执行 #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions demo/game_tetris.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ static int g_map_mod[] = {1, 4, 4, 4, 2, 2, 2, 1, 0};

/* 初始化全局数据及图形显示 */
void initgr() {
initgraph(g_width, g_height);
initgraph(g_width, g_height, INIT_RENDERMANUAL | INIT_EVENTLOOP);
setfont(12, 6, "宋体");
int Trs_map[8][4][4][4] =
{
Expand Down Expand Up @@ -385,7 +385,7 @@ int main() {
game.m_droptime = nfps / 2;
game.m_movxtime = 10;

setrendermode(RENDER_MANUAL);
//setrendermode(RENDER_MANUAL);
for ( ; is_run(); delay_fps(nfps)) {
game.update();
game.render();
Expand Down
2 changes: 1 addition & 1 deletion demo/test_doubleclick.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ int mouseKeyToIndex(int keyMask)
int main()
{
const int winWidth = 1200, winHeight = 300;
initgraph(winWidth, winHeight, INIT_RENDERMANUAL);
initgraph(winWidth, winHeight, INIT_RENDERMANUAL | INIT_EVENTLOOP);
ege_enable_aa(true);

setlinecolor(EGEARGB(128, 81, 128, 222));
Expand Down
2 changes: 2 additions & 0 deletions include/ege.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ enum initmode_flag
INIT_UNICODE = 0x20, ///< Unicode character messages (equivalent to setunicodecharmessage(true))
INIT_HIDE = 0x40, ///< Hidden window
INIT_WITHLOGO = 0x100, ///< Show EGE Logo animation on startup (not shown by default in Debug version)
INIT_EVENTLOOP = 0x200, ///< Event loop

INIT_ANIMATION = INIT_DEFAULT | INIT_RENDERMANUAL | INIT_NOFORCEEXIT ///< Animation mode
};

Expand Down
6 changes: 6 additions & 0 deletions src/ege_graph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,20 @@ class egeControlBase; // 前置声明

initmode_flag getinitmode();

int initWindow(_graph_setting* pg);

void logoscene();

int messageHandle();

int dealmessage(_graph_setting* pg, bool force_update);

bool needToUpdate(_graph_setting* pg);

int graphupdate(_graph_setting* pg);

int graphInitOption();

void guiupdate(_graph_setting* pg, egeControlBase* root);

int waitdealmessage(_graph_setting* pg);
Expand Down
1 change: 1 addition & 0 deletions src/ege_head.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ struct _graph_setting
std::wstring window_caption;
HICON window_hicon;
color_t window_initial_color;
int init_option;
int exit_flag;
int exit_window;
int update_mark_count; // 更新标记
Expand Down
9 changes: 7 additions & 2 deletions src/egegapi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1450,21 +1450,26 @@ void setfillstyle(int pattern, color_t color, PIMAGE pimg)

void setrendermode(rendermode_e mode)
{
struct _graph_setting* pg = &graph_setting;
/* INIT_EVENTLOOP 模式下，固定为 RENDER_MANUAL 模式*/
if (pg->init_option & INIT_EVENTLOOP) {
return;
}

if (mode == RENDER_MANUAL) {
struct _graph_setting* pg = &graph_setting;
if (pg->lock_window) {
;
} else {
KillTimer(pg->hwnd, RENDER_TIMER_ID);
pg->timer_stop_mark = true;
PostMessageW(pg->hwnd, WM_TIMER, RENDER_TIMER_ID, 0);
pg->lock_window = true;

while (pg->timer_stop_mark) {
::Sleep(1);
}
}
} else {
struct _graph_setting* pg = &graph_setting;
delay_ms(0);
SetTimer(pg->hwnd, RENDER_TIMER_ID, 50, NULL);
pg->skip_timer_mark = false;
Expand Down
83 changes: 56 additions & 27 deletions src/graphics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ unsigned long getlogodatasize();
}
#endif

DWORD WINAPI messageloopthread(LPVOID lpParameter);
DWORD WINAPI messageLoopThread(LPVOID lpParameter);

_graph_setting::_graph_setting()
{
Expand Down Expand Up @@ -285,10 +285,12 @@ void guiupdate(_graph_setting* pg, egeControlBase* root)
root->update();
}

/*private function*/
int waitdealmessage(_graph_setting* pg)
{
// MSG msg;
if (pg->init_option & INIT_EVENTLOOP) {
messageHandle();
}

if (pg->update_mark_count < UPDATE_MAX_CALL) {
egeControlBase* root = pg->egectrl_root;
root->draw(NULL);
Expand Down Expand Up @@ -857,6 +859,7 @@ void initgraph(int* gdriver, int* gmode, const char* path)
{
struct _graph_setting* pg = &graph_setting;

pg->init_option = getinitmode();
pg->exit_flag = 0;
pg->exit_window = 0;

Expand Down Expand Up @@ -886,17 +889,22 @@ void initgraph(int* gdriver, int* gmode, const char* path)
register_classW(pg, pg->instance);

// SECURITY_ATTRIBUTES sa = {0};
DWORD pid;
pg->threadui_handle = CreateThread(NULL, 0, messageloopthread, pg, CREATE_SUSPENDED, &pid);
ResumeThread(pg->threadui_handle);

while (!pg->has_init) {
::Sleep(1);
if (pg->init_option & INIT_EVENTLOOP) {
initWindow(pg);
} else {
DWORD pid;
pg->threadui_handle = CreateThread(NULL, 0, messageLoopThread, pg, CREATE_SUSPENDED, &pid);
ResumeThread(pg->threadui_handle);

while (!pg->has_init) {
::Sleep(1);
}
}

UpdateWindow(pg->hwnd);

if (!(g_initoption & INIT_HIDE)) {
if (!(pg->init_option & INIT_HIDE)) {
ShowWindow(pg->hwnd, SW_SHOWNORMAL);
BringWindowToTop(pg->hwnd);
SetForegroundWindow(pg->hwnd);
Expand All @@ -914,11 +922,11 @@ void initgraph(int* gdriver, int* gmode, const char* path)

static egeControlBase _egeControlBase;

if ((g_initoption & INIT_WITHLOGO) && !(g_initoption & INIT_HIDE)) {
if ((pg->init_option & INIT_WITHLOGO) && !(pg->init_option & INIT_HIDE)) {
logoscene();
}

if (g_initoption & INIT_RENDERMANUAL) {
if (pg->init_option & INIT_RENDERMANUAL) {
setrendermode(RENDER_MANUAL);
}

Expand All @@ -945,12 +953,8 @@ void closegraph()
ShowWindow(pg->hwnd, SW_HIDE);
}

/*private function*/
DWORD WINAPI messageloopthread(LPVOID lpParameter)
int initWindow(_graph_setting* pg)
{
_graph_setting* pg = (_graph_setting*)lpParameter;
MSG msg;

/* 执行应用程序初始化: */
if (!init_instance(pg->instance)) {
return 0xFFFFFFFF;
Expand All @@ -963,25 +967,50 @@ DWORD WINAPI messageloopthread(LPVOID lpParameter)

pg->mouse_show = 0;
pg->exit_flag = 0;
pg->use_force_exit = (g_initoption & INIT_NOFORCEEXIT ? false : true);
pg->use_force_exit = (pg->init_option & INIT_NOFORCEEXIT ? false : true);

if (g_initoption & INIT_NOFORCEEXIT) {
if (pg->init_option & INIT_NOFORCEEXIT) {
SetCloseHandler(DefCloseHandler);
}

pg->close_manually = true;
pg->skip_timer_mark = false;
SetTimer(pg->hwnd, RENDER_TIMER_ID, 50, NULL);

/* 仅在 INIT_EVENTLOOP 模式下设置定时器(INIT_EVENTLOOP 模式下事件在主线程中处理，固定为手动渲染模式，无需设置定时器。 */
if (pg->init_option & INIT_EVENTLOOP) {
pg->lock_window = true;
pg->skip_timer_mark = true;
} else {
pg->skip_timer_mark = false;
SetTimer(pg->hwnd, RENDER_TIMER_ID, 50, NULL);
}

pg->has_init = true;
}

while (!pg->exit_window) {
if (GetMessageW(&msg, NULL, 0, 0)) {
TranslateMessage(&msg);
DispatchMessageW(&msg);
} else {
Sleep(1);
int messageHandle()
{
MSG msg;
int handleCount = 0;
while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) {
if (msg.message == WM_QUIT) {
return -1;
}

TranslateMessage(&msg);
DispatchMessageW(&msg);
handleCount++;
}

return handleCount;
}

/*private function*/
DWORD WINAPI messageLoopThread(LPVOID lpParameter)
{
_graph_setting* pg = (_graph_setting*)lpParameter;
initWindow(pg);
while (messageHandle() != -1) {
Sleep(1);
}

return 0;
Expand Down Expand Up @@ -1054,7 +1083,7 @@ BOOL init_instance(HINSTANCE hInstance)
//DeleteObject(hfont);
} //*/

if (!(g_initoption & INIT_HIDE)) {
if (!(pg->init_option & INIT_HIDE)) {
SetActiveWindow(pg->hwnd);
}

Expand Down
13 changes: 13 additions & 0 deletions src/time.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ void delay_ms(long ms)

const double targetTime = get_highfeq_time_ls(pg) * 1000.0 + ms;

if (pg->init_option & INIT_EVENTLOOP) {
messageHandle();
}

/* 处理 UI 事件，更新 UI 控件数据 */
guiupdate(pg, root);

Expand Down Expand Up @@ -129,6 +133,10 @@ void delay_fps(double fps)
dw = pg->delay_fps_dwLast;
}

if (pg->init_option & INIT_EVENTLOOP) {
messageHandle();
}

root->draw(NULL);

for (; nloop >= 0; --nloop) {
Expand Down Expand Up @@ -182,6 +190,11 @@ void delay_jfps(double fps)
dw = pg->delay_fps_dwLast;
}


if (pg->init_option & INIT_EVENTLOOP) {
messageHandle();
}

root->draw(NULL);

for (; nloop >= 0; --nloop) {
Expand Down
Loading