Automatic commit

[selector.git] / selector.cc

diff --git a/selector.cc b/selector.cc
index 93a4611..bec4ed3 100644 (file)
--- a/selector.cc
+++ b/selector.cc
@@ -304,7 +304,9 @@ int main(int argc, char **argv) {
   char buffer[buffer_size];
   char *lines[nb_lines_max];
   int no_blink = 0;
-  int theme = 0;
+  int color_theme = 0;
+
+  setlocale(LC_ALL, "");
 
   char input_filename[buffer_size], output_filename[buffer_size];
   strcpy(input_filename, "");
@@ -353,7 +355,7 @@ int main(int argc, char **argv) {
 
     else if(strcmp(argv[i], "-t") == 0) {
       check_opt(argc, argv, i, 1, "<color theme number>");
-      theme = atoi(argv[i+1]);
+      color_theme = atoi(argv[i+1]);
       i += 2;
     }
 
@@ -411,16 +413,32 @@ int main(int argc, char **argv) {
   if(with_colors) {
     if(has_colors()) {
       start_color();
-      switch(theme) {
+      switch(color_theme) {
       default:
       case 0:
         init_pair(1, COLOR_WHITE, COLOR_GREEN);
         init_pair(2, COLOR_BLACK, COLOR_YELLOW);
         break;
       case 1:
+        init_pair(1, COLOR_WHITE, COLOR_BLACK);
+        init_pair(2, COLOR_BLACK, COLOR_YELLOW);
+        break;
+      case 2:
         init_pair(1, COLOR_BLACK, COLOR_GREEN);
         init_pair(2, COLOR_BLACK, COLOR_YELLOW);
         break;
+      case 3:
+        init_pair(1, COLOR_BLACK, COLOR_RED);
+        init_pair(2, COLOR_BLACK, COLOR_YELLOW);
+        break;
+      case 4:
+        init_pair(1, COLOR_WHITE, COLOR_BLACK);
+        init_pair(2, COLOR_BLACK, COLOR_BLUE);
+        break;
+      case 5:
+        init_pair(1, COLOR_BLACK, COLOR_MAGENTA);
+        init_pair(2, COLOR_BLACK, COLOR_CYAN);
+        break;
       }
     } else {
       with_colors = 0;
@@ -497,7 +515,7 @@ int main(int argc, char **argv) {
       if (fd >= 0) {
         // Save current port settings
         tcgetattr(fd,&oldtio);
-        bzero(&newtio, sizeof(newtio));
+        memset(&newtio, 0, sizeof(newtio));
         // Set input mode (non-canonical, *no echo*,...)
         tcflush(fd, TCIFLUSH);
         tcsetattr(fd,TCSANOW, &newtio);