Changeset 2463Tweet

Timestamp:

Jun 20, 2008, 1:42:06 PM (14 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added configuration file and routines

Location:

neercs/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• configuration.c (added)
• main.c (modified) (4 diffs)
• neercs.h (modified) (4 diffs)
• neercs.ini (added)

neercs/trunk/src/Makefile.am

@@ -3 +3 @@
 
 neercs_SOURCES = neercs.h mygetopt.c recurrent.c main.c screens.c term.c \
-                 grab.c effects.c wm.c screensaver.c attach.c
+                 grab.c effects.c wm.c screensaver.c attach.c configuration.c
 neercs_CFLAGS = @CACA_CFLAGS@
 neercs_LDADD = @CACA_LIBS@ @UTIL_LIBS@ @PAM_LIBS@
-

neercs/trunk/src/main.c

@@ -77 +77 @@
     int lock_offset = 0;
 
+
     default_shell = getenv("SHELL");
 
@@ -113 +114 @@
         return -1;
     }
+
+
     screen_list->count = 0;
     screen_list->width  = cucul_get_canvas_width(cv);
@@ -130 +133 @@
     memset(screen_list->lockmsg, 0, 1024);
     memset(screen_list->lockpass, 0, 1024);
+
+
+    if(!read_configuration_file("neercs.ini", screen_list))
+    {
+
+        if(!read_configuration_file("~/neercs.ini", screen_list))
+        {
+                 if(!read_configuration_file("/etc/neercs.ini", screen_list))
+                 {
+                     printf("Failed to read configuration file\n");
+                 }
+        }
+    }
+
 
     recurrent_list = (struct recurrent_list*) malloc(sizeof(struct recurrent_list));
@@ -449 +466 @@
 
     free(screen_list->screen);
+
+
+    struct option *option = screen_list->config;
+
+
+    while(option)
+    {
+        struct option *kromeugnon = option;
+        option = option->next;
+        free(kromeugnon->key);
+        free(kromeugnon->value);
+        free(kromeugnon);
+    }
+
     free(screen_list);
 

neercs/trunk/src/neercs.h

@@ -28 +28 @@
 
 
+struct option
+{
+    char *key;
+    char *value;
+
+    struct option *next;
+};
+
+
 struct screen
 {
@@ -83 +92 @@
     int width, height;           /* caca window size */
     struct screen **screen;      /* Windows */
+
+    struct option *config;
+
 };
 
@@ -99 +111 @@
     struct recurrent **recurrent;
 };
+
 
 
@@ -177 +190 @@
 
 
+
+/* Configuration file */
+int read_configuration_file(char *filename, struct screen_list *screen_list);
+int parse_conf_line(char *buf, int size, struct screen_list *screen_list);
+int get_key_value(char *line, struct option *option);
+int fill_config(struct screen_list *screen_list);
+
 #if 0
 #   define debug(f, z...) fprintf(stderr, f "\n", z)