vba-commit Mailing List for VisualBoyAdvance

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/vba/VisualBoyAdvance/src/gtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7130

Modified Files:
	Makefile.am Makefile.in vba.glade window.cpp window.h 
Added Files:
	windowcallbacks.cpp 
Log Message:
Added load/save game slots support.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	2 Apr 2004 01:22:17 -0000	1.2
--- Makefile.am	29 Apr 2004 01:44:35 -0000	1.3
***************
*** 17,20 ****
--- 17,21 ----
  	tools.cpp		\
  	tools.h			\
+ 	windowcallbacks.cpp	\
  	window.cpp		\
  	window.h

Index: window.h
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/window.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** window.h	27 Apr 2004 23:16:32 -0000	1.10
--- window.h	29 Apr 2004 01:44:36 -0000	1.11
***************
*** 21,28 ****
--- 21,31 ----
  #define __VBA_WINDOW_H__

+ #include <sys/types.h>
+ 
  #include <libglademm.h>
  #include <gtkmm.h>

  #include <string>
+ #include <list>

  #include "../System.h"
***************
*** 121,124 ****
--- 124,132 ----

    virtual void vOnFileOpen();
+   virtual void vOnLoadGameMostRecent();
+   virtual void vOnLoadGameAutoToggled(Gtk::CheckMenuItem * _poCMI);
+   virtual void vOnLoadGame(int _iSlot);
+   virtual void vOnSaveGameOldest();
+   virtual void vOnSaveGame(int _iSlot);
    virtual void vOnFilePauseToggled(Gtk::CheckMenuItem * _poCMI);
    virtual void vOnFileReset();
***************
*** 206,209 ****
--- 214,230 ----
    Gtk::CheckMenuItem * m_poSoundOffItem;

+   struct SGameSlot
+   {
+     bool        m_bEmpty;
+     std::string m_sFile;
+     time_t      m_uiTime;
+   };
+ 
+   Gtk::MenuItem * m_apoLoadGameItem[10];
+   Gtk::MenuItem * m_apoSaveGameItem[10];
+   SGameSlot       m_astGameSlot[10];
+ 
+   std::list<Gtk::Widget *> m_listSensitiveWhenPlaying;
+ 
    SigC::Connection m_oEmuSig;

***************
*** 238,247 ****
    void vLoadBattery();
    void vSaveBattery();
-   void vLoadState(int _iNum);
-   void vSaveState(int _iNum);
    void vStartEmu();
    void vStopEmu();
    void vSetThrottle(int _iPercent);
    void vSelectBestThrottleItem();
  };

--- 259,267 ----
    void vLoadBattery();
    void vSaveBattery();
    void vStartEmu();
    void vStopEmu();
    void vSetThrottle(int _iPercent);
    void vSelectBestThrottleItem();
+   void vUpdateGameSlots();
  };

Index: window.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/window.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** window.cpp	27 Apr 2004 23:16:32 -0000	1.10
--- window.cpp	29 Apr 2004 01:44:36 -0000	1.11
***************
*** 19,25 ****
  #include "window.h"

- #include <sys/types.h>
  #include <sys/stat.h>

  #include <SDL.h>

--- 19,27 ----
  #include "window.h"

[...991 lines suppressed...]
!         char csDateTime[30];
!         strftime(csDateTime, sizeof(csDateTime), csDateFormat,
!                  localtime(&stStat.st_mtime));
!         sDateTime = csDateTime;
!         m_astGameSlot[i].m_bEmpty = false;
!         m_astGameSlot[i].m_uiTime = stStat.st_mtime;
        }

!       Gtk::Label * poLabel;
!       poLabel = dynamic_cast<Gtk::Label *>(m_apoLoadGameItem[i]->get_child());
!       poLabel->set_text(csPrefix + sDateTime);
!       m_apoLoadGameItem[i]->set_sensitive(! m_astGameSlot[i].m_bEmpty);

!       poLabel = dynamic_cast<Gtk::Label *>(m_apoSaveGameItem[i]->get_child());
!       poLabel->set_text(csPrefix + sDateTime);
!       m_apoSaveGameItem[i]->set_sensitive();
      }
    }
  }

Index: Makefile.in
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.in	2 Apr 2004 01:22:17 -0000	1.2
--- Makefile.in	29 Apr 2004 01:44:36 -0000	1.3
***************
*** 169,172 ****
--- 169,173 ----
  	tools.cpp		\
  	tools.h			\
+ 	windowcallbacks.cpp	\
  	window.cpp		\
  	window.h
***************
*** 287,291 ****
  	gvba-input.$(OBJEXT) gvba-main.$(OBJEXT) \
  	gvba-screenarea.$(OBJEXT) gvba-system.$(OBJEXT) \
! 	gvba-tools.$(OBJEXT) gvba-window.$(OBJEXT)
  gvba_OBJECTS = $(am_gvba_OBJECTS)
  gvba_DEPENDENCIES = libgba.a
--- 288,293 ----
  	gvba-input.$(OBJEXT) gvba-main.$(OBJEXT) \
  	gvba-screenarea.$(OBJEXT) gvba-system.$(OBJEXT) \
! 	gvba-tools.$(OBJEXT) gvba-windowcallbacks.$(OBJEXT) \
! 	gvba-window.$(OBJEXT)
  gvba_OBJECTS = $(am_gvba_OBJECTS)
  gvba_DEPENDENCIES = libgba.a
***************
*** 302,305 ****
--- 304,308 ----
  @AMDEP_TRUE@	./$(DEPDIR)/gvba-tools.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/gvba-window.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/gvba-windowcallbacks.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/libgba_a-2xSaI.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/libgba_a-Cheats.Po \
***************
*** 412,415 ****
--- 415,419 ----
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvba-tools.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvba-window.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvba-windowcallbacks.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgba_a-2xSaI.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgba_a-Cheats.Po@am__quote@
***************
*** 1416,1419 ****
--- 1420,1445 ----
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-tools.obj `if test -f 'tools.cpp'; then $(CYGPATH_W) 'tools.cpp'; else $(CYGPATH_W) '$(srcdir)/tools.cpp'; fi`

+ gvba-windowcallbacks.o: windowcallbacks.cpp
+ @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-windowcallbacks.o -MD -MP -MF "$(DEPDIR)/gvba-windowcallbacks.Tpo" \
+ @am__fastdepCXX_TRUE@	  -c -o gvba-windowcallbacks.o `test -f 'windowcallbacks.cpp' || echo '$(srcdir)/'`windowcallbacks.cpp; \
+ @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gvba-windowcallbacks.Tpo" "$(DEPDIR)/gvba-windowcallbacks.Po"; \
+ @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/gvba-windowcallbacks.Tpo"; exit 1; \
+ @am__fastdepCXX_TRUE@	fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='windowcallbacks.cpp' object='gvba-windowcallbacks.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/gvba-windowcallbacks.Po' tmpdepfile='$(DEPDIR)/gvba-windowcallbacks.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-windowcallbacks.o `test -f 'windowcallbacks.cpp' || echo '$(srcdir)/'`windowcallbacks.cpp
+ 
+ gvba-windowcallbacks.obj: windowcallbacks.cpp
+ @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-windowcallbacks.obj -MD -MP -MF "$(DEPDIR)/gvba-windowcallbacks.Tpo" \
+ @am__fastdepCXX_TRUE@	  -c -o gvba-windowcallbacks.obj `if test -f 'windowcallbacks.cpp'; then $(CYGPATH_W) 'windowcallbacks.cpp'; else $(CYGPATH_W) '$(srcdir)/windowcallbacks.cpp'; fi`; \
+ @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gvba-windowcallbacks.Tpo" "$(DEPDIR)/gvba-windowcallbacks.Po"; \
+ @am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/gvba-windowcallbacks.Tpo"; exit 1; \
+ @am__fastdepCXX_TRUE@	fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='windowcallbacks.cpp' object='gvba-windowcallbacks.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/gvba-windowcallbacks.Po' tmpdepfile='$(DEPDIR)/gvba-windowcallbacks.TPo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -c -o gvba-windowcallbacks.obj `if test -f 'windowcallbacks.cpp'; then $(CYGPATH_W) 'windowcallbacks.cpp'; else $(CYGPATH_W) '$(srcdir)/windowcallbacks.cpp'; fi`
+ 
  gvba-window.o: window.cpp
  @am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvba_CPPFLAGS) $(CPPFLAGS) $(gvba_CXXFLAGS) $(CXXFLAGS) -MT gvba-window.o -MD -MP -MF "$(DEPDIR)/gvba-window.Tpo" \

Index: vba.glade
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/vba.glade,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** vba.glade	27 Apr 2004 23:16:31 -0000	1.7
--- vba.glade	29 Apr 2004 01:44:36 -0000	1.8
***************
*** 51,55 ****

  			  <child internal-child="image">
! 			    <widget class="GtkImage" id="image90">
  			      <property name="visible">True</property>
  			      <property name="stock">gtk-open</property>
--- 51,55 ----

  			  <child internal-child="image">
! 			    <widget class="GtkImage" id="image106">
  			      <property name="visible">True</property>
  			      <property name="stock">gtk-open</property>
***************
*** 93,96 ****
--- 93,214 ----
  			  <property name="label" translatable="yes">Loa_d game</property>
  			  <property name="use_underline">True</property>
+ 
+ 			  <child>
+ 			    <widget class="GtkMenu" id="LoadGameMenu_menu">
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="LoadGameMostRecent">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Most recent</property>
+ 				  <property name="use_underline">True</property>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkCheckMenuItem" id="LoadGameAuto">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Auto load most recent</property>
+ 				  <property name="use_underline">True</property>
+ 				  <property name="active">False</property>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkSeparatorMenuItem" id="separator28">
+ 				  <property name="visible">True</property>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="LoadGameSlot1">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot1</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F1" modifiers="0" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="LoadGameSlot2">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot2</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F2" modifiers="0" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="LoadGameSlot3">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot3</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F3" modifiers="0" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="LoadGameSlot4">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot4</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F4" modifiers="0" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="LoadGameSlot5">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot5</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F5" modifiers="0" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="LoadGameSlot6">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot6</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F6" modifiers="0" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="LoadGameSlot7">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot7</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F7" modifiers="0" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="LoadGameSlot8">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot8</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F8" modifiers="0" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="LoadGameSlot9">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot9</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F9" modifiers="0" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="LoadGameSlot10">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot10</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F10" modifiers="0" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 			    </widget>
+ 			  </child>
  			</widget>
  		      </child>
***************
*** 101,104 ****
--- 219,331 ----
  			  <property name="label" translatable="yes">S_ave game</property>
  			  <property name="use_underline">True</property>
+ 
+ 			  <child>
+ 			    <widget class="GtkMenu" id="SaveGameMenu_menu">
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="SaveGameOldest">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Oldest slot</property>
+ 				  <property name="use_underline">True</property>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkSeparatorMenuItem" id="separator27">
+ 				  <property name="visible">True</property>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="SaveGameSlot1">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot1</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F1" modifiers="GDK_SHIFT_MASK" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="SaveGameSlot2">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot2</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F2" modifiers="GDK_SHIFT_MASK" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="SaveGameSlot3">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot3</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F3" modifiers="GDK_SHIFT_MASK" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="SaveGameSlot4">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot4</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F4" modifiers="GDK_SHIFT_MASK" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="SaveGameSlot5">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot5</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F5" modifiers="GDK_SHIFT_MASK" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="SaveGameSlot6">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot6</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F6" modifiers="GDK_SHIFT_MASK" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="SaveGameSlot7">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot7</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F7" modifiers="GDK_SHIFT_MASK" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="SaveGameSlot8">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot8</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F8" modifiers="GDK_SHIFT_MASK" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="SaveGameSlot9">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot9</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F9" modifiers="GDK_SHIFT_MASK" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkMenuItem" id="SaveGameSlot10">
+ 				  <property name="visible">True</property>
+ 				  <property name="label" translatable="yes">Slot10</property>
+ 				  <property name="use_underline">True</property>
+ 				  <accelerator key="F10" modifiers="GDK_SHIFT_MASK" signal="activate"/>
+ 				</widget>
+ 			      </child>
+ 			    </widget>
+ 			  </child>
  			</widget>
  		      </child>
***************
*** 200,204 ****

  			  <child internal-child="image">
! 			    <widget class="GtkImage" id="image91">
  			      <property name="visible">True</property>
  			      <property name="stock">gtk-close</property>
--- 427,431 ----

  			  <child internal-child="image">
! 			    <widget class="GtkImage" id="image107">
  			      <property name="visible">True</property>
  			      <property name="stock">gtk-close</property>
***************
*** 221,225 ****

  			  <child internal-child="image">
! 			    <widget class="GtkImage" id="image92">
  			      <property name="visible">True</property>
  			      <property name="stock">gtk-quit</property>
--- 448,452 ----

--- NEW FILE: windowcallbacks.cpp ---
// VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator.
// Copyright (C) 1999-2003 Forgotten
// Copyright (C) 2004 Forgotten and the VBA development team

// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2, or(at your option)
// any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software Foundation,
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

#include "window.h"

#include <sys/stat.h>

#include <stdio.h>
#include <time.h>

#include <SDL.h>

#include "../GBA.h"
#include "../gb/GB.h"
#include "../gb/gbGlobals.h"
#include "../gb/gbPrinter.h"
#include "../Sound.h"
#include "../Util.h"

#include "tools.h"
#include "intl.h"

extern int systemRenderedFrames;
extern int systemFPS;
extern bool debugger;
extern int RGB_LOW_BITS_MASK;

#ifdef MMX
extern "C" bool cpu_mmx;
#endif // MMX

namespace VBA
{

using Gnome::Glade::Xml;

void Window::vOnFileOpen()
{
  if (m_poFileOpenDialog == NULL)
  {
    m_poFileOpenDialog = new Gtk::FileSelection(_("Open"));
    m_poFileOpenDialog->set_transient_for(*this);

    std::string sDir = m_poDirConfig->sGetKey("gba_roms");
    if (sDir != "")
    {
      m_poFileOpenDialog->set_filename(sDir + "/");
    }
  }

  while (m_poFileOpenDialog->run() == Gtk::RESPONSE_OK)
  {
    if (bLoadROM(m_poFileOpenDialog->get_filename()))
    {
      break;
    }
  }
  m_poFileOpenDialog->hide();
}

void Window::vOnLoadGameMostRecent()
{
  int    iMostRecent = -1;
  time_t uiTimeMax;

  for (int i = 0; i < 10; i++)
  {
    if (! m_astGameSlot[i].m_bEmpty
        && (iMostRecent < 0 || m_astGameSlot[i].m_uiTime > uiTimeMax))
    {
      iMostRecent = i;
      uiTimeMax = m_astGameSlot[i].m_uiTime;
    }
  }

  if (iMostRecent >= 0)
  {
    vOnLoadGame(iMostRecent + 1);
  }
}

void Window::vOnLoadGameAutoToggled(Gtk::CheckMenuItem * _poCMI)
{
  m_poCoreConfig->vSetKey("load_game_auto", _poCMI->get_active());
}

void Window::vOnLoadGame(int _iSlot)
{
  int i = _iSlot - 1;
  if (! m_astGameSlot[i].m_bEmpty)
  {
    m_stEmulator.emuReadState(m_astGameSlot[i].m_sFile.c_str());
    m_poFilePauseItem->set_active(false);
  }
}

void Window::vOnSaveGameOldest()
{
  int    iOldest = -1;
  time_t uiTimeMin;

  for (int i = 0; i < 10; i++)
  {
    if (! m_astGameSlot[i].m_bEmpty
        && (iOldest < 0 || m_astGameSlot[i].m_uiTime < uiTimeMin))
    {
      iOldest = i;
      uiTimeMin = m_astGameSlot[i].m_uiTime;
    }
  }

  if (iOldest >= 0)
  {
    vOnSaveGame(iOldest + 1);
  }
  else
  {
    vOnSaveGame(1);
  }
}

void Window::vOnSaveGame(int _iSlot)
{
  int i = _iSlot - 1;
  m_stEmulator.emuWriteState(m_astGameSlot[i].m_sFile.c_str());
  vUpdateGameSlots();
}

void Window::vOnFilePauseToggled(Gtk::CheckMenuItem * _poCMI)
{
  m_bPaused = _poCMI->get_active();
  if (emulating)
  {
    if (m_bPaused)
    {
      vStopEmu();
      soundPause();
    }
    else
    {
      vStartEmu();
      soundResume();
    }
  }
}

void Window::vOnFileReset()
{
  if (emulating)
  {
    m_stEmulator.emuReset();
    m_poFilePauseItem->set_active(false);
  }
}

void Window::vOnFileClose()
{
  if (emulating)
  {
    soundPause();
    vStopEmu();
    vSetDefaultTitle();
    vDrawDefaultScreen();
    vSaveBattery();
    m_stEmulator.emuCleanUp();
    m_eCartridge = CartridgeNone;
    emulating = 0;

    vUpdateGameSlots();

    for (std::list<Gtk::Widget *>::iterator it = m_listSensitiveWhenPlaying.begin();
         it != m_listSensitiveWhenPlaying.end();
         it++)
    {
      (*it)->set_sensitive(false);
    }

    m_poFilePauseItem->set_active(false);
  }
}

void Window::vOnFileExit()
{
  hide();
}

void Window::vOnFrameskipToggled(Gtk::CheckMenuItem * _poCMI, int _iValue)
{
  if (! _poCMI->get_active())
  {
    return;
  }

  if (_iValue >= 0 && _iValue <= 9)
  {
    m_poCoreConfig->vSetKey("frameskip", _iValue);
    gbFrameSkip      = _iValue;
    systemFrameSkip  = _iValue;
    m_bAutoFrameskip = false;
  }
  else
  {
    m_poCoreConfig->vSetKey("frameskip", "auto");
    gbFrameSkip      = 0;
    systemFrameSkip  = 0;
    m_bAutoFrameskip = true;
  }
}

void Window::vOnThrottleToggled(Gtk::CheckMenuItem * _poCMI, int _iPercent)
{
  if (! _poCMI->get_active())
  {
    return;
  }

  vSetThrottle(_iPercent);

  // Initialize the frameskip adjustment each time throttle is changed
  if (m_bAutoFrameskip)
  {
    systemFrameSkip = 0;
  }
}

void Window::vOnThrottleOther(Gtk::CheckMenuItem * _poCMI)
{
  if (! _poCMI->get_active())
  {
    return;
  }

  Glib::RefPtr<Xml> poXml;
  poXml = Xml::create(PKGDATADIR "/vba.glade", "ThrottleDialog");

  Gtk::Dialog * poDialog = dynamic_cast<Gtk::Dialog *>(poXml->get_widget("ThrottleDialog"));
  Gtk::SpinButton * poSpin = dynamic_cast<Gtk::SpinButton *>(poXml->get_widget("ThrottleSpin"));

  poDialog->set_transient_for(*this);

  if (m_iThrottle != 0)
  {
    poSpin->set_value(m_iThrottle);
  }
  else
  {
    poSpin->set_value(100);
  }

  if (poDialog->run() == Gtk::RESPONSE_OK)
  {
    vSetThrottle(poSpin->get_value_as_int());
  }

  delete poDialog;
  vSelectBestThrottleItem();
}

void Window::vOnVideoScaleToggled(Gtk::CheckMenuItem * _poCMI, int _iScale)
{
  if (! _poCMI->get_active())
  {
    return;
  }

  m_poDisplayConfig->vSetKey("scale", _iScale);
  vUpdateScreen();
}

void Window::vOnLayerToggled(Gtk::CheckMenuItem * _poCMI, int _iLayer)
{
  int iMask = (0x0100 << _iLayer);
  if (_poCMI->get_active())
  {
    layerSettings |= iMask;
  }
  else
  {
    layerSettings &= ~iMask;
  }
  layerEnable = DISPCNT & layerSettings;

  const char * acsLayers[] =
  {
    "layer_bg0",
    "layer_bg1",
    "layer_bg2",
    "layer_bg3",
    "layer_obj",
    "layer_win0",
    "layer_win1",
    "layer_objwin"
  };
  m_poCoreConfig->vSetKey(acsLayers[_iLayer], _poCMI->get_active());
}

void Window::vOnDirectories()
{
  Glib::RefPtr<Xml> poXml;
  poXml = Xml::create(PKGDATADIR "/vba.glade", "DirectoriesDialog");

  struct
  {
    const char * m_csKey;
    const char * m_csEntry;
    const char * m_csResetButton;
    const char * m_csSelectButton;
  }
  astRow[] =
  {
    { "gba_roms",  "GBARomsDirEntry",   "GBARomsDirResetButton",   "GBARomsDirSelectButton"   },
    { "gb_roms",   "GBRomsDirEntry",    "GBRomsDirResetButton",    "GBRomsDirSelectButton"    },
    { "batteries", "BatteriesDirEntry", "BatteriesDirResetButton", "BatteriesDirSelectButton" },
    { "saves",     "SavesDirEntry",     "SavesDirResetButton",     "SavesDirSelectButton"     },
    { "captures",  "CapturesDirEntry",  "CapturesDirResetButton",  "CapturesDirSelectButton"  }
  };

  for (guint i = 0; i < sizeof(astRow) / sizeof(astRow[0]); i++)
  {
    Gtk::Entry *  poEntry  = dynamic_cast<Gtk::Entry *>(poXml->get_widget(astRow[i].m_csEntry));
    Gtk::Button * poReset  = dynamic_cast<Gtk::Button *>(poXml->get_widget(astRow[i].m_csResetButton));
    Gtk::Button * poSelect = dynamic_cast<Gtk::Button *>(poXml->get_widget(astRow[i].m_csSelectButton));

    poEntry->set_text(m_poDirConfig->sGetKey(astRow[i].m_csKey));

    poReset->signal_clicked().connect(SigC::bind<Gtk::Entry *>(
                                        SigC::slot(*this, &Window::vOnDirectoryReset),
                                        poEntry));
    poSelect->signal_clicked().connect(SigC::bind<Gtk::Entry *>(
                                         SigC::slot(*this, &Window::vOnDirectorySelect),
                                         poEntry));
  }

  Gtk::Dialog * poDialog = dynamic_cast<Gtk::Dialog *>(poXml->get_widget("DirectoriesDialog"));
  poDialog->set_transient_for(*this);

  if (poDialog->run() == Gtk::RESPONSE_OK)
  {
    for (guint i = 0; i < sizeof(astRow) / sizeof(astRow[0]); i++)
    {
      Gtk::Entry * poEntry = dynamic_cast<Gtk::Entry *>(poXml->get_widget(astRow[i].m_csEntry));
      Glib::ustring sDir = poEntry->get_text();
      if (! Glib::file_test(sDir, Glib::FILE_TEST_IS_DIR))
      {
        sDir = "";
      }
      m_poDirConfig->vSetKey(astRow[i].m_csKey, sDir);
    }

    // Needed if saves dir changed
    vUpdateGameSlots();
  }

  delete poDialog;
}

void Window::vOnDirectoryReset(Gtk::Entry * _poEntry)
{
  _poEntry->set_text("");
}

void Window::vOnDirectorySelect(Gtk::Entry * _poEntry)
{
  Gtk::FileSelection * poDialog = new Gtk::FileSelection(_("Select directory"));
  poDialog->set_transient_for(*this);

  if (_poEntry->get_text() != "")
  {
    poDialog->set_filename(_poEntry->get_text() + "/");
  }

  if (poDialog->run() == Gtk::RESPONSE_OK)
  {
    std::string sFile = poDialog->get_filename();
    if (! Glib::file_test(sFile, Glib::FILE_TEST_IS_DIR))
    {
      sFile = Glib::path_get_dirname(sFile);
    }
    _poEntry->set_text(sFile);
  }

  delete poDialog;
}

void Window::vOnPauseWhenInactiveToggled(Gtk::CheckMenuItem * _poCMI)
{
  m_poDisplayConfig->vSetKey("pause_when_inactive", _poCMI->get_active());
}

void Window::vOnSelectBios()
{
  Gtk::FileSelection * poDialog = new Gtk::FileSelection(_("Select BIOS file"));
  poDialog->set_transient_for(*this);

  if (m_poCoreConfig->sGetKey("bios_file") != "")
  {
    poDialog->set_filename(m_poCoreConfig->sGetKey("bios_file"));
  }

  while (poDialog->run() == Gtk::RESPONSE_OK)
  {
    if (Glib::file_test(poDialog->get_filename(), Glib::FILE_TEST_IS_REGULAR))
    {
      m_poCoreConfig->vSetKey("bios_file", poDialog->get_filename());
      m_poUseBiosItem->set_sensitive();
      break;
    }
  }

  delete poDialog;
}

void Window::vOnUseBiosToggled(Gtk::CheckMenuItem * _poCMI)
{
  m_poCoreConfig->vSetKey("use_bios_file", _poCMI->get_active());
}

void Window::vOnShowSpeedToggled(Gtk::CheckMenuItem * _poCMI, int _iShowSpeed)
{
  if (! _poCMI->get_active())
  {
    return;
  }

  m_eShowSpeed = (EShowSpeed)_iShowSpeed;
  if (m_eShowSpeed == ShowNone)
  {
    vSetDefaultTitle();
  }
  m_poDisplayConfig->vSetKey("show_speed", _iShowSpeed);
}

void Window::vOnSaveTypeToggled(Gtk::CheckMenuItem * _poCMI, int _iSaveType)
{
  if (! _poCMI->get_active())
  {
    return;
  }

  cpuSaveType = _iSaveType;
  m_poCoreConfig->vSetKey("save_type", _iSaveType);
}

void Window::vOnFlashSizeToggled(Gtk::CheckMenuItem * _poCMI, int _iFlashSize)
{
  if (! _poCMI->get_active())
  {
    return;
  }

  if (_iFlashSize == 64)
  {
    flashSetSize(0x10000);
  }
  else
  {
    flashSetSize(0x20000);
  }
  m_poCoreConfig->vSetKey("flash_size", _iFlashSize);
}

void Window::vOnSoundStatusToggled(Gtk::CheckMenuItem * _poCMI, int _iSoundStatus)
{
  if (! _poCMI->get_active())
  {
    return;
  }

  std::string sSoundStatus;
  switch (_iSoundStatus)
  {
  case SoundOff:
    soundOffFlag = true;
    if (systemSoundOn)
    {
      soundShutdown();
    }
    sSoundStatus = "off";
    break;
  case SoundMute:
    soundDisable(0x30f);
    sSoundStatus = "mute";
    break;
  case SoundOn:
    if (soundOffFlag)
    {
      soundOffFlag = false;
      if (! soundInit())
      {
        m_poSoundOffItem->set_active();
        return;
      }
    }
    soundEnable(0x30f);
    sSoundStatus = "on";
    break;
  }
  m_poSoundConfig->vSetKey("status", sSoundStatus);
}

void Window::vOnSoundEchoToggled(Gtk::CheckMenuItem * _poCMI)
{
  soundEcho = _poCMI->get_active();
  m_poSoundConfig->vSetKey("echo", soundEcho);
}

void Window::vOnSoundLowPassToggled(Gtk::CheckMenuItem * _poCMI)
{
  soundLowPass = _poCMI->get_active();
  m_poSoundConfig->vSetKey("low_pass", soundLowPass);
}

void Window::vOnSoundReverseToggled(Gtk::CheckMenuItem * _poCMI)
{
  soundReverse = _poCMI->get_active();
  m_poSoundConfig->vSetKey("reverse_stereo", soundReverse);
}

void Window::vOnSoundChannelToggled(Gtk::CheckMenuItem * _poCMI, int _iSoundChannel)
{
  int iShift = _iSoundChannel;
  if (_iSoundChannel > 3)
  {
    iShift += 4;
  }
  int iFlag = 1 << iShift;
  int iActive = soundGetEnable() & 0x30f;
  if (_poCMI->get_active())
  {
    iActive |= iFlag;
  }
  else
  {
    iActive &= ~iFlag;
  }
  soundEnable(iActive);
  soundDisable(~iActive & 0x30f);

  const char * acsChannels[] =
  {
    "channel_1",
    "channel_2",
    "channel_3",
    "channel_4",
    "channel_A",
    "channel_B"
  };
  m_poSoundConfig->vSetKey(acsChannels[_iSoundChannel], _poCMI->get_active());
}

void Window::vOnSoundQualityToggled(Gtk::CheckMenuItem * _poCMI, int _iSoundQuality)
{
  if (! _poCMI->get_active())
  {
    return;
  }

  m_eSoundQuality = (ESoundQuality)_iSoundQuality;
  if (m_eCartridge == CartridgeGBA)
  {
    soundSetQuality(_iSoundQuality);
  }
  else if (m_eCartridge == CartridgeGB)
  {
    gbSoundSetQuality(_iSoundQuality);
  }
  m_poSoundConfig->vSetKey("quality", _iSoundQuality);
}

void Window::vOnSoundVolumeToggled(Gtk::CheckMenuItem * _poCMI, int _iSoundVolume)
{
  if (! _poCMI->get_active())
  {
    return;
  }

  soundVolume = _iSoundVolume;
  m_poSoundConfig->vSetKey("volume", _iSoundVolume);
}

void Window::vOnGBBorderToggled(Gtk::CheckMenuItem * _poCMI)
{
  gbBorderOn = _poCMI->get_active();
  if (emulating && m_eCartridge == CartridgeGB && _poCMI->get_active())
  {
    gbSgbRenderBorder();
  }
  vUpdateScreen();
  m_poCoreConfig->vSetKey("gb_border", _poCMI->get_active());
}

void Window::vOnGBPrinterToggled(Gtk::CheckMenuItem * _poCMI)
{
  if (_poCMI->get_active())
  {
    gbSerialFunction = gbPrinterSend;
  }
  else
  {
    gbSerialFunction = NULL;
  }
  m_poCoreConfig->vSetKey("gb_printer", _poCMI->get_active());
}

void Window::vOnEmulatorTypeToggled(Gtk::CheckMenuItem * _poCMI, int _iEmulatorType)
{
  gbEmulatorType = _iEmulatorType;
  m_poCoreConfig->vSetKey("emulator_type", _iEmulatorType);
}

void Window::vOnFilter2xToggled(Gtk::CheckMenuItem * _poCMI, int _iFilter2x)
{
  if (! _poCMI->get_active())
  {
    return;
  }

  m_poScreenArea->vSetFilter2x((EFilter2x)_iFilter2x);
  if (emulating)
  {
    vDrawScreen();
  }
  m_poDisplayConfig->vSetKey("filter2x", _iFilter2x);
}

void Window::vOnFilterIBToggled(Gtk::CheckMenuItem * _poCMI, int _iFilterIB)
{
  if (! _poCMI->get_active())
  {
    return;
  }

  m_poScreenArea->vSetFilterIB((EFilterIB)_iFilterIB);
  if (emulating)
  {
    vDrawScreen();
  }
  m_poDisplayConfig->vSetKey("filterIB", _iFilterIB);
}

#ifdef MMX
void Window::vOnDisableMMXToggled(Gtk::CheckMenuItem * _poCMI)
{
  cpu_mmx = ! _poCMI->get_active();
  m_poDisplayConfig->vSetKey("filter_disable_mmx", _poCMI->get_active());
}
#endif // MMX

void Window::vOnHelpAbout()
{
  Glib::RefPtr<Xml> poXml;
  poXml = Xml::create(PKGDATADIR "/vba.glade", "AboutDialog");

  Gtk::Dialog * poDialog = dynamic_cast<Gtk::Dialog *>(poXml->get_widget("AboutDialog"));
  Gtk::Label *  poLabel  = dynamic_cast<Gtk::Label *>(poXml->get_widget("VersionLabel"));

  poDialog->set_transient_for(*this);
  poLabel->set_markup("<b><big>" PACKAGE " " VERSION "</big></b>");
  poDialog->run();
  delete poDialog;
}

bool Window::bOnEmuIdle()
{
  if (m_uiThrottleDelay != 0)
  {
    u32 uiTime = SDL_GetTicks();
    if (uiTime - m_uiThrottleLastTime >= m_uiThrottleDelay)
    {
      m_uiThrottleDelay = 0;
      m_uiThrottleLastTime = uiTime;
    }
    else
    {
      return true;
    }
  }

  m_stEmulator.emuMain(m_stEmulator.emuCount);
  return true;
}

bool Window::on_focus_in_event(GdkEventFocus * _pstEvent)
{
  if (emulating
      && ! m_bPaused
      && m_poDisplayConfig->oGetKey<bool>("pause_when_inactive"))
  {
    vStartEmu();
    soundResume();
  }
  return false;
}

bool Window::on_focus_out_event(GdkEventFocus * _pstEvent)
{
  if (emulating
      && ! m_bPaused
      && m_poDisplayConfig->oGetKey<bool>("pause_when_inactive"))
  {
    vStopEmu();
    soundPause();
  }
  return false;
}

bool Window::on_key_press_event(GdkEventKey * _pstEvent)
{
  EKey eKey;

  if ((_pstEvent->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK))
      || (eKey = m_oKeymap.eGetKey(_pstEvent->keyval)) == KeyNone)
  {
    return Gtk::Window::on_key_press_event(_pstEvent);
  }

  switch (eKey)
  {
  case KeyA:
    m_uiJoypadState |= KeyFlagA;
    break;
  case KeyB:
    m_uiJoypadState |= KeyFlagB;
    break;
  case KeySelect:
    m_uiJoypadState |= KeyFlagSelect;
    break;
  case KeyStart:
    m_uiJoypadState |= KeyFlagStart;
    break;
  case KeyRight:
    m_uiJoypadState |= KeyFlagRight;
    m_uiJoypadState &= ~KeyFlagLeft;
    break;
  case KeyLeft:
    m_uiJoypadState |= KeyFlagLeft;
    m_uiJoypadState &= ~KeyFlagRight;
    break;
  case KeyUp:
    m_uiJoypadState |= KeyFlagUp;
    m_uiJoypadState &= ~KeyFlagDown;
    break;
  case KeyDown:
    m_uiJoypadState |= KeyFlagDown;
    m_uiJoypadState &= ~KeyFlagUp;
    break;
  case KeyR:
    m_uiJoypadState |= KeyFlagR;
    break;
  case KeyL:
    m_uiJoypadState |= KeyFlagL;
    break;
  case KeySpeed:
    m_uiJoypadState |= KeyFlagSpeed;
    break;
  case KeyCapture:
    m_uiJoypadState |= KeyFlagCapture;
    break;
  case KeyNone:
    break;
  }
  return true;
}

bool Window::on_key_release_event(GdkEventKey * _pstEvent)
{
  EKey eKey;

  if ((_pstEvent->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK))
      || (eKey = m_oKeymap.eGetKey(_pstEvent->keyval)) == KeyNone)
  {
    return Gtk::Window::on_key_release_event(_pstEvent);
  }

  switch (eKey)
  {
  case KeyA:
    m_uiJoypadState &= ~KeyFlagA;
    break;
  case KeyB:
    m_uiJoypadState &= ~KeyFlagB;
    break;
  case KeySelect:
    m_uiJoypadState &= ~KeyFlagSelect;
    break;
  case KeyStart:
    m_uiJoypadState &= ~KeyFlagStart;
    break;
  case KeyRight:
    m_uiJoypadState &= ~KeyFlagRight;
    break;
  case KeyLeft:
    m_uiJoypadState &= ~KeyFlagLeft;
    break;
  case KeyUp:
    m_uiJoypadState &= ~KeyFlagUp;
    break;
  case KeyDown:
    m_uiJoypadState &= ~KeyFlagDown;
    break;
  case KeyR:
    m_uiJoypadState &= ~KeyFlagR;
    break;
  case KeyL:
    m_uiJoypadState &= ~KeyFlagL;
    break;
  case KeySpeed:
    m_uiJoypadState &= ~KeyFlagSpeed;
    break;
  case KeyCapture:
    m_uiJoypadState &= ~KeyFlagCapture;
    break;
  case KeyNone:
    break;
  }
  return true;
}

} // namespace VBA

2004	Jan (17)	Feb (38)	Mar (24)	Apr (18)	May (75)	Jun (2)	Jul	Aug	Sep (21)	Oct (3)	Nov (19)	Dec (5)
2005	Jan	Feb	Mar	Apr	May	Jun (15)	Jul (2)	Aug	Sep (5)	Oct	Nov	Dec
2006	Jan (8)	Feb	Mar	Apr (6)	May (73)	Jun (57)	Jul (12)	Aug (68)	Sep (6)	Oct	Nov	Dec

vba-commit Mailing List for VisualBoyAdvance

An emulator for Gameboy and GameboyAdvance systems

vba-commit — CVS commits for VBA

S	M	T	W	T	F	S
				1	2 (2)	3
4	5	6	7	8	9	10
11	12 (1)	13	14	15 (2)	16 (3)	17
18 (2)	19	20	21	22 (1)	23	24
25 (3)	26 (2)	27 (1)	28	29 (1)	30