Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

widget: move definition into widget.h 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2009-04-17 16:15:19 +02:00
parent 486ef71a7f
commit 416f88f84f
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
structs.h
View File

@ -74,8 +74,6 @@ typedef struct client_t client_t;
typedef struct client_node client_node_t; typedef struct client_node client_node_t;
typedef struct tag tag_t; typedef struct tag tag_t;
typedef struct tag_client_node_t tag_client_node_t; typedef struct tag_client_node_t tag_client_node_t;
typedef widget_t *(widget_constructor_t)(widget_t *);
typedef void (widget_destructor_t)(widget_t *);
typedef struct awesome_t awesome_t; typedef struct awesome_t awesome_t;
ARRAY_TYPE(widget_node_t, widget_node) ARRAY_TYPE(widget_node_t, widget_node)
@ -122,37 +120,6 @@ typedef struct
} wibox_t; } wibox_t;
ARRAY_TYPE(wibox_t *, wibox) ARRAY_TYPE(wibox_t *, wibox)
/** Widget */
struct widget_t
{
/** Lua references */
luaA_ref_array_t refs;
/** Widget type is constructor */
widget_constructor_t *type;
/** Widget destructor */
widget_destructor_t *destructor;
/** Geometry function */
area_t (*geometry)(widget_t *, screen_t *, int, int);
/** Draw function */
void (*draw)(widget_t *, draw_context_t *, area_t, wibox_t *);
/** Index function */
int (*index)(lua_State *, awesome_token_t);
/** Newindex function */
int (*newindex)(lua_State *, awesome_token_t);
/** Mouse over event handler */
luaA_ref mouse_enter, mouse_leave;
/** Alignement */
alignment_t align;
/** Supported alignment */
alignment_t align_supported;
/** Misc private data */
void *data;
/** Button bindings */
button_array_t buttons;
/** True if the widget is visible */
bool isvisible;
};
/* Strut */ /* Strut */
typedef struct typedef struct
{ {

34
widget.h
View File

@ -24,6 +24,40 @@
#include "mouse.h" #include "mouse.h"
typedef widget_t *(widget_constructor_t)(widget_t *);
typedef void (widget_destructor_t)(widget_t *);
/** Widget */
struct widget_t
{
/** Lua references */
luaA_ref_array_t refs;
/** Widget type is constructor */
widget_constructor_t *type;
/** Widget destructor */
widget_destructor_t *destructor;
/** Geometry function */
area_t (*geometry)(widget_t *, screen_t *, int, int);
/** Draw function */
void (*draw)(widget_t *, draw_context_t *, area_t, wibox_t *);
/** Index function */
int (*index)(lua_State *, awesome_token_t);
/** Newindex function */
int (*newindex)(lua_State *, awesome_token_t);
/** Mouse over event handler */
luaA_ref mouse_enter, mouse_leave;
/** Alignement */
alignment_t align;
/** Supported alignment */
alignment_t align_supported;
/** Misc private data */
void *data;
/** Button bindings */
button_array_t buttons;
/** True if the widget is visible */
bool isvisible;
};
LUA_OBJECT_FUNCS(widget_t, widget, "widget"); LUA_OBJECT_FUNCS(widget_t, widget, "widget");
struct widget_node_t struct widget_node_t