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

Rename luaA_pushcolor() to luaA_pushxcolor() 

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2009-04-18 11:55:29 +02:00 committed by Julien Danjou
parent d19d679f2a
commit 99b521b2c7
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client.c
View File

@ -1958,7 +1958,7 @@ luaA_client_index(lua_State *L)
lua_pushnumber(L, c->border); lua_pushnumber(L, c->border);
break; break;
case A_TK_BORDER_COLOR: case A_TK_BORDER_COLOR:
luaA_pushcolor(L, &c->border_color); luaA_pushxcolor(L, &c->border_color);
break; break;
case A_TK_TITLEBAR: case A_TK_TITLEBAR:
return wibox_push(L, c->titlebar); return wibox_push(L, c->titlebar);

6
luaa.c
View File

@ -585,10 +585,10 @@ luaA_awesome_index(lua_State *L)
lua_pushstring(L, globalconf.conffile); lua_pushstring(L, globalconf.conffile);
break; break;
case A_TK_FG: case A_TK_FG:
luaA_pushcolor(L, &globalconf.colors.fg); luaA_pushxcolor(L, &globalconf.colors.fg);
break; break;
case A_TK_BG: case A_TK_BG:
luaA_pushcolor(L, &globalconf.colors.bg); luaA_pushxcolor(L, &globalconf.colors.bg);
break; break;
default: default:
return 0; return 0;
@ -831,7 +831,7 @@ luaA_on_timer(EV_P_ ev_timer *w, int revents)
* \return The number of elements pushed on stack. * \return The number of elements pushed on stack.
*/ */
int 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 r = (unsigned)c->red * 0xff / 0xffff;
uint8_t g = (unsigned)c->green * 0xff / 0xffff; uint8_t g = (unsigned)c->green * 0xff / 0xffff;

2
luaa.h
View File

@ -331,7 +331,7 @@ luaA_pushpadding(lua_State *L, padding_t *padding)
void luaA_init(xdgHandle); void luaA_init(xdgHandle);
bool luaA_parserc(xdgHandle, const char *, bool); bool luaA_parserc(xdgHandle, const char *, bool);
void luaA_on_timer(EV_P_ ev_timer *, int); 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 *); bool luaA_hasitem(lua_State *, const void *);
void luaA_table2wtable(lua_State *); void luaA_table2wtable(lua_State *);
int luaA_next(lua_State *, int); int luaA_next(lua_State *, int);

6
wibox.c
View File

@ -875,16 +875,16 @@ luaA_wibox_index(lua_State *L)
lua_pushnumber(L, wibox->sw.border.width); lua_pushnumber(L, wibox->sw.border.width);
break; break;
case A_TK_BORDER_COLOR: case A_TK_BORDER_COLOR:
luaA_pushcolor(L, &wibox->sw.border.color); luaA_pushxcolor(L, &wibox->sw.border.color);
break; break;
case A_TK_ALIGN: case A_TK_ALIGN:
lua_pushstring(L, draw_align_tostr(wibox->align)); lua_pushstring(L, draw_align_tostr(wibox->align));
break; break;
case A_TK_FG: case A_TK_FG:
luaA_pushcolor(L, &wibox->sw.ctx.fg); luaA_pushxcolor(L, &wibox->sw.ctx.fg);
break; break;
case A_TK_BG: case A_TK_BG:
luaA_pushcolor(L, &wibox->sw.ctx.bg); luaA_pushxcolor(L, &wibox->sw.ctx.bg);
break; break;
case A_TK_BG_IMAGE: case A_TK_BG_IMAGE:
image_push(L, wibox->bg_image); image_push(L, wibox->bg_image);

4
widgets/graph.c
View File

@ -466,10 +466,10 @@ luaA_graph_index(lua_State *L, awesome_token_t token)
lua_pushnumber(L, d->width); lua_pushnumber(L, d->width);
break; break;
case A_TK_BORDER_COLOR: case A_TK_BORDER_COLOR:
luaA_pushcolor(L, &d->border_color); luaA_pushxcolor(L, &d->border_color);
break; break;
case A_TK_BG: case A_TK_BG:
luaA_pushcolor(L, &d->bg); luaA_pushxcolor(L, &d->bg);
break; break;
case A_TK_GROW: case A_TK_GROW:
switch(d->grow) switch(d->grow)

2
widgets/imagebox.c
View File

@ -143,7 +143,7 @@ luaA_imagebox_index(lua_State *L, awesome_token_t token)
image_push(L, d->image); image_push(L, d->image);
break; break;
case A_TK_BG: case A_TK_BG:
luaA_pushcolor(L, &d->bg); luaA_pushxcolor(L, &d->bg);
break; break;
case A_TK_RESIZE: case A_TK_RESIZE:
lua_pushboolean(L, d->resize); lua_pushboolean(L, d->resize);

4
widgets/textbox.c
View File

@ -190,7 +190,7 @@ luaA_textbox_index(lua_State *L, awesome_token_t token)
case A_TK_BG_IMAGE: case A_TK_BG_IMAGE:
return image_push(L, d->bg_image); return image_push(L, d->bg_image);
case A_TK_BG: case A_TK_BG:
return luaA_pushcolor(L, &d->bg); return luaA_pushxcolor(L, &d->bg);
case A_TK_MARGIN: case A_TK_MARGIN:
lua_pushcfunction(L, luaA_textbox_margin); lua_pushcfunction(L, luaA_textbox_margin);
return 1; return 1;
@ -201,7 +201,7 @@ luaA_textbox_index(lua_State *L, awesome_token_t token)
lua_pushnumber(L, d->border.width); lua_pushnumber(L, d->border.width);
return 1; return 1;
case A_TK_BORDER_COLOR: case A_TK_BORDER_COLOR:
luaA_pushcolor(L, &d->border.color); luaA_pushxcolor(L, &d->border.color);
return 1; return 1;
case A_TK_TEXT: case A_TK_TEXT:
if(d->data.len > 0) if(d->data.len > 0)