mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

* view.c (display): Extracted the code for drawing the ruler into

Browse Source 
its own function, view_display_ruler(). Rewrote it.
This commit is contained in:
Roland Illig 2005-04-19 22:33:21 +00:00
parent 2312d2ce97
commit 92526f4b57
2 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ChangeLog
View File

@ -9,6 +9,8 @@
* view.c (view_move_forward2): Early return if get_byte() returns * view.c (view_move_forward2): Early return if get_byte() returns
-1. -1.
* view.c: Replaced const_cast with str_unconst. * view.c: Replaced const_cast with str_unconst.
* view.c (display): Extracted the code for drawing the ruler into
its own function, view_display_ruler(). Rewrote it.
2005-04-18 Roland Illig <roland.illig@gmx.de> 2005-04-18 Roland Illig <roland.illig@gmx.de>

59
src/view.c
View File

@ -77,6 +77,7 @@ typedef unsigned long offset_type;
#define INVALID_OFFSET ((offset_type) -1) #define INVALID_OFFSET ((offset_type) -1)
#define OFFSETTYPE_MAX (~((offset_type) 0)) #define OFFSETTYPE_MAX (~((offset_type) 0))
#define OFFSETTYPE_PRIX "%08lX" #define OFFSETTYPE_PRIX "%08lX"
#define OFFSETTYPE_PRId "%lu"
/* A width or height on the screen */ /* A width or height on the screen */
typedef unsigned int screen_dimen; typedef unsigned int screen_dimen;
@ -864,6 +865,38 @@ view_count_backspaces (WView *view, off_t offset)
return backspaces; return backspaces;
} }
static void
view_display_ruler (WView *view)
{
const char ruler_chars[] = "|----*----";
const int top = view_get_top (view);
const int left = view_get_left (view);
const int bottom = view_get_bottom (view);
const int right = view_get_right (view);
const int line_row = (ruler == 1) ? top + 0 : (bottom - 1) - 0;
const int nums_row = (ruler == 1) ? top + 1 : (bottom - 1) - 1;
char r_buff[10];
offset_type cl;
int c;
attrset (MARKED_COLOR);
for (c = left; c < right; c++) {
/* FIXME: possible integer overflow */
cl = c + view->dpy_text_start_col;
view_gotoyx (view, line_row, c);
view_add_character (view, ruler_chars[cl % 10]);
if ((cl != 0) && (cl % 10) == 0) {
g_snprintf (r_buff, sizeof (r_buff), OFFSETTYPE_PRId, cl);
widget_move (view, nums_row, c - 1);
view_add_string (view, r_buff);
}
}
attrset (NORMAL_COLOR);
}
/* Shows the file pointed to by *dpy_text_start on view_win */ /* Shows the file pointed to by *dpy_text_start on view_win */
static offset_type static offset_type
display (WView *view) display (WView *view)
@ -887,31 +920,7 @@ display (WView *view)
/* Optionally, display a ruler */ /* Optionally, display a ruler */
if ((!view->hex_mode) && (ruler)) { if ((!view->hex_mode) && (ruler)) {
const char ruler_chars[] = "|----*----"; view_display_ruler (view);
char r_buff[10];
int cl;
attrset (MARKED_COLOR);
for (c = left; c < right; c++) {
/* FIXME: possible integer overflow */
cl = c + view->dpy_text_start_col;
if (ruler == 1)
view_gotoyx (view, row, c);
else
view_gotoyx (view, bottom - 1, c);
view_add_character (view, ruler_chars[cl % 10]);
if ((cl != 0) && (cl % 10) == 0) {
g_snprintf (r_buff, sizeof (r_buff), "%03d", cl);
if (ruler == 1) {
widget_move (view, row + 1, c - 1);
} else {
widget_move (view, bottom - 2, c - 1);
}
view_add_string (view, r_buff);
}
}
attrset (NORMAL_COLOR);
if (ruler == 1) if (ruler == 1)
row += 2; row += 2;
else else