Changeset 115 for trunk/bin

Timestamp:

10/06/16 21:10:15 (8 years ago)

Author:

tim

Message:

256 color now default

File:

• trunk/bin/bletchley-analyze (modified) (3 diffs)

trunk/bin/bletchley-analyze

@@ -44 +44 @@
 parser.add_argument('-p', dest='output_lines', type=int, default=10,
                     help='Number of lines of input to display in decoded form.')
+parser.add_argument('-C', action='store_const', const=True, default=False,
+                    help='Use mono output for decoded highlights.')
 parser.add_argument('-c', action='store_const', const=True, default=False,
-                    help='Use color output for decoded highlights.')
-parser.add_argument('-c256', action='store_const', const=True, default=False,
-                    help='Use 256 color output for decoded highlights.')
+                    help='Use 8 color output for decoded highlights.')
+parser.add_argument('-c256', action='store_const', const=True, default=True,
+                    help='Use 256 color output for decoded highlights. (default)')
 options = parser.parse_args()
 
@@ -66 +68 @@
         return s
 
-    if options.c256:
-        fg = code%216+16
-        bg = (code^0xffffffff)%216+16
-        return "\x1b[0;38;05;%d;48;05;%dm%s\x1b[0m" % (fg,bg,s)
+    if options.C:
+        return "\x1b[7m%s\x1b[0m" % s        
     elif options.c:
         fg = code%6+31
@@ -75 +75 @@
         return "\x1b[0;%d;%dm%s\x1b[0m" % (fg,bg,s)
     else:
-        return "\x1b[7m%s\x1b[0m" % s
+        fg = code%216+16
+        bg = (code^0xffffffff)%216+16
+        return "\x1b[0;38;05;%d;48;05;%dm%s\x1b[0m" % (fg,bg,s)