Added functionality to read configuration from an INI file

- use libiniparser from http://ndevilla.free.fr/iniparser/ to parse the config
- read values for touch input device, thresholds and whether vert and horz scroll
  should be enabled from the config file

Author: Robin Müller

configure.ac

@@ -10,7 +10,8 @@ AC_CONFIG_SRCDIR([src/main.c])
 AC_PROG_CC
 
 # Checks for libraries.
-AC_CHECK_LIB([m], [sqrt])
+AC_CHECK_LIB([m], [sqrt], [], [AC_MSG_ERROR([libm is required])])
+AC_CHECK_LIB([iniparser], [iniparser_load], [], [AC_MSG_ERROR([libiniparser from http://ndevilla.free.fr/iniparser/ is required])])
 
 # Checks for header files.
 AC_CHECK_HEADERS([fcntl.h stddef.h stdint.h stdlib.h string.h unistd.h])

src/configuraion.c

@@ -23,10 +23,12 @@
  */
 
 #include <stdint.h>
+#include <stdbool.h>
+#include <iniparser.h>
 
 #include "configuraion.h"
 
-void clean_config(configuration_t *config) {
+static void clean_config(configuration_t *config) {
   int32_t i, j, k;
   for (i = 0; i < MAX_FINGERS; i++) {
     for (j = 0; j < DIRECTIONS_COUNT; j++) {
@@ -36,3 +38,24 @@ void clean_config(configuration_t *config) {
     }
   }
 }
+
+configuration_t read_config(const char *filename) {
+  configuration_t result;
+  clean_config(&result);
+  dictionary *ini = iniparser_load(filename);
+  char *touch_device_path = iniparser_getstring(ini, "general:touchdevice", NULL);
+  if (touch_device_path) {
+    result.touch_device_path = malloc(strlen(touch_device_path) + 1);
+    if (result.touch_device_path) {
+      strcpy(result.touch_device_path, touch_device_path);
+    }
+  } else {
+    result.touch_device_path = NULL;
+  }
+  result.vert_scroll = iniparser_getboolean(ini, "scroll:vertical", false);
+  result.horz_scroll = iniparser_getboolean(ini, "scroll:horizontal", false);
+  result.vert_threshold_percentage = iniparser_getint(ini, "thresholds:vertical", 15),
+  result.horz_threshold_percentage = iniparser_getint(ini, "thresholds:horizontal", 15),
+  iniparser_freedict(ini);
+  return result;
+}

src/configuraion.h

@@ -40,6 +40,7 @@ typedef struct keys_array {
 } keys_array_t;
 
 typedef struct configuration {
+  char *touch_device_path;
   bool vert_scroll;
   bool horz_scroll;
   uint8_t vert_threshold_percentage;
@@ -49,6 +50,6 @@ typedef struct configuration {
 
 typedef enum direction { UP, DOWN, LEFT, RIGHT, NONE } direction_t;
 
-void clean_config(configuration_t *config);
+configuration_t read_config(const char *filename);
 
 #endif // CONFIGURATION_H_

src/main.c

@@ -51,14 +51,11 @@ int main(int argc, char *argv[]) {
   free(keys);
 
   if (argc > 1) {
-    int fd = open(argv[1], O_RDONLY);
+    configuration_t config = read_config(argv[1]);
+    int fd = open(config.touch_device_path, O_RDONLY);
     if (fd < 0) {
       die("error: open");
     }
-    configuration_t config;
-    clean_config(&config);
-    config.horz_threshold_percentage = 15;
-    config.vert_threshold_percentage = 15;
     config.swipe_keys[3][UP].keys[0] = KEY_LEFTCTRL;
     config.swipe_keys[3][UP].keys[1] = KEY_LEFTALT;
     config.swipe_keys[3][UP].keys[2] = KEY_DOWN;