Cosmetics.

[selector.git] / selector.c

diff --git a/selector.c b/selector.c
index 24ad55d..77ab603 100644 (file)
--- a/selector.c
+++ b/selector.c
@@ -45,9 +45,9 @@
 #include <getopt.h>
 #include <limits.h>
 
-#define VERSION "1.1.6"
+#define VERSION "1.1.7"
 
-#define BUFFER_SIZE 4096
+#define BUFFER_SIZE 16384
 
 /* Yeah, global variables! */
 
@@ -206,6 +206,8 @@ void usage(FILE *out) {
   fprintf(out, " --      all following arguments are filenames\n");
   fprintf(out, " -t <title>, --title <title>\n");
   fprintf(out, "         add a title in the modeline\n");
+  fprintf(out, " -r <pattern>, --pattern <pattern>\n");
+  fprintf(out, "         set an initial pattern\n");
   fprintf(out, " -c <colors>, --colors <colors>\n");
   fprintf(out, "         set the display colors with an argument of the form\n");
   fprintf(out, "         <fg_modeline>,<bg_modeline>,<fg_highlight>,<bg_highlight>\n");
@@ -214,7 +216,8 @@ void usage(FILE *out) {
   fprintf(out, " -s <pattern separator>, --pattern-separator <pattern separator>\n");
   fprintf(out, "         set the symbol to separate substrings in the pattern\n");
   fprintf(out, " -x <label separator>, --label-separator <label separator>\n");
-  fprintf(out, "         set the symbol to terminate the label\n");
+  fprintf(out, "         set the character to separate the label to show from the\n");
+  fprintf(out, "         string to return\n");
   fprintf(out, " -l <max number of lines>, --number-of-lines <max number of lines>\n");
   fprintf(out, "         set the maximum number of lines to take into account\n");
   fprintf(out, "\n");
@@ -764,9 +767,10 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
               addnstr("\\", 1);
               attroff(attr_focus_line);
             } else {
-              buffer[k++] = '\n';
-              buffer[k++] = '\0';
-
+              if(k < console_width) {
+                buffer[k++] = '\n';
+                buffer[k++] = '\0';
+              }
               print_string_with_switches(buffer, k,
                                          nb_switches / 2, switches);
             }
@@ -920,6 +924,7 @@ void read_file(struct hash_table_t *hash_table,
   char raw_line[BUFFER_SIZE];
   char *s;
   FILE *file;
+  int l;
 
   file = fopen(input_filename, "r");
 
@@ -928,11 +933,22 @@ void read_file(struct hash_table_t *hash_table,
     exit(EXIT_FAILURE);
   }
 
-  while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
-    for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
-      *s = '\0';
+  if(label_separator == '\n') {
+    while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
+      l = strlen(raw_line);
+      fgets(raw_line + l, BUFFER_SIZE - l, file);
+      for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
+        *s = '\0';
+      }
+      store_line(hash_table, raw_line, nb_lines, lines);
+    }
+  } else {
+    while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
+      for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
+        *s = '\0';
+      }
+      store_line(hash_table, raw_line, nb_lines, lines);
     }
-    store_line(hash_table, raw_line, nb_lines, lines);
   }
 
   fclose(file);
@@ -965,6 +981,7 @@ static struct option long_options[] = {
   { "show-hits", no_argument, 0, 'j'},
   { "upper-case-makes-case-sensitive", no_argument, 0, 'u' },
   { "title", 1, 0, 't' },
+  { "pattern", 1, 0, 'r' },
   { "number-of-lines", 1, 0, 'l' },
   { "colors", 1, 0, 'c' },
   { "bash", no_argument, 0, OPT_BASH_MODE },
@@ -996,6 +1013,8 @@ int main(int argc, char **argv) {
     exit(EXIT_FAILURE);
   }
 
+  pattern[0] = '\0';
+
   color_fg_modeline  = COLOR_WHITE;
   color_bg_modeline  = COLOR_BLACK;
   color_fg_highlight = COLOR_BLACK;
@@ -1005,7 +1024,7 @@ int main(int argc, char **argv) {
 
   strcpy(output_filename, "");
 
-  while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeajyunt:l:c:-h",
+  while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeajyunt:r:l:c:-h",
                           long_options, NULL)) != -1) {
 
     switch(c) {
@@ -1019,7 +1038,11 @@ int main(int argc, char **argv) {
       break;
 
     case 'x':
-      label_separator = optarg[0];
+      if(strcmp(optarg, "\\n") == 0) {
+        label_separator = '\n';
+      } else {
+        label_separator = optarg[0];
+      }
       break;
 
     case 'v':
@@ -1080,6 +1103,10 @@ int main(int argc, char **argv) {
       strcpy(title, optarg);
       break;
 
+    case 'r':
+      strcpy(pattern, optarg);
+      break;
+
     case 'l':
       str_to_positive_integers(optarg, &nb_lines_max, 1);
       break;
@@ -1198,8 +1225,6 @@ int main(int argc, char **argv) {
     *s = '\0';
   }
 
-  pattern[0] = '\0';
-
   cursor_position = 0;
 
   /* Here we start to display with curse */
@@ -1245,6 +1270,7 @@ int main(int argc, char **argv) {
 
   current_focus_line = 0;
   displayed_focus_line = 0;
+  cursor_position = strlen(pattern);
 
   update_screen(&current_focus_line, &displayed_focus_line,
                 0,