X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fmemwin.c;h=4c8cc221b0d30e348feb42da902c2a917754c8b1;hb=ca2a000a22e5b5121a61833198966f001aa2a77f;hp=17b94136fefae5b783bbe8716285c9bd786281b7;hpb=fcc8caad9c6c54d1bd1fa3b6e37dd392aac6eb47;p=emu8051.git

diff --git a/src/memwin.c b/src/memwin.c
index 17b9413..4c8cc22 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)
@@ -93,6 +94,7 @@ memwin_cell_edited(GtkCellRendererText *cell, gchar *path_string,
         columnptr = g_object_get_data(G_OBJECT(cell), "column");
         column = GPOINTER_TO_UINT(columnptr);
 
+	/* Memory ID  is passed as renderer object data */
 	memory_id_ptr = g_object_get_data(G_OBJECT(cell), "memory_id");
 	memory_id = GPOINTER_TO_UINT(memory_id_ptr);
 
@@ -132,7 +134,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
@@ -157,21 +159,25 @@ memwin_init_columns(GtkWidget *listview, int memory_id)
 		/* Create new renderer for each editable cell. */
 		renderer = gtk_cell_renderer_text_new();
 
-		/* Allow edition, align to right side. */
-		g_object_set(renderer, "editable", TRUE, "xalign", 1.0, NULL);
+		/* Allow edition, align to left side. */
+		g_object_set(renderer, "editable", TRUE, "xalign", 0, NULL);
 
 		g_signal_connect(renderer, "edited",
 				 G_CALLBACK(memwin_cell_edited),
 				 gtk_tree_view_get_model(
 					 GTK_TREE_VIEW(listview)));
 
-		/* Add column index, used when editing the cell. */
+		/* Add column index and memory_id, used when editing the cell. */
 		g_object_set_data(G_OBJECT(renderer), "column",
 				  GUINT_TO_POINTER(i));
 		g_object_set_data(G_OBJECT(renderer), "memory_id",
 				  GUINT_TO_POINTER(memory_id));
 
-		sprintf(col_name, "B%02d", i - COL_DATA0);
+		/* Use two digits only if DATA_ROWS > 10 */
+		if (DATA_COLS < 10)
+			sprintf(col_name, "B%1d", i - COL_DATA0);
+		else
+			sprintf(col_name, "B%02d", i - COL_DATA0);
 
 		column = gtk_tree_view_column_new_with_attributes(
 			col_name, renderer, "text", i, NULL);
@@ -180,7 +186,9 @@ memwin_init_columns(GtkWidget *listview, int memory_id)
 		gtk_tree_view_append_column(GTK_TREE_VIEW(listview), column);
 	}
 
-	/* Add ASCII column */
+	/* Add ASCII column, using fixed-font. */
+	renderer = gtk_cell_renderer_text_new();
+	g_object_set(renderer, "family", "Monospace", NULL);
 	column = gtk_tree_view_column_new_with_attributes(
 		"ASCII", renderer, "text", COL_ASCII, NULL);
 	gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
@@ -247,9 +255,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 +265,6 @@ memwin_DumpD(int memory_id)
 	GtkWidget *memlist;
 	int data_rows;
 
-	log_info("memwin_DumpD()");
-
 	Address = 0;
 
 	if (memory_id == INT_MEM_ID) {