Mercurial > mplayer.hg
annotate libmenu/menu_cmdlist.c @ 26499:dbab8bc1020c
Remove unused variable.
author | diego |
---|---|
date | Fri, 25 Apr 2008 08:30:43 +0000 |
parents | 8d329f7bbc3c |
children | 36948c17c4af |
rev | line source |
---|---|
8197 | 1 |
16862 | 2 #include "config.h" |
17994
6927fabaef92
Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents:
17945
diff
changeset
|
3 #include "mp_msg.h" |
6927fabaef92
Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents:
17945
diff
changeset
|
4 #include "help_mp.h" |
8197 | 5 |
6 #include <stdlib.h> | |
7 #include <stdio.h> | |
8 #include <ctype.h> | |
8623
440301fef3fe
Added/reordered #includes to silence warnings about "implicit declaration".
rathann
parents:
8197
diff
changeset
|
9 #include <string.h> |
8197 | 10 |
19431
ac69ba536915
Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.
diego
parents:
18819
diff
changeset
|
11 #include "libmpcodecs/img_format.h" |
ac69ba536915
Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.
diego
parents:
18819
diff
changeset
|
12 #include "libmpcodecs/mp_image.h" |
8197 | 13 |
16862 | 14 #include "m_option.h" |
15 #include "m_struct.h" | |
16 #include "asxparser.h" | |
8197 | 17 #include "menu.h" |
18 #include "menu_list.h" | |
19 | |
16862 | 20 #include "libvo/font_load.h" |
8197 | 21 |
16862 | 22 #include "input/input.h" |
23 #include "version.h" | |
8197 | 24 |
25 | |
26 | |
27 struct list_entry_s { | |
28 struct list_entry p; | |
29 | |
30 char* ok; | |
31 char* cancel; | |
17945
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
32 char* left; |
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
33 char* right; |
8197 | 34 }; |
35 | |
36 struct menu_priv_s { | |
37 menu_list_priv_t p; | |
38 }; | |
39 | |
18819
cd0491dc2afa
support for auto_close parameter in menu command list (geexbox patch)
ben
parents:
18817
diff
changeset
|
40 #define ST_OFF(m) M_ST_OFF(struct menu_priv_s, m) |
cd0491dc2afa
support for auto_close parameter in menu command list (geexbox patch)
ben
parents:
18817
diff
changeset
|
41 |
8197 | 42 static struct menu_priv_s cfg_dflt = { |
18819
cd0491dc2afa
support for auto_close parameter in menu command list (geexbox patch)
ben
parents:
18817
diff
changeset
|
43 MENU_LIST_PRIV_DFLT, |
8197 | 44 }; |
45 | |
46 static m_option_t cfg_fields[] = { | |
47 MENU_LIST_PRIV_FIELDS, | |
48 { "title",M_ST_OFF(struct menu_priv_s,p.title), CONF_TYPE_STRING, 0, 0, 0, NULL }, | |
49 { NULL, NULL, NULL, 0,0,0,NULL } | |
50 }; | |
51 | |
52 #define mpriv (menu->priv) | |
53 | |
54 static void read_cmd(menu_t* menu,int cmd) { | |
55 switch(cmd) { | |
17945
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
56 case MENU_CMD_RIGHT: |
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
57 if(mpriv->p.current->right) { |
25320
4fbf536cc033
Support to run multiple mplayer commands set in menu.conf
ulion
parents:
25263
diff
changeset
|
58 mp_input_parse_and_queue_cmds(mpriv->p.current->right); |
17945
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
59 break; |
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
60 } // fallback on ok if right is not defined |
25498 | 61 case MENU_CMD_OK: |
25505
8d329f7bbc3c
Remove redundant option 'auto-close' from cmdlist and filesel.
ulion
parents:
25498
diff
changeset
|
62 if (mpriv->p.current->ok) |
8d329f7bbc3c
Remove redundant option 'auto-close' from cmdlist and filesel.
ulion
parents:
25498
diff
changeset
|
63 mp_input_parse_and_queue_cmds(mpriv->p.current->ok); |
25498 | 64 break; |
17945
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
65 case MENU_CMD_LEFT: |
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
66 if(mpriv->p.current->left) { |
25320
4fbf536cc033
Support to run multiple mplayer commands set in menu.conf
ulion
parents:
25263
diff
changeset
|
67 mp_input_parse_and_queue_cmds(mpriv->p.current->left); |
17945
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
68 break; |
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
69 } // fallback on cancel if left is not defined |
8197 | 70 case MENU_CMD_CANCEL: |
71 if(mpriv->p.current->cancel) { | |
25320
4fbf536cc033
Support to run multiple mplayer commands set in menu.conf
ulion
parents:
25263
diff
changeset
|
72 mp_input_parse_and_queue_cmds(mpriv->p.current->cancel); |
8197 | 73 break; |
74 } | |
75 default: | |
76 menu_list_read_cmd(menu,cmd); | |
77 } | |
78 } | |
79 | |
80 static void free_entry(list_entry_t* entry) { | |
81 if(entry->ok) | |
82 free(entry->ok); | |
83 if(entry->cancel) | |
84 free(entry->cancel); | |
25401 | 85 if(entry->left) |
86 free(entry->left); | |
87 if(entry->right) | |
88 free(entry->right); | |
8197 | 89 free(entry->p.txt); |
90 free(entry); | |
91 } | |
92 | |
18817
a2b064a48775
declaring static functions with the same name than libc ones was not the best idea ever
ben
parents:
18006
diff
changeset
|
93 static void close_menu(menu_t* menu) { |
8197 | 94 menu_list_uninit(menu,free_entry); |
95 } | |
96 | |
97 static int parse_args(menu_t* menu,char* args) { | |
17945
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
98 char *element,*body, **attribs, *name; |
8197 | 99 list_entry_t* m = NULL; |
100 int r; | |
101 ASX_Parser_t* parser = asx_parser_new(); | |
102 | |
103 while(1) { | |
104 r = asx_get_element(parser,&args,&element,&body,&attribs); | |
105 if(r < 0) { | |
17994
6927fabaef92
Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents:
17945
diff
changeset
|
106 mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_SyntaxErrorAtLine,parser->line); |
8197 | 107 asx_parser_free(parser); |
108 return -1; | |
109 } else if(r == 0) { | |
110 asx_parser_free(parser); | |
111 if(!m) | |
17994
6927fabaef92
Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents:
17945
diff
changeset
|
112 mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_NoEntryFoundInTheMenuDefinition); |
8197 | 113 return m ? 1 : 0; |
114 } | |
115 // Has it a name ? | |
116 name = asx_get_attrib("name",attribs); | |
117 if(!name) { | |
17994
6927fabaef92
Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents:
17945
diff
changeset
|
118 mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_ListMenuEntryDefinitionsNeedAName,parser->line); |
8197 | 119 free(element); |
120 if(body) free(body); | |
121 asx_free_attribs(attribs); | |
122 continue; | |
123 } | |
124 m = calloc(1,sizeof(struct list_entry_s)); | |
125 m->p.txt = name; | |
17945
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
126 m->ok = asx_get_attrib("ok",attribs); |
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
127 m->cancel = asx_get_attrib("cancel",attribs); |
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
128 m->left = asx_get_attrib("left",attribs); |
98f4e3704a76
Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents:
16862
diff
changeset
|
129 m->right = asx_get_attrib("right",attribs); |
8197 | 130 menu_list_add_entry(menu,m); |
131 | |
132 free(element); | |
133 if(body) free(body); | |
134 asx_free_attribs(attribs); | |
135 } | |
136 } | |
137 | |
23366
b344b6520518
rename some menu open functions, to avoid confusion with libc native open()
ben
parents:
19431
diff
changeset
|
138 static int open_cmdlist(menu_t* menu, char* args) { |
8197 | 139 menu->draw = menu_list_draw; |
140 menu->read_cmd = read_cmd; | |
18817
a2b064a48775
declaring static functions with the same name than libc ones was not the best idea ever
ben
parents:
18006
diff
changeset
|
141 menu->close = close_menu; |
8197 | 142 |
143 if(!args) { | |
18006
ce1a5b200c39
Minor spelling and grammar fixes for part 1 of Otvos Attila's
corey
parents:
17994
diff
changeset
|
144 mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_ListMenuNeedsAnArgument); |
8197 | 145 return 0; |
146 } | |
147 | |
148 menu_list_init(menu); | |
149 if(!parse_args(menu,args)) | |
150 return 0; | |
151 return 1; | |
152 } | |
153 | |
154 const menu_info_t menu_info_cmdlist = { | |
155 "Command list menu", | |
156 "cmdlist", | |
157 "Albeu", | |
158 "", | |
159 { | |
160 "cmdlist_cfg", | |
161 sizeof(struct menu_priv_s), | |
162 &cfg_dflt, | |
163 cfg_fields | |
164 }, | |
23366
b344b6520518
rename some menu open functions, to avoid confusion with libc native open()
ben
parents:
19431
diff
changeset
|
165 open_cmdlist |
8197 | 166 }; |