zipped rom support in GUI
[drnoksnes] / gui / plugin.c
index 79e0fe7..6c65620 100644 (file)
 #include <hildon/hildon-note.h>
 #include <hildon/hildon-defines.h>
 
+#if MAEMO_VERSION >= 5
+#include <hildon/hildon-button.h>
+#include <hildon/hildon-check-button.h>
+#include <hildon/hildon-picker-button.h>
+#include <hildon/hildon-touch-selector.h>
+#include <hildon/hildon-gtk.h>
+#else
+#include <hildon/hildon-caption.h>
+#endif
+
 #include "../platform/hgw.h"
 #include "plugin.h"
 
@@ -44,7 +54,7 @@ static void plugin_callback(GtkWidget * menu_item, gpointer data);
 
 GConfClient * gcc = NULL;
 static GameStartupInfo gs;
-static GtkWidget * menu_items[1];
+static GtkWidget * menu_items[4];
 
 static StartupPluginInfo plugin_info = {
        load_plugin,
@@ -60,24 +70,46 @@ STARTUP_INIT_PLUGIN(plugin_info, gs, FALSE, TRUE)
 gchar* current_rom_file = 0;
 gboolean current_rom_file_exists = FALSE;
 
+#if MAEMO_VERSION >= 5
+static HildonButton* select_rom_btn;
+static HildonCheckButton* sound_check;
+static HildonPickerButton* framerate_picker;
+static HildonCheckButton* display_fps_check;
+static HildonCheckButton* turbo_check;
+// speedhacks=no and accuracy=yes in fremantle
+#else
+static GtkButton* select_rom_btn;
 static GtkLabel* rom_label;
-static GtkCheckButton* audio_check;
+static GtkCheckButton* sound_check;
 static GtkCheckButton* turbo_check;
-static GtkSpinButton* frameskip_spin;
-static GtkCheckButton* auto_framerate_check;
-static GtkCheckButton* trans_check;
+static GtkComboBox* framerate_combo;
+static GtkCheckButton* accu_check;
+static GtkCheckButton* display_fps_check;
 static GtkComboBox* speedhacks_combo;
+#endif
+
+static inline void set_rom_label(gchar * text)
+{
+#if MAEMO_VERSION >= 5
+       hildon_button_set_value(select_rom_btn, text);
+#else
+       gtk_label_set_text(GTK_LABEL(rom_label), text);
+#endif
+}
 
 static void set_rom(const char * rom_file)
 {
-       if (!rom_file) return;
        if (current_rom_file) g_free(current_rom_file);
-
-       gchar * utf8_filename = g_filename_display_name(rom_file);
+       if (!rom_file || strlen(rom_file) == 0) {
+               current_rom_file = NULL;
+               set_rom_label("<no rom selected>");
+               return;
+       }
 
        current_rom_file = g_strdup(rom_file);
-       gtk_label_set_text(GTK_LABEL(rom_label), utf8_filename);
 
+       gchar * utf8_filename = g_filename_display_basename(rom_file);
+       set_rom_label(utf8_filename);
        g_free(utf8_filename);
 
        current_rom_file_exists = g_file_test(current_rom_file,
@@ -101,6 +133,10 @@ static void select_rom_callback(GtkWidget * button, gpointer data)
        gtk_file_filter_add_pattern(filter, "*.smc");
        gtk_file_filter_add_pattern(filter, "*.sfc");
        gtk_file_filter_add_pattern(filter, "*.fig");
+       gtk_file_filter_add_pattern(filter, "*.smc.gz");
+       gtk_file_filter_add_pattern(filter, "*.sfc.gz");
+       gtk_file_filter_add_pattern(filter, "*.fig.gz");
+       gtk_file_filter_add_pattern(filter, "*.zip");
 
        dialog = hildon_file_chooser_dialog_new_with_properties(
                get_parent_window(),
@@ -136,14 +172,27 @@ static void controls_item_callback(GtkWidget * button, gpointer data)
        controls_dialog(get_parent_window());
 }
 
-static void auto_framerate_callback(GtkWidget * button, gpointer data)
+static void advanced_item_callback(GtkWidget * button, gpointer data)
 {
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auto_framerate_check))) {
-               gtk_widget_set_sensitive(GTK_WIDGET(frameskip_spin), FALSE);
-       } else {
-               gtk_widget_set_sensitive(GTK_WIDGET(frameskip_spin), TRUE);
-       }
+       advanced_dialog(get_parent_window());
+}
+
+static void about_item_callback(GtkWidget * button, gpointer data)
+{
+       about_dialog(get_parent_window());
+}
+
+#if MAEMO_VERSION >= 5
+/* Called for each of the play/restart/continue buttons */
+static void found_ogs_button_callback(GtkWidget *widget, gpointer data)
+{
+       hildon_gtk_widget_set_theme_size(widget,
+               HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_THUMB_HEIGHT);
+       gtk_widget_set_size_request(widget, 200, -1);
+       gtk_box_set_child_packing(GTK_BOX(data), widget,
+               FALSE, FALSE, 0, GTK_PACK_START);
 }
+#endif
 
 static GtkWidget * load_plugin(void)
 {
@@ -151,85 +200,167 @@ static GtkWidget * load_plugin(void)
        gcc = gconf_client_get_default();
 
        GtkWidget* parent = gtk_vbox_new(FALSE, HILDON_MARGIN_DEFAULT);
-       GtkWidget* rom_hbox = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
-       GtkWidget* opt_hbox = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
-       GtkWidget* opt2_hbox = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
 
-       GtkWidget* selectRomBtn = gtk_button_new_with_label("Select ROM...");
+/* Select ROM button */
+#if MAEMO_VERSION >= 5
+{
+       select_rom_btn = HILDON_BUTTON(hildon_button_new_with_text(
+               HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_THUMB_HEIGHT,
+               HILDON_BUTTON_ARRANGEMENT_VERTICAL,
+               "ROM",
+               NULL));
+       hildon_button_set_alignment(select_rom_btn, 0.0f, 0.5f, 0.9f, 0.2f);
+
+       // Ugly hacks: resize the Osso-Games-Startup buttons
+       GtkBox* button_box =
+               GTK_BOX(gtk_widget_get_parent(gs.ui->play_button));
+       gtk_box_set_spacing(button_box, HILDON_MARGIN_DEFAULT);
+       gtk_container_foreach(GTK_CONTAINER(button_box),
+               found_ogs_button_callback, button_box);
+
+       // Ugly hacks: move the select rom button to the left.
+       gtk_box_pack_start_defaults(button_box, GTK_WIDGET(select_rom_btn));
+       gtk_box_reorder_child(button_box, GTK_WIDGET(select_rom_btn), 0);
+}
+#else
+{
+       GtkWidget* rom_hbox = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+       select_rom_btn = GTK_BUTTON(gtk_button_new_with_label("Select ROM..."));
+       gtk_widget_set_size_request(GTK_WIDGET(select_rom_btn), 180, 46);
        rom_label = GTK_LABEL(gtk_label_new(NULL));
 
-       GtkContainer* audio_cont =
-               GTK_CONTAINER(gtk_alignment_new(0.0, 0.0, 0.0, 0.0));
-       audio_check =
-               GTK_CHECK_BUTTON(gtk_check_button_new_with_label("Enable audio"));
-       GtkWidget* framerate_label = gtk_label_new("Frameskip:");
-       frameskip_spin =
-               GTK_SPIN_BUTTON(gtk_spin_button_new_with_range(0.0, 10.0, 1.0));
-       auto_framerate_check =
-               GTK_CHECK_BUTTON(gtk_check_button_new_with_label("Auto"));
+       gtk_box_pack_start(GTK_BOX(rom_hbox), GTK_WIDGET(select_rom_btn), FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(rom_hbox), GTK_WIDGET(rom_label), TRUE, TRUE, 0);
+       gtk_box_pack_start(GTK_BOX(parent), rom_hbox, FALSE, FALSE, 0);
+}
+#endif
+
+/* First row of widgets */
+#if MAEMO_VERSION >= 5
+{
+       GtkBox* opt_hbox1 = GTK_BOX(gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT));
+       sound_check =
+               HILDON_CHECK_BUTTON(hildon_check_button_new(
+                       HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT));
+       gtk_button_set_label(GTK_BUTTON(sound_check), "Sound");
+
+       framerate_picker = HILDON_PICKER_BUTTON(hildon_picker_button_new(
+               HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
+               HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
+       hildon_button_set_title(HILDON_BUTTON(framerate_picker), "Target framerate");
+
+       HildonTouchSelector* framerate_sel =
+               HILDON_TOUCH_SELECTOR(hildon_touch_selector_new_text());
+       hildon_touch_selector_append_text(framerate_sel, "Auto");
+       for (int i = 1; i < 10; i++) {
+               gchar buffer[20];
+               sprintf(buffer, "%d-%d", 50/i, 60/i);
+               hildon_touch_selector_append_text(framerate_sel, buffer);
+       }
+       hildon_picker_button_set_selector(framerate_picker, framerate_sel);
+
+       GtkBox* framerate_sel_box = GTK_BOX(gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT));
+
+       display_fps_check =
+               HILDON_CHECK_BUTTON(hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT));
+       gtk_button_set_label(GTK_BUTTON(display_fps_check),
+               "Show while in game");
+       turbo_check =
+               HILDON_CHECK_BUTTON(hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT));
+       gtk_button_set_label(GTK_BUTTON(turbo_check),
+               "Turbo mode");
+
+       gtk_box_pack_start_defaults(framerate_sel_box, GTK_WIDGET(display_fps_check));
+       gtk_box_pack_start_defaults(framerate_sel_box, GTK_WIDGET(turbo_check));
+       gtk_box_pack_start(GTK_BOX(framerate_sel), GTK_WIDGET(framerate_sel_box), FALSE, FALSE, 0);
+       gtk_widget_show_all(GTK_WIDGET(framerate_sel_box));
+
+       gtk_box_pack_start_defaults(opt_hbox1, GTK_WIDGET(sound_check));
+       gtk_box_pack_start_defaults(opt_hbox1, GTK_WIDGET(framerate_picker));
+       gtk_box_pack_start(GTK_BOX(parent), GTK_WIDGET(opt_hbox1), FALSE, FALSE, 0);
+}
+#else
+{
+       GtkBox* opt_hbox1 = GTK_BOX(gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT));
+       sound_check =
+               GTK_CHECK_BUTTON(gtk_check_button_new_with_label("Enable sound"));
+
        turbo_check =
                GTK_CHECK_BUTTON(gtk_check_button_new_with_label("Turbo mode"));
-       GtkContainer* trans_cont =
-               GTK_CONTAINER(gtk_alignment_new(0.0, 0.0, 0.0, 0.0));
-       trans_check =
-               GTK_CHECK_BUTTON(gtk_check_button_new_with_label("Accurate graphics"));
+       display_fps_check =
+               GTK_CHECK_BUTTON(gtk_check_button_new_with_label("Display framerate"));
        speedhacks_combo =
                GTK_COMBO_BOX(gtk_combo_box_new_text());
 
-       gtk_widget_set_size_request(GTK_WIDGET(selectRomBtn),
-                                                               180, 46);
-       gtk_combo_box_append_text(speedhacks_combo, "No speedhacks");
-       gtk_combo_box_append_text(speedhacks_combo, "Safe hacks only");
-       gtk_combo_box_append_text(speedhacks_combo, "All speedhacks");
-
+       gtk_box_pack_start(opt_hbox1, GTK_WIDGET(sound_check), FALSE, FALSE, 0);
+       gtk_box_pack_start(opt_hbox1, GTK_WIDGET(display_fps_check), TRUE, FALSE, 0);
+       gtk_box_pack_start(opt_hbox1, GTK_WIDGET(turbo_check), FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(parent), GTK_WIDGET(opt_hbox1), FALSE, FALSE, 0);
+}
+#endif
 
-       gtk_box_pack_start(GTK_BOX(rom_hbox), selectRomBtn, FALSE, FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(rom_hbox), GTK_WIDGET(rom_label), TRUE, TRUE, 0);
+/* Second row of widgets */
+#if MAEMO_VERSION >= 5
+       // Empty
+#else
+{
+       GtkBox* opt_hbox2 = GTK_BOX(gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT));
 
-       gtk_container_add(audio_cont, GTK_WIDGET(audio_check));
-       gtk_box_pack_start(GTK_BOX(opt_hbox), GTK_WIDGET(audio_cont), TRUE, TRUE, 0);
-       gtk_box_pack_start(GTK_BOX(opt_hbox), framerate_label, FALSE, FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(opt_hbox), GTK_WIDGET(frameskip_spin), FALSE, FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(opt_hbox), GTK_WIDGET(auto_framerate_check), FALSE, FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(opt_hbox), GTK_WIDGET(turbo_check), FALSE, FALSE, 0);
+       accu_check =
+               GTK_CHECK_BUTTON(gtk_check_button_new_with_label("Accurate graphics"));
 
-       gtk_container_add(trans_cont, GTK_WIDGET(trans_check));
-       gtk_box_pack_start(GTK_BOX(opt2_hbox), GTK_WIDGET(trans_cont), TRUE, TRUE, 0);
-       gtk_box_pack_start(GTK_BOX(opt2_hbox), GTK_WIDGET(speedhacks_combo), FALSE, FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(parent), rom_hbox, FALSE, FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(parent), opt_hbox, FALSE, FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(parent), opt2_hbox, FALSE, FALSE, 0);
+       framerate_combo =
+               GTK_COMBO_BOX(gtk_combo_box_new_text());
+       GtkWidget* framerate_box = hildon_caption_new(NULL, "Framerate:",
+               GTK_WIDGET(framerate_combo), NULL, HILDON_CAPTION_OPTIONAL);
+
+       gtk_combo_box_append_text(framerate_combo, "Auto");
+       for (int i = 1; i < 10; i++) {
+               gchar buffer[20];
+               sprintf(buffer, "%d-%d", 50/i, 60/i);
+               gtk_combo_box_append_text(framerate_combo, buffer);
+       }
+       gtk_combo_box_append_text(speedhacks_combo, "No speedhacks");
+       gtk_combo_box_append_text(speedhacks_combo, "Safe hacks only");
+       gtk_combo_box_append_text(speedhacks_combo, "All speedhacks");
 
-       // Load current configuration from GConf
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(audio_check),
-               !gconf_client_get_bool(gcc, kGConfDisableAudio, NULL));
+       gtk_box_pack_start(opt_hbox2, GTK_WIDGET(accu_check), FALSE, FALSE, 0);
+       gtk_box_pack_start(opt_hbox2, GTK_WIDGET(framerate_box), TRUE, FALSE, 0);
+       gtk_box_pack_start(opt_hbox2, GTK_WIDGET(speedhacks_combo), FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(parent), GTK_WIDGET(opt_hbox2), FALSE, FALSE, 0);
+}
+#endif
+
+/* Load current configuration from GConf */
+#if MAEMO_VERSION >= 5
+       hildon_check_button_set_active(sound_check,
+               gconf_client_get_bool(gcc, kGConfSound, NULL));
+       hildon_picker_button_set_active(framerate_picker,
+               gconf_client_get_int(gcc, kGConfFrameskip, NULL));
+       hildon_check_button_set_active(turbo_check,
+               gconf_client_get_bool(gcc, kGConfTurboMode, NULL));
+       hildon_check_button_set_active(display_fps_check,
+               gconf_client_get_bool(gcc, kGConfDisplayFramerate, NULL));
+#else
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sound_check),
+               gconf_client_get_bool(gcc, kGConfSound, NULL));
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(turbo_check),
                gconf_client_get_bool(gcc, kGConfTurboMode, NULL));
-
-       int frameskip = gconf_client_get_int(gcc, kGConfFrameskip, NULL);
-       if (frameskip <= 0) {
-               gtk_widget_set_sensitive(GTK_WIDGET(frameskip_spin), FALSE);
-               gtk_spin_button_set_value(frameskip_spin, 0);
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_framerate_check), TRUE);
-       } else {
-               gtk_widget_set_sensitive(GTK_WIDGET(frameskip_spin), TRUE);
-               gtk_spin_button_set_value(frameskip_spin, frameskip - 1);
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_framerate_check), FALSE);
-       }
-
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(trans_check),
+       gtk_combo_box_set_active(framerate_combo,
+               gconf_client_get_int(gcc, kGConfFrameskip, NULL));
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(accu_check),
                gconf_client_get_bool(gcc, kGConfTransparency, NULL));
-
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(display_fps_check),
+               gconf_client_get_bool(gcc, kGConfDisplayFramerate, NULL));
        gtk_combo_box_set_active(speedhacks_combo,
                gconf_client_get_int(gcc, kGConfSpeedhacks, NULL));
+#endif
 
        set_rom(gconf_client_get_string(gcc, kGConfRomFile, NULL));
 
        // Connect signals
-       g_signal_connect(G_OBJECT(selectRomBtn), "clicked",
+       g_signal_connect(G_OBJECT(select_rom_btn), "clicked",
                                        G_CALLBACK(select_rom_callback), NULL);
-       g_signal_connect(G_OBJECT(auto_framerate_check), "toggled",
-                                       G_CALLBACK(auto_framerate_callback), NULL);
 
        return parent;
 }
@@ -247,26 +378,33 @@ static void unload_plugin(void)
 
 static void write_config(void)
 {
-       // Write settings to GConf
-       gconf_client_set_bool(gcc, kGConfDisableAudio,
-               !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(audio_check)), NULL);
+/* Write current settings to gconf */
+#if MAEMO_VERSION >= 5
+       gconf_client_set_bool(gcc, kGConfSound,
+               hildon_check_button_get_active(sound_check), NULL);
+       gconf_client_set_int(gcc, kGConfFrameskip,
+               hildon_picker_button_get_active(framerate_picker), NULL);
+       gconf_client_set_bool(gcc, kGConfDisplayFramerate,
+               hildon_check_button_get_active(display_fps_check), NULL);
+       gconf_client_set_bool(gcc, kGConfTurboMode,
+               hildon_check_button_get_active(turbo_check), NULL);
+#else
+       gconf_client_set_bool(gcc, kGConfSound,
+               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sound_check)), NULL);
        gconf_client_set_bool(gcc, kGConfTurboMode,
                gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(turbo_check)), NULL);
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auto_framerate_check))) {
-               gconf_client_set_int(gcc, kGConfFrameskip, 0, NULL);
-       } else {
-               gconf_client_set_int(gcc, kGConfFrameskip,
-                       gtk_spin_button_get_value(frameskip_spin) + 1, NULL);
-       }
+       gconf_client_set_int(gcc, kGConfFrameskip,
+               gtk_combo_box_get_active(framerate_combo), NULL);
        gconf_client_set_bool(gcc, kGConfTransparency,
-               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(trans_check)), NULL);
+               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(accu_check)), NULL);
+       gconf_client_set_bool(gcc, kGConfDisplayFramerate,
+               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(display_fps_check)), NULL);
        gconf_client_set_int(gcc, kGConfSpeedhacks,
                gtk_combo_box_get_active(speedhacks_combo), NULL);
+#endif
 
        if (current_rom_file) {
                gconf_client_set_string(gcc, kGConfRomFile, current_rom_file, NULL);
-       } else {
-               gconf_client_unset(gcc, kGConfRomFile, NULL);
        }
 
        controls_setup();
@@ -274,19 +412,47 @@ static void write_config(void)
 
 static GtkWidget **load_menu(guint *nitems)
 {
+#if MAEMO_VERSION >= 5
+       const HildonSizeType button_size =
+               HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH;
+       menu_items[0] = hildon_gtk_button_new(button_size);
+       gtk_button_set_label(GTK_BUTTON(menu_items[0]), "Settings…");
+       menu_items[1] = hildon_gtk_button_new(button_size);
+       gtk_button_set_label(GTK_BUTTON(menu_items[1]), "Controls…");
+       menu_items[2] = hildon_gtk_button_new(button_size);
+       gtk_button_set_label(GTK_BUTTON(menu_items[2]), "About…");
+       *nitems = 3;
+
+       g_signal_connect(G_OBJECT(menu_items[0]), "clicked",
+                                       G_CALLBACK(advanced_item_callback), NULL);
+       g_signal_connect(G_OBJECT(menu_items[1]), "clicked",
+                                       G_CALLBACK(controls_item_callback), NULL);
+       g_signal_connect(G_OBJECT(menu_items[2]), "clicked",
+                                       G_CALLBACK(about_item_callback), NULL);
+#else
        menu_items[0] = gtk_menu_item_new_with_label("Settings");
-       *nitems = 1;
+       menu_items[1] = gtk_menu_item_new_with_label("About…");
+       *nitems = 2;
 
        GtkMenu* settings_menu = GTK_MENU(gtk_menu_new());
-       GtkMenuItem* controls_item =
-               GTK_MENU_ITEM(gtk_menu_item_new_with_label("Controls…"));
-       
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_items[0]),
                GTK_WIDGET(settings_menu));
+
+       GtkMenuItem* controls_item =
+               GTK_MENU_ITEM(gtk_menu_item_new_with_label("Controls…"));
        gtk_menu_append(GTK_MENU(settings_menu), GTK_WIDGET(controls_item));
 
+       GtkMenuItem* advanced_item =
+               GTK_MENU_ITEM(gtk_menu_item_new_with_label("Advanced…"));
+       gtk_menu_append(GTK_MENU(settings_menu), GTK_WIDGET(advanced_item));
+
        g_signal_connect(G_OBJECT(controls_item), "activate",
                                        G_CALLBACK(controls_item_callback), NULL);
+       g_signal_connect(G_OBJECT(advanced_item), "activate",
+                                       G_CALLBACK(advanced_item_callback), NULL);
+       g_signal_connect(G_OBJECT(menu_items[1]), "activate",
+                                       G_CALLBACK(about_item_callback), NULL);
+#endif
 
        return menu_items;
 }
@@ -296,19 +462,43 @@ static void update_menu(void)
        // Nothing to update in the current menu
 }
 
+// From osso-games-startup
+#define MA_GAME_PLAY 1
+#define MA_GAME_RESTART 2
+#define MA_GAME_OPEN 3
+#define MA_GAME_SAVE 4
+#define MA_GAME_SAVE_AS 5
+#define MA_GAME_HELP 6
+#define MA_GAME_RECENT_1 7
+#define MA_GAME_RECENT_2 8
+#define MA_GAME_RECENT_3 9
+#define MA_GAME_RECENT_4 10
+#define MA_GAME_RECENT_5 11
+#define MA_GAME_RECENT_6 12
+#define MA_GAME_CLOSE 13
+#define MA_GAME_HIGH_SCORES 14
+#define MA_GAME_RESET 15
+#define MA_GAME_CHECKSTATE 16
+#define MA_GAME_SAVEMENU_REFERENCE 17
+#define ME_GAME_OPEN     20
+#define ME_GAME_SAVE     21
+#define ME_GAME_SAVE_AS  22
+#define MA_GAME_PLAYING_START 30
+#define MA_GAME_PLAYING 31
+
 static void plugin_callback(GtkWidget * menu_item, gpointer data)
 {
        switch ((gint) data) {
-               case 20:        // ME_GAME_OPEN
+               case ME_GAME_OPEN:
                        save_load(get_parent_window());
                        break;
-               case 21:        // ME_GAME_SAVE
+               case ME_GAME_SAVE:
                        save_save(get_parent_window());
                        break;
-               case 22:        // ME_GAME_SAVE_AS
+               case ME_GAME_SAVE_AS:
                        save_save_as(get_parent_window());
                        break;
-               case 30:        // MA_GAME_PLAYING_START
+               case MA_GAME_PLAYING_START:
                        if (!menu_item) {
                                // Avoid duplicate message
                                break;