1.1 --- a/src/gui/gtkcb.c	Wed Oct 17 11:26:45 2007 +0000
     1.2 +++ b/src/gui/gtkcb.c	Sun Oct 21 11:38:02 2007 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: gtkcb.c,v 1.4 2007-10-17 11:26:45 nkeynes Exp $
     1.6 + * $Id: gtkcb.c,v 1.5 2007-10-21 05:21:35 nkeynes Exp $
     1.7   *
     1.8   * Action callbacks from the main window
     1.9   *
    1.10 @@ -21,6 +21,7 @@
    1.11  #include "dreamcast.h"
    1.12  #include "gdrom/gdrom.h"
    1.13  #include "gui/gtkui.h"
    1.14 +#include "pvr2/pvr2.h"
    1.15  
    1.16  typedef gboolean (*file_callback_t)( const gchar *filename );
    1.17  
    1.18 @@ -161,11 +162,6 @@
    1.19      exit(0);
    1.20  }
    1.21  
    1.22 -void debugger_action_callback( GtkAction *action, gpointer user_data)
    1.23 -{
    1.24 -    gtk_gui_show_debugger();
    1.25 -}
    1.26 -
    1.27  void path_settings_callback( GtkAction *action, gpointer user_data)
    1.28  {
    1.29      path_dialog_run();
    1.30 @@ -175,9 +171,9 @@
    1.31  {
    1.32  }
    1.33  
    1.34 -void controller_settings_callback( GtkAction *action, gpointer user_data)
    1.35 +void maple_settings_callback( GtkAction *action, gpointer user_data)
    1.36  {
    1.37 -    controller_dialog_run( );
    1.38 +    maple_dialog_run( );
    1.39  }
    1.40  
    1.41  void network_settings_callback( GtkAction *action, gpointer user_data)
    1.42 @@ -191,3 +187,50 @@
    1.43  void fullscreen_toggle_callback( GtkToggleAction *action, gpointer user_data)
    1.44  {
    1.45  }
    1.46 +
    1.47 +void debugger_action_callback( GtkAction *action, gpointer user_data)
    1.48 +{
    1.49 +    gtk_gui_show_debugger();
    1.50 +}
    1.51 +
    1.52 +void debug_memory_action_callback( GtkAction *action, gpointer user_data)
    1.53 +{
    1.54 +    dump_window_new( APP_NAME " " APP_VERSION " :: Memory dump" );
    1.55 +}
    1.56 +
    1.57 +void debug_mmio_action_callback( GtkAction *action, gpointer user_data)
    1.58 +{
    1.59 +    gtk_gui_show_mmio();
    1.60 +}
    1.61 +
    1.62 +void save_scene_action_callback( GtkAction *action, gpointer user_data)
    1.63 +{
    1.64 +    const gchar *dir = lxdream_get_config_value(CONFIG_SAVE_PATH);
    1.65 +    save_file_dialog( "Save next scene...", pvr2_save_next_scene, "*.dsc", "lxdream scene file (*.dsc)", dir );
    1.66 +}
    1.67 +
    1.68 +void debug_step_action_callback( GtkAction *action, gpointer user_data)
    1.69 +{
    1.70 +    debug_window_single_step(gtk_gui_get_debugger());
    1.71 +}
    1.72 +
    1.73 +void debug_runto_action_callback( GtkAction *action, gpointer user_data)
    1.74 +{
    1.75 +    debug_window_t debug = gtk_gui_get_debugger();
    1.76 +    int selected_row = debug_window_get_selected_row(debug);
    1.77 +    if( selected_row == -1 ) {
    1.78 +        WARN( "No address selected, so can't run to it", NULL );
    1.79 +    } else {
    1.80 +	debug_window_set_oneshot_breakpoint( debug, selected_row );
    1.81 +	dreamcast_run();
    1.82 +    }
    1.83 +}
    1.84 +
    1.85 +void debug_breakpoint_action_callback( GtkAction *action, gpointer user_data)
    1.86 +{
    1.87 +    debug_window_t debug = gtk_gui_get_debugger();
    1.88 +    int selected_row = debug_window_get_selected_row(debug);
    1.89 +    if( selected_row != -1 ) {
    1.90 +	debug_window_toggle_breakpoint( debug, selected_row );
    1.91 +    }
    1.92 +}