Merge branch 'testing'

5 files changed, 25 insertions, 44 deletions

diff --git a/src/include/cache.h b/src/include/cache.h
index 894e4e1..701691f 100644
--- a/src/include/cache.h
+++ b/src/include/cache.h
@@ -1,6 +1,8 @@
 #ifndef CACHE_H
 #define CACHE_H
 
+#include <stdbool.h>
+
 void save_to_cache(int g_count, int g_hover, int *e_hover, int *e_offset, int true_hover, char *cfg_name);
 
 void load_cache(int g_count, int *g_hover, int **e_hover, int **e_offset, int *true_hover, char *new_cfg_name);
diff --git a/src/include/draw.h b/src/include/draw.h
index 387ced3..022abe5 100644
--- a/src/include/draw.h
+++ b/src/include/draw.h
@@ -5,11 +5,14 @@
 
 #define BUF_LEN 1024
 
+// currently selected group
 extern int g_hover;
+// array of currently selected entries for each group
 extern int *e_hover;
+// array of groups (as loaded from the config)
 extern struct group **g;
-extern struct entry **e;
 
+// returns the command to run for the current entry
 char *get_launch();
 
 //functions that differ between os
diff --git a/src/include/entry.h b/src/include/entry.h
index 51e43ca..a46dc46 100644
--- a/src/include/entry.h
+++ b/src/include/entry.h
@@ -1,17 +1,11 @@
+#include <stdbool.h>
+
 #ifndef ENTRY_H
 #define ENTRY_H
 
 typedef struct entry ENTRY;
 
-ENTRY *create_entry(char *new_name, char *new_path, bool force);
-
-void entry_rm(ENTRY *e, ENTRY *prev);
-
-void clear_entries(ENTRY *head);
-
-int entry_add(ENTRY *head, ENTRY *tail, ENTRY *add);
-
-ENTRY **get_entries(ENTRY *head, int count);
+ENTRY *create_entry(const char *new_name, const char *new_path, const bool force);
 
 char *get_ename(ENTRY *e);
 
@@ -19,10 +13,4 @@ char *get_epath(ENTRY *e);
 
 bool get_eforce(ENTRY *e);
 
-void set_hide(ENTRY *e, bool status);
-
-bool get_hide(ENTRY *e);
-
-void entry_debug(ENTRY *trav);
-
 #endif
diff --git a/src/include/group.h b/src/include/group.h
index ab6f409..bad33a5 100644
--- a/src/include/group.h
+++ b/src/include/group.h
@@ -1,40 +1,33 @@
 #ifndef GROUP_H
 #define GROUP_H
 
-typedef struct group GROUP;
-
-GROUP *create_group(char *new_name);
+#include <stdbool.h>
 
-void group_add(char *gname, ENTRY *addme);
+#include "entry.h"
 
-void group_rm(GROUP *g);
-
-void clean_groups(); //remove empty groups from linked list
+typedef struct group GROUP;
 
-GROUP **get_groups();
+GROUP *create_group(const char *new_name, const int entry_count);
 
 char *get_gname(GROUP *g);
 
 char *get_gprog(GROUP *g);
 
-void set_gprog(GROUP *g, char *p);
+void set_gprog(GROUP *g, const char *p);
 
 char *get_gflags(GROUP *g);
 
-void set_gflags(GROUP *g, char *p);
+void set_gflags(GROUP *g, const char *p);
 
-ENTRY *get_ghead(GROUP *g);
+ENTRY **get_gentries(GROUP *g);
+
+void set_gentry(GROUP *g, int entry_index, ENTRY *new_entry);
 
 int get_ecount(GROUP *g);
 
 void set_ecount(GROUP *g, int new_count); //for use in hiding entries
 
-void set_gquotes(GROUP *g, bool b);
-
-bool get_gquotes(GROUP *g);
-
-int get_gcount();
-
-void group_debug(); //debug function to output all groups
+// print all group and entry information
+void group_debug(GROUP *g);
 
 #endif 
diff --git a/src/include/read_cfg.h b/src/include/read_cfg.h
index df3e5bd..1337e32 100644
--- a/src/include/read_cfg.h
+++ b/src/include/read_cfg.h
@@ -1,23 +1,18 @@
 #ifndef READ_CFG_H
 #define READ_CFG_H
 
+#include <stdbool.h>
+
+#include "group.h"
+
 #define BUF_LEN 1024
 
-bool cfg_interp(char *path);
-bool get_sort();
-bool get_case_sensitivity();
+GROUP **cfg_interp(char *path, int *group_count);
 void refer_to_doc();
-void addme(char *path, char *group, bool force, char *name);
-int search_ch(char *str, char c);
-int search_last_ch(char *str, char c);
-int wild_cmp(char *wild, char *literal);
-char *strip_quotes(char *str);
-void error_mes(int ln, char *message);
 
 //functions that differ by os
 extern char sep;
 char *find_config();
 void mkconfig_wizard(char *path);
-void handle_fname(char *path, char *group, bool recurs, bool force, char *name, int ln);
 
 #endif