Changeset 2484 for neercs/trunkTweet

Timestamp:

Jun 24, 2008, 4:13:18 PM (13 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Factorized multiple calls of caca_refresh_display()
• Configuration file is now /etc/neercs.conf and ~/.neercsrc

Location:

neercs/trunk

Files:

• man/neercs.1 (modified) (1 diff)
• src/main.c (modified) (9 diffs)
• src/neercs.ini (modified) (1 diff)

neercs/trunk/man/neercs.1

@@ -11 +11 @@
 ($SHELL environment variable).
 .PP
-\fBneercs\fR will search for a configuration file called \fBneercs.ini\fR in
-the current directory, your home directory, and /etc (in that order).
+\fBneercs\fR will search for a configuration file called /etc/neercs.conf, then \fB.neercsrc\fR in
+your home directory (in that order).
 .SH EXAMPLES
 .PP

neercs/trunk/src/main.c

@@ -28 +28 @@
 #include <sys/time.h>
 #include <time.h>
+#include <pwd.h>
+
 
 #if !defined HAVE_GETOPT_LONG
@@ -78 +80 @@
     struct screen_list *screen_list = NULL;
     struct recurrent_list *recurrent_list = NULL;
-    char *default_shell = NULL;
+    struct passwd *user_info;
+    char *default_shell = NULL, *user_path = NULL;
     int i, w, h, args, s=0;
     int eof = 0, refresh = 1, command = 0;
@@ -133 +136 @@
     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");
-            }
-        }
-    }
+
+    /* Read global configuration first */
+    read_configuration_file("/etc/neercs.conf", screen_list);
+
+    /* Then local one  */
+    user_info = getpwuid(getuid());
+    if(user_info)
+    {
+        user_path = malloc(strlen(user_info->pw_dir) + strlen("/.neercsrc") + 1);
+        sprintf(user_path, "%s/%s", user_info->pw_dir, ".neercsrc");
+        read_configuration_file(user_path, screen_list);
+        free(user_path);
+    }
+
 
     recurrent_list = (struct recurrent_list*) malloc(sizeof(struct recurrent_list));
@@ -277 +283 @@
     last_key_time = get_us();
 
-    /* Refresh */
-    caca_refresh_display(dp);
 
     for(;;)
@@ -524 +528 @@
         {
             draw_lock(cv, screen_list);
-            caca_refresh_display(dp);
+            refresh = 1;
         }
         else
@@ -531 +535 @@
                (get_us() - last_key_time < screen_list->screensaver_timeout))
             {
-                refresh = 0;
                 refresh_screens(cv, screen_list);
                 if(screen_list->screen[screen_list->pty]->title)
@@ -537 +540 @@
                 else
                     caca_set_display_title(dp, PACKAGE_STRING);
-                caca_refresh_display(dp);
+                refresh = 1;
+
             }
 
@@ -548 +552 @@
                 caca_set_cursor(dp, 0);
                 draw_screensaver(cv, dp, screen_list);
-                caca_refresh_display(dp);
-            }
+                refresh = 1;
+            }
+        }
+
+        /* Refresh screen if needed */
+        if(refresh)
+        {
+            caca_refresh_display(dp);
+            refresh = 0;
         }
 
@@ -601 +612 @@
     free(recurrent_list->recurrent);
     free(recurrent_list);
+
+    free(user_path);
+
 
     return mainret;

neercs/trunk/src/neercs.ini

@@ -11 +11 @@
 [windows]
 window_manager = hsplit   ; full card  hsplit vsplit
+status_bar = true         ; Activate status bar
 
 [eyecandy]                ; Not-that-useful stuff
-thumbnails = true         ; Activate thumbnails
-status_bar = true         ; Activate status bar
+thumbnails = false         ; Activate thumbnails
 screensaver_timeout = 60  ; Screen Saver timeout in seconds, 0 to desactivate