Refactor perl code to write file header
[emu8051.git] / src / emugtk.c
index 45448a2..097e7ae 100644 (file)
 #include <stdio.h>
 #include "config.h"
 
+#include <stdint.h>
+#include <stdbool.h>
+
 #include <gtk/gtk.h>
 
 #include "common.h"
 #include "cpu8051.h"
+#include "memory.h"
 #include "options.h"
 #include "hexfile.h"
 
 #include "regwin.h"
 #include "pgmwin.h"
 #include "memwin.h"
+#include "app-config.h"
 
-static int RunningState;
-static int RunFuncTag;
-static GtkWidget *mainwin;
+#define BUTTONS_BORDER 2
 
-/* Signal DestroyEvent */
-static void
-WindowDestroyEvent( GtkWidget *widget, gpointer data )
-{
-#ifdef EMU8051_DEBUG
-  g_print( "emugtk_DestroyEvent(...)\n" );
-#endif
+static int running;
+static int running_function_tag;
+static int restart_gui = true;
 
-  gtk_main_quit();
-}
+GtkWidget *mainwin;
 
+extern struct app_config_t *cfg;
+extern struct options_t options;
 
-/* Taken from the Gxine source code. */
-static GtkWidget *
-AddPixButton( GtkWidget *box, gchar **pixmap_array )
+void
+emugtk_UpdateDisplay(void)
 {
-  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 );
-  gtk_container_add( GTK_CONTAINER(button), icon );
+       log_debug("UpdateDisplay()");
+       regwin_refresh();
+       pgmwin_refresh();
 
-  gtk_box_pack_start( GTK_BOX(box), button, FALSE, FALSE, 0 );
+       if (cfg->view_int_memory)
+               memwin_refresh(INT_MEM_ID);
 
-  return button;
+       if (cfg->view_ext_memory)
+               memwin_refresh(EXT_MEM_ID);
 }
 
-
-/* Creates the Reset, Run, Stop and Step buttons. */
-static GtkWidget *
-AddButtons( void )
+/* Step out of running state */
+static void
+emugtk_stop_running()
 {
-  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 = AddPixButton( button_hbox, reset_xpm );
-  gtk_signal_connect( GTK_OBJECT(button), "clicked",
-                     GTK_SIGNAL_FUNC(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 );
-
-  /* Creating STOP button. */
-  button = AddPixButton( button_hbox, stop_xpm );
-  gtk_signal_connect( GTK_OBJECT(button), "clicked",
-                     GTK_SIGNAL_FUNC(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 );
-
-  return button_hbox;
+       if (running) {
+               log_info("StopRunning()");
+               g_source_remove(running_function_tag);
+               running = 0;
+               emugtk_UpdateDisplay();
+       }
 }
 
-
-GtkWidget *
-AddMenu( void )
+/* Running function called when idle from gtk_main */
+static gboolean
+emugtk_running(gpointer data)
 {
-  GtkWidget *menu_bar;
-
-  /* Creating menu item. */
-  menu_bar = gtk_menu_bar_new();
-
-  /* Adding the 'File' submenu */
-  FileAddMenu( menu_bar );
+       cpu8051_Exec();
+       if (IsBreakpoint(cpu8051.pc)) {
+               log_info("Breakpoint Hit");
+               emugtk_stop_running();
+       }
 
-  /* Adding the 'View' submenu */
-  ViewAddMenu( menu_bar );
-  
-  /* Adding the 'Help' submenu */
-  HelpAddMenu( menu_bar );
-
-  gtk_widget_show_all( GTK_WIDGET( menu_bar ) );
-  
-  return menu_bar;
+       return TRUE;
 }
 
-
+/* Get in the running state */
 static void
-emugtk_window_init( void )
+emugtk_start_running(void)
 {
-  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();*/
-  
-  /* main_vbox contains the menu bar and body_vbox (for all remaining items). */
-  main_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 );
-
-  /* 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 );
-
-  /* Emulator fixed window. */
-  emufixed = gtk_fixed_new();
-  gtk_widget_set_usize( GTK_WIDGET( emufixed ), MAIN_WIN_WIDTH,
-                       REG_WIN_HEIGHT + MEM_WIN_HEIGHT + 10 );
-
-  /* 8051 registers frame. */
-  fixed_frame = regwin_init( REG_WIN_WIDTH, REG_WIN_HEIGHT );
-  gtk_fixed_put( GTK_FIXED( emufixed ), fixed_frame, 0, 0 );
-
-  /* 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 );
-
-  /* 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 the main_vbox to the main window. */
-  gtk_container_add( GTK_CONTAINER(mainwin), main_vbox );
-
-  gtk_widget_show_all( mainwin );
+       if (!running) {
+               log_info("StartRunning()");
+               running_function_tag = g_idle_add(emugtk_running, 0);
+               running = 1;
+       }
 }
 
-
-int
-main( int argc, char **argv )
+/* Taken from the Gxine source code. */
+static GtkWidget *
+button_add_pix(GtkWidget *box, char **xpm)
 {
-  char *hex_file;
-
-  ParseCommandLineOptions( argc, argv );
-
-  cpu8051_init();
-
-  RunningState = 0;
-  
-  gtk_init( &argc, &argv );
+       GtkWidget *button, *icon;
 
-  emugtk_window_init();
+       button = gtk_button_new();
+       gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NORMAL);
 
-  hex_file = get_hex_filename();
+       icon = gtk_image_new_from_pixbuf(
+               gdk_pixbuf_new_from_xpm_data((const char **) xpm));
+       gtk_container_add(GTK_CONTAINER(button), icon);
 
-  if( hex_file != NULL ) {
-    emugtk_new_file( hex_file );
-  }
+       gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, BUTTONS_BORDER);
 
-  /*emugtk_Reset();*/
-
-  gtk_main();
-
-  printf( "End of program.\n" );
-  
-  return EXIT_SUCCESS;
+       return button;
 }
 
+/* CPU reset and Gtk UI update */
+static void
+emugtk_Reset(void)
+{
+       cpu8051_Reset();
+       emugtk_UpdateDisplay();
+}
 
-void
-emugtk_new_file( char *file )
+/* Signal ResetEvent (ResetButton) */
+static void
+emugtk_ResetEvent(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
-  emugtk_StopRunning();
-  
-  LoadHexFile( file );
-  
-  emugtk_Reset();
-  emugtk_UpdateDisplay();
+       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();
+}
 
-void
-AddMenuSeparator( GtkWidget *menu )
+/* Signal StopEvent (StopButton) */
+static void
+emugtk_StopEvent(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
-  GtkWidget *item;
-  
-  item = gtk_menu_item_new();
-  gtk_menu_append( GTK_MENU(menu), item );
+       log_info("StopEvent()");
+       emugtk_stop_running();
 }
 
-
-void
-emugtk_UpdateDisplay( void )
+/* Signal StepEvent (StepButton) */
+static void
+emugtk_StepEvent(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
-#ifdef EMU8051_DEBUG
-  g_print( "emugtk_UpdateDisplay()\n" );
-#endif
-
-  regwin_Show();
-  pgmwin_Disasm();
-  memwin_DumpD("0x00");
+       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)
+{
+       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;
 
+       cfg->hpane_pos = gtk_paned_get_position(GTK_PANED(paned));
+}
 
+static void
+vpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data)
+{
+       GtkWidget *paned = data;
 
+       cfg->vpane_pos = gtk_paned_get_position(GTK_PANED(paned));
+}
 
-//////////////////////////////////////////////////////////////////////////////
-// CPU reset and Gtk UI update
-//////////////////////////////////////////////////////////////////////////////
-void
-emugtk_Reset( void )
+static void
+main_paned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data)
 {
-  cpu8051_Reset( );
-  regwin_Show();
-  pgmwin_Disasm();
-  memwin_DumpD("0x00");
-}
+       GtkWidget *paned = data;
 
+       cfg->main_pane_pos = gtk_paned_get_position(GTK_PANED(paned));
+}
 
-//////////////////////////////////////////////////////////////////////////////
-// CPU Step and Gtk UI update
-//////////////////////////////////////////////////////////////////////////////
 void
-emugtk_Step( void )
+emugtk_restart_gui(void)
 {
-  cpu8051_Exec();
-  regwin_Show();
-  pgmwin_Disasm();
-  memwin_DumpD("0x00");
-}
+       emugtk_stop_running();
 
+       gtk_widget_destroy(mainwin);
 
-//////////////////////////////////////////////////////////////////////////////
-// 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( );
+       restart_gui = true;
 }
 
-
-//////////////////////////////////////////////////////////////////////////////
-// Signal RunEvent ( RunButton )
-//////////////////////////////////////////////////////////////////////////////
 void
-emugtk_RunEvent( GtkWidget *widget, GdkEvent *event, gpointer data )
+emugtk_quit_gui(void)
 {
-#ifdef EMU8051_DEBUG
-  g_print( "emugtk_RunEvent(...)\n" );
-#endif
-  if ( RunningState ) {
-    //   g_print( "Getting out of RunningState! \n" );
-    emugtk_StopRunning( );
-  }
-  else {
-    //   g_print( "Going In RunningState! \n" );
-    emugtk_StartRunning( );
-  }
-}
+       gtk_main_quit();
 
+       restart_gui = false;
+}
 
-//////////////////////////////////////////////////////////////////////////////
-// Signal StopEvent ( StopButton )
-//////////////////////////////////////////////////////////////////////////////
-void
-emugtk_StopEvent( GtkWidget *widget, GdkEvent *event, gpointer data )
+static GtkWidget *
+emugtk_create_memory_paned(void)
 {
-#ifdef EMU8051_DEBUG
-  g_print( "emugtk_StopEvent(...)\n" );
-#endif
-  emugtk_StopRunning( );
+       GtkWidget *vpaned;
+       GtkWidget *scrollwin;
+
+       /* 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);
+               }
+
+               return vpaned;
+       } 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;
+
+       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();
+
+       /* 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);
+}
 
-//////////////////////////////////////////////////////////////////////////////
-// Signal StepEvent ( StepButton )
-//////////////////////////////////////////////////////////////////////////////
 void
-emugtk_StepEvent( GtkWidget *widget, GdkEvent *event, gpointer data )
+AddMenuSeparator(GtkWidget *menu)
 {
-#ifdef EMU8051_DEBUG
-  g_print( "emugtk_StepEvent(...)\n" );
-#endif
-  emugtk_StopRunning( );
-  emugtk_Step();
-}
+       GtkWidget *item;
 
+       item = gtk_menu_item_new();
+       gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+}
 
-//////////////////////////////////////////////////////////////////////////////
-// Running called by RunningFunction( )
-//////////////////////////////////////////////////////////////////////////////
 void
-emugtk_Running( )
+emugtk_new_file(char *file)
 {
-  cpu8051_Exec( );
-  if( pgmwin_IsBreakpoint( cpu8051.pc ) ) {
-#ifdef EMU8051_DEBUG
-    g_print( "Breakpoint Hit, stopping!\n" );
-#endif
-    emugtk_StopRunning( );
-  }
-}
+       emugtk_stop_running();
 
+       LoadHexFile(file);
 
-//////////////////////////////////////////////////////////////////////////////
-// RunningFunction called when idle from gtk_main
-//////////////////////////////////////////////////////////////////////////////
-gboolean
-RunningFunction( gpointer data )
-{
-  emugtk_Running( );
-  return TRUE;
-}
+       if (cfg->clear_ram_on_file_load)
+               emugtk_Reset();
 
+       emugtk_UpdateDisplay();
+}
 
-//////////////////////////////////////////////////////////////////////////////
-// Get in the RunningState
-//////////////////////////////////////////////////////////////////////////////
-void
-emugtk_StartRunning( void )
+int
+main(int argc, char **argv)
 {
-  if ( !RunningState ) {
-#ifdef EMU8051_DEBUG
-    printf( "emugtk_StartRunning( )\n" );
-#endif
-    RunFuncTag = gtk_idle_add( RunningFunction, 0 );
-
-    RunningState = 1;
-  }
-}
+       parse_command_line_options(argc, argv);
+       app_config_load();
 
+       cpu8051_init();
 
-//////////////////////////////////////////////////////////////////////////////
-// 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");
-  }
+       running = 0;
+
+       gtk_init(&argc, &argv);
+
+       if (options.filename != NULL)
+               LoadHexFile(options.filename);
+
+       cpu8051_Reset();
+
+       while (restart_gui == true) {
+               log_info("Init GUI");
+
+               emugtk_window_init();
+               emugtk_UpdateDisplay();
+               gtk_main();
+       }
+
+       log_info("Terminate");
+
+       app_config_save();
+
+       return EXIT_SUCCESS;
 }