1 files changed, 17 insertions, 7 deletions

diff --git a/libmenu/menu.c b/libmenu/menu.c
index 038b969e4f..9fd9a40729 100644
--- a/libmenu/menu.c
+++ b/libmenu/menu.c
@@ -88,13 +88,15 @@ double menu_mouse_y = -1.0;
 int menu_mouse_pos_updated = 0;
 
 static struct MPContext *menu_ctx = NULL;
+static struct m_config *menu_mconfig = NULL;
+static struct input_ctx *menu_input = NULL;
 static menu_def_t* menu_list = NULL;
 static int menu_count = 0;
 static menu_cmd_bindings_t *cmd_bindings = NULL;
 static int cmd_bindings_num = 0;
 
 
-menu_cmd_bindings_t *get_cmd_bindings(const char *name) {
+static menu_cmd_bindings_t *get_cmd_bindings(const char *name) {
   int i;
   for (i = 0; i < cmd_bindings_num; ++i)
     if (!strcasecmp(cmd_bindings[i].name, name))
@@ -102,11 +104,12 @@ menu_cmd_bindings_t *get_cmd_bindings(const char *name) {
   return NULL;
 }
 
-static int menu_parse_config(char* buffer) {
+static int menu_parse_config(char* buffer, struct m_config *mconfig)
+{
   char *element,*body, **attribs, *name;
   menu_info_t* minfo = NULL;
   int r,i;
-  ASX_Parser_t* parser = asx_parser_new();
+  ASX_Parser_t* parser = asx_parser_new(mconfig);
 
   while(1) {
     r = asx_get_element(parser,&buffer,&element,&body,&attribs);
@@ -228,7 +231,9 @@ static int menu_parse_config(char* buffer) {
 #define BUF_STEP 1024
 #define BUF_MIN 128
 #define BUF_MAX BUF_STEP*1024
-int menu_init(struct MPContext *mpctx, char* cfg_file) {
+int menu_init(struct MPContext *mpctx, struct m_config *mconfig,
+              struct input_ctx *input_ctx, char* cfg_file)
+{
   char* buffer = NULL;
   int bl = BUF_STEP, br = 0;
   int f, fd;
@@ -267,7 +272,9 @@ int menu_init(struct MPContext *mpctx, char* cfg_file) {
   close(fd);
 
   menu_ctx = mpctx;
-  f = menu_parse_config(buffer);
+  menu_mconfig = mconfig;
+  menu_input = input_ctx;
+  f = menu_parse_config(buffer, mconfig);
   free(buffer);
   return f;
 }
@@ -303,7 +310,8 @@ int menu_dflt_read_key(menu_t* menu,int cmd) {
     for (i = 0; i < bindings->binding_num; ++i) {
       if (bindings->bindings[i].key == cmd) {
         if (bindings->bindings[i].cmd)
-          mp_input_parse_and_queue_cmds(bindings->bindings[i].cmd);
+          mp_input_parse_and_queue_cmds(menu->input_ctx,
+                                        bindings->bindings[i].cmd);
         return 1;
       }
     }
@@ -328,6 +336,8 @@ menu_t* menu_open(char *name) {
   m->priv_st = &(menu_list[i].type->priv_st);
   m->priv = m_struct_copy(m->priv_st,menu_list[i].cfg);
   m->ctx = menu_ctx;
+  m->mconfig = menu_mconfig;
+  m->input_ctx = menu_input;
   m->type = &menu_list[i];
   if(menu_list[i].type->open(m,menu_list[i].args))
     return m;
@@ -725,7 +735,7 @@ int menu_text_num_lines(char* txt, int max_width) {
   return l;
 }
   
-char* menu_text_get_next_line(char* txt, int max_width) {
+static char* menu_text_get_next_line(char* txt, int max_width) {
   int i = 0;
   render_txt(txt);
   while (*txt) {