X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Femugtk.c;h=9ade2cd520a187e1663db3f39337dacdf741ac7e;hb=4c86604f944240034b02db1bd37b9092455d5d9f;hp=e6d98ddbff1073f2efc0474cbd21acd8c504d4f1;hpb=3c5ab93d18bec33726e42747dd7862f73528b7bd;p=emu8051.git diff --git a/src/emugtk.c b/src/emugtk.c index e6d98dd..9ade2cd 100644 --- a/src/emugtk.c +++ b/src/emugtk.c @@ -22,10 +22,14 @@ #include #include "config.h" +#include +#include + #include #include "common.h" #include "cpu8051.h" +#include "memory.h" #include "options.h" #include "hexfile.h" @@ -40,43 +44,141 @@ #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 int restart_gui = true; + +GtkWidget *mainwin; -static int RunningState; -static int RunFuncTag; -static GtkWidget *mainwin; +extern struct app_config_t *cfg; +extern struct options_t options; -/* Signal DestroyEvent */ +void +emugtk_UpdateDisplay(void) +{ + log_debug("UpdateDisplay()"); + regwin_refresh(); + pgmwin_refresh(); + + 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 */ static void -WindowDestroyEvent(GtkWidget *widget, gpointer data) +emugtk_stop_running() +{ + if (running) { + log_info("StopRunning()"); + g_source_remove(running_function_tag); + running = 0; + emugtk_UpdateDisplay(); + } +} + +/* Running function called when idle from gtk_main */ +static gboolean +emugtk_running(gpointer data) { -#ifdef EMU8051_DEBUG - g_print("emugtk_DestroyEvent(...)\n"); -#endif + cpu8051_Exec(); + if (IsBreakpoint(cpu8051.pc)) { + log_info("Breakpoint Hit"); + emugtk_stop_running(); + } - gtk_main_quit(); + return TRUE; +} + +/* Get in the running state */ +static void +emugtk_start_running(void) +{ + if (!running) { + log_info("StartRunning()"); + running_function_tag = g_idle_add(emugtk_running, 0); + running = 1; + } } /* Taken from the Gxine source code. */ static GtkWidget * -AddPixButton(GtkWidget *box, gchar **pixmap_array) +button_add_pix(GtkWidget *box, char **xpm) { GtkWidget *button, *icon; - GdkPixmap *image; - GdkBitmap *transparent; button = gtk_button_new(); gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NORMAL); - image = gdk_pixmap_colormap_create_from_xpm_d( - NULL, gdk_colormap_get_system(), - &transparent, NULL, pixmap_array); - icon = gtk_pixmap_new(image, transparent); + + icon = gtk_image_new_from_pixbuf( + gdk_pixbuf_new_from_xpm_data((const char **) xpm)); gtk_container_add(GTK_CONTAINER(button), icon); - gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, BUTTONS_BORDER); return button; } +/* CPU reset and Gtk UI update */ +static void +emugtk_Reset(void) +{ + cpu8051_Reset(); + emugtk_UpdateDisplay(); +} + +/* Signal ResetEvent (ResetButton) */ +static void +emugtk_ResetEvent(GtkWidget *widget, GdkEvent *event, gpointer data) +{ + log_info("ResetEvent()"); + emugtk_stop_running(); + emugtk_Reset(); +} + +/* CPU Step and Gtk UI update */ +static void +emugtk_Step(void) +{ + cpu8051_Exec(); + emugtk_UpdateDisplay(); +} + +/* Signal RunEvent (RunButton) */ +static void +emugtk_RunEvent(GtkWidget *widget, GdkEvent *event, gpointer data) +{ + log_info("RunEvent()"); + + if (running) + emugtk_stop_running(); + else + emugtk_start_running(); +} + +/* Signal StopEvent (StopButton) */ +static void +emugtk_StopEvent(GtkWidget *widget, GdkEvent *event, gpointer data) +{ + log_info("StopEvent()"); + emugtk_stop_running(); +} + +/* Signal StepEvent (StepButton) */ +static void +emugtk_StepEvent(GtkWidget *widget, GdkEvent *event, gpointer data) +{ + log_info("StepEvent()"); + emugtk_stop_running(); + emugtk_Step(); +} + /* Creates the Reset, Run, Stop and Step buttons. */ static GtkWidget * AddButtons(void) @@ -88,33 +190,33 @@ AddButtons(void) button_hbox = gtk_hbox_new(FALSE, 0); /* Creating the RESET button. */ - button = AddPixButton(button_hbox, reset_xpm); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(emugtk_ResetEvent), - NULL); + button = button_add_pix(button_hbox, reset_xpm); + g_signal_connect(button, "clicked", + G_CALLBACK(emugtk_ResetEvent), + NULL); /* Creating the RUN button. */ - button = AddPixButton(button_hbox, run_xpm); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(emugtk_RunEvent), - NULL); + button = button_add_pix(button_hbox, run_xpm); + g_signal_connect(button, "clicked", + G_CALLBACK(emugtk_RunEvent), + NULL); /* Creating STOP button. */ - button = AddPixButton(button_hbox, stop_xpm); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(emugtk_StopEvent), - NULL); + button = button_add_pix(button_hbox, stop_xpm); + g_signal_connect(GTK_OBJECT(button), "clicked", + G_CALLBACK(emugtk_StopEvent), + NULL); /* Creating STEP button. */ - button = AddPixButton(button_hbox, step_xpm); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(emugtk_StepEvent), - NULL); + button = button_add_pix(button_hbox, step_xpm); + g_signal_connect(GTK_OBJECT(button), "clicked", + G_CALLBACK(emugtk_StepEvent), + NULL); return button_hbox; } -GtkWidget * +static GtkWidget * AddMenu(void) { GtkWidget *menu_bar; @@ -131,114 +233,226 @@ AddMenu(void) /* Adding the 'Help' submenu */ HelpAddMenu(menu_bar); - gtk_widget_show_all(GTK_WIDGET(menu_bar)); - return menu_bar; } -static void -emugtk_window_init(void) +static int +mainwin_configure_event(GtkWindow *window, GdkEvent *event, gpointer data) { - GtkWidget *main_vbox; - GtkWidget *menu_bar; - GtkWidget *buttons_bar; - GtkWidget *emufixed; - GtkWidget *fixed_frame; - - 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_container_set_border_width(GTK_CONTAINER(mainwin), 0); - - /* Window DESTROY event. */ - gtk_signal_connect(GTK_OBJECT(mainwin), "destroy", - GTK_SIGNAL_FUNC(WindowDestroyEvent), NULL); - - /* - * Setting main window geometry based on command line options - * (if specified). - */ - /*MainWindowSetGeometry();*/ + cfg->win_width = event->configure.width; + cfg->win_height = event->configure.height; /* - * main_vbox contains the menu bar and body_vbox (for all remaining - * items). + * Important: + * Returning false allows event to propagate to children. If not, they + * will not be resized when we resize the main window. */ - main_vbox = gtk_vbox_new(FALSE, 1); + return FALSE; +} - /* 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); +static void +hpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data) +{ + GtkWidget *paned = data; - /* 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); + cfg->hpane_pos = gtk_paned_get_position(GTK_PANED(paned)); +} - /* Emulator fixed window. */ - emufixed = gtk_fixed_new(); - gtk_widget_set_usize(GTK_WIDGET(emufixed), MAIN_WIN_WIDTH, - REG_WIN_HEIGHT + MEM_WIN_HEIGHT + 10); +static void +vpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data) +{ + GtkWidget *paned = data; - /* 8051 registers frame. */ - fixed_frame = regwin_init(REG_WIN_WIDTH, REG_WIN_HEIGHT); - gtk_fixed_put(GTK_FIXED(emufixed), fixed_frame, 0, 0); + cfg->vpane_pos = gtk_paned_get_position(GTK_PANED(paned)); +} - /* 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); +static void +main_paned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data) +{ + GtkWidget *paned = data; - /* 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); + cfg->main_pane_pos = gtk_paned_get_position(GTK_PANED(paned)); +} - /* Adding fixed window to main_vbox */ - gtk_box_pack_start(GTK_BOX(main_vbox), emufixed, FALSE, FALSE, 1); +void +emugtk_restart_gui(void) +{ + emugtk_stop_running(); - /* Adding the main_vbox to the main window. */ - gtk_container_add(GTK_CONTAINER(mainwin), main_vbox); + gtk_widget_destroy(mainwin); - gtk_widget_show_all(mainwin); + restart_gui = true; } void -emugtk_new_file(char *file) +emugtk_quit_gui(void) { - emugtk_StopRunning(); - - LoadHexFile(file); + gtk_main_quit(); - emugtk_Reset(); - emugtk_UpdateDisplay(); + restart_gui = false; } -int -main(int argc, char **argv) +/* + * mainwin + * +---------------------------------------------------------------------+ + * | | + * | vbox | + * | +---------------------------------------------------------------+ | + * | | | | + * | | menu_bar | | + * | | +----------------------+ | | + * | | | File View Help | | | + * | | +----------------------+ | | + * | | | | + * | |---------------------------------------------------------------| | + * | | | | + * | | buttons_bar | | + * | | +-----------------------+ | | + * | | | RST RUN STOP STEP | | | + * | | +-----------------------+ | | + * | | | | + * | |---------------------------------------------------------------| | + * | | | | + * | | main_paned | | + * | | +---------------------------------------------------------+ | | + * | | | | | | + * | | | hpaned | | | + * | | | +---------------------------------------------------+ | | | + * | | | | | | | | | + * | | | | scrollwin | scrollwin | | | | + * | | | | +------------------+ * +--------------------+ | | | | + * | | | | | REGISTERS window | * | Disassembly window | | | | | + * | | | | +------------------+ | +--------------------+ | | | | + * | | | | | | | | | + * | | | +---------------------------------------------------+ | | | + * | | | | | | + * | | |--------------------------***----------------------------- | | + * | | | | | | + * | | | vpaned | | | + * | | | +---------------------------------------------------+ | | | + * | | | | | | | | + * | | | | scrollwin | | | | + * | | | | +---------------------------------------------+ | | | | + * | | | | | Internal memory window | | | | | + * | | | | +---------------------------------------------+ | | | | + * | | | | | | | | + * | | | +-----------------------***-------------------------| | | | + * | | | | | | | | + * | | | | scrollwin | | | | + * | | | | +---------------------------------------------+ | | | | + * | | | | | External memory window | | | | | + * | | | | +---------------------------------------------+ | | | | + * | | | | | | | | + * | | | +---------------------------------------------------+ | | | + * | | | | | | + * | | +---------------------------------------------------------+ | | + * | | | | + * | | | | + * | +---------------------------------------------------------------+ | + * | | + * | | + * +---------------------------------------------------------------------+ + */ +static void +emugtk_window_init(void) { - char *hex_file; + GtkWidget *vbox; + GtkWidget *menu_bar; + GtkWidget *buttons_bar; + GtkWidget *scrollwin; + GtkWidget *hpaned; + GtkWidget *vpaned; + GtkWidget *main_paned; - ParseCommandLineOptions(argc, argv); + mainwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_title(GTK_WINDOW(mainwin), PACKAGE); + gtk_window_set_default_size(GTK_WINDOW(mainwin), + cfg->win_width, cfg->win_height); + gtk_container_set_border_width(GTK_CONTAINER(mainwin), 0); - cpu8051_init(); + /* Window DESTROY event. */ + g_signal_connect(mainwin, "destroy", + G_CALLBACK(gtk_main_quit), NULL); - RunningState = 0; + g_signal_connect(G_OBJECT(mainwin), "configure-event", + G_CALLBACK(mainwin_configure_event), NULL); - gtk_init(&argc, &argv); + /* Creating the menu bar. */ + menu_bar = AddMenu(); - emugtk_window_init(); + /* Creating the buttons bar. */ + buttons_bar = AddButtons(); - hex_file = get_hex_filename(); + /* 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); - if (hex_file != NULL) - emugtk_new_file(hex_file); + /* 8051 registers frame. */ + scrollwin = regwin_init(); + gtk_paned_pack1(GTK_PANED(hpaned), scrollwin, FALSE, FALSE); - gtk_main(); + /* Program disassembly frame. */ + scrollwin = pgmwin_init(); + gtk_paned_pack2(GTK_PANED(hpaned), scrollwin, TRUE, FALSE); - printf("End of program.\n"); + /* + * main_paned will contain two groups: + * group1: registers and disassembly windows. + * group2: memory windows + */ + if (cfg->layout == UI_LAYOUT1) + main_paned = gtk_vpaned_new(); + else + main_paned = gtk_hpaned_new(); + + gtk_paned_set_position(GTK_PANED(main_paned), cfg->main_pane_pos); + 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); + + /* 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); + } + + gtk_paned_pack2(GTK_PANED(main_paned), vpaned, TRUE, FALSE); + } - return EXIT_SUCCESS; + /* + * vbox contains the menu bar and body_vbox (for all remaining + * items). + */ + vbox = gtk_vbox_new(FALSE, 1); + gtk_box_pack_start(GTK_BOX(vbox), menu_bar, FALSE, FALSE, 1); + gtk_box_pack_start(GTK_BOX(vbox), buttons_bar, FALSE, FALSE, 1); + gtk_box_pack_start(GTK_BOX(vbox), main_paned, true, true, 1); + + /* Adding the vbox to the main window. */ + gtk_container_add(GTK_CONTAINER(mainwin), vbox); + + g_signal_connect(mainwin, "destroy", G_CALLBACK(emugtk_quit_gui), NULL); + + gtk_widget_show_all(mainwin); } void @@ -247,133 +461,48 @@ 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 -emugtk_UpdateDisplay(void) +emugtk_new_file(char *file) { -#ifdef EMU8051_DEBUG - g_print("emugtk_UpdateDisplay()\n"); -#endif + emugtk_stop_running(); - regwin_Show(); - pgmwin_Disasm(); - memwin_DumpD("0x00"); -} + LoadHexFile(file); -/* CPU reset and Gtk UI update */ -void -emugtk_Reset(void) -{ - cpu8051_Reset(); - regwin_Show(); - pgmwin_Disasm(); - memwin_DumpD("0x00"); + emugtk_Reset(); /* Use app-config->clear_ram_on_file_load */ + emugtk_UpdateDisplay(); } -/* CPU Step and Gtk UI update */ -void -emugtk_Step(void) +int +main(int argc, char **argv) { - cpu8051_Exec(); - regwin_Show(); - pgmwin_Disasm(); - memwin_DumpD("0x00"); -} + parse_command_line_options(argc, argv); + app_config_load(); -/* Signal ResetEvent (ResetButton) */ -void -emugtk_ResetEvent(GtkWidget *widget, GdkEvent *event, gpointer data) -{ -#ifdef EMU8051_DEBUG - g_print("emugtk_ResetEvent(...)\n"); -#endif - emugtk_StopRunning(); - emugtk_Reset(); -} + cpu8051_init(); -/* Signal RunEvent (RunButton) */ -void -emugtk_RunEvent(GtkWidget *widget, GdkEvent *event, gpointer data) -{ -#ifdef EMU8051_DEBUG - g_print("emugtk_RunEvent(...)\n"); -#endif - if (RunningState) - emugtk_StopRunning(); - else - emugtk_StartRunning(); -} + running = 0; -/* Signal StopEvent (StopButton) */ -void -emugtk_StopEvent(GtkWidget *widget, GdkEvent *event, gpointer data) -{ -#ifdef EMU8051_DEBUG - g_print("emugtk_StopEvent(...)\n"); -#endif - emugtk_StopRunning(); -} + gtk_init(&argc, &argv); -/* Signal StepEvent (StepButton) */ -void -emugtk_StepEvent(GtkWidget *widget, GdkEvent *event, gpointer data) -{ -#ifdef EMU8051_DEBUG - g_print("emugtk_StepEvent(...)\n"); -#endif - emugtk_StopRunning(); - emugtk_Step(); -} + if (options.filename != NULL) + LoadHexFile(options.filename); + else + cpu8051_Reset(); -/* Running called by RunningFunction() */ -void -emugtk_Running() -{ - cpu8051_Exec(); - if (IsBreakpoint(cpu8051.pc)) { -#ifdef EMU8051_DEBUG - g_print("Breakpoint Hit, stopping!\n"); -#endif - emugtk_StopRunning(); - } -} + while (restart_gui == true) { + log_info("Init GUI"); -/* RunningFunction called when idle from gtk_main */ -gboolean -RunningFunction(gpointer data) -{ - emugtk_Running(); - return TRUE; -} + emugtk_window_init(); + emugtk_UpdateDisplay(); + gtk_main(); + } -/* Get in the RunningState */ -void -emugtk_StartRunning(void) -{ - if (!RunningState) { -#ifdef EMU8051_DEBUG - printf("emugtk_StartRunning()\n"); -#endif - RunFuncTag = gtk_idle_add(RunningFunction, 0); + log_info("Terminate"); - RunningState = 1; - } -} + app_config_save(); -/* Step out of RunningState */ -void -emugtk_StopRunning() -{ - if (RunningState) { -#ifdef EMU8051_DEBUG - printf("emugtk_StopRunning()\n"); -#endif - gtk_idle_remove(RunFuncTag); - RunningState = 0; - regwin_Show(); - pgmwin_Disasm(); - memwin_DumpD("0x00"); - } + return EXIT_SUCCESS; }