X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=inline;f=libvisor%2Fsrc%2Fvisor.c;h=2c9352188c72b21a63bdd51ebcaffcbe8f7bb7ac;hb=8bf8b3066f32093ee83cb52e720002ea7dc94250;hp=12b5a02ab0b730b54a80395d7eb98763269ea3a2;hpb=94c867869ece77f27cf3c8b637d44e13d86f5b88;p=visor
diff --git a/libvisor/src/visor.c b/libvisor/src/visor.c
index 12b5a02..2c93521 100644
--- a/libvisor/src/visor.c
+++ b/libvisor/src/visor.c
@@ -33,6 +33,21 @@ along with this program. If not, see .
#define vi_write vi->fop.write
#define vi_seek vi->fop.seek
+#define vi_clear() vi->tty.clear(vi->tty_cls)
+#define vi_clear_line() vi->tty.clear_line(vi->tty_cls)
+#define vi_clear_line_at(y) vi->tty.clear_line_at(y, vi->tty_cls)
+#define vi_setcursor(x, y) vi->tty.setcursor(x, y, vi->tty_cls)
+#define vi_putchar(c) vi->tty.putchar(c, vi->tty_cls)
+#define vi_putchar_at(x, y, c) v->tty.putchar_at(x, y, c, vi->tty_cls)
+#define vi_scroll(n) vi->tty.scroll(n, vi->tty_cls)
+#define vi_del_back() vi->tty.del_back(vi->tty_cls)
+#define vi_del_fwd() vi->tty.del_fwd(vi->tty_cls)
+#define vi_status(s) vi->tty.status(s, vi->tty_cls)
+#define vi_flush() vi->tty.flush(vi->tty_cls)
+
+static int remove_buf(struct visor *vi, struct vi_buffer *vb);
+static int add_span(struct vi_buffer *vb, vi_addr at, int src, vi_addr start, unsigned long size);
+
#ifdef HAVE_LIBC
static const struct vi_alloc stdalloc = { malloc, free, realloc };
#endif
@@ -53,6 +68,9 @@ struct visor *vi_create(struct vi_alloc *mm)
memset(vi, 0, sizeof *vi);
vi->mm = *mm;
+ vi->term_width = 80;
+ vi->term_height = 24;
+
return vi;
}
@@ -74,6 +92,67 @@ void vi_set_ttyops(struct visor *vi, struct vi_ttyops *tty)
vi->tty = *tty;
}
+void vi_term_size(struct visor *vi, int xsz, int ysz)
+{
+ vi->term_width = xsz;
+ vi->term_height = ysz;
+}
+
+void vi_redraw(struct visor *vi)
+{
+ int i, col, cur_x = 0, cur_y = 0;
+ char c;
+ struct vi_buffer *vb;
+ struct vi_span *sp, *spans_end;
+ const char *tptr, *tend;
+ vi_addr spoffs, addr;
+
+ vb = vi->buflist;
+ if(!(sp = vi_buf_find_span(vb, vb->view_start, &spoffs))) {
+ sp = vb->spans;
+ spoffs = 0;
+ }
+ spans_end = vb->spans + vb->num_spans;
+
+ tptr = vi_buf_span_text(vb, sp);
+ tend = tptr + sp->size;
+ tptr += spoffs;
+
+ vi_clear();
+
+ addr = vb->view_start;
+ for(i=0; iterm_height; i++) {
+ vi_setcursor(0, i);
+ col = -vb->view_xscroll - 1;
+ while(++col < vi->term_width && (c = (addr++, *tptr++)) != '\n') {
+ if(addr == vb->cursor) {
+ cur_x = col;
+ cur_y = i;
+ }
+
+ if(col >= 0) {
+ vi_putchar(c);
+ }
+ if(tptr >= tend) {
+ if(++sp >= spans_end) {
+ goto end;
+ }
+ tptr = vi_buf_span_text(vb, sp);
+ tend = tptr + sp->size;
+ }
+ }
+ }
+end:
+
+ while(i < vi->term_height) {
+ vi_setcursor(0, i++);
+ vi_putchar('~');
+ }
+
+ vi_setcursor(cur_x, cur_y);
+ vi_flush();
+}
+
struct vi_buffer *vi_new_buf(struct visor *vi, const char *path)
{
struct vi_buffer *nb;
@@ -136,8 +215,16 @@ int vi_delete_buf(struct visor *vi, struct vi_buffer *vb)
return -1;
}
+ if(vb->fp) {
+ if(vb->file_mapped) {
+ vi_unmap(vb->fp);
+ } else {
+ vi_free(vb->orig);
+ }
+ vi_close(vb->fp);
+ }
+
vi_free(vb->path);
- vi_free(vb->orig);
vi_free(vb->add);
vi_free(vb->spans);
return 0;