X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Femugtk.c;h=64253117f6ecc57ba9932a129edde79e9b850438;hb=d367f394a97a15018ff1a46d8989586c8456db12;hp=774278880a5f4d37eea5033231a5af9375b01545;hpb=ba7ff1a7a78b3aa7c2cad9bfce117256638938b1;p=emu8051.git diff --git a/src/emugtk.c b/src/emugtk.c index 7742788..6425311 100644 --- a/src/emugtk.c +++ b/src/emugtk.c @@ -29,6 +29,7 @@ #include "common.h" #include "cpu8051.h" +#include "memory.h" #include "options.h" #include "hexfile.h" @@ -49,19 +50,20 @@ static int running; static int running_function_tag; -static GtkWidget *mainwin; + +GtkWidget *mainwin; extern struct app_config_t *cfg; +extern struct options_t options; -/* Signal DestroyEvent */ -static void -WindowDestroyEvent(GtkWidget *widget, gpointer data) +void +emugtk_UpdateDisplay(void) { -#ifdef EMU8051_DEBUG - g_print("emugtk_DestroyEvent(...)\n"); -#endif - - gtk_main_quit(); + log_debug("UpdateDisplay()"); + regwin_Show(); + pgmwin_Disasm(); + memwin_DumpD(INT_MEM_ID); + memwin_DumpD(EXT_MEM_ID); } /* Step out of running state */ @@ -69,14 +71,10 @@ static void emugtk_stop_running() { if (running) { -#ifdef EMU8051_DEBUG - printf("emugtk_StopRunning()\n"); -#endif + log_info("StopRunning()"); g_source_remove(running_function_tag); running = 0; - regwin_Show(); - pgmwin_Disasm(); - memwin_DumpD("00"); + emugtk_UpdateDisplay(); } } @@ -86,9 +84,7 @@ emugtk_running(gpointer data) { cpu8051_Exec(); if (IsBreakpoint(cpu8051.pc)) { -#ifdef EMU8051_DEBUG - g_print("Breakpoint Hit, stopping!\n"); -#endif + log_info("Breakpoint Hit"); emugtk_stop_running(); } @@ -100,9 +96,7 @@ static void emugtk_start_running(void) { if (!running) { -#ifdef EMU8051_DEBUG - printf("emugtk_StartRunning()\n"); -#endif + log_info("StartRunning()"); running_function_tag = g_idle_add(emugtk_running, 0); running = 1; } @@ -131,18 +125,14 @@ static void emugtk_Reset(void) { cpu8051_Reset(); - regwin_Show(); - pgmwin_Disasm(); - memwin_DumpD("00"); + emugtk_UpdateDisplay(); } /* Signal ResetEvent (ResetButton) */ static void emugtk_ResetEvent(GtkWidget *widget, GdkEvent *event, gpointer data) { -#ifdef EMU8051_DEBUG - g_print("emugtk_ResetEvent(...)\n"); -#endif + log_info("ResetEvent()"); emugtk_stop_running(); emugtk_Reset(); } @@ -152,18 +142,15 @@ static void emugtk_Step(void) { cpu8051_Exec(); - regwin_Show(); - pgmwin_Disasm(); - memwin_DumpD("00"); + emugtk_UpdateDisplay(); } /* Signal RunEvent (RunButton) */ static void emugtk_RunEvent(GtkWidget *widget, GdkEvent *event, gpointer data) { -#ifdef EMU8051_DEBUG - g_print("emugtk_RunEvent(...)\n"); -#endif + log_info("RunEvent()"); + if (running) emugtk_stop_running(); else @@ -174,9 +161,7 @@ emugtk_RunEvent(GtkWidget *widget, GdkEvent *event, gpointer data) static void emugtk_StopEvent(GtkWidget *widget, GdkEvent *event, gpointer data) { -#ifdef EMU8051_DEBUG - g_print("emugtk_StopEvent(...)\n"); -#endif + log_info("StopEvent()"); emugtk_stop_running(); } @@ -184,9 +169,7 @@ emugtk_StopEvent(GtkWidget *widget, GdkEvent *event, gpointer data) static void emugtk_StepEvent(GtkWidget *widget, GdkEvent *event, gpointer data) { -#ifdef EMU8051_DEBUG - g_print("emugtk_StepEvent(...)\n"); -#endif + log_info("StepEvent()"); emugtk_stop_running(); emugtk_Step(); } @@ -245,16 +228,12 @@ AddMenu(void) /* Adding the 'Help' submenu */ HelpAddMenu(menu_bar); - gtk_widget_show_all(GTK_WIDGET(menu_bar)); - return menu_bar; } static int mainwin_configure_event(GtkWindow *window, GdkEvent *event, gpointer data) { - //event->configure.x; - //event->configure.y; cfg->win_width = event->configure.width; cfg->win_height = event->configure.height; @@ -318,9 +297,21 @@ vpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data) * | | | | | | * | | |--------------------------***----------------------------- | | * | | | | | | - * | | | scrollwin | | | + * | | | vpaned_mem | | | * | | | +---------------------------------------------------+ | | | - * | | | | Memory window | | | | + * | | | | | | | | + * | | | | scrollwin | | | | + * | | | | +---------------------------------------------+ | | | | + * | | | | | Internal memory window | | | | | + * | | | | +---------------------------------------------+ | | | | + * | | | | | | | | + * | | | +-----------------------***-------------------------| | | | + * | | | | | | | | + * | | | | scrollwin | | | | + * | | | | +---------------------------------------------+ | | | | + * | | | | | External memory window | | | | | + * | | | | +---------------------------------------------+ | | | | + * | | | | | | | | * | | | +---------------------------------------------------+ | | | * | | | | | | * | | +---------------------------------------------------------+ | | @@ -340,6 +331,7 @@ emugtk_window_init(void) GtkWidget *scrollwin; GtkWidget *hpaned; GtkWidget *vpaned; + GtkWidget *vpaned_mem; mainwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(mainwin), PACKAGE); @@ -349,7 +341,7 @@ emugtk_window_init(void) /* Window DESTROY event. */ g_signal_connect(mainwin, "destroy", - G_CALLBACK(WindowDestroyEvent), NULL); + G_CALLBACK(gtk_main_quit), NULL); g_signal_connect(G_OBJECT(mainwin), "configure-event", G_CALLBACK(mainwin_configure_event), NULL); @@ -373,7 +365,7 @@ emugtk_window_init(void) /* * vpaned will contain: * Top: registers and disassembly windows. - * Bottom: memory window + * Bottom: memory windows */ vpaned = gtk_vpaned_new(); gtk_paned_set_position(GTK_PANED(vpaned), cfg->vpane_pos); @@ -396,9 +388,23 @@ emugtk_window_init(void) gtk_paned_pack1(GTK_PANED(vpaned), hpaned, FALSE, FALSE); - /* Memory dump frame. */ - scrollwin = memwin_init(); - gtk_paned_pack2(GTK_PANED(vpaned), scrollwin, TRUE, FALSE); + vpaned_mem = gtk_vpaned_new(); + log_info("TODO: set vpaned_mem position and save in config file"); +#ifdef seewfdewfw + gtk_paned_set_position(GTK_PANED(vpaned_mem), cfg->vpane_mem_pos); + g_signal_connect(G_OBJECT(vpaned_mem), "notify::position", + G_CALLBACK(vpaned_mem__notify_event), vpaned_mem); +#endif + + /* Internal memory dump frame. */ + scrollwin = memwin_init("Internal memory", INT_MEM_ID); + gtk_paned_pack1(GTK_PANED(vpaned_mem), scrollwin, FALSE, FALSE); + + /* External memory dump frame. */ + scrollwin = memwin_init("External memory", EXT_MEM_ID); + gtk_paned_pack2(GTK_PANED(vpaned_mem), scrollwin, TRUE, FALSE); + + gtk_paned_pack2(GTK_PANED(vpaned), vpaned_mem, TRUE, FALSE); /* Adding vpaned window to vbox */ gtk_box_pack_start(GTK_BOX(vbox), vpaned, true, true, 1); @@ -409,18 +415,6 @@ emugtk_window_init(void) gtk_widget_show_all(mainwin); } -static void -emugtk_UpdateDisplay(void) -{ -#ifdef EMU8051_DEBUG - g_print("emugtk_UpdateDisplay()\n"); -#endif - - regwin_Show(); - pgmwin_Disasm(); - memwin_DumpD("00"); -} - void AddMenuSeparator(GtkWidget *menu) { @@ -444,10 +438,7 @@ emugtk_new_file(char *file) int main(int argc, char **argv) { - char *hex_file; - - ParseCommandLineOptions(argc, argv); - + parse_command_line_options(argc, argv); app_config_load(); cpu8051_init(); @@ -458,16 +449,14 @@ main(int argc, char **argv) emugtk_window_init(); - hex_file = get_hex_filename(); - - if (hex_file != NULL) - emugtk_new_file(hex_file); + if (options.filename != NULL) + emugtk_new_file(options.filename); + else + emugtk_Reset(); gtk_main(); -#ifdef EMU8051_DEBUG - printf("End of program.\n"); -#endif + log_info("Terminate"); app_config_save();