Changeset 3999 for neercsTweet

Timestamp:

Nov 22, 2009, 3:26:33 PM (11 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added configuration getters

Location:

neercs/trunk/src

Files:

• configuration.c (modified) (4 diffs)
• help.c (modified) (1 diff)
• neercs.h (modified) (2 diffs)

neercs/trunk/src/configuration.c

@@ -26 +26 @@
 
 
-struct config_line
-{
-    const char name[32];
-    int (*func_ptr) (const char *argv, struct screen_list * screen_list);
-};
-
 struct config_line *get_config(const char *name);
 int set_window_manager(const char *argv, struct screen_list *screen_list);
@@ -42 +36 @@
 int set_socket_dir(const char *argv, struct screen_list *screen_list);
 int set_delay(const char *argv, struct screen_list *screen_list);
+char*  get_window_manager(struct screen_list *screen_list);
+char*  get_cube_duration(struct screen_list *screen_list);
+char*  get_thumbnails(struct screen_list *screen_list);
+char*  get_status_bar(struct screen_list *screen_list);
+char*  get_screensaver_timeout(struct screen_list *screen_list);
+char*  get_autolock_timeout(struct screen_list *screen_list);
+char*  get_lock_on_detach(struct screen_list *screen_list);
+char*  get_socket_dir(struct screen_list *screen_list);
+char*  get_delay(struct screen_list *screen_list);
+
 
 /* Options definition and associated function pointer */
 struct config_line config_option[] = {
-    {.name = "window_manager",.func_ptr = set_window_manager},
-    {.name = "cube_duration",.func_ptr = set_cube_duration},
-    {.name = "thumbnails",.func_ptr = set_thumbnails},
-    {.name = "status_bar",.func_ptr = set_status_bar},
-    {.name = "screensaver_timeout",.func_ptr = set_screensaver_timeout},
-    {.name = "autolock_timeout",.func_ptr = set_autolock_timeout},
-    {.name = "lock_on_detach",.func_ptr = set_lock_on_detach},
-    {.name = "socket_dir",.func_ptr = set_socket_dir},
-    {.name = "delay",.func_ptr = set_delay},
+    {.name = "window_manager",.set = set_window_manager, .get = get_window_manager},
+    {.name = "cube_duration",.set = set_cube_duration, .get = get_window_manager},
+    {.name = "thumbnails",.set = set_thumbnails, .get = get_window_manager},
+    {.name = "status_bar",.set = set_status_bar, .get = get_window_manager},
+    {.name = "screensaver_timeout",.set = set_screensaver_timeout, .get = get_window_manager},
+    {.name = "autolock_timeout",.set = set_autolock_timeout, .get = get_window_manager},
+    {.name = "lock_on_detach",.set = set_lock_on_detach, .get = get_window_manager},
+    {.name = "socket_dir",.set = set_socket_dir, .get = get_window_manager},
+    {.name = "delay",.set = set_delay, .get = NULL},
     
-    {.name = "last",.func_ptr = NULL},
+    {.name = "last",.set = NULL},
 };
 
@@ -344 +348 @@
         if (c)
         {
-            c->func_ptr(option->value, screen_list);
+            c->set((const char*)option->value, screen_list);
         }
         option = option->next;
@@ -448 +452 @@
         return 0;
 }
+
+
+
+char* get_window_manager(struct screen_list *screen_list)
+{
+    switch(screen_list->wm_type)
+    {
+        case WM_FULL:
+            return "full";
+        case WM_CARD:
+            return "card";
+        case WM_VSPLIT:
+            return "vsplit";
+        case WM_HSPLIT:
+            return "hsplit";
+        case WM_CUBE:
+            return "cube";
+        default:
+            return "invalid";
+    }
+    return NULL; /* Not reached */
+}
+
+char*  get_cube_duration(struct screen_list *screen_list)
+{
+    char *r = malloc(100);
+    sprintf(r, "%f", (float)screen_list->cube.duration/1000000.0f);
+    return r;
+}
+
+char*  get_thumbnails(struct screen_list *screen_list)
+{
+    if(screen_list->mini) return "yes";
+    return "no";
+}
+
+char*  get_status_bar(struct screen_list *screen_list)
+{
+    if(screen_list->status) return "yes";
+    return "no";
+}
+
+char*  get_screensaver_timeout(struct screen_list *screen_list)
+{
+    char *r = malloc(100);
+    sprintf(r, "%f", (float)screen_list->screensaver_timeout/1000000.0f);
+    return r; 
+}
+
+char*  get_autolock_timeout(struct screen_list *screen_list)
+{
+    char *r = malloc(100);
+    sprintf(r, "%f", (float)screen_list->autolock_timeout/1000000.0f);
+    return r;
+}
+
+char*  get_lock_on_detach(struct screen_list *screen_list)
+{
+    if(screen_list->lock_on_detach) return "yes";
+    else return "no";
+}
+
+char*  get_socket_dir(struct screen_list *screen_list)
+{
+    return screen_list->socket_dir;
+}
+
+char*  get_delay(struct screen_list *screen_list)
+{
+    char *r = malloc(100);
+    sprintf(r, "%d", screen_list->requested_delay);
+    return r;
+}
+
+
+

neercs/trunk/src/help.c

@@ -75 +75 @@
     caca_printf(screen_list->cv, x, y++, "");
     caca_printf(screen_list->cv, x, y++, "");
-    caca_printf(screen_list->cv, x, y++, "See http://caca.zoy.org/wiki/neercs for more informations");
+    caca_printf(screen_list->cv, x, y, "See http://caca.zoy.org/wiki/neercs for more informations");
 }

neercs/trunk/src/neercs.h

@@ -28 +28 @@
     WM_MAX,
 };
-
-struct option
-{
-    char *key;
-    char *value;
-
-    struct option *next;
-};
-
 
 
@@ -218 +209 @@
 };
 
-
+/* Configuration */
+struct option
+{
+    char *key;
+    char *value;
+    
+    struct option *next;
+};
+struct config_line
+{
+    const char name[32];
+    int  (*set) (const char *argv, struct screen_list * screen_list);
+    char* (*get) (struct screen_list * screen_list);
+};
+
+/* Recurrents */
 struct recurrent
 {