X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obt%2Fxevent.c;h=21beb9301b40218a810998ce8653c4713b561b90;hb=890e13b919892887b773462bb866e849e0cb4d91;hp=9732c8f9a27d24046b4c3f4db8e4842444546512;hpb=20b8fcfa33feeade5946bc7f3046705da5d164fe;p=chaz%2Fopenbox diff --git a/obt/xevent.c b/obt/xevent.c index 9732c8f9..21beb930 100644 --- a/obt/xevent.c +++ b/obt/xevent.c @@ -43,8 +43,9 @@ struct _ObtXEventBinding static void xevent_handler(const XEvent *e, gpointer data); static guint window_hash(Window *w) { return *w; } static gboolean window_comp(Window *w1, Window *w2) { return *w1 == *w2; } +static void binding_free(gpointer b); -ObtXEventHandler* xevent_new() +ObtXEventHandler* xevent_new(void) { ObtXEventHandler *h; @@ -94,17 +95,22 @@ void xevent_set_handler(ObtXEventHandler *h, gint type, Window win, for (i = h->num_event_types; i < type + 1; ++i) h->bindings[i] = g_hash_table_new_full((GHashFunc)window_hash, (GEqualFunc)window_comp, - NULL, g_free); + NULL, binding_free); h->num_event_types = type + 1; } - b = g_new(ObtXEventBinding, 1); + b = g_slice_new(ObtXEventBinding); b->win = win; b->func = func; b->data = data; g_hash_table_replace(h->bindings[type], &b->win, b); } +static void binding_free(gpointer b) +{ + g_slice_free(ObtXEventBinding, b); +} + void xevent_remove_handler(ObtXEventHandler *h, gint type, Window win) { g_assert(type < h->num_event_types);