src/config.c Modified

@@ -338,6 +338,14 @@
 	    s = strtok(NULL, " \t\n\r");
 	    if (!strcasecmp(s, "off"))
 		server->vt_switching = false;
+	    else if (!strcasecmp(s, "on"))
+		server->vt_switching = true;
+	} else if (!strcasecmp(s, "scroll_direction")) {
+	    s = strtok(NULL, " \t\n\r");
+	    if (!strcasecmp(s, "natural"))
+		server->reverse_scrolling = false;
+	    else if (!strcasecmp(s, "reverse"))
+		server->reverse_scrolling = true;
 	}
     }
 }
@@ -346,6 +354,15 @@
 void load_config(struct server *server) {
     FILE *stream;
 
+    // remove existing keybindings
+    struct binding *kb, *tmp;
+    wl_list_for_each_safe(kb, tmp, &server->mouse_bindings, link) {
+	free_binding(kb);
+    }
+    wl_list_for_each_safe(kb, tmp, &server->key_bindings, link) {
+	free_binding(kb);
+    }
+
     // load defaults
     char *buffer = NULL;
     size_t size = 0;
@@ -359,6 +376,7 @@
     // load custom configuration file
     if (server->config_file) {
 	stream = fopen(server->config_file, "r");
+	parse_config(server, stream);
 	fclose(stream);
     }