annotate libmenu/menu_filesel.c @ 35418:cedb0ba2b5c6

Move the code to set guiInfo's Track, Chapter and Angle start values. Set them before checking whether there is any media opened, because with no media opened we clear the counters.
author ib
date Thu, 29 Nov 2012 14:11:03 +0000
parents 4c2104e9e0d1
children 389d43c448b3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
28113
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
1 /*
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
2 * This file is part of MPlayer.
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
3 *
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
5 * it under the terms of the GNU General Public License as published by
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
7 * (at your option) any later version.
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
8 *
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
12 * GNU General Public License for more details.
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
13 *
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
14 * You should have received a copy of the GNU General Public License along
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
f8b6c7045cf8 Add standard GPL headers.
diego
parents: 27086
diff changeset
17 */
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
18
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
19 #include <stdlib.h>
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
20 #include <stdio.h>
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
21 #include <dirent.h>
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
22 #include <errno.h>
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
23 #include <string.h>
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
24 #include <sys/types.h>
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
25 #include <sys/stat.h>
23229
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
26 #include <fcntl.h>
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
27 #include <ctype.h>
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
28 #include <unistd.h>
8291
abe95dde3223 limits.h required to get a PATH_MAX definition (on solaris)
jkeil
parents: 8226
diff changeset
29 #include <limits.h>
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
30
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
31
16862
931bdbc37ee0 Unify include paths, -I.. is in CFLAGS.
diego
parents: 16061
diff changeset
32 #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
33 #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
34 #include "help_mp.h"
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
35
16862
931bdbc37ee0 Unify include paths, -I.. is in CFLAGS.
diego
parents: 16061
diff changeset
36 #include "m_struct.h"
931bdbc37ee0 Unify include paths, -I.. is in CFLAGS.
diego
parents: 16061
diff changeset
37 #include "m_option.h"
32004
c536d4b0ce3d Add proper #includes instead of filename/file_filter extern declarations.
diego
parents: 30957
diff changeset
38 #include "mp_core.h"
c536d4b0ce3d Add proper #includes instead of filename/file_filter extern declarations.
diego
parents: 30957
diff changeset
39 #include "mplayer.h"
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
40
19431
ac69ba536915 Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.
diego
parents: 17994
diff changeset
41 #include "libmpcodecs/img_format.h"
ac69ba536915 Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.
diego
parents: 17994
diff changeset
42 #include "libmpcodecs/mp_image.h"
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
43
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
44 #include "menu.h"
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
45 #include "menu_list.h"
16862
931bdbc37ee0 Unify include paths, -I.. is in CFLAGS.
diego
parents: 16061
diff changeset
46 #include "input/input.h"
931bdbc37ee0 Unify include paths, -I.. is in CFLAGS.
diego
parents: 16061
diff changeset
47 #include "osdep/keycodes.h"
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
48
23229
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
49 #define MENU_KEEP_PATH "/tmp/mp_current_path"
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
50
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
51 int menu_keepdir = 0;
23391
9bf57f60bf0a new -menu-chroot option that prevent OSD file selection menu to go to an unwanted location (yeah, chroot ;-))
ben
parents: 23229
diff changeset
52 char *menu_chroot = NULL;
23229
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
53
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
54 struct list_entry_s {
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
55 struct list_entry p;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
56 int d;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
57 };
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
58
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
59 struct menu_priv_s {
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
60 menu_list_priv_t p;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
61 char* dir; // current dir
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
62 /// Cfg fields
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
63 char* path;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
64 char* title;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
65 char* file_action;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
66 char* dir_action;
19490
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
67 char** actions;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28113
diff changeset
68 char* filter;
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
69 };
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
70
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
71 static struct menu_priv_s cfg_dflt = {
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
72 MENU_LIST_PRIV_DFLT,
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
73 NULL,
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
74
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
75 NULL,
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
76 "Select a file: %p",
8226
4b8fcc2af8f1 quote the filenames
albeu
parents: 8197
diff changeset
77 "loadfile '%p'",
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
78 NULL,
19491
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
79 NULL,
19490
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
80 NULL
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
81 };
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
82
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
83 #define ST_OFF(m) M_ST_OFF(struct menu_priv_s,m)
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
84
30957
45b93bea8082 Mark cfg_fields m_option_t array as const.
diego
parents: 30702
diff changeset
85 static const m_option_t cfg_fields[] = {
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
86 MENU_LIST_PRIV_FIELDS,
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
87 { "path", ST_OFF(path), CONF_TYPE_STRING, 0, 0, 0, NULL },
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
88 { "title", ST_OFF(title), CONF_TYPE_STRING, 0, 0, 0, NULL },
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
89 { "file-action", ST_OFF(file_action), CONF_TYPE_STRING, 0, 0, 0, NULL },
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
90 { "dir-action", ST_OFF(dir_action), CONF_TYPE_STRING, 0, 0, 0, NULL },
19490
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
91 { "actions", ST_OFF(actions), CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
19491
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
92 { "filter", ST_OFF(filter), CONF_TYPE_STRING, 0, 0, 0, NULL},
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
93 { NULL, NULL, NULL, 0,0,0,NULL }
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
94 };
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
95
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
96 #define mpriv (menu->priv)
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
97
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
98 static void free_entry(list_entry_t* entry) {
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
99 free(entry->p.txt);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
100 free(entry);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
101 }
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
102
27086
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
103 static char* replace_path(char* title , char* dir , int escape) {
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
104 char *p = strstr(title,"%p");
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
105 if(p) {
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
106 int tl = strlen(title);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
107 int dl = strlen(dir);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28113
diff changeset
108 int t1l = p-title;
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
109 int l = tl - 2 + dl;
10624
cdfd4a43c406 I've juste found a bug which prevent to load a file whose name contain
albeu
parents: 9380
diff changeset
110 char *r, *n, *d = dir;
cdfd4a43c406 I've juste found a bug which prevent to load a file whose name contain
albeu
parents: 9380
diff changeset
111
27086
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
112 if (escape) {
10624
cdfd4a43c406 I've juste found a bug which prevent to load a file whose name contain
albeu
parents: 9380
diff changeset
113 do {
27086
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
114 if (*d == '\\')
10624
cdfd4a43c406 I've juste found a bug which prevent to load a file whose name contain
albeu
parents: 9380
diff changeset
115 l++;
27086
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
116 else if (*d == '\'') /* ' -> \'\\\'\' */
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
117 l+=7;
10624
cdfd4a43c406 I've juste found a bug which prevent to load a file whose name contain
albeu
parents: 9380
diff changeset
118 } while (*d++);
27086
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
119 }
10624
cdfd4a43c406 I've juste found a bug which prevent to load a file whose name contain
albeu
parents: 9380
diff changeset
120 r = malloc(l + 1);
cdfd4a43c406 I've juste found a bug which prevent to load a file whose name contain
albeu
parents: 9380
diff changeset
121 n = r + t1l;
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
122 memcpy(r,title,t1l);
10624
cdfd4a43c406 I've juste found a bug which prevent to load a file whose name contain
albeu
parents: 9380
diff changeset
123 do {
27086
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
124 if (escape) {
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
125 if (*dir == '\\')
10624
cdfd4a43c406 I've juste found a bug which prevent to load a file whose name contain
albeu
parents: 9380
diff changeset
126 *n++ = '\\';
27086
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
127 else if (*dir == '\'') { /* ' -> \'\\\'\' */
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
128 *n++ = '\\'; *n++ = '\'';
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
129 *n++ = '\\'; *n++ = '\\';
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
130 *n++ = '\\'; *n++ = '\'';
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
131 *n++ = '\\';
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
132 }
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
133 }
10624
cdfd4a43c406 I've juste found a bug which prevent to load a file whose name contain
albeu
parents: 9380
diff changeset
134 } while ((*n++ = *dir++));
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
135 if(tl - t1l - 2 > 0)
10624
cdfd4a43c406 I've juste found a bug which prevent to load a file whose name contain
albeu
parents: 9380
diff changeset
136 strcpy(n-1,p+2);
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
137 return r;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
138 } else
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
139 return title;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
140 }
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
141
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
142 static int mylstat(char *dir, char *file,struct stat* st) {
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
143 int l = strlen(dir) + strlen(file);
8613
f88ba181ecf2 some 10l bugfixes
arpi
parents: 8358
diff changeset
144 char s[l+2];
25311
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
145 if (!strcmp("..", file)) {
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
146 char *slash;
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
147 l -= 3;
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
148 strcpy(s, dir);
30608
c05fbacce55f Replace platform preprocessor check by HAVE_DOS_PATHS.
komh
parents: 29263
diff changeset
149 #if HAVE_DOS_PATHS
25311
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
150 if (s[l] == '/' || s[l] == '\\')
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
151 #else
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
152 if (s[l] == '/')
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
153 #endif
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
154 s[l] = '\0';
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
155 slash = strrchr(s, '/');
30608
c05fbacce55f Replace platform preprocessor check by HAVE_DOS_PATHS.
komh
parents: 29263
diff changeset
156 #if HAVE_DOS_PATHS
25311
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
157 if (!slash)
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
158 slash = strrchr(s,'\\');
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
159 #endif
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
160 if (!slash)
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
161 return stat(dir,st);
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
162 slash[1] = '\0';
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
163 return stat(s,st);
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
164 }
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
165 sprintf(s,"%s/%s",dir,file);
9249
8546faeb0112 lstat->stat
arpi
parents: 9104
diff changeset
166 return stat(s,st);
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
167 }
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
168
35216
4c2104e9e0d1 Use correct function prototype instead of casting away the warnings.
reimar
parents: 35215
diff changeset
169 static int compare(const void *av, const void *bv){
4c2104e9e0d1 Use correct function prototype instead of casting away the warnings.
reimar
parents: 35215
diff changeset
170 const char * const *a = av;
4c2104e9e0d1 Use correct function prototype instead of casting away the warnings.
reimar
parents: 35215
diff changeset
171 const char * const *b = bv;
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
172 if((*a)[strlen(*a) - 1] == '/') {
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
173 if((*b)[strlen(*b) - 1] == '/')
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
174 return strcmp(*b, *a) ;
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
175 else
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
176 return 1;
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
177 } else {
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
178 if((*b)[strlen(*b) - 1] == '/')
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
179 return -1;
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
180 else
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
181 return strcmp(*b, *a);
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
182 }
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
183 }
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
184
19491
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
185 static char **get_extensions(menu_t *menu){
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
186 char **extensions, ext[32];
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
187 FILE *fp;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
188 int n = 1;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
189
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
190 if (!mpriv->filter)
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
191 return NULL;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
192
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
193 fp = fopen(mpriv->filter, "r");
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
194 if(!fp)
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
195 return NULL;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
196
30702
9fc9d1e788aa Do not cast the results of malloc/calloc/realloc.
diego
parents: 30608
diff changeset
197 extensions = malloc(sizeof(*extensions));
19491
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
198 *extensions = NULL;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
199
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
200 while(fgets(ext,sizeof(ext),fp)) {
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
201 char **l, *e;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
202 int s = strlen (ext);
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
203
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
204 if(ext[s-1] == '\n') {
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
205 ext[s-1] = '\0';
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
206 s--;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
207 }
30702
9fc9d1e788aa Do not cast the results of malloc/calloc/realloc.
diego
parents: 30608
diff changeset
208 e = malloc(s+1);
9fc9d1e788aa Do not cast the results of malloc/calloc/realloc.
diego
parents: 30608
diff changeset
209 extensions = realloc(extensions, ++n * sizeof(*extensions));
9fc9d1e788aa Do not cast the results of malloc/calloc/realloc.
diego
parents: 30608
diff changeset
210 extensions = realloc(extensions, ++n * sizeof(*extensions));
19491
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
211 strcpy (e, ext);
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
212 for (l=extensions; *l; l++);
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
213 *l++ = e;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
214 *l = NULL;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
215 }
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
216
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
217 fclose (fp);
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
218 return extensions;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
219 }
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
220
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
221 static void free_extensions(char **extensions){
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
222 if (extensions) {
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
223 char **l = extensions;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
224 while (*l)
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
225 free (*l++);
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
226 free (extensions);
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
227 }
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
228 }
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
229
25354
a4c4b56e933d reverted r25323: deprecated by ulion's recent patches
ben
parents: 25320
diff changeset
230 static int open_dir(menu_t* menu,char* args) {
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
231 char **namelist, **tp;
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
232 struct dirent *dp;
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
233 struct stat st;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
234 int n;
23229
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
235 int path_fp;
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
236 list_entry_t* e;
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
237 DIR* dirp;
19491
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
238 char **extensions, **elem, *ext;
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
239
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
240 menu_list_init(menu);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
241
32537
8fa2f43cb760 Remove most of the NULL pointer check before free all over the code
cboesch
parents: 32004
diff changeset
242 free(mpriv->dir);
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
243 mpriv->dir = strdup(args);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
244 if(mpriv->p.title && mpriv->p.title != mpriv->title && mpriv->p.title != cfg_dflt.p.title)
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
245 free(mpriv->p.title);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
246
27086
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
247 mpriv->p.title = replace_path(mpriv->title,mpriv->dir,0);
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
248
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
249 if ((dirp = opendir (mpriv->dir)) == NULL){
17994
6927fabaef92 Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents: 17945
diff changeset
250 mp_msg(MSGT_GLOBAL,MSGL_ERR,MSGTR_LIBMENU_OpendirError, strerror(errno));
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
251 return 0;
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
252 }
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
253
23229
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
254 if (menu_keepdir) {
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
255 path_fp = open (MENU_KEEP_PATH, O_CREAT | O_WRONLY | O_TRUNC, 0666);
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
256 if (path_fp >= 0) {
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
257 write (path_fp, mpriv->dir, strlen (mpriv->dir));
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
258 close (path_fp);
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
259 }
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
260 }
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
261
30702
9fc9d1e788aa Do not cast the results of malloc/calloc/realloc.
diego
parents: 30608
diff changeset
262 namelist = malloc(sizeof(char *));
19491
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
263 extensions = get_extensions(menu);
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
264
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
265 n=0;
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
266 while ((dp = readdir(dirp)) != NULL) {
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
267 if(dp->d_name[0] == '.' && strcmp(dp->d_name,"..") != 0)
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
268 continue;
23391
9bf57f60bf0a new -menu-chroot option that prevent OSD file selection menu to go to an unwanted location (yeah, chroot ;-))
ben
parents: 23229
diff changeset
269 if (menu_chroot && !strcmp (dp->d_name,"..")) {
26945
b105b2c1f8ae Use size_t instead of int for a variable that is compared to the result
diego
parents: 25632
diff changeset
270 size_t len = strlen (menu_chroot);
23391
9bf57f60bf0a new -menu-chroot option that prevent OSD file selection menu to go to an unwanted location (yeah, chroot ;-))
ben
parents: 23229
diff changeset
271 if ((strlen (mpriv->dir) == len || strlen (mpriv->dir) == len + 1)
9bf57f60bf0a new -menu-chroot option that prevent OSD file selection menu to go to an unwanted location (yeah, chroot ;-))
ben
parents: 23229
diff changeset
272 && !strncmp (mpriv->dir, menu_chroot, len))
9bf57f60bf0a new -menu-chroot option that prevent OSD file selection menu to go to an unwanted location (yeah, chroot ;-))
ben
parents: 23229
diff changeset
273 continue;
9bf57f60bf0a new -menu-chroot option that prevent OSD file selection menu to go to an unwanted location (yeah, chroot ;-))
ben
parents: 23229
diff changeset
274 }
25311
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
275 if (mylstat(args,dp->d_name,&st))
605f00b6a4ae Fix mylstat() call to parent dir where the subdir has no exec permission.
ulion
parents: 25300
diff changeset
276 continue;
19491
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
277 if (file_filter && extensions && !S_ISDIR(st.st_mode)) {
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
278 if((ext = strrchr(dp->d_name,'.')) == NULL)
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
279 continue;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
280 ext++;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
281 elem = extensions;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
282 do {
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
283 if (!strcasecmp(ext, *elem))
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
284 break;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
285 } while (*++elem);
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
286 if (*elem == NULL)
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
287 continue;
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
288 }
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
289 if(n%20 == 0){ // Get some more mem
30702
9fc9d1e788aa Do not cast the results of malloc/calloc/realloc.
diego
parents: 30608
diff changeset
290 if((tp = realloc(namelist, (n+20) * sizeof (char *)))
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
291 == NULL) {
17994
6927fabaef92 Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents: 17945
diff changeset
292 mp_msg(MSGT_GLOBAL,MSGL_ERR,MSGTR_LIBMENU_ReallocError, strerror(errno));
9104
a0aacfb492a5 Also attached some cleanup to menu_filesel.c, mainly to make it more
arpi
parents: 8853
diff changeset
293 n--;
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
294 goto bailout;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28113
diff changeset
295 }
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
296 namelist=tp;
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
297 }
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
298
30702
9fc9d1e788aa Do not cast the results of malloc/calloc/realloc.
diego
parents: 30608
diff changeset
299 namelist[n] = malloc(strlen(dp->d_name) + 2);
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
300 if(namelist[n] == NULL){
17994
6927fabaef92 Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents: 17945
diff changeset
301 mp_msg(MSGT_GLOBAL,MSGL_ERR,MSGTR_LIBMENU_MallocError, strerror(errno));
9104
a0aacfb492a5 Also attached some cleanup to menu_filesel.c, mainly to make it more
arpi
parents: 8853
diff changeset
302 n--;
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
303 goto bailout;
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
304 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28113
diff changeset
305
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
306 strcpy(namelist[n], dp->d_name);
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
307 if(S_ISDIR(st.st_mode))
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
308 strcat(namelist[n], "/");
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
309 n++;
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
310 }
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
311
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
312 bailout:
19491
10d8f2cae948 added new filter option to menu file browser to only display some files according to extension
ben
parents: 19490
diff changeset
313 free_extensions (extensions);
16061
261022c048cd add some closedir() to fix some opendir() leaks
aurel
parents: 10624
diff changeset
314 closedir(dirp);
261022c048cd add some closedir() to fix some opendir() leaks
aurel
parents: 10624
diff changeset
315
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
316 if (n < 0) {
17994
6927fabaef92 Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents: 17945
diff changeset
317 mp_msg(MSGT_GLOBAL,MSGL_ERR,MSGTR_LIBMENU_ReaddirError,strerror(errno));
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
318 return 0;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
319 }
35216
4c2104e9e0d1 Use correct function prototype instead of casting away the warnings.
reimar
parents: 35215
diff changeset
320 qsort(namelist, n, sizeof(char *), compare);
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
321 while(n--) {
9104
a0aacfb492a5 Also attached some cleanup to menu_filesel.c, mainly to make it more
arpi
parents: 8853
diff changeset
322 if((e = calloc(1,sizeof(list_entry_t))) != NULL){
8613
f88ba181ecf2 some 10l bugfixes
arpi
parents: 8358
diff changeset
323 e->p.next = NULL;
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
324 e->p.txt = strdup(namelist[n]);
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
325 if(strchr(namelist[n], '/') != NULL)
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
326 e->d = 1;
8358
ecf6a4cf3272 No scandir() an no functions defined within other functions.
arpi
parents: 8291
diff changeset
327 menu_list_add_entry(menu,e);
9104
a0aacfb492a5 Also attached some cleanup to menu_filesel.c, mainly to make it more
arpi
parents: 8853
diff changeset
328 }else{
17994
6927fabaef92 Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents: 17945
diff changeset
329 mp_msg(MSGT_GLOBAL,MSGL_ERR,MSGTR_LIBMENU_MallocError, strerror(errno));
9104
a0aacfb492a5 Also attached some cleanup to menu_filesel.c, mainly to make it more
arpi
parents: 8853
diff changeset
330 }
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
331 free(namelist[n]);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
332 }
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
333 free(namelist);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
334
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
335 return 1;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
336 }
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
337
19490
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
338 static char *action;
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
339
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
340 static void read_cmd(menu_t* menu,int cmd) {
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
341 switch(cmd) {
17945
98f4e3704a76 Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents: 16862
diff changeset
342 case MENU_CMD_LEFT:
98f4e3704a76 Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents: 16862
diff changeset
343 mpriv->p.current = mpriv->p.menu; // Hack : we consider that the first entry is ../
98f4e3704a76 Allow 6 ways (up/down/left/right/ok/cancel) navigation.
albeu
parents: 16862
diff changeset
344 case MENU_CMD_RIGHT:
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
345 case MENU_CMD_OK: {
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
346 // Directory
25300
b1638a8b9dc6 Combine common code for dealing with file action and dir action.
ulion
parents: 25299
diff changeset
347 if(mpriv->p.current->d && !mpriv->dir_action) {
b1638a8b9dc6 Combine common code for dealing with file action and dir action.
ulion
parents: 25299
diff changeset
348 // Default action : open this dirctory ourself
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
349 int l = strlen(mpriv->dir);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
350 char *slash = NULL, *p = NULL;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
351 if(strcmp(mpriv->p.current->p.txt,"../") == 0) {
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
352 if(l <= 1) break;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
353 mpriv->dir[l-1] = '\0';
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
354 slash = strrchr(mpriv->dir,'/');
30608
c05fbacce55f Replace platform preprocessor check by HAVE_DOS_PATHS.
komh
parents: 29263
diff changeset
355 #if HAVE_DOS_PATHS
20505
543f6e8deeb6 Handle windows path separator in filesel menu.
reimar
parents: 19491
diff changeset
356 if (!slash)
543f6e8deeb6 Handle windows path separator in filesel menu.
reimar
parents: 19491
diff changeset
357 slash = strrchr(mpriv->dir,'\\');
543f6e8deeb6 Handle windows path separator in filesel menu.
reimar
parents: 19491
diff changeset
358 #endif
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
359 if(!slash) break;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
360 slash[1] = '\0';
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
361 p = strdup(mpriv->dir);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
362 } else {
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
363 p = malloc(l + strlen(mpriv->p.current->p.txt) + 1);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
364 sprintf(p,"%s%s",mpriv->dir,mpriv->p.current->p.txt);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
365 }
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
366 menu_list_uninit(menu,free_entry);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
367 if(!open_dir(menu,p)) {
17994
6927fabaef92 Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu
reynaldo
parents: 17945
diff changeset
368 mp_msg(MSGT_GLOBAL,MSGL_ERR,MSGTR_LIBMENU_CantOpenDirectory,p);
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
369 menu->cl = 1;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
370 }
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
371 free(p);
25300
b1638a8b9dc6 Combine common code for dealing with file action and dir action.
ulion
parents: 25299
diff changeset
372 } else { // File and directory dealt with action string.
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
373 int fname_len = strlen(mpriv->dir) + strlen(mpriv->p.current->p.txt) + 1;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
374 char filename[fname_len];
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
375 char *str;
25300
b1638a8b9dc6 Combine common code for dealing with file action and dir action.
ulion
parents: 25299
diff changeset
376 char *action = mpriv->p.current->d ? mpriv->dir_action:mpriv->file_action;
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
377 sprintf(filename,"%s%s",mpriv->dir,mpriv->p.current->p.txt);
27086
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
378 str = replace_path(action, filename,1);
25505
8d329f7bbc3c Remove redundant option 'auto-close' from cmdlist and filesel.
ulion
parents: 25502
diff changeset
379 mp_input_parse_and_queue_cmds(str);
25300
b1638a8b9dc6 Combine common code for dealing with file action and dir action.
ulion
parents: 25299
diff changeset
380 if (str != action)
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
381 free(str);
25300
b1638a8b9dc6 Combine common code for dealing with file action and dir action.
ulion
parents: 25299
diff changeset
382 }
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
383 } break;
19490
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
384 case MENU_CMD_ACTION: {
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
385 int fname_len = strlen(mpriv->dir) + strlen(mpriv->p.current->p.txt) + 1;
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
386 char filename[fname_len];
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
387 char *str;
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
388 sprintf(filename,"%s%s",mpriv->dir,mpriv->p.current->p.txt);
27086
1d0ac8ff2527 fixes two bugs:
ben
parents: 26970
diff changeset
389 str = replace_path(action, filename,1);
25320
4fbf536cc033 Support to run multiple mplayer commands set in menu.conf
ulion
parents: 25311
diff changeset
390 mp_input_parse_and_queue_cmds(str);
19490
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
391 if(str != action)
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
392 free(str);
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
393 } break;
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
394 default:
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
395 menu_list_read_cmd(menu,cmd);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
396 }
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
397 }
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
398
25502
605d4e3e403f From now on, libmenu does not steal all input keys from input modules.
ulion
parents: 25354
diff changeset
399 static int read_key(menu_t* menu,int c){
19490
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
400 char **str;
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
401 for (str=mpriv->actions; str && *str; str++)
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
402 if (c == (*str)[0]) {
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
403 action = &(*str)[2];
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
404 read_cmd(menu,MENU_CMD_ACTION);
25502
605d4e3e403f From now on, libmenu does not steal all input keys from input modules.
ulion
parents: 25354
diff changeset
405 return 1;
19490
f57977ac0394 support multiple actions in menu's file browser using key bindings
ben
parents: 19431
diff changeset
406 }
25263
96d0992c7920 Remove hardcoded key->cmd bindings in libmenu, support custom key bindings
ulion
parents: 25134
diff changeset
407 if (menu_dflt_read_key(menu, c))
25502
605d4e3e403f From now on, libmenu does not steal all input keys from input modules.
ulion
parents: 25354
diff changeset
408 return 1;
605d4e3e403f From now on, libmenu does not steal all input keys from input modules.
ulion
parents: 25354
diff changeset
409 return menu_list_jump_to_key(menu, c);
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
410 }
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
411
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
412 static void clos(menu_t* menu) {
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
413 menu_list_uninit(menu,free_entry);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
414 free(mpriv->dir);
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
415 }
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
416
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
417 static int open_fs(menu_t* menu, char* args) {
26970
2eea71274bd1 Removed unused freepath variable.
ben
parents: 26961
diff changeset
418 char *path = mpriv->path;
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
419 int r = 0;
25134
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
420 char wd[PATH_MAX+1], b[PATH_MAX+1];
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
421 args = NULL; // Warning kill
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
422
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
423 menu->draw = menu_list_draw;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
424 menu->read_cmd = read_cmd;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
425 menu->read_key = read_key;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
426 menu->close = clos;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
427
23229
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
428 if (menu_keepdir) {
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
429 if (!path || path[0] == '\0') {
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
430 struct stat st;
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
431 int path_fp;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28113
diff changeset
432
23229
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
433 path_fp = open (MENU_KEEP_PATH, O_RDONLY);
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
434 if (path_fp >= 0) {
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
435 if (!fstat (path_fp, &st) && (st.st_size > 0)) {
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
436 path = malloc(st.st_size+1);
26960
805f7deb1b48 Ensure 'path' string is 0 terminated.
ben
parents: 26945
diff changeset
437 path[st.st_size] = '\0';
26970
2eea71274bd1 Removed unused freepath variable.
ben
parents: 26961
diff changeset
438 if (!((read(path_fp, path, st.st_size) == st.st_size) && path[0] == '/'
2eea71274bd1 Removed unused freepath variable.
ben
parents: 26961
diff changeset
439 && !stat(path, &st) && S_ISDIR(st.st_mode))) {
23229
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
440 free(path);
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
441 path = NULL;
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
442 }
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
443 }
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
444 close (path_fp);
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
445 }
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
446 }
ae2a2d5ca64b new -menu-keepdir option that allows libmenu file browser to always restart browsing from the last place we were instead of current dir
ben
parents: 20505
diff changeset
447 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28113
diff changeset
448
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
449 getcwd(wd,PATH_MAX);
25528
e3f6092fb640 Default use the dir where the current playing file located if path not set.
ulion
parents: 25505
diff changeset
450 if (!path || path[0] == '\0') {
25632
61bc7acb7bb1 Deny the code using realpath().
ulion
parents: 25528
diff changeset
451 #if 0
25528
e3f6092fb640 Default use the dir where the current playing file located if path not set.
ulion
parents: 25505
diff changeset
452 char *slash = NULL;
e3f6092fb640 Default use the dir where the current playing file located if path not set.
ulion
parents: 25505
diff changeset
453 if (filename && !strstr(filename, "://") && (path=realpath(filename, b))) {
e3f6092fb640 Default use the dir where the current playing file located if path not set.
ulion
parents: 25505
diff changeset
454 slash = strrchr(path, '/');
30608
c05fbacce55f Replace platform preprocessor check by HAVE_DOS_PATHS.
komh
parents: 29263
diff changeset
455 #if HAVE_DOS_PATHS
25528
e3f6092fb640 Default use the dir where the current playing file located if path not set.
ulion
parents: 25505
diff changeset
456 // FIXME: Do we need and can convert all '\\' in path to '/' on win32?
e3f6092fb640 Default use the dir where the current playing file located if path not set.
ulion
parents: 25505
diff changeset
457 if (!slash)
e3f6092fb640 Default use the dir where the current playing file located if path not set.
ulion
parents: 25505
diff changeset
458 slash = strrchr(path, '\\');
e3f6092fb640 Default use the dir where the current playing file located if path not set.
ulion
parents: 25505
diff changeset
459 #endif
e3f6092fb640 Default use the dir where the current playing file located if path not set.
ulion
parents: 25505
diff changeset
460 }
e3f6092fb640 Default use the dir where the current playing file located if path not set.
ulion
parents: 25505
diff changeset
461 if (slash)
e3f6092fb640 Default use the dir where the current playing file located if path not set.
ulion
parents: 25505
diff changeset
462 slash[1] = '\0';
e3f6092fb640 Default use the dir where the current playing file located if path not set.
ulion
parents: 25505
diff changeset
463 else
25632
61bc7acb7bb1 Deny the code using realpath().
ulion
parents: 25528
diff changeset
464 #endif
25528
e3f6092fb640 Default use the dir where the current playing file located if path not set.
ulion
parents: 25505
diff changeset
465 path = wd;
e3f6092fb640 Default use the dir where the current playing file located if path not set.
ulion
parents: 25505
diff changeset
466 }
25134
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
467 if (path[0] != '/') {
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
468 if(path[strlen(path)-1] != '/')
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
469 snprintf(b,sizeof(b),"%s/%s/",wd,path);
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
470 else
25134
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
471 snprintf(b,sizeof(b),"%s/%s",wd,path);
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
472 path = b;
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
473 } else if (path[strlen(path)-1]!='/') {
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
474 sprintf(b,"%s/",path);
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
475 path = b;
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
476 }
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
477 if (menu_chroot && menu_chroot[0] == '/') {
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
478 int l = strlen(menu_chroot);
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
479 if (l > 0 && menu_chroot[l-1] == '/')
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
480 --l;
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
481 if (strncmp(menu_chroot, path, l) || (path[l] != '\0' && path[l] != '/')) {
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
482 if (menu_chroot[l] == '/')
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
483 path = menu_chroot;
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
484 else {
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
485 sprintf(b,"%s/",menu_chroot);
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
486 path = b;
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
487 }
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
488 }
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
489 }
dcf1bfb29dc8 Fix code to make sure the browse starting path within the menu-chroot path.
ulion
parents: 23391
diff changeset
490 r = open_dir(menu,path);
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
491
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
492 return r;
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
493 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28113
diff changeset
494
8197
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
495 const menu_info_t menu_info_filesel = {
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
496 "File seletor menu",
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
497 "filesel",
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
498 "Albeu",
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
499 "",
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
500 {
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
501 "fs_cfg",
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
502 sizeof(struct menu_priv_s),
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
503 &cfg_dflt,
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
504 cfg_fields
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
505 },
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
506 open_fs
b31caec933e9 OSD menus initial version
albeu
parents:
diff changeset
507 };