#include "obt/display.h"
#include "obt/util.h"
+#ifdef HAVE_STDIO_H
#include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
#include <stdlib.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SIGNAL_H
#include <signal.h>
+#endif
typedef struct _ObtMainLoopTimer ObtMainLoopTimer;
typedef struct _ObtMainLoopSignal ObtMainLoopSignal;
GDestroyNotify destroy;
};
-ObtMainLoop *obt_main_loop_new()
+ObtMainLoop *obt_main_loop_new(void)
{
ObtMainLoop *loop;
- loop = g_new0(ObtMainLoop, 1);
+ loop = g_slice_new0(ObtMainLoop);
loop->ref = 1;
FD_ZERO(&loop->fd_set);
loop->fd_x = -1;
for (it = loop->timers; it; it = g_slist_next(it)) {
ObtMainLoopTimer *t = it->data;
if (t->destroy) t->destroy(t->data);
- g_free(t);
+ g_slice_free(ObtMainLoopTimer, t);
}
g_slist_free(loop->timers);
loop->timers = NULL;
}
}
- obt_free0(loop, ObtMainLoop, 1);
+ g_slice_free(ObtMainLoop, loop);
}
}
do {
XNextEvent(loop->display, &e);
+ if (e.type == MappingNotify)
+ XRefreshKeyboardMapping(&e.xmapping);
+
for (it = loop->x_handlers; it; it = g_slist_next(it)) {
ObtMainLoopXHandlerType *h = it->data;
h->func(&e, h->data);
{
ObtMainLoopXHandlerType *h;
- h = g_new(ObtMainLoopXHandlerType, 1);
+ h = g_slice_new(ObtMainLoopXHandlerType);
h->loop = loop;
h->func = handler;
h->data = data;
if (h->func == handler) {
loop->x_handlers = g_slist_delete_link(loop->x_handlers, it);
if (h->destroy) h->destroy(h->data);
- g_free(h);
+ g_slice_free(ObtMainLoopXHandlerType, h);
}
}
g_return_if_fail(signal < NUM_SIGNALS);
- h = g_new(ObtMainLoopSignalHandlerType, 1);
+ h = g_slice_new(ObtMainLoopSignalHandlerType);
h->loop = loop;
h->signal = signal;
h->func = handler;
g_slist_delete_link(loop->signal_handlers[i], it);
if (h->destroy) h->destroy(h->data);
- g_free(h);
+ g_slice_free(ObtMainLoopSignalHandlerType, h);
}
}
}
{
ObtMainLoopFdHandlerType *h;
- h = g_new(ObtMainLoopFdHandlerType, 1);
+ h = g_slice_new(ObtMainLoopFdHandlerType);
h->loop = loop;
h->fd = fd;
h->func = handler;
if (h->destroy)
h->destroy(h->data);
+ g_slice_free(ObtMainLoopFdHandlerType, h);
}
void obt_main_loop_fd_remove(ObtMainLoop *loop,
GEqualFunc cmp,
GDestroyNotify notify)
{
- ObtMainLoopTimer *t = g_new(ObtMainLoopTimer, 1);
+ ObtMainLoopTimer *t = g_slice_new(ObtMainLoopTimer);
g_assert(microseconds > 0); /* if it's 0 it'll cause an infinite loop */
loop->timers = g_slist_delete_link(loop->timers, it);
if (curr->destroy)
curr->destroy(curr->data);
- g_free(curr);
+ g_slice_free(ObtMainLoopTimer, curr);
continue;
}
} else {
if (curr->destroy)
curr->destroy(curr->data);
- g_free(curr);
+ g_slice_free(ObtMainLoopTimer, curr);
}
/* the timer queue has been shuffled, start from the beginning