X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=9c863a4851fcb583d1c104b9cb5119aa69a37d3f;hb=32b050005b3bdc3f1f6feab17a25000723e50d79;hp=0bb2d3f95ced54cd5fde0dddc68172f7b0204872;hpb=af3bbcdf9a629c4fb333709dedd435b72bdc5213;p=selector.git

diff --git a/selector.cc b/selector.cc
index 0bb2d3f..9c863a4 100644
--- a/selector.cc
+++ b/selector.cc
@@ -54,6 +54,7 @@ int inverse_order = 0;
 int remove_duplicates = 0;
 int use_regexp = 0;
 int case_sensitive = 0;
+char *title = 0;
 
 //////////////////////////////////////////////////////////////////////
 
@@ -86,6 +87,10 @@ void check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
 //////////////////////////////////////////////////////////////////////
 // A quick and dirty hash table
 
+// The table itself stores index of the strings in a char
+// **table. When a string is added, if it was already in the table,
+// the new index replaces the previous one.
+
 int *new_hash_table(int hash_table_size) {
   int *result;
   result = new int[hash_table_size];
@@ -95,6 +100,10 @@ int *new_hash_table(int hash_table_size) {
   return result;
 }
 
+// Adds new_string in the table, associated to new_index. If this
+// string was not already in the table, returns -1. Otherwise, returns
+// the previous index it had.
+
 int test_and_add(char *new_string, int new_index,
                  char **strings, int *hash_table, int hash_table_size) {
   unsigned int code = 0;
@@ -109,16 +118,23 @@ int test_and_add(char *new_string, int new_index,
   code = code % hash_table_size;
 
   while(hash_table[code] >= 0) {
+    // There is a string with that code
     if(strcmp(new_string, strings[hash_table[code]]) == 0) {
+      // It is the same string, we keep a copy of the stored index
       int result = hash_table[code];
+      // Put the new one
       hash_table[code] = new_index;
+      // And return the previous one
       return result;
     }
+    // This collision was not the same string, let's move to the next
+    // in the table
     code = (code + 1) % hash_table_size;
   }
 
+  // This string was not already in there, store the index in the
+  // table and return -1
   hash_table[code] = new_index;
-
   return -1;
 }
 
@@ -363,11 +379,20 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
   // Draw the modeline
 
-  sprintf(buffer, "%d/%d pattern: %s%s",
-          nb_printed_lines,
-          nb_lines,
-          pattern,
-          use_regexp ? " [regexp]" : "");
+  if(title) {
+    sprintf(buffer, "%s %d/%d pattern: %s%s",
+            title,
+            nb_printed_lines,
+            nb_lines,
+            pattern,
+            use_regexp ? " [regexp]" : "");
+  } else {
+    sprintf(buffer, "%d/%d pattern: %s%s",
+            nb_printed_lines,
+            nb_lines,
+            pattern,
+            use_regexp ? " [regexp]" : "");
+  }
 
   for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' ';
   buffer[console_width] = '\0';
@@ -477,6 +502,14 @@ int main(int argc, char **argv) {
       i++;
     }
 
+    else if(strcmp(argv[i], "-t") == 0) {
+      check_opt(argc, argv, i, 1, "<title>");
+      delete[] title;
+      title = new char[strlen(argv[i+1]) + 1];
+      strcpy(title, argv[i+1]);
+      i += 2;
+    }
+
     else if(strcmp(argv[i], "-l") == 0) {
       check_opt(argc, argv, i, 1, "<maximum number of lines>");
       nb_lines_max = atoi(argv[i+1]);
@@ -520,6 +553,8 @@ int main(int argc, char **argv) {
          << " -e      start in regexp mode" << endl
          << " -a      case sensitive" << endl
          << " -m      monochrome mode" << endl
+         << " -t <title>" << endl
+         << "         add a title in the modeline" << endl
          << " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl
          << "         set the display colors" << endl
          << " -o <output filename>" << endl
@@ -602,8 +637,8 @@ int main(int argc, char **argv) {
         lines[nb_lines] = new char[strlen(s) + 1];
         strcpy(lines[nb_lines], s);
       } else {
-        // We do not allocate a new string but use the pointer to the
-        // first occurence of it
+        // The string was already in there, so we do not allocate a
+        // new string but use the pointer to the first occurence of it
         lines[nb_lines] = lines[dup];
         lines[dup] = 0;
       }
@@ -769,6 +804,7 @@ int main(int argc, char **argv) {
   }
 
   delete[] lines;
+  delete[] title;
 
   exit(0);
 }