Ticket #113: 2079-mcedit-visible-ws-v2.diff

edit/editdraw.c

@@ -52 +52 @@
 #define MOD_MARKED              (1 << 10)
 #define MOD_CURSOR              (1 << 11)
+#define MOD_WHITESPACE          (1 << 12)
 
 #define FONT_OFFSET_X 0
@@ -244 +245 @@
         }
 
-        if (style & MOD_BOLD) {
-            set_color (EDITOR_BOLD_COLOR);
-        } else if (style & MOD_MARKED) {
-            set_color (EDITOR_MARKED_COLOR);
+        if (style & MOD_WHITESPACE) {
+            if (style & MOD_MARKED) {
+                textchar = ' ';
+                set_color (EDITOR_MARKED_COLOR);
+            } else {
+#if 0
+                if (color != EDITOR_NORMAL_COLOR) {
+                    textchar = ' ';
+                    lowlevel_set_color (color);
+                } else
+#endif
+                    set_color (EDITOR_WHITESPACE_COLOR);
+            }
         } else {
-            lowlevel_set_color (color);
+            if (style & MOD_BOLD) {
+                set_color (EDITOR_BOLD_COLOR);
+            } else if (style & MOD_MARKED) {
+                set_color (EDITOR_MARKED_COLOR);
+            } else {
+                lowlevel_set_color (color);
+            }
         }
 
@@ -257 +273 @@
 }
 
+int visible_tabs = 1, visible_tws = 1;
+
 /* b is a pointer to the beginning of the line */
 static void
@@ -264 +282 @@
     static unsigned int line[MAX_LINE_LEN];
     unsigned int *p = line;
-    long m1 = 0, m2 = 0, q, c1, c2;
+    long m1 = 0, m2 = 0, q, c1, c2, tws;
     int col, start_col_real;
     unsigned int c;
@@ -287 +305 @@
 
         if (row <= edit->total_lines - edit->start_line) {
+            if (use_colors && visible_tws) {
+                tws = edit_eol (edit, b);
+                while (tws > b && ((c = edit_get_byte (edit, tws - 1)) == ' '
+                                   || c == '\t'))
+                    tws--;
+            }
+
             while (col <= end_col - edit->start_col) {
                 *p = 0;
@@ -313 +338 @@
                     *p |= book_mark << 16;
                 }
-                q++;
                 switch (c) {
                 case '\n':
@@ -321 +345 @@
                 case '\t':
                     i = TAB_SIZE - ((int) col % TAB_SIZE);
-                    *p |= ' ';
-                    c = *(p++) & ~MOD_CURSOR;
                     col += i;
-                    while (--i)
-                        *(p++) = c;
+                    if (use_colors && visible_tabs) {
+                        c = (*p & ~MOD_CURSOR) | MOD_WHITESPACE;
+                        if (i > 2) {
+                            *(p++) |= '<' | MOD_WHITESPACE;
+                            while (--i > 1)
+                                *(p++) = c | '-';
+                            *(p++) = c | '>';
+                        } else if (i > 1) {
+                            *(p++) |= '<' | MOD_WHITESPACE;
+                            *(p++) = c | '>';
+                        } else
+                            *(p++) |= '>' | MOD_WHITESPACE;
+                    } else if (use_colors && visible_tws && q >= tws) {
+                        *p |= '.' | MOD_WHITESPACE;
+                        c = *(p++) & ~MOD_CURSOR;
+                        while (--i)
+                            *(p++) = c;
+                    } else {
+                        *p |= ' ';
+                        c = *(p++) & ~MOD_CURSOR;
+                        while (--i)
+                            *(p++) = c;
+                    }
                     break;
+                case ' ':
+                    if (use_colors && visible_tws && q >= tws) {
+                        *(p++) |= '.' | MOD_WHITESPACE;
+                        col++;
+                        break;
+                    }
+                    /* fallthrough */
                 default:
                     c = convert_to_display_c (c);
@@ -352 +402 @@
                     break;
                 }
+                q++;
             }
         }

src/color.c

@@ -100 +100 @@
     { "editbold=",       0, 0 },        /* search->found */
     { "editmarked=",     0, 0 },        /* marked/selected */
+    { "editwhitespace=", 0, 0 },        /* whitespace */
 
-/* error dialog colors start at 37 */
-    { "errdhotnormal=",  0, 0 }, /* Error dialog normal/hot */ /* 37 */
+/* error dialog colors start at 38 */
+    { "errdhotnormal=",  0, 0 }, /* Error dialog normal/hot */ /* 38 */
     { "errdhotfocus=",   0, 0 }, /* Error dialog focused/hot */
 };
@@ -165 +166 @@
 "editbold=yellow,blue:"
 "editmarked=black,cyan:"
+"editwhitespace=brightblue,blue:"
 "errdhotnormal=yellow,red:"
 "errdhotfocus=yellow,lightgray";

src/color.h

@@ -72 +72 @@
 
 /*
- * editor colors - only 3 for normal, search->found, and select, respectively
+ * editor colors - only 4 for normal, search->found, select, and whitespace
+ * respectively
  * Last is defined to view color.
  */
@@ -79 +80 @@
 #define EDITOR_BOLD_COLOR            IF_COLOR (35, A_BOLD)
 #define EDITOR_MARKED_COLOR          IF_COLOR (36, A_REVERSE)
+#define EDITOR_WHITESPACE_COLOR      IF_COLOR (37, 0 /* irrelevant */)
 
 /* Error dialog colors */
-#define ERROR_HOT_NORMAL   IF_COLOR (37, 0)
-#define ERROR_HOT_FOCUS    IF_COLOR (38, 0)
+#define ERROR_HOT_NORMAL   IF_COLOR (38, 0)
+#define ERROR_HOT_FOCUS    IF_COLOR (39, 0)
 
 #ifdef HAVE_SLANG