From: Hugo Villeneuve Date: Sat, 8 Feb 2014 06:02:14 +0000 (-0500) Subject: Rename CLI and GUI versions main source files X-Git-Tag: v2.0.1~25 X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=1466890269b04da08adf7b3640698e75e9593f56;hp=f2f9b967b44e9df39b7254d32e74f89d9fda3dfb;p=emu8051.git Rename CLI and GUI versions main source files --- diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am index 3fba226..ac87424 100644 --- a/src/cli/Makefile.am +++ b/src/cli/Makefile.am @@ -15,7 +15,7 @@ bin_PROGRAMS = emu8051-cli emu8051_cli_SOURCES = \ parser.y scanner.l \ - emuconsole.c \ + main.c \ menu.c menu.h \ keyboard.c keyboard.h diff --git a/src/cli/emuconsole.c b/src/cli/emuconsole.c deleted file mode 100644 index cbea820..0000000 --- a/src/cli/emuconsole.c +++ /dev/null @@ -1,63 +0,0 @@ -/* - * emuconsole.c - * - * Copyright (C) 1999 Jonathan St-André - * Copyright (C) 1999 Hugo Villeneuve - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include -#include - -#include "config.h" -#include "common.h" -#include "cpu8051.h" -#include "options.h" -#include "hexfile.h" -#include "menu.h" -#include "parser.h" - -extern struct options_t options; - -int -main(int argc, char **argv) -{ - int rc; - - parse_command_line_options(argc, argv); - - cpu8051_init(); - - if (options.filename != NULL) { - rc = LoadHexFile(options.filename); - if (rc == false) - exit(1); - } - - console_reset(); - - if (options.stop_address != 0) { - /* Automatically run program and stop at specified address. */ - console_exec(-1); - } else { - menu_display_usage(); - console_show_registers(); - menu_prompt(); - yyparse(); - } - - return 0; -} diff --git a/src/cli/main.c b/src/cli/main.c new file mode 100644 index 0000000..bf71cf9 --- /dev/null +++ b/src/cli/main.c @@ -0,0 +1,63 @@ +/* + * main.c + * + * Copyright (C) 1999 Jonathan St-André + * Copyright (C) 1999 Hugo Villeneuve + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include +#include + +#include "config.h" +#include "common.h" +#include "cpu8051.h" +#include "options.h" +#include "hexfile.h" +#include "menu.h" +#include "parser.h" + +extern struct options_t options; + +int +main(int argc, char **argv) +{ + int rc; + + parse_command_line_options(argc, argv); + + cpu8051_init(); + + if (options.filename != NULL) { + rc = LoadHexFile(options.filename); + if (rc == false) + exit(1); + } + + console_reset(); + + if (options.stop_address != 0) { + /* Automatically run program and stop at specified address. */ + console_exec(-1); + } else { + menu_display_usage(); + console_show_registers(); + menu_prompt(); + yyparse(); + } + + return 0; +} diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am index 980609b..989906d 100644 --- a/src/gtk/Makefile.am +++ b/src/gtk/Makefile.am @@ -21,7 +21,7 @@ LDADD = \ bin_PROGRAMS = emu8051-gtk emu8051_gtk_SOURCES = \ - emugtk.c emugtk.h \ + main.c main.h \ app-config.c app-config.h \ memwin.c memwin.h \ pgmwin.c pgmwin.h \ diff --git a/src/gtk/emugtk.c b/src/gtk/emugtk.c deleted file mode 100644 index 3374d62..0000000 --- a/src/gtk/emugtk.c +++ /dev/null @@ -1,629 +0,0 @@ -/* - * emugtk.c - * - * Copyright (C) 1999 Jonathan St-André - * Copyright (C) 1999 Hugo Villeneuve - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include -#include "config.h" - -#include -#include - -#include - -#include "common.h" -#include "cpu8051.h" -#include "memory.h" -#include "options.h" -#include "hexfile.h" - -#include "emugtk.h" -#include "reset.xpm" -#include "run.xpm" -#include "stop.xpm" -#include "step.xpm" -#include "filemenu.h" -#include "viewmenu.h" -#include "helpmenu.h" -#include "messagebox.h" -#include "regwin.h" -#include "pgmwin.h" -#include "memwin.h" -#include "pswwin.h" -#include "timerwin.h" -#include "app-config.h" - -#define BUTTONS_BORDER 2 - -static int running; -static int running_function_tag; - -static int emugtk_window_init_complete; -static GtkWidget *vpaned1; -static GtkWidget *scrollwin_int; -static GtkWidget *scrollwin_ext; - -GtkWidget *mainwin; - -extern struct app_config_t *cfg; -extern struct options_t options; - -void -emugtk_UpdateDisplay(void) -{ - log_debug("UpdateDisplay()"); - regwin_refresh(); - pgmwin_refresh(); - pswwin_refresh(); - timerwin_update(); - - if (cfg->view_int_memory && scrollwin_int) - memwin_refresh(INT_MEM_ID); - - if (cfg->view_ext_memory && scrollwin_ext) - memwin_refresh(EXT_MEM_ID); -} - -/* Step out of running state */ -static void -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) -{ - int breakpoint_hit; - - (void) data; /* Remove compiler warning about unused variable. */ - - breakpoint_hit = cpu8051_run(1, NULL); - - if (breakpoint_hit) - emugtk_stop_running(); - - 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 * -button_add_pix(GtkWidget *box, char **xpm) -{ - GtkWidget *button, *icon; - - button = gtk_button_new(); - gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NORMAL); - - 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, 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) -{ - /* Remove compiler warning about unused variables. */ - (void) widget; - (void) event; - (void) 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) -{ - /* Remove compiler warning about unused variables. */ - (void) widget; - (void) event; - (void) 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) -{ - /* Remove compiler warning about unused variables. */ - (void) widget; - (void) event; - (void) data; - - log_info("StopEvent()"); - emugtk_stop_running(); -} - -/* Signal StepEvent (StepButton) */ -static void -emugtk_StepEvent(GtkWidget *widget, GdkEvent *event, gpointer data) -{ - /* Remove compiler warning about unused variables. */ - (void) widget; - (void) event; - (void) data; - - log_info("StepEvent()"); - emugtk_stop_running(); - emugtk_Step(); -} - -/* Creates the Reset, Run, Stop and Step buttons. */ -static GtkWidget * -AddButtons(void) -{ - GtkWidget *button_hbox; - GtkWidget *button; - - /* The buttons of the hbox are NOT given equal space in the box. */ - button_hbox = gtk_hbox_new(FALSE, 0); - - /* Creating the RESET button. */ - button = button_add_pix(button_hbox, reset_xpm); - g_signal_connect(button, "clicked", - G_CALLBACK(emugtk_ResetEvent), - NULL); - - /* Creating the RUN button. */ - button = button_add_pix(button_hbox, run_xpm); - g_signal_connect(button, "clicked", - G_CALLBACK(emugtk_RunEvent), - NULL); - - /* Creating STOP button. */ - button = button_add_pix(button_hbox, stop_xpm); - g_signal_connect(GTK_OBJECT(button), "clicked", - G_CALLBACK(emugtk_StopEvent), - NULL); - - /* Creating STEP button. */ - button = button_add_pix(button_hbox, step_xpm); - g_signal_connect(GTK_OBJECT(button), "clicked", - G_CALLBACK(emugtk_StepEvent), - NULL); - - return button_hbox; -} - -static GtkWidget * -AddMenu(void) -{ - GtkWidget *menu_bar; - - /* Creating menu item. */ - menu_bar = gtk_menu_bar_new(); - - /* Adding the 'File' submenu */ - FileAddMenu(menu_bar); - - /* Adding the 'View' submenu */ - ViewAddMenu(menu_bar); - - /* Adding the 'Help' submenu */ - HelpAddMenu(menu_bar); - - return menu_bar; -} - -static int -mainwin_configure_event(GtkWindow *window, GdkEvent *event, gpointer data) -{ - /* Remove compiler warning about unused variables. */ - (void) window; - (void) 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 *paned = data; - - /* Remove compiler warning about unused variables. */ - (void) window; - (void) event; - - cfg->hpane_pos = gtk_paned_get_position(GTK_PANED(paned)); -} - -static void -vpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data) -{ - GtkWidget *paned = data; - - /* Remove compiler warning about unused variables. */ - (void) window; - (void) event; - - cfg->vpane_pos = gtk_paned_get_position(GTK_PANED(paned)); -} - -static void -main_paned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data) -{ - GtkWidget *paned = data; - - /* Remove compiler warning about unused variables. */ - (void) window; - (void) event; - - cfg->main_pane_pos = gtk_paned_get_position(GTK_PANED(paned)); -} - -void -emugtk_quit_gui(void) -{ - gtk_main_quit(); -} - -static void -emugtk_show_memory_paned(void) -{ - gtk_widget_show_all(mainwin); - emugtk_UpdateDisplay(); -} - -void -emugtk_create_int_memory_paned(void) -{ - scrollwin_int = memwin_init("Internal memory (IRAM)", - INT_MEM_ID); - gtk_paned_pack1(GTK_PANED(vpaned1), scrollwin_int, - FALSE, FALSE); - if (emugtk_window_init_complete == true) - emugtk_show_memory_paned(); -} - -void -emugtk_destroy_int_memory_paned(void) -{ - if (scrollwin_int == NULL) - return; - - gtk_widget_destroy(scrollwin_int); - scrollwin_int = NULL; -} - -void -emugtk_create_ext_memory_paned(void) -{ - scrollwin_ext = memwin_init("External memory (XRAM)", - EXT_MEM_ID); - - gtk_paned_pack2(GTK_PANED(vpaned1), scrollwin_ext, - TRUE, FALSE); - - if (emugtk_window_init_complete == true) - emugtk_show_memory_paned(); -} - -void -emugtk_destroy_ext_memory_paned(void) -{ - if (scrollwin_ext == NULL) - return; - - gtk_widget_destroy(scrollwin_ext); - scrollwin_ext = NULL; -} - -void -emugtk_recreate_memory_paned(void) -{ - if (cfg->view_int_memory) { - emugtk_destroy_int_memory_paned(); - emugtk_create_int_memory_paned(); - } - - if (cfg->view_ext_memory) { - emugtk_destroy_ext_memory_paned(); - emugtk_create_ext_memory_paned(); - } - - if (emugtk_window_init_complete == true) - emugtk_show_memory_paned(); -} - -static GtkWidget * -emugtk_create_memory_paned(void) -{ - /* Create vpaned (memory windows) only if necessary. */ - if (cfg->view_int_memory || cfg->view_ext_memory) { - vpaned1 = gtk_vpaned_new(); - - gtk_paned_set_position(GTK_PANED(vpaned1), cfg->vpane_pos); - g_signal_connect(G_OBJECT(vpaned1), "notify::position", - G_CALLBACK(vpaned_notify_event), vpaned1); - - emugtk_recreate_memory_paned(); - - return vpaned1; - } else - return NULL; -} - -/* - * 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) -{ - GtkWidget *vbox; - GtkWidget *menu_bar; - GtkWidget *buttons_bar; - GtkWidget *scrollwin; - GtkWidget *hpaned; - GtkWidget *vpaned; - GtkWidget *main_paned; - - emugtk_window_init_complete = false; - - 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); - - /* Window DESTROY event. */ - g_signal_connect(mainwin, "destroy", - G_CALLBACK(gtk_main_quit), NULL); - - g_signal_connect(G_OBJECT(mainwin), "configure-event", - G_CALLBACK(mainwin_configure_event), NULL); - - /* Creating the menu bar. */ - menu_bar = AddMenu(); - - /* Creating the buttons bar. */ - buttons_bar = AddButtons(); - - scrollwin = pswwin_init(); - gtk_box_pack_start(GTK_BOX(buttons_bar), scrollwin, FALSE, FALSE, 100); - - scrollwin = timerwin_init(); - gtk_box_pack_start(GTK_BOX(buttons_bar), scrollwin, FALSE, FALSE, 100); - - /* 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. */ - scrollwin = regwin_init(); - gtk_paned_pack1(GTK_PANED(hpaned), scrollwin, FALSE, FALSE); - - /* Program disassembly frame. */ - scrollwin = pgmwin_init(); - gtk_paned_pack2(GTK_PANED(hpaned), scrollwin, TRUE, FALSE); - - /* - * 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); - - vpaned = emugtk_create_memory_paned(); - if (vpaned != NULL) - gtk_paned_pack2(GTK_PANED(main_paned), vpaned, - TRUE, FALSE); - - /* - * 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); - - emugtk_window_init_complete = true; -} - -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) -{ - int rc; - - emugtk_stop_running(); - - rc = LoadHexFile(file); - if (rc == false) { - message_show_error("Error parsing hex file"); - } else { - if (cfg->clear_ram_on_file_load) - emugtk_Reset(); - - emugtk_UpdateDisplay(); - } -} - -int -main(int argc, char **argv) -{ - int rc_load_hexfile = true; - - parse_command_line_options(argc, argv); - app_config_load(); - - cpu8051_init(); - - running = 0; - - gtk_init(&argc, &argv); - - if (options.filename != NULL) - rc_load_hexfile = LoadHexFile(options.filename); - - cpu8051_Reset(); - - log_info("Init GUI"); - emugtk_window_init(); - emugtk_UpdateDisplay(); - - if (rc_load_hexfile == false) - message_show_error("Error parsing hex file"); - - gtk_main(); - - log_info("Terminate"); - - app_config_save(); - - return EXIT_SUCCESS; -} diff --git a/src/gtk/emugtk.h b/src/gtk/emugtk.h deleted file mode 100644 index a590fab..0000000 --- a/src/gtk/emugtk.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * emugtk.h - * - * Copyright (C) 1999 Jonathan St-André - * Copyright (C) 1999 Hugo Villeneuve - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef EMUGTK_H -#define EMUGTK_H 1 - -#include - -void -AddMenuSeparator(GtkWidget *menu); - -void -emugtk_new_file(char *file); - -void -emugtk_UpdateDisplay(void); - -void -emugtk_quit_gui(void); - -void -emugtk_create_int_memory_paned(void); - -void -emugtk_destroy_int_memory_paned(void); - -void -emugtk_create_ext_memory_paned(void); - -void -emugtk_destroy_ext_memory_paned(void); - -void -emugtk_recreate_memory_paned(void); - -#endif /* EMUGTK_H */ diff --git a/src/gtk/filemenu.c b/src/gtk/filemenu.c index 1332bb0..8375607 100644 --- a/src/gtk/filemenu.c +++ b/src/gtk/filemenu.c @@ -28,7 +28,7 @@ #include #include "common.h" -#include "emugtk.h" +#include "main.h" #include "messagebox.h" #include "filemenu.h" diff --git a/src/gtk/helpmenu.c b/src/gtk/helpmenu.c index aa8e413..b280405 100644 --- a/src/gtk/helpmenu.c +++ b/src/gtk/helpmenu.c @@ -35,7 +35,7 @@ #include "common.h" #include "options.h" -#include "emugtk.h" +#include "main.h" #include "messagebox.h" #include "helpmenu.h" diff --git a/src/gtk/main.c b/src/gtk/main.c new file mode 100644 index 0000000..0750559 --- /dev/null +++ b/src/gtk/main.c @@ -0,0 +1,629 @@ +/* + * main.c + * + * Copyright (C) 1999 Jonathan St-André + * Copyright (C) 1999 Hugo Villeneuve + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include +#include "config.h" + +#include +#include + +#include + +#include "common.h" +#include "cpu8051.h" +#include "memory.h" +#include "options.h" +#include "hexfile.h" + +#include "main.h" +#include "reset.xpm" +#include "run.xpm" +#include "stop.xpm" +#include "step.xpm" +#include "filemenu.h" +#include "viewmenu.h" +#include "helpmenu.h" +#include "messagebox.h" +#include "regwin.h" +#include "pgmwin.h" +#include "memwin.h" +#include "pswwin.h" +#include "timerwin.h" +#include "app-config.h" + +#define BUTTONS_BORDER 2 + +static int running; +static int running_function_tag; + +static int emugtk_window_init_complete; +static GtkWidget *vpaned1; +static GtkWidget *scrollwin_int; +static GtkWidget *scrollwin_ext; + +GtkWidget *mainwin; + +extern struct app_config_t *cfg; +extern struct options_t options; + +void +emugtk_UpdateDisplay(void) +{ + log_debug("UpdateDisplay()"); + regwin_refresh(); + pgmwin_refresh(); + pswwin_refresh(); + timerwin_update(); + + if (cfg->view_int_memory && scrollwin_int) + memwin_refresh(INT_MEM_ID); + + if (cfg->view_ext_memory && scrollwin_ext) + memwin_refresh(EXT_MEM_ID); +} + +/* Step out of running state */ +static void +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) +{ + int breakpoint_hit; + + (void) data; /* Remove compiler warning about unused variable. */ + + breakpoint_hit = cpu8051_run(1, NULL); + + if (breakpoint_hit) + emugtk_stop_running(); + + 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 * +button_add_pix(GtkWidget *box, char **xpm) +{ + GtkWidget *button, *icon; + + button = gtk_button_new(); + gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NORMAL); + + 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, 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) +{ + /* Remove compiler warning about unused variables. */ + (void) widget; + (void) event; + (void) 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) +{ + /* Remove compiler warning about unused variables. */ + (void) widget; + (void) event; + (void) 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) +{ + /* Remove compiler warning about unused variables. */ + (void) widget; + (void) event; + (void) data; + + log_info("StopEvent()"); + emugtk_stop_running(); +} + +/* Signal StepEvent (StepButton) */ +static void +emugtk_StepEvent(GtkWidget *widget, GdkEvent *event, gpointer data) +{ + /* Remove compiler warning about unused variables. */ + (void) widget; + (void) event; + (void) data; + + log_info("StepEvent()"); + emugtk_stop_running(); + emugtk_Step(); +} + +/* Creates the Reset, Run, Stop and Step buttons. */ +static GtkWidget * +AddButtons(void) +{ + GtkWidget *button_hbox; + GtkWidget *button; + + /* The buttons of the hbox are NOT given equal space in the box. */ + button_hbox = gtk_hbox_new(FALSE, 0); + + /* Creating the RESET button. */ + button = button_add_pix(button_hbox, reset_xpm); + g_signal_connect(button, "clicked", + G_CALLBACK(emugtk_ResetEvent), + NULL); + + /* Creating the RUN button. */ + button = button_add_pix(button_hbox, run_xpm); + g_signal_connect(button, "clicked", + G_CALLBACK(emugtk_RunEvent), + NULL); + + /* Creating STOP button. */ + button = button_add_pix(button_hbox, stop_xpm); + g_signal_connect(GTK_OBJECT(button), "clicked", + G_CALLBACK(emugtk_StopEvent), + NULL); + + /* Creating STEP button. */ + button = button_add_pix(button_hbox, step_xpm); + g_signal_connect(GTK_OBJECT(button), "clicked", + G_CALLBACK(emugtk_StepEvent), + NULL); + + return button_hbox; +} + +static GtkWidget * +AddMenu(void) +{ + GtkWidget *menu_bar; + + /* Creating menu item. */ + menu_bar = gtk_menu_bar_new(); + + /* Adding the 'File' submenu */ + FileAddMenu(menu_bar); + + /* Adding the 'View' submenu */ + ViewAddMenu(menu_bar); + + /* Adding the 'Help' submenu */ + HelpAddMenu(menu_bar); + + return menu_bar; +} + +static int +mainwin_configure_event(GtkWindow *window, GdkEvent *event, gpointer data) +{ + /* Remove compiler warning about unused variables. */ + (void) window; + (void) 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 *paned = data; + + /* Remove compiler warning about unused variables. */ + (void) window; + (void) event; + + cfg->hpane_pos = gtk_paned_get_position(GTK_PANED(paned)); +} + +static void +vpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data) +{ + GtkWidget *paned = data; + + /* Remove compiler warning about unused variables. */ + (void) window; + (void) event; + + cfg->vpane_pos = gtk_paned_get_position(GTK_PANED(paned)); +} + +static void +main_paned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data) +{ + GtkWidget *paned = data; + + /* Remove compiler warning about unused variables. */ + (void) window; + (void) event; + + cfg->main_pane_pos = gtk_paned_get_position(GTK_PANED(paned)); +} + +void +emugtk_quit_gui(void) +{ + gtk_main_quit(); +} + +static void +emugtk_show_memory_paned(void) +{ + gtk_widget_show_all(mainwin); + emugtk_UpdateDisplay(); +} + +void +emugtk_create_int_memory_paned(void) +{ + scrollwin_int = memwin_init("Internal memory (IRAM)", + INT_MEM_ID); + gtk_paned_pack1(GTK_PANED(vpaned1), scrollwin_int, + FALSE, FALSE); + if (emugtk_window_init_complete == true) + emugtk_show_memory_paned(); +} + +void +emugtk_destroy_int_memory_paned(void) +{ + if (scrollwin_int == NULL) + return; + + gtk_widget_destroy(scrollwin_int); + scrollwin_int = NULL; +} + +void +emugtk_create_ext_memory_paned(void) +{ + scrollwin_ext = memwin_init("External memory (XRAM)", + EXT_MEM_ID); + + gtk_paned_pack2(GTK_PANED(vpaned1), scrollwin_ext, + TRUE, FALSE); + + if (emugtk_window_init_complete == true) + emugtk_show_memory_paned(); +} + +void +emugtk_destroy_ext_memory_paned(void) +{ + if (scrollwin_ext == NULL) + return; + + gtk_widget_destroy(scrollwin_ext); + scrollwin_ext = NULL; +} + +void +emugtk_recreate_memory_paned(void) +{ + if (cfg->view_int_memory) { + emugtk_destroy_int_memory_paned(); + emugtk_create_int_memory_paned(); + } + + if (cfg->view_ext_memory) { + emugtk_destroy_ext_memory_paned(); + emugtk_create_ext_memory_paned(); + } + + if (emugtk_window_init_complete == true) + emugtk_show_memory_paned(); +} + +static GtkWidget * +emugtk_create_memory_paned(void) +{ + /* Create vpaned (memory windows) only if necessary. */ + if (cfg->view_int_memory || cfg->view_ext_memory) { + vpaned1 = gtk_vpaned_new(); + + gtk_paned_set_position(GTK_PANED(vpaned1), cfg->vpane_pos); + g_signal_connect(G_OBJECT(vpaned1), "notify::position", + G_CALLBACK(vpaned_notify_event), vpaned1); + + emugtk_recreate_memory_paned(); + + return vpaned1; + } else + return NULL; +} + +/* + * 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) +{ + GtkWidget *vbox; + GtkWidget *menu_bar; + GtkWidget *buttons_bar; + GtkWidget *scrollwin; + GtkWidget *hpaned; + GtkWidget *vpaned; + GtkWidget *main_paned; + + emugtk_window_init_complete = false; + + 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); + + /* Window DESTROY event. */ + g_signal_connect(mainwin, "destroy", + G_CALLBACK(gtk_main_quit), NULL); + + g_signal_connect(G_OBJECT(mainwin), "configure-event", + G_CALLBACK(mainwin_configure_event), NULL); + + /* Creating the menu bar. */ + menu_bar = AddMenu(); + + /* Creating the buttons bar. */ + buttons_bar = AddButtons(); + + scrollwin = pswwin_init(); + gtk_box_pack_start(GTK_BOX(buttons_bar), scrollwin, FALSE, FALSE, 100); + + scrollwin = timerwin_init(); + gtk_box_pack_start(GTK_BOX(buttons_bar), scrollwin, FALSE, FALSE, 100); + + /* 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. */ + scrollwin = regwin_init(); + gtk_paned_pack1(GTK_PANED(hpaned), scrollwin, FALSE, FALSE); + + /* Program disassembly frame. */ + scrollwin = pgmwin_init(); + gtk_paned_pack2(GTK_PANED(hpaned), scrollwin, TRUE, FALSE); + + /* + * 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); + + vpaned = emugtk_create_memory_paned(); + if (vpaned != NULL) + gtk_paned_pack2(GTK_PANED(main_paned), vpaned, + TRUE, FALSE); + + /* + * 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); + + emugtk_window_init_complete = true; +} + +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) +{ + int rc; + + emugtk_stop_running(); + + rc = LoadHexFile(file); + if (rc == false) { + message_show_error("Error parsing hex file"); + } else { + if (cfg->clear_ram_on_file_load) + emugtk_Reset(); + + emugtk_UpdateDisplay(); + } +} + +int +main(int argc, char **argv) +{ + int rc_load_hexfile = true; + + parse_command_line_options(argc, argv); + app_config_load(); + + cpu8051_init(); + + running = 0; + + gtk_init(&argc, &argv); + + if (options.filename != NULL) + rc_load_hexfile = LoadHexFile(options.filename); + + cpu8051_Reset(); + + log_info("Init GUI"); + emugtk_window_init(); + emugtk_UpdateDisplay(); + + if (rc_load_hexfile == false) + message_show_error("Error parsing hex file"); + + gtk_main(); + + log_info("Terminate"); + + app_config_save(); + + return EXIT_SUCCESS; +} diff --git a/src/gtk/main.h b/src/gtk/main.h new file mode 100644 index 0000000..d2f41e3 --- /dev/null +++ b/src/gtk/main.h @@ -0,0 +1,54 @@ +/* + * main.h + * + * Copyright (C) 1999 Jonathan St-André + * Copyright (C) 1999 Hugo Villeneuve + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef MAIN_H +#define MAIN_H 1 + +#include + +void +AddMenuSeparator(GtkWidget *menu); + +void +emugtk_new_file(char *file); + +void +emugtk_UpdateDisplay(void); + +void +emugtk_quit_gui(void); + +void +emugtk_create_int_memory_paned(void); + +void +emugtk_destroy_int_memory_paned(void); + +void +emugtk_create_ext_memory_paned(void); + +void +emugtk_destroy_ext_memory_paned(void); + +void +emugtk_recreate_memory_paned(void); + +#endif /* MAIN_H */ diff --git a/src/gtk/memwin.c b/src/gtk/memwin.c index c525fb1..a2b24a1 100644 --- a/src/gtk/memwin.c +++ b/src/gtk/memwin.c @@ -34,7 +34,7 @@ #include "cpu8051.h" #include "regwin.h" #include "memwin.h" -#include "emugtk.h" +#include "main.h" #include "options.h" #include "app-config.h" diff --git a/src/gtk/pswwin.c b/src/gtk/pswwin.c index 6b890d0..1d7a298 100644 --- a/src/gtk/pswwin.c +++ b/src/gtk/pswwin.c @@ -35,7 +35,7 @@ #include "psw.h" #include "instructions_8051.h" #include "hexfile.h" -#include "emugtk.h" +#include "main.h" static GtkWidget *pswlist; diff --git a/src/gtk/regwin.c b/src/gtk/regwin.c index a2b0f6e..dc2a292 100644 --- a/src/gtk/regwin.c +++ b/src/gtk/regwin.c @@ -35,7 +35,7 @@ #include "pgmwin.h" #include "instructions_8051.h" #include "hexfile.h" -#include "emugtk.h" +#include "main.h" static GtkWidget *reglist; diff --git a/src/gtk/timerwin.c b/src/gtk/timerwin.c index 2687c5a..bbf1a7c 100644 --- a/src/gtk/timerwin.c +++ b/src/gtk/timerwin.c @@ -29,7 +29,7 @@ #include "common.h" #include "timers.h" -#include "emugtk.h" +#include "main.h" static GtkWidget *label; diff --git a/src/gtk/viewmenu.c b/src/gtk/viewmenu.c index fa1fd14..fa1a383 100644 --- a/src/gtk/viewmenu.c +++ b/src/gtk/viewmenu.c @@ -26,7 +26,7 @@ #include #include "common.h" -#include "emugtk.h" /* For AddMenuSeparator() function. */ +#include "main.h" /* For AddMenuSeparator() function. */ #include "messagebox.h" #include "viewmenu.h" #include "app-config.h"