X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmemwin.c;h=f5945bf0182167f868e4c6687d0e0682dce84a37;hb=1e334b447fea096671d90dd364cd830eae17514e;hp=3c2b73d4e109ab7a5f3c865fa62bca6af7e0f08a;hpb=d75d156ebcb9015d2fb15698d94e9cb04fa7966f;p=emu8051.git

diff --git a/src/memwin.c b/src/memwin.c
index 3c2b73d..f5945bf 100644
--- a/src/memwin.c
+++ b/src/memwin.c
@@ -24,67 +24,207 @@
 #endif
 
 #include <stdio.h>
+#include <ctype.h> /* For isprint */
 
 #include "common.h"
 #include "memory.h"
 #include "hexfile.h"
 #include "cpu8051.h"
-#include "gtksizes.h"
+#include "regwin.h"
 #include "memwin.h"
 
-static GtkWidget *memclist;
+static GtkWidget *memlist;
 
-GtkWidget *
-memwin_init(int width, int height)
+#define DATA_COLS 16 /* Must be a power of 2 */
+#define DATA_ROWS (INT_MEM_SIZE / DATA_COLS)
+
+enum
+{
+	COL_ADDRESS = 0,
+	COL_DATA0,
+	COL_ASCII = DATA_COLS + 1,
+	N_COLUMNS,
+};
+
+/* Creating a model */
+static GtkListStore *
+memwin_init_store(void)
+{
+	GtkTreeIter iter;
+	int rows;
+	int col;
+	GtkListStore *store;
+	GType col_types[N_COLUMNS];
+
+	for (col = 0; col < N_COLUMNS; col++) {
+		col_types[col] = G_TYPE_STRING;
+	}
+
+	store = gtk_list_store_newv(N_COLUMNS, col_types);
+
+	/* Initialize with rows of dummy data... */
+	for (rows = 0; rows < DATA_ROWS; rows++) {
+		/* Add new row. */
+		gtk_list_store_append(store, &iter);
+	}
+
+	return store;
+}
+
+static void
+memwin_cell_edited(GtkCellRendererText *cell, gchar *path_string,
+	    gchar *new_str, gpointer model)
+{
+	guint column;
+	gpointer columnptr;
+	GtkTreeIter iter;
+	int address;
+	u_int8_t old;
+	int new;
+	char *str;
+
+	if (!model) {
+		g_error("Unable to get model from cell renderer");
+	}
+
+	/* Column number is passed as renderer object data */
+        columnptr = g_object_get_data(G_OBJECT(cell), "column");
+        column = GPOINTER_TO_UINT(columnptr);
+
+	/* Get the iterator */
+        gtk_tree_model_get_iter_from_string(model, &iter, path_string);
+
+	/* Get base address. */
+	gtk_tree_model_get(model, &iter, COL_ADDRESS, &str, -1);
+	sscanf(str, "%x", &address);
+
+	/* Convert column number (1, 2, 3...) to index (0, 1, 2...) */
+	address += (column - COL_DATA0);
+	old = cpu8051_ReadD(address);
+
+	log_info("Address: $%02X", address);
+	log_info("  old value: $%02X", old);
+
+	/* Convert new value (asciihex) to integer. */
+	sscanf(new_str, "%x", &new);
+
+	if ((new < 0) || (new > 255)) {
+		log_info("  new value: out of range");
+		new = old; /* Put back old value... */
+	} else {
+		log_info("  new value: $%02X", new);
+	}
+
+	/* Store new value in emulator memory. */
+	cpu8051_WriteD(address, new);
+
+	/* Convert to text. */
+	sprintf(str, "%.2X", new);
+
+	/* Store new value in gtk model. */
+        gtk_list_store_set(GTK_LIST_STORE(model), &iter, column, str, -1);
+
+	/*
+	 * Make sure to update all registers and memory.
+	 * For example, BANKed registers depends on internal memory.
+	 */
+	regwin_Show();
+};
+
+static void
+memwin_init_columns(void)
 {
 	int i;
-	GtkWidget *fixed_frame;
-	PangoFontDescription *pango_font;
-	char *memdummy[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			     0, 0, 0, 0, 0, 0, 0, 0, 0 };
-
-	fixed_frame = gtk_frame_new(0);
-	gtk_frame_set_shadow_type(GTK_FRAME(fixed_frame),
-				  GTK_SHADOW_ETCHED_OUT);
-	gtk_widget_set_size_request(GTK_WIDGET(fixed_frame), width, height);
-
-	memclist = gtk_clist_new(18);
-	gtk_clist_set_selection_mode(GTK_CLIST(memclist), GTK_SELECTION_SINGLE);
-	gtk_widget_set_size_request(GTK_WIDGET(memclist), 620, 250);
-
-	for (i = 0; i < 18; i++) {
-		gtk_clist_set_column_justification(
-			GTK_CLIST(memclist), i, GTK_JUSTIFY_LEFT);
+	GtkCellRenderer *renderer;
+	GtkTreeViewColumn *column;
+
+	/* Columns and cell renderers */
+	renderer = gtk_cell_renderer_text_new();
+
+	/* Add address column */
+	column = gtk_tree_view_column_new_with_attributes(
+		"Address", renderer, "text", COL_ADDRESS, NULL);
+	gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(memlist), column);
+
+	for (i = COL_DATA0; i < (COL_DATA0 + DATA_COLS); i++) {
+		/* 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);
+
+		g_signal_connect(renderer, "edited",
+				 G_CALLBACK(memwin_cell_edited),
+				 gtk_tree_view_get_model(GTK_TREE_VIEW(memlist)));
+
+		/* Add column index, used when editing the cell. */
+		g_object_set_data(G_OBJECT(renderer), "column",
+				  GUINT_TO_POINTER(i));
+
+		column = gtk_tree_view_column_new_with_attributes(
+			"Val", renderer, "text", i, NULL);
+		gtk_tree_view_column_set_sizing(column,
+						GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+		gtk_tree_view_append_column(GTK_TREE_VIEW(memlist), column);
 	}
 
-	gtk_clist_set_column_width(GTK_CLIST(memclist), 0,
-				   5 * FIXED_FONT_SYMBOL_WIDTH);
+	/* Add ASCII column */
+	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);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(memlist), column);
+}
+
+GtkWidget *
+memwin_init(void)
+{
+	GtkWidget *frame;
+	GtkWidget *scrollwin;
+	GtkListStore *store;
+
+	frame = gtk_frame_new("Internal memory");
+
+	scrollwin = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin),
+					    GTK_SHADOW_ETCHED_OUT);
+
+	/* Automatically add scrollbars when necessary. */
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
+				       GTK_POLICY_AUTOMATIC,
+				       GTK_POLICY_AUTOMATIC);
 
-	for (i = 1; i < 17; i++)
-		gtk_clist_set_column_width(GTK_CLIST(memclist), i,
-					   2 * FIXED_FONT_SYMBOL_WIDTH);
+	gtk_container_add(GTK_CONTAINER(frame), scrollwin);
 
-	gtk_clist_set_column_width(GTK_CLIST(memclist), 17,
-				   16 * FIXED_FONT_SYMBOL_WIDTH);
+	/* Creating a model */
+	store = memwin_init_store();
 
-	pango_font = pango_font_description_from_string(FIXED_FONT);
-	gtk_widget_modify_font(memclist, pango_font);
+	/* Creating the view component */
+	memlist = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(memlist), TRUE);
+	gtk_container_add(GTK_CONTAINER(scrollwin), memlist);
 
-	for (i = 0; i < 16; i++)
-		gtk_clist_append(GTK_CLIST(memclist), memdummy);
+	memwin_init_columns();
 
-	gtk_container_add(GTK_CONTAINER(fixed_frame), memclist);
+	/*
+	 * The tree view has acquired its own reference to the model, so we can
+	 * drop ours. That way the model will be freed automatically when the
+	 * tree view is destroyed.
+	 */
+	g_object_unref(store);
 
-	return fixed_frame;
+	return frame;
 }
 
-/* Dump 16 rows of 16 bytes from Address in Memory (direct addressing) */
+/* Dump up to 256 bytes from Address in Memory (direct addressing) */
 void
 memwin_DumpD(char *MemAddress)
 {
-	char TextTmp[1024];
-	int row, column, TextLength;
+	int row;
 	unsigned int Address;
+	GtkListStore *store;
+
+	log_info("memwin_DumpD, address = %s", MemAddress);
 
 	if (strlen(MemAddress) != 0) {
 		if (STREQ(MemAddress, "PC"))
@@ -95,35 +235,52 @@ memwin_DumpD(char *MemAddress)
 		Address = 0;
 	}
 
-	gtk_clist_freeze(GTK_CLIST(memclist));
+	store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(memlist)));
 
-	for (row = 0; row < 16; row++) {
-		sprintf(TextTmp, "%.4X", Address);
-		gtk_clist_set_text(GTK_CLIST(memclist), row, 0, TextTmp);
+	for (row = 0; row < DATA_ROWS; row++) {
+		int valid;
+		GtkTreeIter iter;
+		char str[4 + 2]; /* Maximum str len is for address column (4 digits) */
+		char ascii_str[DATA_COLS];
+		int col;
 
-		for (column = 0; column < 16; column++) {
-			sprintf(TextTmp, "%.2X",
-				(int) cpu8051_ReadD(Address + column));
-			gtk_clist_set_text(GTK_CLIST(memclist), row,
-					   column + 1, TextTmp);
+		if (row == 0) {
+			/* Get first row in list store */
+			valid = gtk_tree_model_get_iter_first(
+				GTK_TREE_MODEL(store), &iter);
+		} else {
+			/* Get next row in list store */
+			valid = gtk_tree_model_iter_next(
+				GTK_TREE_MODEL(store), &iter);
 		}
 
-		TextLength = 0;
-		for (column = 0; column < 16; column++) {
-			if (((int) cpu8051_ReadD(Address + column) >= 32) &&
-			    ((int) cpu8051_ReadD(Address + column) <= 126))
-				TextLength += sprintf(
-					&TextTmp[TextLength],
-					"%c", cpu8051_ReadD(Address + column));
-			else
-				TextLength +=
-					sprintf(&TextTmp[TextLength], ".");
+		if (!valid) {
+			printf("Invalid iter...\n");
+			return;
 		}
-		gtk_clist_set_text(GTK_CLIST(memclist), row, 17, TextTmp);
 
-		Address += 16;
-	}
+		/* Display base address. */
+		sprintf(str, "%.4X", Address);
+		gtk_list_store_set(store, &iter, COL_ADDRESS, str, -1);
+
+		for (col = 0; col < DATA_COLS; col++) {
+			u_int8_t data;
 
-	gtk_clist_select_row(GTK_CLIST(memclist), 0, 0);
-	gtk_clist_thaw(GTK_CLIST(memclist));
+			data = cpu8051_ReadD(Address + col);
+
+			/* Display hex data */
+			sprintf(str, "%.2X", (u_int8_t) data);
+			gtk_list_store_set(store, &iter, col + 1, str, -1);
+
+			/* Append to ASCII string (if applicable). */
+			if (!isprint(data))
+				data = '.';
+			sprintf(&ascii_str[col], "%c", data);
+		}
+
+		/* Display ASCII characters. */
+		gtk_list_store_set(store, &iter, COL_ASCII, ascii_str, -1);
+
+		Address += DATA_COLS;
+	}
 }