#include "chimara-glk-private.h"
#include "window.h"
-extern GPrivate *glk_data_key;
+extern GPrivate glk_data_key;
/**
* glk_set_interrupt_handler:
void
glk_set_interrupt_handler(void (*func)(void))
{
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
glk_data->interrupt_handler = func;
}
static void
abort_glk(void)
{
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
if(glk_data->interrupt_handler)
(*(glk_data->interrupt_handler))();
shutdown_glk_pre();
void
check_for_abort(void)
{
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
g_mutex_lock(&glk_data->abort_lock);
if(glk_data->abort_signalled)
{
void
shutdown_glk_pre(void)
{
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-
+ ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
/* Stop any timers */
glk_request_timer_events(0);
void
shutdown_glk_post(void)
{
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-
+ ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
/* Free all opaque objects; can't iterate normally, because the objects are
being removed from the global iteration lists */
if(glk_data->root_window)
/* Empty the event queue */
g_mutex_lock(&glk_data->event_lock);
g_queue_foreach(glk_data->event_queue, (GFunc)g_free, NULL);
-
- /* COMPAT: g_queue_clear could be used here, but only appeared in 2.14 */
- // g_queue_clear(glk_data->event_queue);
- g_list_free(glk_data->event_queue->head);
- glk_data->event_queue->head = glk_data->event_queue->tail = NULL;
- glk_data->event_queue->length = 0;
-
+ g_queue_clear(glk_data->event_queue);
g_mutex_unlock(&glk_data->event_lock);
/* Reset the abort signaling mechanism */