aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2015-05-13 00:22:26 -0500
committerRob Landley <rob@landley.net>2015-05-13 00:22:26 -0500
commit913a7796bb47e0b65c4f28920c39a87c6b6211dd (patch)
tree3a9a61617b8488087ca49c9b96076a20b8ca0c94
parentb18c7e8a59e61b8ec49e2d0f8cb2dda19b8f6a82 (diff)
downloadtoybox-913a7796bb47e0b65c4f28920c39a87c6b6211dd.tar.gz
More hexedit cursor boundary tweaking.
-rw-r--r--toys/other/hexedit.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/toys/other/hexedit.c b/toys/other/hexedit.c
index 518755bb..9e9ca11e 100644
--- a/toys/other/hexedit.c
+++ b/toys/other/hexedit.c
@@ -75,18 +75,17 @@ static void draw_char(char broiled)
static void draw_line(long long yy)
{
- int x;
+ int x, xx = 16;
yy = (TT.base+yy)*16;
+ if (yy+xx>=TT.len) xx = TT.len-yy;
if (yy<TT.len) {
printf("\r%0*llX ", TT.numlen, yy);
- for (x=0; x<16; x++) {
- if (yy+x<TT.len) printf(" %02X", TT.data[yy+x]);
- else printf(" ");
- }
- printf(" ");
- for (x=0; x<16; x++) draw_char(TT.data[yy+x]);
+ for (x=0; x<xx; x++) printf(" %02X", TT.data[yy+x]);
+ printf("%*s", 2+3*(16-xx), "");
+ for (x=0; x<xx; x++) draw_char(TT.data[yy+x]);
+ printf("%*s", 16-xx, "");
}
esc("K");
}
@@ -166,7 +165,8 @@ void hexedit_main(void)
pos = 16*(TT.base+y)+x;
if (pos>=TT.len) {
pos = TT.len-1;
- x = (TT.len-1)%15;
+ x = pos&15;
+ y = (pos/16)-TT.base;
}
// Display cursor
@@ -212,14 +212,14 @@ void hexedit_main(void)
y = 0;
}
} else if (key==KEY_DOWN) {
- if (y == TT.height-1 && pos+32<TT.len) {
+ if (y == TT.height-1 && (pos|15)+1<TT.len) {
down:
TT.base++;
esc("1S");
jump(0, TT.height-1);
draw_line(TT.height-1);
}
- if (pos+16<TT.len && ++y>=TT.height) y--;
+ if (++y>=TT.height) y--;
} else if (key==KEY_RIGHT) {
if (x<15 && pos+1<TT.len) x++;
} else if (key==KEY_LEFT) {