From 99b521b2c7ac5b91cffa8fcb7f1f07a5aa1e71bc Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Sat, 18 Apr 2009 11:55:29 +0200 Subject: [PATCH] Rename luaA_pushcolor() to luaA_pushxcolor() Signed-off-by: Uli Schlachter --- client.c | 2 +- luaa.c | 6 +++--- luaa.h | 2 +- wibox.c | 6 +++--- widgets/graph.c | 4 ++-- widgets/imagebox.c | 2 +- widgets/textbox.c | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client.c b/client.c index 94b4c5361..917b1013f 100644 --- a/client.c +++ b/client.c @@ -1958,7 +1958,7 @@ luaA_client_index(lua_State *L) lua_pushnumber(L, c->border); break; case A_TK_BORDER_COLOR: - luaA_pushcolor(L, &c->border_color); + luaA_pushxcolor(L, &c->border_color); break; case A_TK_TITLEBAR: return wibox_push(L, c->titlebar); diff --git a/luaa.c b/luaa.c index 90ddddbeb..552df1241 100644 --- a/luaa.c +++ b/luaa.c @@ -585,10 +585,10 @@ luaA_awesome_index(lua_State *L) lua_pushstring(L, globalconf.conffile); break; case A_TK_FG: - luaA_pushcolor(L, &globalconf.colors.fg); + luaA_pushxcolor(L, &globalconf.colors.fg); break; case A_TK_BG: - luaA_pushcolor(L, &globalconf.colors.bg); + luaA_pushxcolor(L, &globalconf.colors.bg); break; default: return 0; @@ -831,7 +831,7 @@ luaA_on_timer(EV_P_ ev_timer *w, int revents) * \return The number of elements pushed on stack. */ int -luaA_pushcolor(lua_State *L, const xcolor_t *c) +luaA_pushxcolor(lua_State *L, const xcolor_t *c) { uint8_t r = (unsigned)c->red * 0xff / 0xffff; uint8_t g = (unsigned)c->green * 0xff / 0xffff; diff --git a/luaa.h b/luaa.h index 2c2ab6a9b..8f77bb9d4 100644 --- a/luaa.h +++ b/luaa.h @@ -331,7 +331,7 @@ luaA_pushpadding(lua_State *L, padding_t *padding) void luaA_init(xdgHandle); bool luaA_parserc(xdgHandle, const char *, bool); void luaA_on_timer(EV_P_ ev_timer *, int); -int luaA_pushcolor(lua_State *, const xcolor_t *); +int luaA_pushxcolor(lua_State *, const xcolor_t *); bool luaA_hasitem(lua_State *, const void *); void luaA_table2wtable(lua_State *); int luaA_next(lua_State *, int); diff --git a/wibox.c b/wibox.c index bd6e98356..0d602175f 100644 --- a/wibox.c +++ b/wibox.c @@ -875,16 +875,16 @@ luaA_wibox_index(lua_State *L) lua_pushnumber(L, wibox->sw.border.width); break; case A_TK_BORDER_COLOR: - luaA_pushcolor(L, &wibox->sw.border.color); + luaA_pushxcolor(L, &wibox->sw.border.color); break; case A_TK_ALIGN: lua_pushstring(L, draw_align_tostr(wibox->align)); break; case A_TK_FG: - luaA_pushcolor(L, &wibox->sw.ctx.fg); + luaA_pushxcolor(L, &wibox->sw.ctx.fg); break; case A_TK_BG: - luaA_pushcolor(L, &wibox->sw.ctx.bg); + luaA_pushxcolor(L, &wibox->sw.ctx.bg); break; case A_TK_BG_IMAGE: image_push(L, wibox->bg_image); diff --git a/widgets/graph.c b/widgets/graph.c index 5067ab176..e68562f8c 100644 --- a/widgets/graph.c +++ b/widgets/graph.c @@ -466,10 +466,10 @@ luaA_graph_index(lua_State *L, awesome_token_t token) lua_pushnumber(L, d->width); break; case A_TK_BORDER_COLOR: - luaA_pushcolor(L, &d->border_color); + luaA_pushxcolor(L, &d->border_color); break; case A_TK_BG: - luaA_pushcolor(L, &d->bg); + luaA_pushxcolor(L, &d->bg); break; case A_TK_GROW: switch(d->grow) diff --git a/widgets/imagebox.c b/widgets/imagebox.c index 8763f46ba..dc14274ac 100644 --- a/widgets/imagebox.c +++ b/widgets/imagebox.c @@ -143,7 +143,7 @@ luaA_imagebox_index(lua_State *L, awesome_token_t token) image_push(L, d->image); break; case A_TK_BG: - luaA_pushcolor(L, &d->bg); + luaA_pushxcolor(L, &d->bg); break; case A_TK_RESIZE: lua_pushboolean(L, d->resize); diff --git a/widgets/textbox.c b/widgets/textbox.c index eadc25e6d..35174fc24 100644 --- a/widgets/textbox.c +++ b/widgets/textbox.c @@ -190,7 +190,7 @@ luaA_textbox_index(lua_State *L, awesome_token_t token) case A_TK_BG_IMAGE: return image_push(L, d->bg_image); case A_TK_BG: - return luaA_pushcolor(L, &d->bg); + return luaA_pushxcolor(L, &d->bg); case A_TK_MARGIN: lua_pushcfunction(L, luaA_textbox_margin); return 1; @@ -201,7 +201,7 @@ luaA_textbox_index(lua_State *L, awesome_token_t token) lua_pushnumber(L, d->border.width); return 1; case A_TK_BORDER_COLOR: - luaA_pushcolor(L, &d->border.color); + luaA_pushxcolor(L, &d->border.color); return 1; case A_TK_TEXT: if(d->data.len > 0)