X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Femugtk.c;h=f3e6e375cd0f4b502e9c53523dd828d854e53595;hb=f3f6f52c0e9b6f42e392835502a5d19ef7abbfc5;hp=91efb28cb44a31605dd94c567fd72398fc41936d;hpb=536beb0f1eae0cdc86bc82ef945cf01d04e846ca;p=emu8051.git diff --git a/src/emugtk.c b/src/emugtk.c index 91efb28..f3e6e37 100644 --- a/src/emugtk.c +++ b/src/emugtk.c @@ -49,29 +49,18 @@ static int running; static int running_function_tag; -static GtkWidget *mainwin; -extern struct app_config_t *cfg; +GtkWidget *mainwin; -/* Signal DestroyEvent */ -static void -WindowDestroyEvent(GtkWidget *widget, gpointer data) -{ -#ifdef EMU8051_DEBUG - g_print("emugtk_DestroyEvent(...)\n"); -#endif - - gtk_main_quit(); -} +extern struct app_config_t *cfg; +extern struct options_t options; /* Step out of running state */ 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(); @@ -86,9 +75,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 +87,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; } @@ -140,9 +125,7 @@ emugtk_Reset(void) 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(); } @@ -161,9 +144,8 @@ emugtk_Step(void) 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 +156,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 +164,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,18 +223,21 @@ AddMenu(void) /* Adding the 'Help' submenu */ HelpAddMenu(menu_bar); - gtk_widget_show_all(GTK_WIDGET(menu_bar)); - return menu_bar; } -static void +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; + + /* + * 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 @@ -275,10 +256,59 @@ vpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data) cfg->vpane_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 | | | | | + * | | | | +------------------+ | +--------------------+ | | | | + * | | | | | | | | | + * | | | +---------------------------------------------------+ | | | + * | | | | | | + * | | |--------------------------***----------------------------- | | + * | | | | | | + * | | | scrollwin | | | + * | | | +---------------------------------------------------+ | | | + * | | | | Memory window | | | | + * | | | +---------------------------------------------------+ | | | + * | | | | | | + * | | +---------------------------------------------------------+ | | + * | | | | + * | | | | + * | +---------------------------------------------------------------+ | + * | | + * | | + * +---------------------------------------------------------------------+ + */ static void emugtk_window_init(void) { - GtkWidget *main_vbox; + GtkWidget *vbox; GtkWidget *menu_bar; GtkWidget *buttons_bar; GtkWidget *scrollwin; @@ -293,26 +323,26 @@ 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); /* - * 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: @@ -344,11 +374,11 @@ emugtk_window_init(void) scrollwin = memwin_init(); gtk_paned_pack2(GTK_PANED(vpaned), scrollwin, TRUE, FALSE); - /* Adding vpaned window to main_vbox */ - gtk_box_pack_start(GTK_BOX(main_vbox), vpaned, true, true, 1); + /* Adding vpaned window to vbox */ + gtk_box_pack_start(GTK_BOX(vbox), vpaned, true, true, 1); - /* Adding the main_vbox to the main window. */ - gtk_container_add(GTK_CONTAINER(mainwin), main_vbox); + /* Adding the vbox to the main window. */ + gtk_container_add(GTK_CONTAINER(mainwin), vbox); gtk_widget_show_all(mainwin); } @@ -356,10 +386,7 @@ emugtk_window_init(void) static void emugtk_UpdateDisplay(void) { -#ifdef EMU8051_DEBUG - g_print("emugtk_UpdateDisplay()\n"); -#endif - + log_debug("UpdateDisplay()"); regwin_Show(); pgmwin_Disasm(); memwin_DumpD("00"); @@ -388,10 +415,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(); @@ -402,16 +426,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();