awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

globalconf: move conffile out 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2009-11-10 10:22:04 +01:00
parent 8d36fefd15
commit c036ea5f3e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
globalconf.h
View File

@ -75,8 +75,6 @@ typedef struct
client_array_t clients; client_array_t clients;
/** Embedded windows */ /** Embedded windows */
xembed_window_array_t embedded; xembed_window_array_t embedded;
/** Path to config file */
char *conffile;
/** Stack client history */ /** Stack client history */
client_array_t stack; client_array_t stack;
/** Lua VM state */ /** Lua VM state */

7
luaa.c
View File

@ -55,6 +55,9 @@ extern const struct luaL_reg awesome_mouse_meta[];
extern const struct luaL_reg awesome_screen_methods[]; extern const struct luaL_reg awesome_screen_methods[];
extern const struct luaL_reg awesome_screen_meta[]; extern const struct luaL_reg awesome_screen_meta[];
/** Path to config file */
static char *conffile;
/** Quit awesome. /** Quit awesome.
* \param L The Lua VM state. * \param L The Lua VM state.
* \return The number of elements pushed on stack. * \return The number of elements pushed on stack.
@ -558,7 +561,7 @@ luaA_awesome_index(lua_State *L)
lua_pushnumber(L, globalconf.font->height); lua_pushnumber(L, globalconf.font->height);
break; break;
case A_TK_CONFFILE: case A_TK_CONFFILE:
lua_pushstring(L, globalconf.conffile); lua_pushstring(L, conffile);
break; break;
case A_TK_FG: case A_TK_FG:
luaA_pushxcolor(L, globalconf.colors.fg); luaA_pushxcolor(L, globalconf.colors.fg);
@ -834,7 +837,7 @@ luaA_loadrc(const char *confpath, bool run)
fprintf(stderr, "%s\n", lua_tostring(globalconf.L, -1)); fprintf(stderr, "%s\n", lua_tostring(globalconf.L, -1));
else else
{ {
globalconf.conffile = a_strdup(confpath); conffile = a_strdup(confpath);
return true; return true;
} }
} }