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

(mcview_offset_doz): use more.

Browse Source
This commit is contained in:
Andrew Borodin 2014-09-26 11:11:11 +04:00
parent 0ad09aa393
commit e9c5fb3048
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/viewer/inlines.h
View File

@ -17,6 +17,7 @@
/*** inline functions ****************************************************************************/ /*** inline functions ****************************************************************************/
/* difference or zero */
static inline off_t static inline off_t
mcview_offset_doz (off_t a, off_t b) mcview_offset_doz (off_t a, off_t b)
{ {

21
src/viewer/move.c
View File

@ -180,10 +180,8 @@ mcview_move_down (mcview_t * view, off_t lines)
{ {
off_t i, limit; off_t i, limit;
if (last_byte >= (off_t) view->bytes_per_line) limit = mcview_offset_doz (last_byte, (off_t) view->bytes_per_line);
limit = last_byte - view->bytes_per_line;
else
limit = 0;
for (i = 0; i < lines && view->hex_cursor < limit; i++) for (i = 0; i < lines && view->hex_cursor < limit; i++)
{ {
view->hex_cursor += view->bytes_per_line; view->hex_cursor += view->bytes_per_line;
@ -258,12 +256,8 @@ mcview_move_left (mcview_t * view, off_t columns)
view->hexedit_lownibble = !view->hexedit_lownibble; view->hexedit_lownibble = !view->hexedit_lownibble;
} }
else else
{ view->dpy_text_column = mcview_offset_doz (view->dpy_text_column, columns);
if (view->dpy_text_column >= columns)
view->dpy_text_column -= columns;
else
view->dpy_text_column = 0;
}
mcview_movement_fixups (view, FALSE); mcview_movement_fixups (view, FALSE);
} }
@ -276,6 +270,7 @@ mcview_move_right (mcview_t * view, off_t columns)
{ {
off_t last_byte; off_t last_byte;
off_t old_cursor = view->hex_cursor; off_t old_cursor = view->hex_cursor;
last_byte = mcview_offset_doz (mcview_get_filesize (view), 1); last_byte = mcview_offset_doz (mcview_get_filesize (view), 1);
#ifdef HAVE_ASSERT_H #ifdef HAVE_ASSERT_H
assert (columns == 1); assert (columns == 1);
@ -410,10 +405,8 @@ mcview_moveto_eol (mcview_t * view)
if (eol > bol) if (eol > bol)
view->dpy_text_column = eol - bol; view->dpy_text_column = eol - bol;
if (view->dpy_text_column < (off_t) view->data_area.width) view->dpy_text_column =
view->dpy_text_column = 0; mcview_offset_doz (view->dpy_text_column, (off_t) view->data_area.width);
else
view->dpy_text_column = view->dpy_text_column - (off_t) view->data_area.width;
} }
mcview_movement_fixups (view, FALSE); mcview_movement_fixups (view, FALSE);
} }