log_debug("UpdateDisplay()");
regwin_refresh();
pgmwin_refresh();
- memwin_refresh(INT_MEM_ID);
- memwin_refresh(EXT_MEM_ID);
+
+ if (cfg->view_int_memory)
+ memwin_refresh(INT_MEM_ID);
+
+ if (cfg->view_ext_memory)
+ memwin_refresh(EXT_MEM_ID);
}
/* Step out of running state */
restart_gui = false;
}
+static GtkWidget *
+emugtk_create_memory_paned(void)
+{
+ GtkWidget *vpaned;
+ GtkWidget *scrollwin;
+
+ /* Create vpaned (memory windows) only if necessary. */
+ if (cfg->view_int_memory || cfg->view_ext_memory) {
+ vpaned = gtk_vpaned_new();
+ gtk_paned_set_position(GTK_PANED(vpaned), cfg->vpane_pos);
+ g_signal_connect(G_OBJECT(vpaned), "notify::position",
+ G_CALLBACK(vpaned_notify_event), vpaned);
+
+ /* Internal memory dump frame. */
+ if (cfg->view_int_memory) {
+ scrollwin = memwin_init("Internal memory (IRAM)",
+ INT_MEM_ID);
+ gtk_paned_pack1(GTK_PANED(vpaned), scrollwin,
+ FALSE, FALSE);
+ }
+
+ /* External memory dump frame. */
+ if (cfg->view_ext_memory) {
+ scrollwin = memwin_init("External memory (XRAM)",
+ EXT_MEM_ID);
+ gtk_paned_pack2(GTK_PANED(vpaned), scrollwin,
+ TRUE, FALSE);
+ }
+
+ return vpaned;
+ } else
+ return NULL;
+}
+
/*
* mainwin
* +---------------------------------------------------------------------+
scrollwin = pgmwin_init();
gtk_paned_pack2(GTK_PANED(hpaned), scrollwin, TRUE, FALSE);
- vpaned = gtk_vpaned_new();
- gtk_paned_set_position(GTK_PANED(vpaned), cfg->vpane_pos);
- g_signal_connect(G_OBJECT(vpaned), "notify::position",
- G_CALLBACK(vpaned_notify_event), vpaned);
-
- /* Internal memory dump frame. */
- scrollwin = memwin_init("Internal memory (IRAM)", INT_MEM_ID);
- gtk_paned_pack1(GTK_PANED(vpaned), scrollwin, FALSE, FALSE);
-
- /* External memory dump frame. */
- scrollwin = memwin_init("External memory (XRAM)", EXT_MEM_ID);
- gtk_paned_pack2(GTK_PANED(vpaned), scrollwin, TRUE, FALSE);
-
/*
* main_paned will contain two groups:
* group1: registers and disassembly windows.
g_signal_connect(G_OBJECT(main_paned), "notify::position",
G_CALLBACK(main_paned_notify_event), main_paned);
gtk_paned_pack1(GTK_PANED(main_paned), hpaned, FALSE, FALSE);
- gtk_paned_pack2(GTK_PANED(main_paned), vpaned, TRUE, FALSE);
+
+ vpaned = emugtk_create_memory_paned();
+ if (vpaned != NULL)
+ gtk_paned_pack2(GTK_PANED(main_paned), vpaned,
+ TRUE, FALSE);
/*
* vbox contains the menu bar and body_vbox (for all remaining
LoadHexFile(file);
- emugtk_Reset(); /* Use app-config->clear_ram_on_file_load */
+ if (cfg->clear_ram_on_file_load)
+ emugtk_Reset();
+
emugtk_UpdateDisplay();
}
if (options.filename != NULL)
LoadHexFile(options.filename);
- else
- cpu8051_Reset();
+
+ cpu8051_Reset();
while (restart_gui == true) {
log_info("Init GUI");