X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Femugtk.c;h=d0a4582d50409ae146e7ac044b47a4c5c74f3901;hb=c361bcde92ff71208eded7e706f25f567c1de793;hp=e6d98ddbff1073f2efc0474cbd21acd8c504d4f1;hpb=3c5ab93d18bec33726e42747dd7862f73528b7bd;p=emu8051.git diff --git a/src/emugtk.c b/src/emugtk.c index e6d98dd..d0a4582 100644 --- a/src/emugtk.c +++ b/src/emugtk.c @@ -22,6 +22,9 @@ #include #include "config.h" +#include +#include + #include #include "common.h" @@ -41,8 +44,10 @@ #include "pgmwin.h" #include "memwin.h" -static int RunningState; -static int RunFuncTag; +#define BUTTONS_BORDER 2 + +static int running; +static int running_function_tag; static GtkWidget *mainwin; /* Signal DestroyEvent */ @@ -56,27 +61,133 @@ WindowDestroyEvent(GtkWidget *widget, gpointer data) gtk_main_quit(); } +/* Step out of running state */ +static void +emugtk_stop_running() +{ + if (running) { +#ifdef EMU8051_DEBUG + printf("emugtk_StopRunning()\n"); +#endif + g_source_remove(running_function_tag); + running = 0; + regwin_Show(); + pgmwin_Disasm(); + memwin_DumpD("00"); + } +} + +/* Running function called when idle from gtk_main */ +static gboolean +emugtk_running(gpointer data) +{ + cpu8051_Exec(); + if (IsBreakpoint(cpu8051.pc)) { +#ifdef EMU8051_DEBUG + g_print("Breakpoint Hit, stopping!\n"); +#endif + emugtk_stop_running(); + } + + return TRUE; +} + +/* Get in the running state */ +static void +emugtk_start_running(void) +{ + if (!running) { +#ifdef EMU8051_DEBUG + printf("emugtk_StartRunning()\n"); +#endif + 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(); + regwin_Show(); + pgmwin_Disasm(); + memwin_DumpD("00"); +} + +/* Signal ResetEvent (ResetButton) */ +static void +emugtk_ResetEvent(GtkWidget *widget, GdkEvent *event, gpointer data) +{ +#ifdef EMU8051_DEBUG + g_print("emugtk_ResetEvent(...)\n"); +#endif + emugtk_stop_running(); + emugtk_Reset(); +} + +/* CPU Step and Gtk UI update */ +static void +emugtk_Step(void) +{ + cpu8051_Exec(); + regwin_Show(); + pgmwin_Disasm(); + memwin_DumpD("00"); +} + +/* Signal RunEvent (RunButton) */ +static void +emugtk_RunEvent(GtkWidget *widget, GdkEvent *event, gpointer data) +{ +#ifdef EMU8051_DEBUG + g_print("emugtk_RunEvent(...)\n"); +#endif + if (running) + emugtk_stop_running(); + else + emugtk_start_running(); +} + +/* Signal StopEvent (StopButton) */ +static void +emugtk_StopEvent(GtkWidget *widget, GdkEvent *event, gpointer data) +{ +#ifdef EMU8051_DEBUG + g_print("emugtk_StopEvent(...)\n"); +#endif + emugtk_stop_running(); +} + +/* Signal StepEvent (StepButton) */ +static void +emugtk_StepEvent(GtkWidget *widget, GdkEvent *event, gpointer data) +{ +#ifdef EMU8051_DEBUG + g_print("emugtk_StepEvent(...)\n"); +#endif + emugtk_stop_running(); + emugtk_Step(); +} + /* Creates the Reset, Run, Stop and Step buttons. */ static GtkWidget * AddButtons(void) @@ -88,33 +199,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; @@ -142,18 +253,18 @@ emugtk_window_init(void) GtkWidget *main_vbox; GtkWidget *menu_bar; GtkWidget *buttons_bar; - GtkWidget *emufixed; GtkWidget *fixed_frame; + GtkWidget *hbox; 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), + 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); + g_signal_connect(mainwin, "destroy", + G_CALLBACK(WindowDestroyEvent), NULL); /* * Setting main window geometry based on command line options @@ -177,25 +288,24 @@ emugtk_window_init(void) /* Adding buttons bar to main_vbox */ gtk_box_pack_start(GTK_BOX(main_vbox), buttons_bar, FALSE, FALSE, 1); - /* Emulator fixed window. */ - emufixed = gtk_fixed_new(); - gtk_widget_set_usize(GTK_WIDGET(emufixed), MAIN_WIN_WIDTH, - REG_WIN_HEIGHT + MEM_WIN_HEIGHT + 10); + /* hbox will contain registers and disassembly windows. */ + hbox = gtk_hbox_new(FALSE, 1); /* 8051 registers frame. */ fixed_frame = regwin_init(REG_WIN_WIDTH, REG_WIN_HEIGHT); - gtk_fixed_put(GTK_FIXED(emufixed), fixed_frame, 0, 0); + gtk_box_pack_start(GTK_BOX(hbox), fixed_frame, true, true, 1); /* 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); + gtk_box_pack_start(GTK_BOX(hbox), fixed_frame, true, true, 1); + + /* Adding hbox window to main_vbox */ + gtk_box_pack_start(GTK_BOX(main_vbox), hbox, true, true, 1); /* 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); - - /* Adding fixed window to main_vbox */ - gtk_box_pack_start(GTK_BOX(main_vbox), emufixed, FALSE, FALSE, 1); + /* Adding memory dump window to main_vbox */ + gtk_box_pack_start(GTK_BOX(main_vbox), fixed_frame, true, true, 1); /* Adding the main_vbox to the main window. */ gtk_container_add(GTK_CONTAINER(mainwin), main_vbox); @@ -203,10 +313,31 @@ 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) +{ + GtkWidget *item; + + item = gtk_menu_item_new(); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); +} + void emugtk_new_file(char *file) { - emugtk_StopRunning(); + emugtk_stop_running(); LoadHexFile(file); @@ -223,7 +354,7 @@ main(int argc, char **argv) cpu8051_init(); - RunningState = 0; + running = 0; gtk_init(&argc, &argv); @@ -236,144 +367,9 @@ main(int argc, char **argv) gtk_main(); - printf("End of program.\n"); - - return EXIT_SUCCESS; -} - -void -AddMenuSeparator(GtkWidget *menu) -{ - GtkWidget *item; - - item = gtk_menu_item_new(); - gtk_menu_append(GTK_MENU(menu), item); -} - -void -emugtk_UpdateDisplay(void) -{ -#ifdef EMU8051_DEBUG - g_print("emugtk_UpdateDisplay()\n"); -#endif - - regwin_Show(); - pgmwin_Disasm(); - memwin_DumpD("0x00"); -} - -/* CPU reset and Gtk UI update */ -void -emugtk_Reset(void) -{ - cpu8051_Reset(); - regwin_Show(); - pgmwin_Disasm(); - memwin_DumpD("0x00"); -} - -/* CPU Step and Gtk UI update */ -void -emugtk_Step(void) -{ - cpu8051_Exec(); - regwin_Show(); - pgmwin_Disasm(); - memwin_DumpD("0x00"); -} - -/* 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(); -} - -/* 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(); -} - -/* Signal StopEvent (StopButton) */ -void -emugtk_StopEvent(GtkWidget *widget, GdkEvent *event, gpointer data) -{ -#ifdef EMU8051_DEBUG - g_print("emugtk_StopEvent(...)\n"); -#endif - emugtk_StopRunning(); -} - -/* 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(); -} - -/* 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(); - } -} - -/* RunningFunction called when idle from gtk_main */ -gboolean -RunningFunction(gpointer data) -{ - emugtk_Running(); - return TRUE; -} - -/* Get in the RunningState */ -void -emugtk_StartRunning(void) -{ - if (!RunningState) { -#ifdef EMU8051_DEBUG - printf("emugtk_StartRunning()\n"); + printf("End of program.\n"); #endif - RunFuncTag = gtk_idle_add(RunningFunction, 0); - - RunningState = 1; - } -} -/* 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; }