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

window: Factor out helper functions for xproperties 

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2014-03-23 18:09:32 +01:00
parent db00145406
commit 2869cdc860
2 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
objects/window.c
View File

@ -308,36 +308,31 @@ luaA_find_xproperty(lua_State *L, int idx)
return NULL; return NULL;
} }
/** Set an xproperty. int
* \param L The Lua VM state. window_set_xproperty(lua_State *L, xcb_window_t window, int prop_idx, int value_idx)
* \return The number of elements pushed on stack.
*/
static int
luaA_window_set_xproperty(lua_State *L)
{ {
window_t *w = luaA_checkudata(L, 1, &window_class); xproperty_t *prop = luaA_find_xproperty(L, prop_idx);
xproperty_t *prop = luaA_find_xproperty(L, 2);
xcb_atom_t type; xcb_atom_t type;
uint8_t format; uint8_t format;
size_t len; size_t len;
uint32_t number; uint32_t number;
const void *data; const void *data;
if(lua_isnil(L, 3)) if(lua_isnil(L, value_idx))
{ {
xcb_delete_property(globalconf.connection, w->window, prop->atom); xcb_delete_property(globalconf.connection, window, prop->atom);
} else { } else {
if(prop->type == PROP_STRING) if(prop->type == PROP_STRING)
{ {
data = luaL_checklstring(L, 3, &len); data = luaL_checklstring(L, value_idx, &len);
type = UTF8_STRING; type = UTF8_STRING;
format = 8; format = 8;
} else if(prop->type == PROP_NUMBER || prop->type == PROP_BOOLEAN) } else if(prop->type == PROP_NUMBER || prop->type == PROP_BOOLEAN)
{ {
if (prop->type == PROP_NUMBER) if (prop->type == PROP_NUMBER)
number = luaL_checkinteger(L, 3); number = luaL_checkinteger(L, value_idx);
else else
number = luaA_checkboolean(L, 3); number = luaA_checkboolean(L, value_idx);
data = &number; data = &number;
len = 1; len = 1;
type = XCB_ATOM_CARDINAL; type = XCB_ATOM_CARDINAL;
@ -345,21 +340,16 @@ luaA_window_set_xproperty(lua_State *L)
} else } else
fatal("Got an xproperty with invalid type"); fatal("Got an xproperty with invalid type");
xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE, w->window, xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE, window,
prop->atom, type, format, len, data); prop->atom, type, format, len, data);
} }
return 0; return 0;
} }
/** Get an xproperty. int
* \param L The Lua VM state. window_get_xproperty(lua_State *L, xcb_window_t window, int prop_idx)
* \return The number of elements pushed on stack.
*/
static int
luaA_window_get_xproperty(lua_State *L)
{ {
window_t *w = luaA_checkudata(L, 1, &window_class); xproperty_t *prop = luaA_find_xproperty(L, prop_idx);
xproperty_t *prop = luaA_find_xproperty(L, 2);
xcb_atom_t type; xcb_atom_t type;
void *data; void *data;
xcb_get_property_reply_t *reply; xcb_get_property_reply_t *reply;
@ -368,7 +358,7 @@ luaA_window_get_xproperty(lua_State *L)
type = prop->type == PROP_STRING ? UTF8_STRING : XCB_ATOM_CARDINAL; type = prop->type == PROP_STRING ? UTF8_STRING : XCB_ATOM_CARDINAL;
length = prop->type == PROP_STRING ? UINT32_MAX : 1; length = prop->type == PROP_STRING ? UINT32_MAX : 1;
reply = xcb_get_property_reply(globalconf.connection, reply = xcb_get_property_reply(globalconf.connection,
xcb_get_property_unchecked(globalconf.connection, false, w->window, xcb_get_property_unchecked(globalconf.connection, false, window,
prop->atom, type, 0, length), NULL); prop->atom, type, 0, length), NULL);
if(!reply) if(!reply)
return 0; return 0;
@ -394,6 +384,28 @@ luaA_window_get_xproperty(lua_State *L)
return 1; return 1;
} }
/** Set an xproperty.
* \param L The Lua VM state.
* \return The number of elements pushed on stack.
*/
static int
luaA_window_set_xproperty(lua_State *L)
{
window_t *w = luaA_checkudata(L, 1, &window_class);
return window_set_xproperty(L, w->window, 2, 3);
}
/** Get an xproperty.
* \param L The Lua VM state.
* \return The number of elements pushed on stack.
*/
static int
luaA_window_get_xproperty(lua_State *L)
{
window_t *w = luaA_checkudata(L, 1, &window_class);
return window_get_xproperty(L, w->window, 2);
}
/** Translate a window_type_t into the corresponding EWMH atom. /** Translate a window_type_t into the corresponding EWMH atom.
* @param type The type to return. * @param type The type to return.
* @return The EWMH atom for this type. * @return The EWMH atom for this type.

4
objects/window.h
View File

@ -82,7 +82,9 @@ void window_set_opacity(lua_State *, int, double);
void window_set_border_width(lua_State *, int, int); void window_set_border_width(lua_State *, int, int);
int luaA_window_get_type(lua_State *, window_t *); int luaA_window_get_type(lua_State *, window_t *);
int luaA_window_set_type(lua_State *, window_t *); int luaA_window_set_type(lua_State *, window_t *);
uint32_t window_translate_type(window_type_t type); uint32_t window_translate_type(window_type_t);
int window_set_xproperty(lua_State *, xcb_window_t, int, int);
int window_get_xproperty(lua_State *, xcb_window_t, int);
#endif #endif
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80