ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Partially ported the X11 version to the new eventhandler class. It now 

compiles and runs, but I haven't done any testing yet.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@179 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2003-09-09 16:45:47 +00:00
parent 3ab45a632d
commit b2f6fa4823
3 changed files with 330 additions and 497 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stella/src/build/makefile
View File

@ -13,7 +13,7 @@
## See the file "license" for information on usage and redistribution of ## See the file "license" for information on usage and redistribution of
## this file, and for a DISCLAIMER OF ALL WARRANTIES. ## this file, and for a DISCLAIMER OF ALL WARRANTIES.
## ##
## $Id: makefile,v 1.34 2003-09-07 18:30:28 stephena Exp $ ## $Id: makefile,v 1.35 2003-09-09 16:45:47 stephena Exp $
##============================================================================ ##============================================================================
##============================================================================ ##============================================================================
@ -30,7 +30,7 @@ OPTIMIZATIONS = $(CXXFLAGS) -Wall -Wno-unused
### SDL sound not yet supported in the X11 version ### SDL sound not yet supported in the X11 version
### comment out all lines to completely disable sound ### comment out all lines to completely disable sound
### ###
SOUND_ALSA = 1 #SOUND_ALSA = 1
#SOUND_OSS = 1 #SOUND_OSS = 1
#SOUND_SDL = 1 #SOUND_SDL = 1
@ -44,7 +44,7 @@ SOUND_ALSA = 1
# DEBUG = 1 # DEBUG = 1
### to include joystick support in the X11 and SDL versions ### to include joystick support in the X11 and SDL versions
JOYSTICK_SUPPORT = 1 # JOYSTICK_SUPPORT = 1
### to include support for saving snapshots in png format ### to include support for saving snapshots in png format
### (requires PNG library) ### (requires PNG library)

11
stella/src/ui/sdl/mainSDL.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: mainSDL.cxx,v 1.46 2003-09-07 18:30:28 stephena Exp $ // $Id: mainSDL.cxx,v 1.47 2003-09-09 16:45:47 stephena Exp $
//============================================================================ //============================================================================
#include <fstream> #include <fstream>
@ -22,8 +22,10 @@
#include <string> #include <string>
#include <algorithm> #include <algorithm>
#include <time.h> #ifdef HAVE_GETTIMEOFDAY
#include <sys/time.h> #include <time.h>
#include <sys/time.h>
#endif
#include <SDL.h> #include <SDL.h>
#include <SDL_syswm.h> #include <SDL_syswm.h>
@ -120,9 +122,6 @@ static string theSnapShotDir, theSnapShotName;
static Snapshot* snapshot; static Snapshot* snapshot;
#endif #endif
// FIXME - these are going to disappear
//static Event theEvent;
// Pointer to the console object or the null pointer // Pointer to the console object or the null pointer
static Console* theConsole = (Console*) NULL; static Console* theConsole = (Console*) NULL;

800
stella/src/ui/x11/mainX11.cxx
View File

File diff suppressed because it is too large Load Diff