From 7657e4d7db609460aa6d7bc993ee1ec2aa94670f Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Sun, 20 Oct 2013 21:46:07 -0400
Subject: [PATCH] Harmonize windows refresh function names

---
 src/emugtk.c | 8 ++++----
 src/memwin.c | 9 ++++-----
 src/memwin.h | 2 +-
 src/pgmwin.c | 7 +++----
 src/pgmwin.h | 2 +-
 src/regwin.c | 2 +-
 src/regwin.h | 2 +-
 7 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/emugtk.c b/src/emugtk.c
index f4f9301..3ca0c04 100644
--- a/src/emugtk.c
+++ b/src/emugtk.c
@@ -60,10 +60,10 @@ void
 emugtk_UpdateDisplay(void)
 {
 	log_debug("UpdateDisplay()");
-	regwin_Show();
-	pgmwin_Disasm();
-	memwin_DumpD(INT_MEM_ID);
-	memwin_DumpD(EXT_MEM_ID);
+	regwin_refresh();
+	pgmwin_refresh();
+	memwin_refresh(INT_MEM_ID);
+	memwin_refresh(EXT_MEM_ID);
 }
 
 /* Step out of running state */
diff --git a/src/memwin.c b/src/memwin.c
index 17b9413..ffe5e56 100644
--- a/src/memwin.c
+++ b/src/memwin.c
@@ -32,6 +32,7 @@
 #include "cpu8051.h"
 #include "regwin.h"
 #include "memwin.h"
+#include "emugtk.h"
 
 #define DATA_COLS 16 /* Must be a power of 2 */
 #define DATA_ROWS_INT (INT_MEM_SIZE / DATA_COLS)
@@ -132,7 +133,7 @@ memwin_cell_edited(GtkCellRendererText *cell, gchar *path_string,
 	 * Make sure to update all registers and memory.
 	 * For example, BANKed registers depends on internal memory.
 	 */
-	regwin_Show();
+	emugtk_UpdateDisplay();
 };
 
 static void
@@ -247,9 +248,9 @@ memwin_init(char *title, int memory_id)
 	return frame;
 }
 
-/* Dump up to 256 bytes from Address in Memory (direct addressing) */
+/* Dump internal or external memory. */
 void
-memwin_DumpD(int memory_id)
+memwin_refresh(int memory_id)
 {
 	int row;
 	unsigned int Address;
@@ -257,8 +258,6 @@ memwin_DumpD(int memory_id)
 	GtkWidget *memlist;
 	int data_rows;
 
-	log_info("memwin_DumpD()");
-
 	Address = 0;
 
 	if (memory_id == INT_MEM_ID) {
diff --git a/src/memwin.h b/src/memwin.h
index 3d0704f..ccb528d 100644
--- a/src/memwin.h
+++ b/src/memwin.h
@@ -28,6 +28,6 @@ GtkWidget *
 memwin_init(char *title, int memory_id);
 
 void
-memwin_DumpD(int memory_id);
+memwin_refresh(int memory_id);
 
 #endif /* MEMWIN_H */
diff --git a/src/pgmwin.c b/src/pgmwin.c
index 04cff15..69410bc 100644
--- a/src/pgmwin.c
+++ b/src/pgmwin.c
@@ -144,7 +144,7 @@ pgmwin_sel_changed_event(GtkWidget *widget, GdkEvent *event, gpointer data)
 		log_debug("  row address is: $%04X", val);
 
 		ToggleBreakpoint(val);
-		pgmwin_Disasm();
+		pgmwin_refresh();
 
 		g_free(str_addr);
 	} else {
@@ -205,7 +205,7 @@ pgmwin_init(void)
 
 /* Show disassembled program. */
 void
-pgmwin_Disasm(void)
+pgmwin_refresh(void)
 {
 	int row;
 	GtkListStore *store;
@@ -219,8 +219,7 @@ pgmwin_Disasm(void)
 		int valid;
 		GtkTreeIter iter;
 		char str[128];
-		int k;
-		int col_id;
+		int k;		int col_id;
 		int InstSize;
 		unsigned char OpCode;
 
diff --git a/src/pgmwin.h b/src/pgmwin.h
index 0276e7f..952d931 100644
--- a/src/pgmwin.h
+++ b/src/pgmwin.h
@@ -28,7 +28,7 @@ GtkWidget *
 pgmwin_init(void);
 
 void
-pgmwin_Disasm(void);
+pgmwin_refresh(void);
 
 int
 pgmwin_IsBreakpoint(unsigned int address);
diff --git a/src/regwin.c b/src/regwin.c
index aaa006b..f94b8f9 100644
--- a/src/regwin.c
+++ b/src/regwin.c
@@ -466,7 +466,7 @@ regwin_init(void)
 
 /* Show registers. */
 void
-regwin_Show(void)
+regwin_refresh(void)
 {
 	int row;
 	GtkListStore *store;
diff --git a/src/regwin.h b/src/regwin.h
index 45e71e2..a526f6f 100644
--- a/src/regwin.h
+++ b/src/regwin.h
@@ -28,6 +28,6 @@ GtkWidget *
 regwin_init(void);
 
 void
-regwin_Show(void);
+regwin_refresh(void);
 
 #endif /* REGWIN_H */
-- 
2.20.1