1.1 --- a/src/gui/gtkui.h	Wed Oct 17 11:26:45 2007 +0000
     1.2 +++ b/src/gui/gtkui.h	Sun Oct 21 05:21:35 2007 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: gtkui.h,v 1.4 2007-10-17 11:26:45 nkeynes Exp $
     1.6 + * $Id: gtkui.h,v 1.5 2007-10-21 05:21:35 nkeynes Exp $
     1.7   *
     1.8   * Core GTK-based user interface
     1.9   *
    1.10 @@ -33,27 +33,41 @@
    1.11   * Construct and show the main window, returning an 
    1.12   * opaque pointer to the window.
    1.13   */
    1.14 -main_window_t main_window_new( const gchar *title );
    1.15 +main_window_t main_window_new( const gchar *title, GtkWidget *menubar, 
    1.16 +			       GtkWidget *toolbar, GtkAccelGroup *accel );
    1.17  GtkWindow *main_window_get_frame( main_window_t win );
    1.18  GtkWidget *main_window_get_renderarea( main_window_t win );
    1.19  void main_window_set_running( main_window_t win, gboolean running );
    1.20  void main_window_set_framerate( main_window_t win, float rate );
    1.21  void main_window_set_speed( main_window_t win, double speed );
    1.22  
    1.23 -debug_window_t debug_window_new();
    1.24 +debug_window_t debug_window_new( const gchar *title, GtkWidget *menubar,
    1.25 +				 GtkWidget *toolbar, GtkAccelGroup *accel );
    1.26  void debug_window_show( debug_window_t win, gboolean show );
    1.27  void debug_window_set_running( debug_window_t win, gboolean running );
    1.28  void debug_window_update(debug_window_t win);
    1.29 +void debug_window_single_step( debug_window_t data );
    1.30 +void debug_window_set_oneshot_breakpoint( debug_window_t data, int row );
    1.31 +void debug_window_toggle_breakpoint( debug_window_t data, int row );
    1.32  
    1.33 -mmio_window_t mmio_window_new();
    1.34 +
    1.35 +mmio_window_t mmio_window_new( const gchar *title );
    1.36  void mmio_window_show( mmio_window_t win, gboolean show );
    1.37  
    1.38 -void controller_dialog_run();
    1.39 +void dump_window_new( const gchar *title );
    1.40 +
    1.41 +void maple_dialog_run();
    1.42  void path_dialog_run();
    1.43  
    1.44 +main_window_t gtk_gui_get_main();
    1.45 +debug_window_t gtk_gui_get_debugger();
    1.46 +mmio_window_t gtk_gui_get_mmio();
    1.47 +
    1.48  /********************* Helper functions **********************/
    1.49  
    1.50 -gint gtk_gui_run_property_dialog( const gchar *title, GtkWidget *panel );
    1.51 +typedef void (*gtk_dialog_done_fn)(GtkWidget *panel, gboolean isOK);
    1.52 +void gtk_gui_enable_action( const gchar *action, gboolean enabled );
    1.53 +gint gtk_gui_run_property_dialog( const gchar *title, GtkWidget *panel, gtk_dialog_done_fn fn );
    1.54  
    1.55  /******************** Video driver hooks *********************/
    1.56  
    1.57 @@ -68,16 +82,23 @@
    1.58  void load_state_action_callback( GtkAction *action, gpointer user_data);
    1.59  void save_state_action_callback( GtkAction *action, gpointer user_data);
    1.60  void about_action_callback( GtkAction *action, gpointer user_data);
    1.61 -void debugger_action_callback( GtkAction *action, gpointer user_data);
    1.62  void exit_action_callback( GtkAction *action, gpointer user_data);
    1.63  
    1.64  void path_settings_callback( GtkAction *action, gpointer user_data);
    1.65  void audio_settings_callback( GtkAction *action, gpointer user_data);
    1.66 -void controller_settings_callback( GtkAction *action, gpointer user_data);
    1.67 +void maple_settings_callback( GtkAction *action, gpointer user_data);
    1.68  void network_settings_callback( GtkAction *action, gpointer user_data);
    1.69  void video_settings_callback( GtkAction *action, gpointer user_data);
    1.70  void fullscreen_toggle_callback( GtkToggleAction *action, gpointer user_data);
    1.71  
    1.72 +void debugger_action_callback( GtkAction *action, gpointer user_data);
    1.73 +void debug_memory_action_callback( GtkAction *action, gpointer user_data);
    1.74 +void debug_mmio_action_callback( GtkAction *action, gpointer user_data);
    1.75 +void save_scene_action_callback( GtkAction *action, gpointer user_data);
    1.76 +void debug_step_action_callback( GtkAction *action, gpointer user_data);
    1.77 +void debug_runto_action_callback( GtkAction *action, gpointer user_data);
    1.78 +void debug_breakpoint_action_callback( GtkAction *action, gpointer user_data);
    1.79 +
    1.80  /*************** Constant colour/font values *****************/
    1.81  extern PangoFontDescription *gui_fixed_font;
    1.82  extern GdkColor gui_colour_normal, gui_colour_changed, gui_colour_error;