[mednaffe] 04/99: Added an option to search files recursively. (Thanks to Shoegazer for the suggestion)
Stephen Kitt
skitt at moszumanska.debian.org
Tue Aug 2 20:59:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository mednaffe.
commit 6d57b336948de86280ada77ca9f2c33dceff6675
Author: amatcoder <amatcoder at 44025b82-9115-564b-7d03-7f3fc60b4744>
Date: Tue Sep 3 07:42:06 2013 +0000
Added an option to search files recursively. (Thanks to Shoegazer for the suggestion)
---
src/command.c | 24 +++++--------
src/common.h | 2 ++
src/list.c | 95 +++++++++++++++++++++++++++++++++-------------------
src/mednaffe.c | 23 +++++++++++--
src/mednaffe_glade.h | 84 ++++++++++++++++++++++++++++------------------
5 files changed, 141 insertions(+), 87 deletions(-)
diff --git a/src/command.c b/src/command.c
index 2880d10..1024d3d 100644
--- a/src/command.c
+++ b/src/command.c
@@ -44,7 +44,7 @@ gchar **build_command(guidata *gui)
}
g_list_free(list);
- command[num] = g_strconcat(gui->rompath, G_DIR_SEPARATOR_S, gui->rom, NULL);
+ command[num] = g_strdup(gui->fullpath);
num++;
command[num] = NULL;
@@ -96,8 +96,8 @@ void row_exec(GtkTreeView *treeview, GtkTreePath *patho,
GPid pid;
gboolean ret;
- if ((gui->executing == TRUE) || (gui->rompath == NULL) ||
- (gui->rom == NULL)) return;
+ if ((gui->executing == TRUE) || (gui->rompath == NULL))
+ return;
gui->command = build_command(gui);
printf ("[Mednaffe] Executing mednafen:\n\n");
@@ -146,23 +146,15 @@ void open_rom(GtkWidget *sender, guidata *gui)
if (filename != NULL)
{
- gchar *g_rompath;
- gchar *g_rom;
+ gchar *g_fullpath;
- g_rompath = gui->rompath;
- g_rom = gui->rom;
-
- gui->rompath = g_path_get_dirname(filename);
- gui->rom = g_path_get_basename(filename);
+ g_fullpath = gui->fullpath;
+ gui->fullpath = filename;
- g_free(filename);
-
row_exec(NULL, NULL, NULL, gui);
- g_free(gui->rompath);
- g_free(gui->rom);
- gui->rompath = g_rompath;
- gui->rom = g_rom;
+ g_free(gui->fullpath);
+ gui->fullpath = g_fullpath;
}
}
gtk_widget_destroy(folder);
diff --git a/src/common.h b/src/common.h
index bc62303..8c43ef9 100644
--- a/src/common.h
+++ b/src/common.h
@@ -45,7 +45,9 @@ typedef struct
GtkTreeViewColumn *column;
GtkListStore *store;
gint filtermode;
+ gboolean recursive;
gchar *binpath;
+ gchar *fullpath;
gchar *rompath;
gchar *rom;
GHashTable* hash;
diff --git a/src/list.c b/src/list.c
index f41ea66..dd31560 100644
--- a/src/list.c
+++ b/src/list.c
@@ -209,6 +209,55 @@ void open_folder(GtkWidget *sender, guidata *gui)
gtk_widget_destroy(folder);
}
+void scan_dir(gchar *romdir, guidata *gui)
+{
+ GtkTreeIter iter;
+ gboolean filterzip, filtercue;
+ GDir *dir = NULL;
+
+ dir = g_dir_open(romdir, 0, NULL);
+
+ if (dir != NULL)
+ {
+ const gchar *file = NULL;
+
+ while ((file=g_dir_read_name(dir)) != NULL)
+ {
+ gchar *testdir = NULL;
+
+ testdir = g_strconcat(romdir, G_DIR_SEPARATOR_S, file, NULL);
+
+ if (!g_file_test (testdir, G_FILE_TEST_IS_DIR))
+ {
+ filterzip = (g_str_has_suffix(file, ".zip") ||
+ g_str_has_suffix(file, ".ZIP"));
+
+ filtercue = (g_str_has_suffix(file, ".cue") ||
+ g_str_has_suffix(file, ".toc") ||
+ g_str_has_suffix(file, ".m3u") ||
+ g_str_has_suffix(file, ".CUE") ||
+ g_str_has_suffix(file, ".TOC") ||
+ g_str_has_suffix(file, ".M3U"));
+
+ gtk_list_store_append(gui->store, &iter);
+ gtk_list_store_set(gui->store, &iter,
+ 0, file,
+ 1, filterzip,
+ 2, filtercue,
+ 3, testdir, -1);
+
+ }
+ else
+ {
+ if (gui->recursive)
+ scan_dir(testdir,gui);
+ }
+ g_free(testdir);
+ }
+ g_dir_close(dir);
+ }
+}
+
#ifdef G_OS_WIN32
G_MODULE_EXPORT
#endif
@@ -216,7 +265,6 @@ void fill_list(GtkComboBox *combobox, guidata *gui)
{
GtkTreeModel *model;
GtkTreeIter iter;
- gboolean filterzip, filtercue;
model=gtk_combo_box_get_model(GTK_COMBO_BOX(gui->cbpath));
gtk_list_store_clear(gui->store);
@@ -237,40 +285,8 @@ void fill_list(GtkComboBox *combobox, guidata *gui)
if (gui->rompath!=NULL)
{
- GDir *dir = NULL;
- dir = g_dir_open(gui->rompath, 0, NULL);
-
- if (dir != NULL)
- {
- const gchar *file = NULL;
-
- while ((file=g_dir_read_name(dir)) != NULL)
- {
- gchar *testdir = NULL;
-
- testdir = g_strconcat(gui->rompath, G_DIR_SEPARATOR_S, file, NULL);
-
- if (!g_file_test (testdir, G_FILE_TEST_IS_DIR))
- {
- filterzip = (g_str_has_suffix(file, ".zip") ||
- g_str_has_suffix(file, ".ZIP"));
-
- filtercue = (g_str_has_suffix(file, ".cue") ||
- g_str_has_suffix(file, ".toc") ||
- g_str_has_suffix(file, ".m3u") ||
- g_str_has_suffix(file, ".CUE") ||
- g_str_has_suffix(file, ".TOC") ||
- g_str_has_suffix(file, ".M3U"));
-
- gtk_list_store_append(gui->store, &iter);
- gtk_list_store_set(gui->store, &iter, 0, file,
- 1, filterzip, 2, filtercue, -1);
-
- }
- g_free(testdir);
- }
- g_dir_close(dir);
- }
+ scan_dir(gui->rompath, gui);
+
gtk_tree_sortable_set_sort_column_id(
GTK_TREE_SORTABLE(gui->modelsort), 0, GTK_SORT_ASCENDING);
@@ -291,3 +307,12 @@ void fill_list(GtkComboBox *combobox, guidata *gui)
change_list(gui);
}
}
+
+#ifdef G_OS_WIN32
+G_MODULE_EXPORT
+#endif
+void on_recursivemenuitem_toggled(GtkCheckMenuItem *menuitem, guidata *gui)
+{
+ gui->recursive = gtk_check_menu_item_get_active(menuitem);
+ fill_list(NULL,gui);
+}
diff --git a/src/mednaffe.c b/src/mednaffe.c
index d587dc1..daaf87d 100644
--- a/src/mednaffe.c
+++ b/src/mednaffe.c
@@ -129,7 +129,8 @@ void game_selected(GtkTreeSelection *treeselection, guidata *gui)
gchar *selected = NULL;
g_free(gui->rom);
- gtk_tree_model_get(model, &iter, 0, &gui->rom, -1);
+ g_free(gui->fullpath);
+ gtk_tree_model_get(model, &iter, 0, &gui->rom, 3, &gui->fullpath, -1);
gtk_statusbar_pop(GTK_STATUSBAR(gui->sbname), 1);
selected = g_strconcat(" Game selected: ", gui->rom, NULL);
gtk_statusbar_push(GTK_STATUSBAR(gui->sbname), 1, selected);
@@ -192,6 +193,7 @@ void quit(GObject *object, guidata *gui)
g_key_file_set_boolean(key_file, "GUI", "Tooltips",
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(option)));
+ g_key_file_set_boolean(key_file, "GUI", "Recursive", gui->recursive);
g_key_file_set_integer(key_file, "GUI", "ActionLaunch", gui->state);
list = g_hash_table_get_keys(gui->clist);
@@ -233,6 +235,7 @@ void quit(GObject *object, guidata *gui)
g_hash_table_destroy(gui->clist);
g_slist_free(gui->dinlist);
g_free(gui->binpath);
+ g_free(gui->fullpath);
g_free(gui->rompath);
g_free(gui->rom);
g_free(gui->system);
@@ -286,7 +289,7 @@ void load_conf(guidata *gui)
}
}
option = GTK_WIDGET(gtk_builder_get_object(gui->builder,
- "showtooltips"));
+ "showtooltips"));
value = g_key_file_get_boolean(key_file, "GUI", "Tooltips", &err);
if (err==NULL)
@@ -294,6 +297,15 @@ void load_conf(guidata *gui)
else
g_error_free (err);
+ option = GTK_WIDGET(gtk_builder_get_object(gui->builder,
+ "recursivemenuitem"));
+ value = g_key_file_get_boolean(key_file, "GUI", "Recursive", &err);
+
+ if (err==NULL)
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(option),value);
+ else
+ g_error_free (err);
+
state=g_key_file_get_integer(key_file, "GUI", "ActionLaunch", NULL);
switch (state)
@@ -498,7 +510,10 @@ int main(int argc, char **argv)
/* Create store and models */
gui.store =
- gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
+ gtk_list_store_new(4, G_TYPE_STRING,
+ G_TYPE_BOOLEAN,
+ G_TYPE_BOOLEAN,
+ G_TYPE_STRING);
gui.modelsort =
GTK_TREE_MODEL_SORT
@@ -533,8 +548,10 @@ int main(int argc, char **argv)
/* Set initial values */
gui.filtermode = 0;
+ gui.recursive = FALSE;
gui.state = 0;
gui.executing = FALSE;
+ gui.fullpath = NULL;
gui.rompath = NULL;
gui.rom = NULL;
gui.command = NULL;
diff --git a/src/mednaffe_glade.h b/src/mednaffe_glade.h
index bf69158..0232294 100644
--- a/src/mednaffe_glade.h
+++ b/src/mednaffe_glade.h
@@ -28,10 +28,35 @@ static const char *mednaffe_glade =
"<interface>\n"
"<requires lib=\"gtk+\" version=\"2.16\"/>\n"
"<!-- interface-naming-policy toplevel-contextual -->\n"
-"<object class=\"GtkImage\" id=\"add_image\">\n"
-"<property name=\"visible\">True</property>\n"
-"<property name=\"can_focus\">False</property>\n"
-"<property name=\"stock\">gtk-add</property>\n"
+"<object class=\"GtkAdjustment\" id=\"adjustbuffsize\">\n"
+"<property name=\"lower\">1</property>\n"
+"<property name=\"upper\">999</property>\n"
+"<property name=\"value\">32</property>\n"
+"<property name=\"step_increment\">1</property>\n"
+"<property name=\"page_increment\">10</property>\n"
+"</object>\n"
+"<object class=\"GtkAdjustment\" id=\"adjustplayrate\">\n"
+"<property name=\"lower\">22050</property>\n"
+"<property name=\"upper\">1048576</property>\n"
+"<property name=\"value\">48000</property>\n"
+"<property name=\"step_increment\">1</property>\n"
+"<property name=\"page_increment\">10</property>\n"
+"</object>\n"
+"<object class=\"GtkAdjustment\" id=\"adjustvolume\">\n"
+"<property name=\"upper\">150</property>\n"
+"<property name=\"value\">100</property>\n"
+"<property name=\"step_increment\">1</property>\n"
+"<property name=\"page_increment\">10</property>\n"
+"</object>\n"
+"<object class=\"GtkAdjustment\" id=\"adjxres\">\n"
+"<property name=\"upper\">65536</property>\n"
+"<property name=\"step_increment\">1</property>\n"
+"<property name=\"page_increment\">160</property>\n"
+"</object>\n"
+"<object class=\"GtkAdjustment\" id=\"adyres\">\n"
+"<property name=\"upper\">65536</property>\n"
+"<property name=\"step_increment\">1</property>\n"
+"<property name=\"page_increment\">160</property>\n"
"</object>\n"
"<object class=\"GtkAdjustment\" id=\"adjautofire\">\n"
"<property name=\"upper\">1000</property>\n"
@@ -172,31 +197,6 @@ static const char *mednaffe_glade =
"<property name=\"step_increment\">1</property>\n"
"<property name=\"page_increment\">10</property>\n"
"</object>\n"
-"<object class=\"GtkAdjustment\" id=\"adjustbuffsize\">\n"
-"<property name=\"lower\">1</property>\n"
-"<property name=\"upper\">999</property>\n"
-"<property name=\"value\">32</property>\n"
-"<property name=\"step_increment\">1</property>\n"
-"<property name=\"page_increment\">10</property>\n"
-"</object>\n"
-"<object class=\"GtkAdjustment\" id=\"adjustplayrate\">\n"
-"<property name=\"lower\">22050</property>\n"
-"<property name=\"upper\">1048576</property>\n"
-"<property name=\"value\">48000</property>\n"
-"<property name=\"step_increment\">1</property>\n"
-"<property name=\"page_increment\">10</property>\n"
-"</object>\n"
-"<object class=\"GtkAdjustment\" id=\"adjustvolume\">\n"
-"<property name=\"upper\">150</property>\n"
-"<property name=\"value\">100</property>\n"
-"<property name=\"step_increment\">1</property>\n"
-"<property name=\"page_increment\">10</property>\n"
-"</object>\n"
-"<object class=\"GtkAdjustment\" id=\"adjxres\">\n"
-"<property name=\"upper\">65536</property>\n"
-"<property name=\"step_increment\">1</property>\n"
-"<property name=\"page_increment\">160</property>\n"
-"</object>\n"
"<object class=\"GtkAdjustment\" id=\"adjxscale\">\n"
"<property name=\"lower\">0.01</property>\n"
"<property name=\"upper\">256</property>\n"
@@ -225,10 +225,10 @@ static const char *mednaffe_glade =
"<property name=\"step_increment\">0.01</property>\n"
"<property name=\"page_increment\">1</property>\n"
"</object>\n"
-"<object class=\"GtkAdjustment\" id=\"adyres\">\n"
-"<property name=\"upper\">65536</property>\n"
-"<property name=\"step_increment\">1</property>\n"
-"<property name=\"page_increment\">160</property>\n"
+"<object class=\"GtkImage\" id=\"add_image\">\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">False</property>\n"
+"<property name=\"stock\">gtk-add</property>\n"
"</object>\n"
"<object class=\"GtkListStore\" id=\"cbpathstore\">\n"
"<columns>\n"
@@ -722,6 +722,24 @@ static const char *mednaffe_glade =
"<property name=\"visible\">True</property>\n"
"<property name=\"can_focus\">False</property>\n"
"<child>\n"
+"<object class=\"GtkCheckMenuItem\" id=\"recursivemenuitem\">\n"
+"<property name=\"use_action_appearance\">False</property>\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">False</property>\n"
+"<property name=\"label\" translatable=\"yes\">Recursive</property>\n"
+"<property name=\"use_underline\">True</property>\n"
+"<accelerator key=\"r\" signal=\"activate\" modifiers=\"GDK_SHIFT_MASK\"/>\n"
+"<signal name=\"toggled\" handler=\"on_recursivemenuitem_toggled\" swapped=\"no\"/>\n"
+"</object>\n"
+"</child>\n"
+"<child>\n"
+"<object class=\"GtkSeparatorMenuItem\" id=\"separatormenuitem3\">\n"
+"<property name=\"use_action_appearance\">False</property>\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">False</property>\n"
+"</object>\n"
+"</child>\n"
+"<child>\n"
"<object class=\"GtkMenuItem\" id=\"menuitemfilter\">\n"
"<property name=\"use_action_appearance\">False</property>\n"
"<property name=\"visible\">True</property>\n"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mednaffe.git
More information about the Pkg-games-commits
mailing list