DeforaOS/GToolkit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename gtoolkit_quit() to gtoolkit_main_quit()

Browse Source
This commit is contained in:
Pierre Pronchery 2020-04-12 03:03:32 +02:00
parent 5718a750e3
commit 837dce5d2a
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/GToolkit.h
View File

@ -12,7 +12,7 @@
/* functions */
/* useful */
int gtoolkit_init(void);
int gtoolkit_main(void);
int gtoolkit_quit(void);
void gtoolkit_main(void);
void gtoolkit_main_quit(void);
#endif /* !GTOOLKIT_GTOOLKIT_H */

29
src/gtoolkit.c
View File

@ -17,7 +17,7 @@ typedef struct _GToolkit
int init;
/* main loop */
int loop;
unsigned int loop;
GWindow ** windows;
size_t windows_cnt;
@ -127,12 +127,13 @@ static void _main_event(void);
static void _main_event_configure(XConfigureEvent * event);
static void _main_event_expose(XExposeEvent * event);
int gtoolkit_main(void)
void gtoolkit_main(void)
{
for(_gt.loop++; _gt.loop >= 1;)
while(XPending(_gt.display) > 0)
_main_event();
return 0;
XCloseDisplay(_gt.display);
memset(&_gt, 0, sizeof(_gt));
}
static void _main_event(void)
@ -179,6 +180,16 @@ static void _main_event_expose(XExposeEvent * event)
}
/* gtoolkit_main_quit */
void gtoolkit_main_quit(void)
{
if(_gt.init == 0)
return;
if(_gt.loop > 0)
_gt.loop--;
}
/* gtoolkit_register_window */
void gtoolkit_register_window(GWindow * gwindow)
{
@ -193,18 +204,6 @@ void gtoolkit_register_window(GWindow * gwindow)
}
/* gtoolkit_quit */
int gtoolkit_quit(void)
{
if(_gt.init == 0)
return 0;
XCloseDisplay(_gt.display);
memset(&_gt, 0, sizeof(_gt));
_gt.init = 0;
return 0;
}
/* private */
/* accessors */
/* gtoolkit_get_gwindow */

1
tools/test.c
View File

@ -16,6 +16,5 @@ int main(void)
gwindow_set_title(window, "Test window");
gwindow_show(window);
gtoolkit_main();
gtoolkit_quit();
return 0;
}