luaobject: use object header and standard gc everywhere

Signed-off-by: Julien Danjou <julien@danjou.info>

button.c

@@ -40,10 +40,9 @@ static int
 luaA_button_gc(lua_State *L)
 {
     button_t *button = luaL_checkudata(L, 1, "button");
-    luaA_ref_array_wipe(&button->refs);
     luaL_unref(globalconf.L, LUA_REGISTRYINDEX, button->press);
     luaL_unref(globalconf.L, LUA_REGISTRYINDEX, button->release);
-    return 0;
+    return luaA_object_gc(L);
 }
 
 /** Create a new mouse button bindings.

button.h

@@ -27,8 +27,7 @@
 /** Mouse buttons bindings */
 struct button_t
 {
-    /** Lua references */
-    luaA_ref_array_t refs;
+    LUA_OBJECT_HEADER
     /** Key modifiers */
     uint16_t mod;
     /** Mouse button number */

client.c

@@ -51,7 +51,6 @@ static int
 luaA_client_gc(lua_State *L)
 {
     client_t *c = luaL_checkudata(L, 1, "client");
-    luaA_ref_array_wipe(&c->refs);
     button_array_wipe(&c->buttons);
     image_unref(L, c->icon);
     p_delete(&c->class);
@@ -59,7 +58,7 @@ luaA_client_gc(lua_State *L)
     p_delete(&c->instance);
     p_delete(&c->icon_name);
     p_delete(&c->name);
-    return 0;
+    return luaA_object_gc(L);
 }
 
 /** Change the clients urgency flag.

client.h

@@ -67,8 +67,7 @@ typedef struct
 /** client_t type */
 struct client_t
 {
-    /** Lua reference counter */
-    luaA_ref_array_t refs;
+    LUA_OBJECT_HEADER
     /** Valid, or not ? */
     bool invalid;
     /** Client name */

image.c

@@ -28,11 +28,10 @@ static int
 luaA_image_gc(lua_State *L)
 {
     image_t *p = luaL_checkudata(L, 1, "image");
-    luaA_ref_array_wipe(&p->refs);
     imlib_context_set_image(p->image);
     imlib_free_image();
     p_delete(&p->data);
-    return 0;
+    return luaA_object_gc(L);
 }
 
 static const char *

image.h

@@ -29,8 +29,7 @@
 
 typedef struct
 {
-    /** Lua references */
-    luaA_ref_array_t refs;
+    LUA_OBJECT_HEADER
     /** Imlib2 image */
     Imlib_Image image;
     /** Image data */

key.c

@@ -50,10 +50,9 @@ static int
 luaA_key_gc(lua_State *L)
 {
     keyb_t *kbp = luaL_checkudata(L, 1, "key");
-    luaA_ref_array_wipe(&kbp->refs);
     luaL_unref(globalconf.L, LUA_REGISTRYINDEX, kbp->press);
     luaL_unref(globalconf.L, LUA_REGISTRYINDEX, kbp->release);
-    return 0;
+    return luaA_object_gc(L);
 }
 
 /** Grab key on a window.

key.h

@@ -26,8 +26,7 @@
 
 typedef struct keyb_t
 {
-    /** Lua references */
-    luaA_ref_array_t refs;
+    LUA_OBJECT_HEADER
     /** Key modifier */
     uint16_t mod;
     /** Keysym */

tag.c

@@ -41,10 +41,9 @@ static int
 luaA_tag_gc(lua_State *L)
 {
     tag_t *tag = luaL_checkudata(L, 1, "tag");
-    luaA_ref_array_wipe(&tag->refs);
     client_array_wipe(&tag->clients);
     p_delete(&tag->name);
-    return 0;
+    return luaA_object_gc(L);
 }
 
 /** View or unview a tag.

tag.h

@@ -27,8 +27,7 @@
 /** Tag type */
 struct tag
 {
-    /** Lua references count */
-    luaA_ref_array_t refs;
+    LUA_OBJECT_HEADER
     /** Tag name */
     char *name;
     /** Screen */

wibox.c

@@ -38,7 +38,6 @@ static int
 luaA_wibox_gc(lua_State *L)
 {
     wibox_t *wibox = luaL_checkudata(L, 1, "wibox");
-    luaA_ref_array_wipe(&wibox->refs);
     p_delete(&wibox->cursor);
     simplewindow_wipe(&wibox->sw);
     button_array_wipe(&wibox->buttons);
@@ -47,7 +46,7 @@ luaA_wibox_gc(lua_State *L)
     luaL_unref(L, LUA_REGISTRYINDEX, wibox->mouse_enter);
     luaL_unref(L, LUA_REGISTRYINDEX, wibox->mouse_leave);
     widget_node_array_wipe(&wibox->widgets);
-    return 0;
+    return luaA_object_gc(L);
 }
 
 void

wibox.h

@@ -35,8 +35,7 @@ typedef enum
 /** Wibox type */
 struct wibox_t
 {
-    /** Lua references */
-    luaA_ref_array_t refs;
+    LUA_OBJECT_HEADER
     /** Ontop */
     bool ontop;
     /** Visible */

widget.c

@@ -44,13 +44,12 @@ static int
 luaA_widget_gc(lua_State *L)
 {
     widget_t *widget = luaL_checkudata(L, 1, "widget");
-    luaA_ref_array_wipe(&widget->refs);
     if(widget->destructor)
         widget->destructor(widget);
     button_array_wipe(&widget->buttons);
     luaL_unref(globalconf.L, LUA_REGISTRYINDEX, widget->mouse_enter);
     luaL_unref(globalconf.L, LUA_REGISTRYINDEX, widget->mouse_leave);
-    return 0;
+    return luaA_object_gc(L);
 }
 
 /** Delete a widget node structure.

widget.h

@@ -31,8 +31,7 @@ typedef void (widget_destructor_t)(widget_t *);
 /** Widget */
 struct widget_t
 {
-    /** Lua references */
-    luaA_ref_array_t refs;
+    LUA_OBJECT_HEADER
     /** Widget type is constructor */
     widget_constructor_t *type;
     /** Widget destructor */