[BACK]Return to gtk_menu.c CVS log [TXT] [DIR] Up to [RetroPC.NET] / np2 / x11 / gtk2

Diff for /np2/x11/gtk2/gtk_menu.c between versions 1.4 and 1.14

version 1.4, 2005/03/05 15:01:03 version 1.14, 2008/04/03 13:53:25
Line 60 Line 60
 #include "gtk2/gtk_menu.h"  #include "gtk2/gtk_menu.h"
 #include "gtk2/gtk_keyboard.h"  #include "gtk2/gtk_keyboard.h"
   
   #ifndef NSTATSAVE
   #define NSTATSAVE       10
   #endif
   
 /* normal */  /* normal */
 static void cb_bmpsave(GtkAction *action, gpointer user_data);  static void cb_bmpsave(GtkAction *action, gpointer user_data);
Line 79  static void cb_reset(GtkAction *action,  Line 82  static void cb_reset(GtkAction *action, 
 static void cb_sasiopen(GtkAction *action, gpointer user_data);  static void cb_sasiopen(GtkAction *action, gpointer user_data);
 static void cb_sasiremove(GtkAction *action, gpointer user_data);  static void cb_sasiremove(GtkAction *action, gpointer user_data);
 #endif  #endif
   #if defined(SUPPORT_STATSAVE)
   static void cb_statsave(GtkAction *action, gpointer user_data);
   static void cb_statload(GtkAction *action, gpointer user_data);
   #endif
   
 static void cb_dialog(GtkAction *action, gpointer user_data);  static void cb_dialog(GtkAction *action, gpointer user_data);
 static void cb_radio(GtkRadioAction *action, GtkRadioAction *current, gpointer user_data);  static void cb_radio(GtkRadioAction *action, GtkRadioAction *current, gpointer user_data);
Line 91  static GtkActionEntry menu_entries[] = { Line 98  static GtkActionEntry menu_entries[] = {
 { "ScreenMenu",   NULL, "Screen",   NULL, NULL, NULL },  { "ScreenMenu",   NULL, "Screen",   NULL, NULL, NULL },
 { "DeviceMenu",   NULL, "Device",   NULL, NULL, NULL },  { "DeviceMenu",   NULL, "Device",   NULL, NULL, NULL },
 { "OtherMenu",    NULL, "Other",    NULL, NULL, NULL },  { "OtherMenu",    NULL, "Other",    NULL, NULL, NULL },
   { "StatMenu",     NULL, "Stat",     NULL, NULL, NULL },
   
 /* Submenu */  /* Submenu */
 { "Drive1Menu",   NULL, "Drive_1",   NULL, NULL, NULL },  { "Drive1Menu",   NULL, "Drive_1",   NULL, NULL, NULL },
Line 108  static GtkActionEntry menu_entries[] = { Line 116  static GtkActionEntry menu_entries[] = {
 { "SASI1Menu",    NULL, "SASI-_1",   NULL, NULL, NULL },  { "SASI1Menu",    NULL, "SASI-_1",   NULL, NULL, NULL },
 { "SASI2Menu",    NULL, "SASI-_2",   NULL, NULL, NULL },  { "SASI2Menu",    NULL, "SASI-_2",   NULL, NULL, NULL },
 #endif  #endif
   { "ScrnSizeMenu", NULL, "Size",      NULL, NULL, NULL },
 { "SoundMenu",    NULL, "_Sound",    NULL, NULL, NULL },  { "SoundMenu",    NULL, "_Sound",    NULL, NULL, NULL },
   
 /* MenuItem */  /* MenuItem */
Line 146  static GtkActionEntry menu_entries[] = { Line 155  static GtkActionEntry menu_entries[] = {
 { "serialopt",   NULL, "Se_rial option...", NULL, NULL, G_CALLBACK(cb_dialog) },  { "serialopt",   NULL, "Se_rial option...", NULL, NULL, G_CALLBACK(cb_dialog) },
 { "soundopt",    NULL, "So_und option...",  NULL, NULL, G_CALLBACK(cb_dialog) },  { "soundopt",    NULL, "So_und option...",  NULL, NULL, G_CALLBACK(cb_dialog) },
 { "reset",       NULL, "_Reset",            NULL, NULL, G_CALLBACK(cb_reset) },  { "reset",       NULL, "_Reset",            NULL, NULL, G_CALLBACK(cb_reset) },
   #if defined(SUPPORT_STATSAVE)
   { "stat00save",  NULL, "Save 0",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat01save",  NULL, "Save 1",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat02save",  NULL, "Save 2",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat03save",  NULL, "Save 3",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat04save",  NULL, "Save 4",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat05save",  NULL, "Save 5",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat06save",  NULL, "Save 6",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat07save",  NULL, "Save 7",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat08save",  NULL, "Save 8",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat09save",  NULL, "Save 9",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat00load",  NULL, "Load 0",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat01load",  NULL, "Load 1",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat02load",  NULL, "Load 2",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat03load",  NULL, "Load 3",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat04load",  NULL, "Load 4",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat05load",  NULL, "Load 5",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat06load",  NULL, "Load 6",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat07load",  NULL, "Load 7",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat08load",  NULL, "Load 8",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat09load",  NULL, "Load 9",            NULL, NULL, G_CALLBACK(cb_statload), },
   #endif
 };  };
 static const guint n_menu_entries = G_N_ELEMENTS(menu_entries);  static const guint n_menu_entries = G_N_ELEMENTS(menu_entries);
   
Line 263  static GtkRadioActionEntry rotate_entrie Line 294  static GtkRadioActionEntry rotate_entrie
 };  };
 static const guint n_rotate_entries = G_N_ELEMENTS(rotate_entries);  static const guint n_rotate_entries = G_N_ELEMENTS(rotate_entries);
   
   static GtkRadioActionEntry screensize_entries[] = {
   { "320x200",  NULL, "320x200",  NULL, NULL, 4 },
   { "480x300",  NULL, "480x300",  NULL, NULL, 6 },
   { "640x400",  NULL, "640x400",  NULL, NULL, 8 },
   { "800x500",  NULL, "800x500",  NULL, NULL, 10 },
   { "960x600",  NULL, "960x600",  NULL, NULL, 12 },
   { "1280x800", NULL, "1280x800", NULL, NULL, 16 },
   };
   static const guint n_screensize_entries = G_N_ELEMENTS(screensize_entries);
   
 static void cb_beepvol(gint idx);  static void cb_beepvol(gint idx);
 static void cb_f12key(gint idx);  static void cb_f12key(gint idx);
 static void cb_framerate(gint idx);  static void cb_framerate(gint idx);
Line 270  static void cb_joykey(gint idx); Line 311  static void cb_joykey(gint idx);
 static void cb_memory(gint idx);  static void cb_memory(gint idx);
 static void cb_rotate(gint idx);  static void cb_rotate(gint idx);
 static void cb_screenmode(gint idx);  static void cb_screenmode(gint idx);
   static void cb_screensize(gint idx);
 static void cb_soundboard(gint idx);  static void cb_soundboard(gint idx);
   
 static const struct {  static const struct {
Line 284  static const struct { Line 326  static const struct {
         { memory_entries, G_N_ELEMENTS(memory_entries), cb_memory },          { memory_entries, G_N_ELEMENTS(memory_entries), cb_memory },
         { rotate_entries, G_N_ELEMENTS(rotate_entries), cb_rotate },          { rotate_entries, G_N_ELEMENTS(rotate_entries), cb_rotate },
         { screenmode_entries, G_N_ELEMENTS(screenmode_entries), cb_screenmode },          { screenmode_entries, G_N_ELEMENTS(screenmode_entries), cb_screenmode },
           { screensize_entries, G_N_ELEMENTS(screensize_entries), cb_screensize },
         { soundboard_entries, G_N_ELEMENTS(soundboard_entries), cb_soundboard },          { soundboard_entries, G_N_ELEMENTS(soundboard_entries), cb_soundboard },
 };  };
 static const guint n_radiomenu_entries = G_N_ELEMENTS(radiomenu_entries);  static const guint n_radiomenu_entries = G_N_ELEMENTS(radiomenu_entries);
Line 298  static const gchar *ui_info = Line 341  static const gchar *ui_info =
 "   <menuitem action='configure'/>\n"  "   <menuitem action='configure'/>\n"
 "   <menuitem action='newdisk'/>\n"  "   <menuitem action='newdisk'/>\n"
 "   <menuitem action='font'/>\n"  "   <menuitem action='font'/>\n"
 "   <menuitem action='configure'/>\n"  
 "   <separator/>\n"  "   <separator/>\n"
 "   <menuitem action='exit'/>\n"  "   <menuitem action='exit'/>\n"
 "  </menu>\n"  "  </menu>\n"
   #if defined(SUPPORT_STATSAVE)
   "  <menu name='Stat' action='StatMenu'>\n"
   "  </menu>\n"
   #endif
 "  <menu name='FDD' action='FDDMenu'>\n"  "  <menu name='FDD' action='FDDMenu'>\n"
 "  </menu>\n"  "  </menu>\n"
 "  <menu name='HardDisk' action='HardDiskMenu'>\n"  "  <menu name='HardDisk' action='HardDiskMenu'>\n"
Line 340  static const gchar *ui_info = Line 386  static const gchar *ui_info =
 "   <menuitem action='dispvsync'/>\n"  "   <menuitem action='dispvsync'/>\n"
 "   <menuitem action='realpalettes'/>\n"  "   <menuitem action='realpalettes'/>\n"
 "   <menuitem action='nowait'/>\n"  "   <menuitem action='nowait'/>\n"
 "   <menuitem name='framerate' action='autoframe'/>\n"  "   <menuitem action='autoframe'/>\n"
 "   <menuitem action='fullframe'/>\n"  "   <menuitem action='fullframe'/>\n"
 "   <menuitem action='1/2 frame'/>\n"  "   <menuitem action='1/2 frame'/>\n"
 "   <menuitem action='1/3 frame'/>\n"  "   <menuitem action='1/3 frame'/>\n"
 "   <menuitem action='1/4 frame'/>\n"  "   <menuitem action='1/4 frame'/>\n"
   #if defined(SUPPORT_SCREENSIZE)
   "   <separator/>\n"
   "   <menu name='Size' action='ScrnSizeMenu'>\n"
   "    <menuitem action='320x200'/>\n"
   "    <menuitem action='480x300'/>\n"
   "    <menuitem action='640x400'/>\n"
   "    <menuitem action='800x500'/>\n"
   "    <menuitem action='960x600'/>\n"
   "    <menuitem action='1280x800'/>\n"
   "   </menu>\n"
   #endif
 "   <separator/>\n"  "   <separator/>\n"
 "   <menuitem action='screenopt'/>\n"  "   <menuitem action='screenopt'/>\n"
 "  </menu>\n"  "  </menu>\n"
Line 486  xmenu_select_item_by_index(MENU_HDL hdl, Line 543  xmenu_select_item_by_index(MENU_HDL hdl,
         xmenu_select_item_by_index(NULL, rotate_entries, n_rotate_entries, v);          xmenu_select_item_by_index(NULL, rotate_entries, n_rotate_entries, v);
 #define xmenu_select_screenmode(v) \  #define xmenu_select_screenmode(v) \
         xmenu_select_item_by_index(NULL, screenmode_entries, n_screenmode_entries, v);          xmenu_select_item_by_index(NULL, screenmode_entries, n_screenmode_entries, v);
   #define xmenu_select_screensize(v) \
           xmenu_select_item_by_index(NULL, screensize_entries, n_screensize_entries, v);
 #define xmenu_select_soundboard(v) \  #define xmenu_select_soundboard(v) \
         xmenu_select_item_by_index(NULL, soundboard_entries, n_soundboard_entries, v);          xmenu_select_item_by_index(NULL, soundboard_entries, n_soundboard_entries, v);
   
Line 524  cb_bmpsave(GtkAction *action, gpointer u Line 583  cb_bmpsave(GtkAction *action, gpointer u
   
         g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);          g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
         gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);          gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
           if (strlen(bmpfilefolder) == 0) {
                   g_strlcpy(bmpfilefolder, modulefile, sizeof(bmpfilefolder));
                   file_cutname(bmpfilefolder);
           }
         utf8 = g_filename_to_utf8(bmpfilefolder, -1, NULL, NULL, NULL);          utf8 = g_filename_to_utf8(bmpfilefolder, -1, NULL, NULL, NULL);
         if (utf8) {          if (utf8) {
                 gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), utf8);                  gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8);
                 g_free(utf8);                  g_free(utf8);
         }          }
   
Line 811  cb_ataopen(GtkAction *action, gpointer u Line 874  cb_ataopen(GtkAction *action, gpointer u
         filter = gtk_file_filter_new();          filter = gtk_file_filter_new();
         if (filter) {          if (filter) {
                 gtk_file_filter_set_name(filter, "IDE disk image files");                  gtk_file_filter_set_name(filter, "IDE disk image files");
                   gtk_file_filter_add_pattern(filter, "*.[tT][hH][dD]");
                   gtk_file_filter_add_pattern(filter, "*.[hH][dD][iI]");
                 gtk_file_filter_add_pattern(filter, "*.[nN][hH][dD]");                  gtk_file_filter_add_pattern(filter, "*.[nN][hH][dD]");
                 gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);                  gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
         }          }
Line 996  cb_newdisk(GtkAction *action, gpointer u Line 1061  cb_newdisk(GtkAction *action, gpointer u
   
         g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);          g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
         gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);          gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
           if (strlen(fddfolder) == 0) {
                   g_strlcpy(fddfolder, modulefile, sizeof(fddfolder));
                   file_cutname(fddfolder);
           }
         utf8 = g_filename_to_utf8(fddfolder, -1, NULL, NULL, NULL);          utf8 = g_filename_to_utf8(fddfolder, -1, NULL, NULL, NULL);
         if (utf8) {          if (utf8) {
                 gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), utf8);                  gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), utf8);
Line 1009  cb_newdisk(GtkAction *action, gpointer u Line 1078  cb_newdisk(GtkAction *action, gpointer u
   
         filter[0] = gtk_file_filter_new();          filter[0] = gtk_file_filter_new();
         if (filter[0]) {          if (filter[0]) {
                 gtk_file_filter_set_name(filter[0], "D88 floppy disk image");                  gtk_file_filter_set_name(filter[0], "D88 floppy disk image (*.d88,*.d98,*.88d,*.98d)");
                 gtk_file_filter_add_pattern(filter[0], "*.[dD]88");                  gtk_file_filter_add_pattern(filter[0], "*.[dD]88");
                 gtk_file_filter_add_pattern(filter[0], "*.88[dD]");                  gtk_file_filter_add_pattern(filter[0], "*.88[dD]");
                 gtk_file_filter_add_pattern(filter[0], "*.[dD]98");                  gtk_file_filter_add_pattern(filter[0], "*.[dD]98");
Line 1018  cb_newdisk(GtkAction *action, gpointer u Line 1087  cb_newdisk(GtkAction *action, gpointer u
         }          }
         filter[1] = gtk_file_filter_new();          filter[1] = gtk_file_filter_new();
         if (filter[1]) {          if (filter[1]) {
                 gtk_file_filter_set_name(filter[1], "Anex86 hard disk image files");                  gtk_file_filter_set_name(filter[1], "Anex86 hard disk image (*.hdi)");
                 gtk_file_filter_add_pattern(filter[1], "*.[hH][dD][iI]");                  gtk_file_filter_add_pattern(filter[1], "*.[hH][dD][iI]");
                 gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[1]);                  gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[1]);
         }          }
         filter[2] = gtk_file_filter_new();          filter[2] = gtk_file_filter_new();
         if (filter[2]) {          if (filter[2]) {
                 gtk_file_filter_set_name(filter[2], "T98 hard disk image files");                  gtk_file_filter_set_name(filter[2], "T98 hard disk image (*.thd)");
                 gtk_file_filter_add_pattern(filter[2], "*.[tT][hH][dD]");                  gtk_file_filter_add_pattern(filter[2], "*.[tT][hH][dD]");
                 gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[2]);                  gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[2]);
         }          }
         filter[3] = gtk_file_filter_new();          filter[3] = gtk_file_filter_new();
         if (filter[3]) {          if (filter[3]) {
                 gtk_file_filter_set_name(filter[3], "T98-Next hard disk image files");                  gtk_file_filter_set_name(filter[3], "T98-Next hard disk image (*.nhd)");
                 gtk_file_filter_add_pattern(filter[3], "*.[nN][hH][dD]");                  gtk_file_filter_add_pattern(filter[3], "*.[nN][hH][dD]");
                 gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[3]);                  gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter[3]);
         }          }
         gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter[0]);          gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter[0]);
   
         if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) {          if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK)
                 gtk_widget_destroy(dialog);                  goto end;
                 install_idle_process();  
                 return;  
         }  
   
         utf8 = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));          utf8 = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
         if (utf8 == NULL)          if (utf8 == NULL)
Line 1064  cb_newdisk(GtkAction *action, gpointer u Line 1130  cb_newdisk(GtkAction *action, gpointer u
                 for (i = 0; i < NELEMENTS(filter); i++) {                  for (i = 0; i < NELEMENTS(filter); i++) {
                         if (f == filter[i]) {                          if (f == filter[i]) {
                                 kind = i;                                  kind = i;
                                 tmp = g_strjoin(".", path, extname[i]);                                  tmp = g_strjoin(".", path, extname[i], NULL);
                                 if (tmp) {                                  if (tmp) {
                                         g_free(path);                                          g_free(path);
                                         path = tmp;                                          path = tmp;
Line 1205  cb_sasiremove(GtkAction *action, gpointe Line 1271  cb_sasiremove(GtkAction *action, gpointe
 }  }
 #endif  /* !SUPPORT_IDEIO */  #endif  /* !SUPPORT_IDEIO */
   
   #if defined(SUPPORT_STATSAVE)
   static void
   cb_statsave(GtkAction *action, gpointer user_data)
   {
           const gchar *name = gtk_action_get_name(GTK_ACTION(action));
           char ext[4];
           guint n;
   
           UNUSED(user_data);
   
           /* name = "stat??save" */
           if ((strlen(name) >= 6)
            && (g_ascii_isdigit(name[4]))
            && (g_ascii_isdigit(name[5]))) {
                   n = g_ascii_digit_value(name[4]) * 10;
                   n += g_ascii_digit_value(name[5]);
                   g_snprintf(ext, sizeof(ext), np2flagext, n);
                   flagsave(ext);
           }
   }
   
   static void
   cb_statload(GtkAction *action, gpointer user_data)
   {
           const gchar *name = gtk_action_get_name(GTK_ACTION(action));
           char ext[4];
           guint n;
   
           UNUSED(user_data);
   
           /* name = "stat??load" */
           if ((strlen(name) >= 6)
            && (g_ascii_isdigit(name[4]))
            && (g_ascii_isdigit(name[5]))) {
                   n = g_ascii_digit_value(name[4]) * 10;
                   n += g_ascii_digit_value(name[5]);
                   g_snprintf(ext, sizeof(ext), np2flagext, n);
                   flagload(ext, "Status Load", TRUE);
           }
   }
   #endif
   
 static void  static void
 cb_dialog(GtkAction *action, gpointer user_data)  cb_dialog(GtkAction *action, gpointer user_data)
 {  {
Line 1649  cb_screenmode(gint idx) Line 1757  cb_screenmode(gint idx)
 }  }
   
 static void  static void
   cb_screensize(gint idx)
   {
           guint value;
   
           if (idx >= 0) {
                   value = screensize_entries[idx].value;
           } else {
                   value = 0;
           }
           scrnmng_setmultiple(value);
   }
   
   static void
 cb_soundboard(gint idx)  cb_soundboard(gint idx)
 {  {
         guint value;          guint value;
Line 1691  cb_radio(GtkRadioAction *action, GtkRadi Line 1812  cb_radio(GtkRadioAction *action, GtkRadi
 /*  /*
  * create menubar   * create menubar
  */   */
   static GtkWidget *menubar;
   static guint menubar_timerid;
   
   #define EVENT_MASK      (GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)
   
   static gboolean
   menubar_timeout(gpointer p)
   {
   
           UNUSED(p);
   
           if (menubar_timerid) {
                   g_source_remove(menubar_timerid);
                   menubar_timerid = 0;
           }
   
           if (scrnmode & SCRNMODE_FULLSCREEN) {
                   xmenu_hide();
           }
   
           return TRUE;
   }
   
   /*
    - Signal: gboolean GtkWidget::enter_notify_event (GtkWidget *widget,
             GdkEventCrossing *event, gpointer user_data)
   */
   static gboolean
   enter_notify_evhandler(GtkWidget *w, GdkEventCrossing *ev, gpointer p)
   {
   
           UNUSED(w);
           UNUSED(ev);
           UNUSED(p);
   
           if (menubar_timerid) {
                   g_source_remove(menubar_timerid);
                   menubar_timerid = 0;
           }
   
           return TRUE;
   }
   
   /*
    - Signal: gboolean GtkWidget::leave_notify_event (GtkWidget *widget,
             GdkEventCrossing *event, gpointer user_data)
   */
   static gboolean
   leave_notify_evhandler(GtkWidget *w, GdkEventCrossing *ev, gpointer p)
   {
   
           UNUSED(w);
           UNUSED(ev);
           UNUSED(p);
   
           if (menubar_timerid) {
                   g_source_remove(menubar_timerid);
                   menubar_timerid = 0;
           }
   
           if (scrnmode & SCRNMODE_FULLSCREEN) {
                   menubar_timerid = g_timeout_add(1000, menubar_timeout, NULL);
           }
   
           return TRUE;
   }
   
   #if defined(SUPPORT_STATSAVE)
   static void
   create_menu_statsave(GtkUIManager *ui_manager, int num)
   {
           char *name, *action;
           guint id;
           int i;
   
           if (num <= 0)
                   return;
   
           /* Save %d */
           for (i = 0; i < num; i++) {
                   id = gtk_ui_manager_new_merge_id(ui_manager);
                   name = g_strdup_printf("Save %d", i);
                   action = g_strdup_printf("stat%02dsave", i);
                   gtk_ui_manager_add_ui(ui_manager, id, "/MainMenu/Stat",
                       name, action, GTK_UI_MANAGER_MENUITEM, FALSE);
                   g_free(action);
                   g_free(name);
           }
   
           /* separator */
           id = gtk_ui_manager_new_merge_id(ui_manager);
           gtk_ui_manager_add_ui(ui_manager, id, "/MainMenu/Stat",
               "", "", GTK_UI_MANAGER_SEPARATOR, FALSE);
   
           /* Load %d */
           for (i = 0; i < num; i++) {
                   id = gtk_ui_manager_new_merge_id(ui_manager);
                   name = g_strdup_printf("Load %d", i);
                   action = g_strdup_printf("stat%02dload", i);
                   gtk_ui_manager_add_ui(ui_manager, id, "/MainMenu/Stat",
                       name, action, GTK_UI_MANAGER_MENUITEM, FALSE);
                   g_free(action);
                   g_free(name);
           }
   }
   #endif
   
 static void  static void
 equip_fddrive(GtkUIManager *ui_manager, guint no)  equip_fddrive(GtkUIManager *ui_manager, guint no)
 {  {
         char path[32], name[32], action[32];          char *path, *name, *action;
         guint id;          guint id;
   
         if (no >= 4)          if (no >= 4)
Line 1702  equip_fddrive(GtkUIManager *ui_manager,  Line 1930  equip_fddrive(GtkUIManager *ui_manager, 
         no++;          no++;
   
         id = gtk_ui_manager_new_merge_id(ui_manager);          id = gtk_ui_manager_new_merge_id(ui_manager);
         g_snprintf(name, sizeof(name), "Drive%d", no);          name = g_strdup_printf("Drive%d", no);
         g_snprintf(action, sizeof(action), "Drive%dMenu", no);          action = g_strdup_printf("Drive%dMenu", no);
         gtk_ui_manager_add_ui(ui_manager, id,          gtk_ui_manager_add_ui(ui_manager, id,
             "/MainMenu/FDD", name, action, GTK_UI_MANAGER_MENU, FALSE);              "/MainMenu/FDD", name, action, GTK_UI_MANAGER_MENU, FALSE);
           g_free(action);
           g_free(name);
   
           path = g_strdup_printf("/MainMenu/FDD/Drive%d", no);
   
         g_snprintf(path, sizeof(path), "/MainMenu/FDD/Drive%d", no);  
         id = gtk_ui_manager_new_merge_id(ui_manager);          id = gtk_ui_manager_new_merge_id(ui_manager);
         g_snprintf(name, sizeof(name), "Drive%dOpen", no);          name = g_strdup_printf("Drive%dOpen", no);
         g_snprintf(action, sizeof(action), "disk%dopen", no);          action = g_strdup_printf("disk%dopen", no);
         gtk_ui_manager_add_ui(ui_manager, id,          gtk_ui_manager_add_ui(ui_manager, id,
             path, name, action, GTK_UI_MANAGER_MENUITEM, FALSE);              path, name, action, GTK_UI_MANAGER_MENUITEM, FALSE);
           g_free(action);
           g_free(name);
   
         id = gtk_ui_manager_new_merge_id(ui_manager);          id = gtk_ui_manager_new_merge_id(ui_manager);
         g_snprintf(name, sizeof(name), "Drive%dEject", no);          name = g_strdup_printf("Drive%dEject", no);
         g_snprintf(action, sizeof(action), "disk%deject", no);          action = g_strdup_printf("disk%deject", no);
         gtk_ui_manager_add_ui(ui_manager, id,          gtk_ui_manager_add_ui(ui_manager, id,
             path, name, action, GTK_UI_MANAGER_MENUITEM, FALSE);              path, name, action, GTK_UI_MANAGER_MENUITEM, FALSE);
           g_free(action);
           g_free(name);
   
           g_free(path);
 }  }
   
 GtkWidget *  GtkWidget *
 create_menu(void)  create_menu(void)
 {  {
         GtkWidget *menubar;  
         GError *err = NULL;          GError *err = NULL;
         gint rv;          gint rv;
         guint i;          guint i;
Line 1755  create_menu(void) Line 1991  create_menu(void)
                 return NULL;                  return NULL;
         }          }
   
   #if defined(SUPPORT_STATSAVE)
           if (np2oscfg.statsave) {
                   create_menu_statsave(menu_hdl.ui_manager, NSTATSAVE);
           }
   #endif
           if (np2cfg.fddequip) {
                   for (i = 0; i < 4; i++) {
                           if (np2cfg.fddequip & (1 << i)) {
                                   equip_fddrive(menu_hdl.ui_manager, i);
                           }
                   }
           }
   
         xmenu_toggle_item(NULL, "dispvsync", np2cfg.DISPSYNC);          xmenu_toggle_item(NULL, "dispvsync", np2cfg.DISPSYNC);
         xmenu_toggle_item(NULL, "joyrapid", np2cfg.BTN_RAPID);          xmenu_toggle_item(NULL, "joyrapid", np2cfg.BTN_RAPID);
         xmenu_toggle_item(NULL, "joyreverse", np2cfg.BTN_MODE);          xmenu_toggle_item(NULL, "joyreverse", np2cfg.BTN_MODE);
Line 1781  create_menu(void) Line 2030  create_menu(void)
         xmenu_select_memory(np2cfg.EXTMEM);          xmenu_select_memory(np2cfg.EXTMEM);
         xmenu_select_rotate(scrnmode & SCRNMODE_ROTATEMASK);          xmenu_select_rotate(scrnmode & SCRNMODE_ROTATEMASK);
         xmenu_select_screenmode(scrnmode & SCRNMODE_FULLSCREEN);          xmenu_select_screenmode(scrnmode & SCRNMODE_FULLSCREEN);
           xmenu_select_screensize(SCREEN_DEFMUL);
         xmenu_select_soundboard(np2cfg.SOUND_SW);          xmenu_select_soundboard(np2cfg.SOUND_SW);
   
         if (np2cfg.fddequip) {  
                 for (i = 0; i < 4; i++) {  
                         if (np2cfg.fddequip & (1 << i)) {  
                                 equip_fddrive(menu_hdl.ui_manager, i);  
                         }  
                 }  
         }  
   
         menubar = gtk_ui_manager_get_widget(menu_hdl.ui_manager, "/MainMenu");          menubar = gtk_ui_manager_get_widget(menu_hdl.ui_manager, "/MainMenu");
   
           gtk_widget_add_events(menubar, EVENT_MASK);
           g_signal_connect(GTK_OBJECT(menubar), "enter_notify_event",
                       GTK_SIGNAL_FUNC(enter_notify_evhandler), NULL);
           g_signal_connect(GTK_OBJECT(menubar), "leave_notify_event",
                       GTK_SIGNAL_FUNC(leave_notify_evhandler), NULL);
   
         return menubar;          return menubar;
 }  }
   
   void
   xmenu_hide(void)
   {
   
           gtk_widget_hide(menubar);
   }
   
   void
   xmenu_show(void)
   {
   
           gtk_widget_show(menubar);
   }
   
   void
   xmenu_toggle_menu(void)
   {
   
           if (GTK_WIDGET_VISIBLE(menubar))
                   xmenu_hide();
           else
                   xmenu_show();
   }
   
   void
   xmenu_select_screen(UINT8 mode)
   {
   
           xmenu_select_rotate(mode & SCRNMODE_ROTATEMASK);
           xmenu_select_screenmode(mode & SCRNMODE_FULLSCREEN);
   }
Removed from v.1.4  
changed lines
  Added in v.1.14

RetroPC.NET-CVS <cvs@retropc.net>