mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-02-09 11:54:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

* edit.h: Move style definitions ...

Browse Source 
* editdraw.c: ... here.  Multiply them by 256.  Remove unused
styles.
(print_to_widget): Don't divide style by 256.  Simplify logic
since we only have 4 styles now.
This commit is contained in:
Pavel Roskin 2002-09-23 23:05:15 +00:00
parent 6d1beed458
commit 50c15654ef
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
edit/ChangeLog
View File

@ -1,5 +1,11 @@
2002-09-23 Pavel Roskin <proski@gnu.org>
* edit.h: Move style definitions ...
* editdraw.c: ... here. Multiply them by 256. Remove unused
styles.
(print_to_widget): Don't divide style by 256. Simplify logic
since we only have 4 styles now.
* edit.c (edit_move_forward3): Use caret notation for code 127
and below code 32.
* editdraw.c (edit_draw_this_line): Likewise. Print '.' for

9
edit/edit.h
View File

@ -84,15 +84,6 @@
#define REDRAW_CHAR_ONLY (1 << 7)
#define REDRAW_COMPLETELY (1 << 8)
#define MOD_ABNORMAL (1 << 0)
#define MOD_UNDERLINED (1 << 1)
#define MOD_BOLD (1 << 2)
#define MOD_HIGHLIGHTED (1 << 3)
#define MOD_MARKED (1 << 4)
#define MOD_ITALIC (1 << 5)
#define MOD_CURSOR (1 << 6)
#define MOD_INVERSE (1 << 7)
#define EDIT_TEXT_HORIZONTAL_OFFSET 0
#define EDIT_TEXT_VERTICAL_OFFSET 1
#define FONT_OFFSET_X 0

45
edit/editdraw.c
View File

@ -31,6 +31,13 @@
#include "src/charsets.h"
#endif
/* Text styles */
#define MOD_ABNORMAL (1 << 8)
#define MOD_BOLD (1 << 9)
#define MOD_MARKED (1 << 10)
#define MOD_CURSOR (1 << 11)
static void status_string (WEdit * edit, char *s, int w, int fill)
{
char byte_str[16];
@ -206,7 +213,7 @@ static void print_to_widget (WEdit * edit, long row, int start_col, float start_
int color;
while (*p) {
style = *p >> 8;
style = *p & 0xFF00;
textchar = *p & 0xFF;
color = *p >> 16;
@ -214,19 +221,15 @@ static void print_to_widget (WEdit * edit, long row, int start_col, float start_
/* Non-printable - use black background */
color = 0;
}
if (!(style & (0xFF - MOD_ABNORMAL - MOD_CURSOR)))
lowlevel_set_color (color);
if (style & MOD_HIGHLIGHTED) {
if (style & MOD_BOLD) {
set_color (EDITOR_BOLD_COLOR);
} else if (style & MOD_MARKED) {
set_color (EDITOR_MARKED_COLOR);
} else {
lowlevel_set_color (color);
}
if (style & MOD_UNDERLINED) {
set_color (EDITOR_UNDERLINED_COLOR);
}
if (style & MOD_BOLD) {
set_color (EDITOR_BOLD_COLOR);
}
addch (textchar);
p++;
}
@ -262,20 +265,20 @@ static void edit_draw_this_line (WEdit * edit, long b, long row, long start_col,
while (col <= end_col - edit->start_col) {
*p = 0;
if (q == edit->curs1)
*p |= MOD_CURSOR * 256;
*p |= MOD_CURSOR;
if (q >= m1 && q < m2) {
if (column_highlighting) {
int x;
x = edit_move_forward3 (edit, b, 0, q);
if (x >= c1 && x < c2)
*p |= MOD_MARKED * 256;
*p |= MOD_MARKED;
} else
*p |= MOD_MARKED * 256;
*p |= MOD_MARKED;
}
if (q == edit->bracket)
*p |= MOD_BOLD * 256;
*p |= MOD_BOLD;
if (q >= edit->found_start && q < edit->found_start + edit->found_len)
*p |= MOD_HIGHLIGHTED * 256;
*p |= MOD_BOLD;
c = edit_get_byte (edit, q);
/* we don't use bg for mc - fg contains both */
if (book_mark == -1) {
@ -293,7 +296,7 @@ static void edit_draw_this_line (WEdit * edit, long b, long row, long start_col,
case '\t':
i = TAB_SIZE - ((int) col % TAB_SIZE);
*p |= ' ';
c = *(p++) & (0xFFFFFFFF - MOD_CURSOR * 256);
c = *(p++) & ~MOD_CURSOR;
col += i;
while (--i)
*(p++) = c;
@ -305,14 +308,14 @@ static void edit_draw_this_line (WEdit * edit, long b, long row, long start_col,
#endif
/* Caret notation for control characters */
if (c < 32) {
*(p++) = '^' | (256 * MOD_ABNORMAL);
*(p++) = (c + 0x40) | (256 * MOD_ABNORMAL);
*(p++) = '^' | MOD_ABNORMAL;
*(p++) = (c + 0x40) | MOD_ABNORMAL;
col += 2;
break;
}
if (c == 127) {
*(p++) = '^' | (256 * MOD_ABNORMAL);
*(p++) = '?' | (256 * MOD_ABNORMAL);
*(p++) = '^' | MOD_ABNORMAL;
*(p++) = '?' | MOD_ABNORMAL;
col += 2;
break;
}
@ -320,7 +323,7 @@ static void edit_draw_this_line (WEdit * edit, long b, long row, long start_col,
if (is_printable (c)) {
*(p++) |= c;
} else {
*(p++) = '.' | (256 * MOD_ABNORMAL);
*(p++) = '.' | MOD_ABNORMAL;
}
col++;
break;