From 2a0f1a1cd06d97933444450365c7c5bafb50b9b9 Mon Sep 17 00:00:00 2001
From: Roland Illig <roland.illig@gmx.de>
Date: Mon, 29 Aug 2005 08:53:28 +0000
Subject: [PATCH] 	* view.c: Converted to use the new tty functions.

---
 src/ChangeLog |  1 +
 src/view.c    | 35 +++++++++++++++--------------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 3979469d4..d9f87c72f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,6 +6,7 @@
 	used instead of depending directly on ncurses or SLang features.
 	* tty.h: Added the new function prototypes from tty.c and some
 	legacy definitions.
+	* view.c: Converted to use the new tty functions.
 
 2005-08-28  Roland Illig  <roland.illig@gmx.de>
 
diff --git a/src/view.c b/src/view.c
index 99f162ee5..4d4dcf0e6 100644
--- a/src/view.c
+++ b/src/view.c
@@ -1685,11 +1685,6 @@ view_display_clean (WView *view)
     }
 }
 
-#define view_add_character(view,c) addch (c)
-#define view_add_one_vline()       one_vline()
-#define view_add_string(view,s)    addstr (s)
-#define view_gotoyx(v,r,c)    widget_move (v,r,c)
-
 typedef enum {
     MARK_NORMAL,
     MARK_SELECTED,
@@ -1729,15 +1724,15 @@ view_display_ruler (WView *view)
     for (c = 0; c < width; c++) {
 	cl = view->dpy_text_column + c;
 	if (line_row < height) {
-	    view_gotoyx (view, top + line_row, left + c);
-	    view_add_character (view, ruler_chars[cl % 10]);
+	    widget_move (view, top + line_row, left + c);
+	    tty_print_char (ruler_chars[cl % 10]);
 	}
 
 	if ((cl != 0) && (cl % 10) == 0) {
 	    g_snprintf (r_buff, sizeof (r_buff), "%"OFFSETTYPE_PRId, cl);
 	    if (nums_row < height) {
 		widget_move (view, top + nums_row, left + c - 1);
-		view_add_string (view, r_buff);
+		tty_print_string (r_buff);
 	    }
 	}
     }
@@ -1776,8 +1771,8 @@ view_display_hex (WView *view)
 	/* Print the hex offset */
 	attrset (MARKED_COLOR);
 	g_snprintf (hex_buff, sizeof (hex_buff), "%08"OFFSETTYPE_PRIX, from);
-	view_gotoyx (view, top + row, left);
-	view_add_string (view, hex_buff);
+	widget_move (view, top + row, left);
+	tty_print_string (hex_buff);
 	attrset (NORMAL_COLOR);
 
 	col = hex_start;
@@ -1823,24 +1818,24 @@ view_display_hex (WView *view)
 		VIEW_UNDERLINED_COLOR);
 
 	    /* Print the hex number */
-	    view_gotoyx (view, top + row, left + col);
-	    view_add_character (view, hex_char[c / 16]);
-	    view_add_character (view, hex_char[c % 16]);
+	    widget_move (view, top + row, left + col);
+	    tty_print_char (hex_char[c / 16]);
+	    tty_print_char (hex_char[c % 16]);
 	    col += 2;
 
 	    /* Print the separator */
 	    attrset (NORMAL_COLOR);
 	    if (bytes != view->bytes_per_line - 1) {
-		view_add_character (view, ' ');
+		tty_print_char (' ');
 		col += 1;
 
 		/* After every four bytes, print a group separator */
 		if (bytes % 4 == 3) {
 		    if (view->data_area.width >= 80) {
-			view_add_one_vline ();
+			tty_print_one_vline ();
 			col += 1;
 		    }
-		    view_add_character (view, ' ');
+		    tty_print_char (' ');
 		    col += 1;
 		}
 	    }
@@ -1860,8 +1855,8 @@ view_display_hex (WView *view)
 		c = '.';
 
 	    /* Print corresponding character on the text side */
-	    view_gotoyx (view, top + row, left + text_start + bytes);
-	    view_add_character (view, c);
+	    widget_move (view, top + row, left + text_start + bytes);
+	    tty_print_char (c);
 
 	    /* Save the cursor position for view_place_cursor() */
 	    if (from == view->hex_cursor && view->hexview_in_text) {
@@ -1960,11 +1955,11 @@ view_display_text (WView * view)
 
 	if (col >= view->dpy_text_column
 	    && col - view->dpy_text_column < width) {
-	    view_gotoyx (view, top + row, left + (col - view->dpy_text_column));
+	    widget_move (view, top + row, left + (col - view->dpy_text_column));
 	    c = convert_to_display_c (c);
 	    if (!is_printable (c))
 		c = '.';
-	    view_add_character (view, c);
+	    tty_print_char (c);
 	}
 	col++;
 	attrset (NORMAL_COLOR);