X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Femugtk.c;h=3ca0c04b316b44dd786843de660523bfce8bae1a;hb=42f213fff59103c0f9ba464057bc1dee8dd0e78b;hp=982a236180a4e7c7381c74527fa9beaa520369da;hpb=cece320b97e8438693b2b5bbc82380d40e1c7d94;p=emu8051.git diff --git a/src/emugtk.c b/src/emugtk.c index 982a236..3ca0c04 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" @@ -43,22 +44,26 @@ #include "regwin.h" #include "pgmwin.h" #include "memwin.h" +#include "app-config.h" #define BUTTONS_BORDER 2 static int running; static int running_function_tag; -static GtkWidget *mainwin; -/* Signal DestroyEvent */ -static void -WindowDestroyEvent(GtkWidget *widget, gpointer data) -{ -#ifdef EMU8051_DEBUG - g_print("emugtk_DestroyEvent(...)\n"); -#endif +GtkWidget *mainwin; - gtk_main_quit(); +extern struct app_config_t *cfg; +extern struct options_t options; + +void +emugtk_UpdateDisplay(void) +{ + log_debug("UpdateDisplay()"); + regwin_refresh(); + pgmwin_refresh(); + memwin_refresh(INT_MEM_ID); + memwin_refresh(EXT_MEM_ID); } /* Step out of running state */ @@ -66,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(); } } @@ -83,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(); } @@ -97,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; } @@ -128,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(); } @@ -149,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 @@ -171,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(); } @@ -181,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(); } @@ -242,88 +228,196 @@ 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) +{ + cfg->win_width = event->configure.width; + cfg->win_height = event->configure.height; + + /* + * Important: + * Returning false allows event to propagate to children. If not, they + * will not be resized when we resize the main window. + */ + return FALSE; +} + +static void +hpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data) +{ + GtkWidget *hpaned = data; + + cfg->hpane_pos = gtk_paned_get_position(GTK_PANED(hpaned)); +} + +static void +vpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data) +{ + GtkWidget *vpaned = data; + + cfg->vpane_pos = gtk_paned_get_position(GTK_PANED(vpaned)); +} + +static void +vpaned_mem_notify_event(GtkWindow *window, GdkEvent *event, gpointer data) +{ + GtkWidget *vpaned = data; + + cfg->vpane_mem_pos = gtk_paned_get_position(GTK_PANED(vpaned)); +} + +/* + * mainwin + * +---------------------------------------------------------------------+ + * | | + * | vbox | + * | +---------------------------------------------------------------+ | + * | | | | + * | | menu_bar | | + * | | +----------------------+ | | + * | | | File View Help | | | + * | | +----------------------+ | | + * | | | | + * | |---------------------------------------------------------------| | + * | | | | + * | | buttons_bar | | + * | | +-----------------------+ | | + * | | | RST RUN STOP STEP | | | + * | | +-----------------------+ | | + * | | | | + * | |---------------------------------------------------------------| | + * | | | | + * | | vpaned | | + * | | +---------------------------------------------------------+ | | + * | | | | | | + * | | | hpaned | | | + * | | | +---------------------------------------------------+ | | | + * | | | | | | | | | + * | | | | scrollwin | scrollwin | | | | + * | | | | +------------------+ * +--------------------+ | | | | + * | | | | | REGISTERS window | * | Disassembly window | | | | | + * | | | | +------------------+ | +--------------------+ | | | | + * | | | | | | | | | + * | | | +---------------------------------------------------+ | | | + * | | | | | | + * | | |--------------------------***----------------------------- | | + * | | | | | | + * | | | vpaned_mem | | | + * | | | +---------------------------------------------------+ | | | + * | | | | | | | | + * | | | | scrollwin | | | | + * | | | | +---------------------------------------------+ | | | | + * | | | | | Internal memory window | | | | | + * | | | | +---------------------------------------------+ | | | | + * | | | | | | | | + * | | | +-----------------------***-------------------------| | | | + * | | | | | | | | + * | | | | scrollwin | | | | + * | | | | +---------------------------------------------+ | | | | + * | | | | | External memory window | | | | | + * | | | | +---------------------------------------------+ | | | | + * | | | | | | | | + * | | | +---------------------------------------------------+ | | | + * | | | | | | + * | | +---------------------------------------------------------+ | | + * | | | | + * | | | | + * | +---------------------------------------------------------------+ | + * | | + * | | + * +---------------------------------------------------------------------+ + */ static void emugtk_window_init(void) { - GtkWidget *main_vbox; + GtkWidget *vbox; GtkWidget *menu_bar; GtkWidget *buttons_bar; - GtkWidget *emufixed; - GtkWidget *fixed_frame; + GtkWidget *scrollwin; + GtkWidget *hpaned; + GtkWidget *vpaned; + GtkWidget *vpaned_mem; mainwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(mainwin), PACKAGE); - gtk_widget_set_usize(GTK_WIDGET(mainwin), - MAIN_WIN_WIDTH, MAIN_WIN_HEIGHT); + gtk_window_set_default_size(GTK_WINDOW(mainwin), + cfg->win_width, cfg->win_height); gtk_container_set_border_width(GTK_CONTAINER(mainwin), 0); /* Window DESTROY event. */ g_signal_connect(mainwin, "destroy", - G_CALLBACK(WindowDestroyEvent), NULL); + G_CALLBACK(gtk_main_quit), NULL); - /* - * Setting main window geometry based on command line options - * (if specified). - */ - /*MainWindowSetGeometry();*/ + g_signal_connect(G_OBJECT(mainwin), "configure-event", + G_CALLBACK(mainwin_configure_event), NULL); /* - * main_vbox contains the menu bar and body_vbox (for all remaining + * vbox contains the menu bar and body_vbox (for all remaining * items). */ - main_vbox = gtk_vbox_new(FALSE, 1); + vbox = gtk_vbox_new(FALSE, 1); /* Creating the menu bar. */ menu_bar = AddMenu(); - /* Adding menu bar to main_vbox */ - gtk_box_pack_start(GTK_BOX(main_vbox), menu_bar, FALSE, FALSE, 1); + /* Adding menu bar to vbox */ + gtk_box_pack_start(GTK_BOX(vbox), menu_bar, FALSE, FALSE, 1); /* Creating the buttons bar. */ buttons_bar = AddButtons(); - /* Adding buttons bar to main_vbox */ - gtk_box_pack_start(GTK_BOX(main_vbox), buttons_bar, FALSE, FALSE, 1); + /* Adding buttons bar to vbox */ + gtk_box_pack_start(GTK_BOX(vbox), buttons_bar, FALSE, FALSE, 1); + + /* + * vpaned will contain: + * Top: registers and disassembly windows. + * Bottom: memory windows + */ + 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); - /* Emulator fixed window. */ - emufixed = gtk_fixed_new(); - gtk_widget_set_usize(GTK_WIDGET(emufixed), MAIN_WIN_WIDTH, - REG_WIN_HEIGHT + MEM_WIN_HEIGHT + 10); + /* hpaned will contain registers and disassembly windows. */ + hpaned = gtk_hpaned_new(); + gtk_paned_set_position(GTK_PANED(hpaned), cfg->hpane_pos); + g_signal_connect(G_OBJECT(hpaned), "notify::position", + G_CALLBACK(hpaned_notify_event), hpaned); /* 8051 registers frame. */ - fixed_frame = regwin_init(REG_WIN_WIDTH, REG_WIN_HEIGHT); - gtk_fixed_put(GTK_FIXED(emufixed), fixed_frame, 0, 0); + scrollwin = regwin_init(); + gtk_paned_pack1(GTK_PANED(hpaned), scrollwin, FALSE, FALSE); /* Program disassembly frame. */ - fixed_frame = pgmwin_init(PGM_WIN_WIDTH, PGM_WIN_HEIGHT); - gtk_fixed_put(GTK_FIXED(emufixed), fixed_frame, REG_WIN_WIDTH + 10, 0); + scrollwin = pgmwin_init(); + gtk_paned_pack2(GTK_PANED(hpaned), scrollwin, TRUE, FALSE); - /* Memory dump frame. */ - fixed_frame = memwin_init(MEM_WIN_WIDTH, MEM_WIN_HEIGHT); - gtk_fixed_put(GTK_FIXED(emufixed), fixed_frame, 0, REG_WIN_HEIGHT); + gtk_paned_pack1(GTK_PANED(vpaned), hpaned, FALSE, FALSE); - /* Adding fixed window to main_vbox */ - gtk_box_pack_start(GTK_BOX(main_vbox), emufixed, FALSE, FALSE, 1); + vpaned_mem = gtk_vpaned_new(); + 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); - /* Adding the main_vbox to the main window. */ - gtk_container_add(GTK_CONTAINER(mainwin), main_vbox); + /* Internal memory dump frame. */ + scrollwin = memwin_init("Internal memory (IRAM)", INT_MEM_ID); + gtk_paned_pack1(GTK_PANED(vpaned_mem), scrollwin, FALSE, FALSE); - gtk_widget_show_all(mainwin); -} + /* External memory dump frame. */ + scrollwin = memwin_init("External memory (XRAM)", EXT_MEM_ID); + gtk_paned_pack2(GTK_PANED(vpaned_mem), scrollwin, TRUE, FALSE); -static void -emugtk_UpdateDisplay(void) -{ -#ifdef EMU8051_DEBUG - g_print("emugtk_UpdateDisplay()\n"); -#endif + 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); - regwin_Show(); - pgmwin_Disasm(); - memwin_DumpD("00"); + /* Adding the vbox to the main window. */ + gtk_container_add(GTK_CONTAINER(mainwin), vbox); + + gtk_widget_show_all(mainwin); } void @@ -332,7 +426,7 @@ AddMenuSeparator(GtkWidget *menu) GtkWidget *item; item = gtk_menu_item_new(); - gtk_menu_append(GTK_MENU(menu), item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); } void @@ -349,9 +443,8 @@ 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(); @@ -361,16 +454,16 @@ 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(); return EXIT_SUCCESS; }