From: Daniel Carl <danielcarl@gmx.de>
Date: Wed, 29 Jun 2016 21:49:12 +0000 (+0200)
Subject: Allow to set config file per option --config, -c.
X-Git-Url: https://git.owens.tech/assets/favicon.png/assets/favicon.png/git?a=commitdiff_plain;h=a2642b38586c7e530b8beaf9aac0594c1c8751c8;p=vimb.git

Allow to set config file per option --config, -c.
---

diff --git a/README.md b/README.md
index 42beb57..c80bd9a 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ project directory.
   - [x] establish communication channel between the vimb instance and the now
         required webextension (dbus)
 2. migrate as many of the features of the webkit1 vimb
-  - [ ] starting with custom config file `--config,-c` option
+  - [x] starting with custom config file `--config,-c` option
   - [ ] running multiple ex-commands during startup `--cmd,-C` options
   - [ ] starting with a named profile `--profile,-p` option
   - [ ] xembed `--embed,-e` option
diff --git a/src/ex.c b/src/ex.c
index 2d0f2e4..e3a5a71 100644
--- a/src/ex.c
+++ b/src/ex.c
@@ -408,6 +408,63 @@ gboolean ex_fill_completion(GtkListStore *store, const char *input)
     return found;
 }
 
+/**
+ * Run all ex commands from a file.
+ */
+VbCmdResult ex_run_file(Client *c, const char *filename)
+{
+    int length, i;
+    char *line, **lines;
+    VbCmdResult res = CMD_SUCCESS;
+
+    lines = util_get_lines(filename);
+    if (!lines) {
+        return res;
+    }
+
+    length = g_strv_length(lines) - 1;
+    for (i = 0; i < length; i++) {
+        line = lines[i];
+        /* skip commented or empty lines */
+        if (*line == '#' || !*line) {
+            continue;
+        }
+        if ((ex_run_string(c, line, false) & ~CMD_KEEPINPUT) == CMD_ERROR) {
+            res = CMD_ERROR | CMD_KEEPINPUT;
+            g_warning("Invalid command in %s: '%s'", filename, line);
+        }
+    }
+    g_strfreev(lines);
+
+    return res;
+}
+
+VbCmdResult ex_run_string(Client *c, const char *input, gboolean enable_history)
+{
+    /* copy to have original command for history */
+    const char *in  = input;
+    gboolean nohist = FALSE;
+    VbCmdResult res = CMD_ERROR | CMD_KEEPINPUT;
+    ExArg *arg = g_slice_new0(ExArg);
+    arg->lhs   = g_string_new("");
+    arg->rhs   = g_string_new("");
+
+    while (in && *in) {
+        if (!parse(c, &in, arg, &nohist) || !(res = execute(c, arg))) {
+            break;
+        }
+    }
+
+    if (enable_history && !nohist) {
+        history_add(c, HISTORY_COMMAND, input, NULL);
+        vb_register_add(c, ':', input);
+    }
+
+    free_cmdarg(arg);
+
+    return res;
+}
+
 /**
  * This is called if the user typed <nl> or <cr> into the inputbox.
  */
@@ -446,32 +503,6 @@ static void input_activate(Client *c)
     g_free(text);
 }
 
-VbCmdResult ex_run_string(Client *c, const char *input, gboolean enable_history)
-{
-    /* copy to have original command for history */
-    const char *in  = input;
-    gboolean nohist = FALSE;
-    VbCmdResult res = CMD_ERROR | CMD_KEEPINPUT;
-    ExArg *arg = g_slice_new0(ExArg);
-    arg->lhs   = g_string_new("");
-    arg->rhs   = g_string_new("");
-
-    while (in && *in) {
-        if (!parse(c, &in, arg, &nohist) || !(res = execute(c, arg))) {
-            break;
-        }
-    }
-
-    if (enable_history && !nohist) {
-        history_add(c, HISTORY_COMMAND, input, NULL);
-        vb_register_add(c, ':', input);
-    }
-
-    free_cmdarg(arg);
-
-    return res;
-}
-
 /**
  * Parses given input string into given ExArg pointer.
  */
diff --git a/src/ex.h b/src/ex.h
index ec0960d..1fd057f 100644
--- a/src/ex.h
+++ b/src/ex.h
@@ -28,6 +28,7 @@ void ex_leave(Client *c);
 VbResult ex_keypress(Client *c, int key);
 void ex_input_changed(Client *c, const char *text);
 gboolean ex_fill_completion(GtkListStore *store, const char *input);
+VbCmdResult ex_run_file(Client *c, const char *filename);
 VbCmdResult ex_run_string(Client *c, const char *input, gboolean enable_history);
 
 #endif /* end of include guard: _EX_H */
diff --git a/src/main.c b/src/main.c
index bc1496e..8644123 100644
--- a/src/main.c
+++ b/src/main.c
@@ -581,6 +581,9 @@ static Client *client_new(WebKitWebView *webview)
 
     gtk_widget_show_all(c->window);
 
+    /* read the config file */
+    ex_run_file(c, vb.files[FILES_CONFIG]);
+
     /* Prepend the new client to the queue of clients. */
     c->next    = vb.clients;
     vb.clients = c;