Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-26 20:45:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

two version of ExitGUISafely for different runmods

Browse Source
This commit is contained in:
Vincent Wei
2020-02-25 08:22:12 +08:00
parent 76cd3d6f27
commit 0777c34039
2 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/init-lite.c
+22
View File
@@ -269,9 +269,11 @@ static void sig_handler (int v)
else if (v == SIGINT) {
_exit(1); /* force to quit */
}
#if 0 /* since 5.0.0, deprecated code */
else if (v == SIGTERM) {
ExitGUISafely (-1);
}
#endif /* since 5.0.0, deprecated code */
else {
exit(1); /* force to quit */
}
@@ -625,4 +627,24 @@ void TerminateGUI (int rcByGUI)
}
#endif /* ifndef _MG_MINIMALGDI */
/* XXX: We need a better policy to exit MiniGUI safely by giving a chance
for all windows to save data. */
void GUIAPI ExitGUISafely (int exitcode)
{
#ifdef _MGRM_PROCESSES
if (mgIsServer)
#endif
{
/* see src/kernel/desktop-*.c */
# define IDM_CLOSEALLWIN (MINID_RESERVED + 1)
SendNotifyMessage (HWND_DESKTOP, MSG_COMMAND, IDM_CLOSEALLWIN, 0);
#ifdef _MGHAVE_VIRTUAL_WINDOW
__mg_join_all_message_threads ();
SendMessage (HWND_DESKTOP, MSG_ENDSESSION, 0, 0);
pthread_join (__mg_dsk_msg_queue->th, NULL);
#endif /* defined _MGHAVE_VIRTUAL_WINDOW */
}
}
#endif /* !_MGRM_THREADS */
src/kernel/init.c
+15 -21
View File
@@ -362,9 +362,11 @@ static void sig_handler (int v)
else if (v == SIGINT) {
_exit(1); /* force to quit */
}
#if 0 /* since 5.0.0, deprecated code */
else if (v == SIGTERM) {
ExitGUISafely(-1);
}
#endif /* since 5.0.0, deprecated code */
else {
exit(1); /* force to quit */
}
@@ -670,31 +672,23 @@ void GUIAPI TerminateGUI (int not_used)
#endif
}
#endif /* _MGRM_THREADS */
/* XXX: We need a better policy to exit MiniGUI safely by giving a chance
for all windows to save data. */
/* see src/kernel/desktop-*.c */
#define IDM_CLOSEALLWIN (MINID_RESERVED + 1)
void GUIAPI ExitGUISafely (int exitcode)
{
#ifdef _MGRM_PROCESSES
if (mgIsServer)
#endif
{
/* see src/kernel/desktop-*.c */
# define IDM_CLOSEALLWIN (MINID_RESERVED + 1)
SendNotifyMessage (HWND_DESKTOP, MSG_COMMAND, IDM_CLOSEALLWIN, 0);
__mg_join_all_message_threads ();
SendMessage (HWND_DESKTOP, MSG_ENDSESSION, 0, 0);
pthread_join (__mg_dsk_msg_queue->th, NULL);
SendNotifyMessage (HWND_DESKTOP, MSG_COMMAND, IDM_CLOSEALLWIN, 0);
#ifdef _MGHAVE_VIRTUAL_WINDOW
__mg_join_all_message_threads ();
SendMessage (HWND_DESKTOP, MSG_ENDSESSION, 0, 0);
pthread_join (__mg_dsk_msg_queue->th, NULL);
# ifdef _MGRM_THREADS
/* Tell event parsor quit */
_is_minigui_running = 0;
pthread_join (_th_parsor, NULL);
# endif /* defined _MGRM_THREADS */
#endif /* defined _MGHAVE_VIRTUAL_WINDOW */
}
/* Tell event parsor quit */
_is_minigui_running = 0;
pthread_join (_th_parsor, NULL);
}
#endif /* _MGRM_THREADS */