Ticket #8922: scummvm-trunk-motoezx.patch

backends/platform/sdl/events.cpp

@@ -187 +187 @@
                 return true;
         }
 
-        while (SDL_PollEvent(&ev)) {
+        while (mySDL_PollEvent(&ev)) {
                 switch (ev.type) {
                 case SDL_KEYDOWN:{
                         b = event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState());
@@ -517 +517 @@
                 event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
         }
 #endif
+#ifdef MOTOEZX
+        // Quit on MOD+Camera Key on A1200
+        if (ev.key.keysym.sym == SDLK_e) {
+                event.type = Common::EVENT_QUIT;
+                return true;
+        }
+        // '1' Bypass security protection - MOD+Call key
+        if (ev.key.keysym.sym ==  SDLK_f) {
+                ev.key.keysym.sym=SDLK_1;
+        }
+        // F5 Game Menu - Call key
+        else if (ev.key.keysym.sym == SDLK_SPACE) {
+                ev.key.keysym.sym=SDLK_F5;
+        }
+        // '3' - Mod+Up key
+        else if (ev.key.keysym.sym == SDLK_j) {
+                ev.key.keysym.sym=SDLK_3;
+        }
+        // '6' - Mod+Down key
+        else if (ev.key.keysym.sym == SDLK_i) {
+                ev.key.keysym.sym=SDLK_6;
+        // 'y' - Mod+Right key
+        }
+        else if (ev.key.keysym.sym == SDLK_g) {
+                ev.key.keysym.sym=SDLK_y;       
+        }
+        // 'n' - Mod+Left key
+        else if (ev.key.keysym.sym == SDLK_h) {
+                ev.key.keysym.sym=SDLK_n;       
+        }
+        // A1200 Joystick to Mouse
+        else if( ev.key.keysym.sym == SDLK_LEFT ) {
+                if( ev.type == SDL_KEYDOWN ) {
+                        _km.x_vel = -1;
+                        _km.x_down_count = 1;
+                }
+                else {
+                        _km.x_vel = 0;
+                        _km.x_down_count = 0;
+                }
+
+                event.type = Common::EVENT_MOUSEMOVE;
+                fillMouseEvent(event, _km.x, _km.y);
+                return true;
+        }
+        else if( ev.key.keysym.sym == SDLK_RIGHT ) {
+                if( ev.type == SDL_KEYDOWN ) {
+                        _km.x_vel = 1;
+                        _km.x_down_count = 1;
+                }
+                else {
+                        _km.x_vel = 0;
+                        _km.x_down_count = 0;
+                }
+
+                event.type = Common::EVENT_MOUSEMOVE;
+                fillMouseEvent(event, _km.x, _km.y);
+                return true;
+        }
+        else if( ev.key.keysym.sym == SDLK_DOWN ) {
+                if( ev.type == SDL_KEYDOWN ) {
+                        _km.y_vel = 1;
+                        _km.y_down_count = 1;
+                }
+                else {
+                        _km.y_vel = 0;
+                        _km.y_down_count = 0;
+                }
+
+                event.type = Common::EVENT_MOUSEMOVE;
+                fillMouseEvent(event, _km.x, _km.y);
+                return true;
+        }
+        else if( ev.key.keysym.sym == SDLK_UP ) {
+                if( ev.type == SDL_KEYDOWN ) {
+                        _km.y_vel = -1;
+                        _km.y_down_count = 1;
+                }
+                else {
+                        _km.y_vel = 0;
+                        _km.y_down_count = 0;
+                }
+
+                event.type = Common::EVENT_MOUSEMOVE;
+                fillMouseEvent(event, _km.x, _km.y);
+                return true;
+        }
+        // Volume Up to pressing Right Mouse
+        else if ( ev.key.keysym.sym == SDLK_PLUS) {
+                        _km.y_vel = 0;
+                        _km.y_down_count = 0;
+                event.type = Common::EVENT_RBUTTONDOWN;
+                fillMouseEvent(event, _km.x, _km.y);
+                return true;
+        }
+        // Volume down to releasing right mouse
+        else if ( ev.key.keysym.sym == SDLK_MINUS) {
+                        _km.y_vel = 0;
+                        _km.y_down_count = 0;
+                event.type =  Common::EVENT_RBUTTONUP;
+                fillMouseEvent(event, _km.x, _km.y);
+                return true;
+        }
+        // MOD+Volume UP to releasing Right Mouse
+        else if ( ev.key.keysym.sym == SDLK_c) {
+                        _km.y_vel = 0;
+                        _km.y_down_count = 0;
+                event.type =  Common::EVENT_RBUTTONUP;
+                fillMouseEvent(event, _km.x, _km.y);
+                return true;
+        }
+        // Camera to releasing Left Mouse
+        else if ( ev.key.keysym.sym == SDLK_PAUSE) {
+                        _km.y_vel = 0;
+                        _km.y_down_count = 0;
+                event.type =  Common::EVENT_LBUTTONUP;
+                fillMouseEvent(event, _km.x, _km.y);
+                return true;
+        } else {
+        // Let the events fall through if we didn't change them, this may not be the best way to
+        // set it up, but i'm not sure how sdl would like it if we let if fall through then redid it though.
+        // and yes i have an huge terminal size so i dont wrap soon enough.
+                event.type = Common::EVENT_KEYDOWN;
+                event.kbd.keycode = (Common::KeyCode)ev.key.keysym.sym;
+                event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
+        }
+#endif
         return false;
 }
 

backends/platform/sdl/sdl.cpp

@@ -641 +641 @@
 
 void OSystem_SDL::setupMixer() {
         SDL_AudioSpec desired;
-        SDL_AudioSpec obtained;
+//      SDL_AudioSpec obtained;
 
         // Determine the desired output sampling frequency.
         _samplesPerSec = 0;
@@ -804 +804 @@
                 _cdEndTime = SDL_GetTicks() + _cdrom->track[_cdTrack].length * 1000 / CD_FPS;
         }
 }
+int OSystem_SDL::mySDL_PollEvent(SDL_Event *event) {
+        int r = SDL_PollEvent(event);
+        if (!r)
+                return 0;
+        if (event->type == SDL_ACTIVEEVENT){
+                if (event->active.state == SDL_APPINPUTFOCUS && !event->active.gain){
+                        suspendAudio(); 
+                        for(;;){
+                        printf("wait\n");
+                        r = SDL_WaitEvent(event);
+                        printf("wait done\n");
+                        if (!r)
+                                continue;
+                        if (event->type == SDL_QUIT)
+                                return 1;
+                        if (event->type != SDL_ACTIVEEVENT)
+                                continue;
+                        if (event->active.state == SDL_APPINPUTFOCUS && event->active.gain){
+                                resumeAudio();
+                                        return 1;
+                                }
+                        }
+                }
+        }
+  return r;
+}
+
+void OSystem_SDL::suspendAudio() {
+        // if (audioSuspended) return;
+        SDL_CloseAudio();
+        audioSuspended = true;
+}
+
+int OSystem_SDL::resumeAudio() {
+        if (!audioSuspended)
+                return -2;
+        if (SDL_OpenAudio(&obtained, NULL) < 0){
+                printf("audio resumed\n");
+                return -1;
+        }
+        SDL_PauseAudio(0);
+        audioSuspended = false;
+        return 0;
+}
+ No newline at end of file

backends/platform/sdl/sdl.h

@@ -78 +78 @@
 
 
 class OSystem_SDL : public OSystem {
+private:
+        SDL_AudioSpec obtained;
+        bool audioSuspended;
 public:
         OSystem_SDL();
         virtual ~OSystem_SDL();
@@ -445 +448 @@
         virtual bool remapKey(SDL_Event &ev, Common::Event &event);
 
         void handleScalerHotkeys(const SDL_KeyboardEvent &key);
+        
+        int mySDL_PollEvent(SDL_Event *event);
+        void suspendAudio();
+        int resumeAudio();
 };
 
 #endif

configure

@@ -583 +583 @@
 
 Configuration:
   -h, --help             display this help and exit
-  --backend=BACKEND      backend to build (sdl, x11, morphos, dc, gp2x, iphone, null) [sdl]
+  --backend=BACKEND      backend to build (sdl, x11, morphos, dc, gp2x, iphone, motoezx, null) [sdl]
 
 Installation directories:
   --prefix=DIR           use this prefix for installing ScummVM [/usr/local]
@@ -811 +811 @@
         _host_os=iphone
         _host_cpu=arm
         ;;
+motoezx)
+        _host_os=linux
+        _host_cpu=arm
+        ;;      
 neuros)
         _host_os=linux
         _host_cpu=arm
@@ -1708 +1712 @@
                 DEFINES="$DEFINES -DSDL_BACKEND"
                 MODULES="$MODULES backends/platform/sdl"
                 ;;
+        motoezx)
+                find_sdlconfig
+                INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+                LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
+                DEFINES="$DEFINES -DSDL_BACKEND"
+                CXXFLAGS="$CXXFLAGS -DMOTOEZX"
+                MODULES="$MODULES backends/platform/sdl"
+                ;;      
         gp2x)
                 find_sdlconfig
                 INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"

configure-motoezx.txt

@@ +1 @@
+./configure --host=arm-linux --backend=motoezx --disable-scalers --disable-vorbis --enable-tremor --enable-mad --enable-zlib --enable-flac