mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* src/color.h: Add a new color pair. 

* src/color.c: Likewise.
* edit/editdraw.c (print_to_widget): Make tabs and trailing whitespace
characters visible.
(edit_draw_this_line): Likewise.
This commit is contained in:
Pavel Tsekov 2007-08-27 12:06:02 +00:00
parent 767982df31
commit 139e48183f
5 changed files with 82 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
edit/ChangeLog
View File

@ -1,3 +1,9 @@
2007-08-27 Oswald Buddenhagen <ossi@kde.org>
* editdraw.c (print_to_widget): Make tabs and trailing whitespace
characters visible.
(edit_draw_this_line): Likewise.
2007-05-02 Pavel Tsekov <ptsekov@gmx.net>
* editcmd.c (edit_find_string): Fix an off-by-one error when matching

73
edit/editdraw.c
View File

@ -51,6 +51,7 @@
#define MOD_BOLD (1 << 9)
#define MOD_MARKED (1 << 10)
#define MOD_CURSOR (1 << 11)
#define MOD_WHITESPACE (1 << 12)
#define FONT_OFFSET_X 0
#define FONT_OFFSET_Y 0
@ -243,12 +244,27 @@ print_to_widget (WEdit *edit, long row, int start_col, int start_col_real,
color = 0;
}
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);
}
}
addch (textchar);
@ -256,6 +272,8 @@ print_to_widget (WEdit *edit, long row, int start_col, int start_col_real,
}
}
int visible_tabs = 1, visible_tws = 1;
/* b is a pointer to the beginning of the line */
static void
edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
@ -263,7 +281,7 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
{
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;
int color;
@ -281,6 +299,13 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
eval_marks (edit, &m1, &m2);
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;
if (q == edit->curs1)
@ -303,7 +328,6 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
/* we don't use bg for mc - fg contains both */
edit_get_syntax_color (edit, q, &color);
*p |= color << 16;
q++;
switch (c) {
case '\n':
col = end_col - edit->start_col + 1; /* quit */
@ -311,12 +335,38 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
break;
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);
@ -342,6 +392,7 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
col++;
break;
}
q++;
}
}
} else {

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2007-08-27 Oswald Buddenhagen <ossi@kde.org>
* color.h: Add a new color pair.
* color.c: Likewise.
2007-08-24 Pavel Tsekov <ptsekov@gmx.net>
* screen.c (show_dir): Surrond the current directory with spaces.

6
src/color.c
View File

@ -99,9 +99,10 @@ static struct colorpair color_map [] = {
{ "editnormal=", 0, 0 }, /* normal */ /* 34 */
{ "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 */
};
@ -164,6 +165,7 @@ static const char *default_colors =
"editnormal=lightgray,blue:"
"editbold=yellow,blue:"
"editmarked=black,cyan:"
"editwhitespace=brightblue,blue:"
"errdhotnormal=yellow,red:"
"errdhotfocus=yellow,lightgray";

8
src/color.h
View File

@ -71,17 +71,19 @@ extern int alarm_colors[4];
#define DEFAULT_COLOR IF_COLOR (DEFAULT_COLOR_INDEX, 0)
/*
* 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.
*/
#define EDITOR_NORMAL_COLOR_INDEX 34
#define EDITOR_NORMAL_COLOR IF_COLOR (EDITOR_NORMAL_COLOR_INDEX, 0)
#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
# define CTYPE const char *