[Scummvm-git-logs] scummvm master -> 75ba54aa3ea881ae32d180a8c7dda74454d02ff4
sev-
sev at scummvm.org
Mon Mar 9 13:31:56 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
75ba54aa3e BACKENDS: Remove LinuxMoto port.
Commit: 75ba54aa3ea881ae32d180a8c7dda74454d02ff4
https://github.com/scummvm/scummvm/commit/75ba54aa3ea881ae32d180a8c7dda74454d02ff4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-09T14:31:14+01:00
Commit Message:
BACKENDS: Remove LinuxMoto port.
This was a relatively short-lived port. We have it broken and
disabled on the buildbot since 2016. Also, the last builds
were provided in 2011. Thus, it makes a little sense to continue
to keep the code in the repository, as it gets bitrot.
Changed paths:
R backends/events/linuxmotosdl/linuxmotosdl-events.cpp
R backends/events/linuxmotosdl/linuxmotosdl-events.h
R backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
R backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h
R backends/platform/linuxmoto/hardwarekeys.cpp
R backends/platform/linuxmoto/linuxmoto-main.cpp
R backends/platform/linuxmoto/linuxmoto-sdl.cpp
R backends/platform/linuxmoto/linuxmoto-sdl.h
R backends/platform/linuxmoto/linuxmoto.mk
R backends/platform/linuxmoto/module.mk
R dists/motoezx/readme-motoezx.txt
R dists/motoezx/scummvm-sm.png
R dists/motoezx/scummvm.desktop
R dists/motoezx/scummvm.lin
R dists/motoezx/scummvm.png
R dists/motomagx/mgx/icon.png
R dists/motomagx/mgx/readme-motomagx-mgx.txt
R dists/motomagx/mgx/scummvm.cfg
R dists/motomagx/mgx/scummvm.lin
R dists/motomagx/mpkg/mySDL.cfg
R dists/motomagx/mpkg/readme-motomagx-mpkg.txt
R dists/motomagx/mpkg/scummvm.desktop
R dists/motomagx/mpkg/scummvm.sh
R dists/motomagx/mpkg/scummvm_usr.png
R dists/motomagx/pep/app/scummvm.sh
R dists/motomagx/pep/description.ini
R dists/motomagx/pep/readme-motomagx-pep.txt
R dists/motomagx/pep/scummvm_big_usr.png
R dists/motomagx/pep/scummvm_small_usr.png
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
backends/mixer/sdl/sdl-mixer.h
backends/module.mk
backends/platform/sdl/posix/posix-main.cpp
configure
engines/cge/snail.cpp
diff --git a/backends/events/linuxmotosdl/linuxmotosdl-events.cpp b/backends/events/linuxmotosdl/linuxmotosdl-events.cpp
deleted file mode 100644
index 00453a036c..0000000000
--- a/backends/events/linuxmotosdl/linuxmotosdl-events.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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
- * of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#if defined(LINUXMOTO)
-
-#include "backends/events/linuxmotosdl/linuxmotosdl-events.h"
-#include "backends/platform/linuxmoto/linuxmoto-sdl.h"
-
-enum {
- GFX_HALF = 12
-};
-
-void LinuxmotoSdlEventSource::preprocessEvents(SDL_Event *event) {
- if (event->type == SDL_ACTIVEEVENT) {
- if (event->active.state == SDL_APPINPUTFOCUS && !event->active.gain) {
- ((OSystem_SDL* )g_system)->getMixerManager()->suspendAudio();
- for (;;) {
- if (!SDL_WaitEvent(event)) {
- SDL_Delay(10);
- continue;
- }
- if (event->type == SDL_QUIT)
- return;
- if (event->type != SDL_ACTIVEEVENT)
- continue;
- if (event->active.state == SDL_APPINPUTFOCUS && event->active.gain) {
- ((OSystem_SDL* )g_system)->getMixerManager()->resumeAudio();
- return;
- }
- }
- }
- }
-}
-
-bool LinuxmotoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
- if (false) {}
-
- // Motorol A1200/E6/A1600 remapkey by Lubomyr
-#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;
- }
- // VirtualKeyboard - Camera key
- else if (ev.key.keysym.sym == SDLK_PAUSE) {
-#ifdef ENABLE_VKEYBD
- event.type = Common::EVENT_VIRTUAL_KEYBOARD;
- return true;
-#endif
- }
- // Enter - mod+fire key
- else if (ev.key.keysym.sym == SDLK_b) {
- ev.key.keysym.sym = SDLK_RETURN;
- }
- // '3' - mod+up key
- else if (ev.key.keysym.sym == SDLK_j) {
- ev.key.keysym.sym = SDLK_3;
- }
- // '6' - mod+up 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+right key
- else if (ev.key.keysym.sym == SDLK_h) {
- ev.key.keysym.sym = SDLK_n;
- }
- // mod+vol'+' -> volume'+'
- else if (ev.key.keysym.sym == SDLK_c) {
- ev.key.keysym.sym = SDLK_RIGHTBRACKET;
- }
- // mod+vol'-' -> volume'-'
- else if (ev.key.keysym.sym == SDLK_d) {
- ev.key.keysym.sym = SDLK_LEFTBRACKET;
- }
-#endif
-
-#ifdef MOTOMAGX
- // Quit on Clr
- if (ev.key.keysym.sym == SDLK_BACKSPACE) {
- event.type = Common::EVENT_QUIT;
- return true;
- }
- // Game Menu - Left Soft key
- else if (ev.key.keysym.sym == SDLK_F9) {
- ev.key.keysym.sym = SDLK_F5;
- }
- // VirtualKeyboard - Right Soft key
- else if (ev.key.keysym.sym == SDLK_F11) {
-#ifdef ENABLE_VKEYBD
- event.type = Common::EVENT_VIRTUAL_KEYBOARD;
- return true;
-#endif
- }
-#endif
-
-// Joystick to Mouse
- else if (ev.key.keysym.sym == SDLK_LEFT) {
- if (ev.type == SDL_KEYDOWN) {
- _km.x_vel = -1 * MULTIPLIER;
- _km.x_down_count = 1;
- } else {
- _km.x_vel = 0 * MULTIPLIER;
- _km.x_down_count = 0;
- }
-
- event.type = Common::EVENT_MOUSEMOVE;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
- return true;
- } else if (ev.key.keysym.sym == SDLK_RIGHT) {
- if (ev.type == SDL_KEYDOWN) {
- _km.x_vel = 1 * MULTIPLIER;
- _km.x_down_count = 1;
- } else {
- _km.x_vel = 0 * MULTIPLIER;
- _km.x_down_count = 0;
- }
-
- event.type = Common::EVENT_MOUSEMOVE;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
-
- return true;
- } else if (ev.key.keysym.sym == SDLK_DOWN) {
- if (ev.type == SDL_KEYDOWN) {
- _km.y_vel = 1 * MULTIPLIER;
- _km.y_down_count = 1;
- } else {
- _km.y_vel = 0 * MULTIPLIER;
- _km.y_down_count = 0;
- }
-
- event.type = Common::EVENT_MOUSEMOVE;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
-
- return true;
- } else if (ev.key.keysym.sym == SDLK_UP) {
- if (ev.type == SDL_KEYDOWN) {
- _km.y_vel = -1 * MULTIPLIER;
- _km.y_down_count = 1;
- } else {
- _km.y_vel = 0 * MULTIPLIER;
- _km.y_down_count = 0;
- }
-
- event.type = Common::EVENT_MOUSEMOVE;
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
-
- return true;
- } else if (ev.key.keysym.sym == SDLK_RETURN) {
- // Joystick center to pressing Left Mouse
- if (ev.key.type == SDL_KEYDOWN) {
- event.type = Common::EVENT_LBUTTONDOWN;
- } else {
- event.type = Common::EVENT_LBUTTONUP;
- }
-
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
-
- return true;
- } else if (ev.key.keysym.sym == SDLK_PLUS) {
- // Volume Up to pressing Right Mouse
- if (ev.key.type == SDL_KEYDOWN ) {
- event.type = Common::EVENT_RBUTTONDOWN;
- } else {
- event.type = Common::EVENT_RBUTTONUP;
- }
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
-
- return true;
- } else if (ev.key.keysym.sym == SDLK_MINUS) {
- // Volume Down to pressing Left Mouse
- if (ev.key.type == SDL_KEYDOWN) {
- event.type = Common::EVENT_LBUTTONDOWN;
- } else {
- event.type = Common::EVENT_LBUTTONUP;
- }
-
- processMouseEvent(event, _km.x / MULTIPLIER, _km.y / MULTIPLIER);
-
- 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);
- }
-
- return false;
-}
-
-#endif
diff --git a/backends/events/linuxmotosdl/linuxmotosdl-events.h b/backends/events/linuxmotosdl/linuxmotosdl-events.h
deleted file mode 100644
index 87eab3ffaa..0000000000
--- a/backends/events/linuxmotosdl/linuxmotosdl-events.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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
- * of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#if !defined(BACKEND_EVENTS_SDL_LINUXMOTO_H) && !defined(DISABLE_DEFAULT_EVENTMANAGER)
-#define BACKEND_EVENTS_SDL_LINUXMOTO_H
-
-#include "backends/events/sdl/sdl-events.h"
-
-/**
- * SDL events manager for LINUXMOTO
- */
-class LinuxmotoSdlEventSource : public SdlEventSource {
-protected:
- virtual void preprocessEvents(SDL_Event *event);
- virtual bool remapKey(SDL_Event &ev, Common::Event &event);
-};
-
-#endif
diff --git a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
deleted file mode 100644
index facb24d638..0000000000
--- a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
+++ /dev/null
@@ -1,480 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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
- * of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "common/scummsys.h"
-
-#if defined(LINUXMOTO)
-
-#include "backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h"
-#include "backends/events/linuxmotosdl/linuxmotosdl-events.h"
-#include "common/mutex.h"
-#include "common/textconsole.h"
-#include "graphics/font.h"
-#include "graphics/fontman.h"
-#include "graphics/scaler.h"
-#include "graphics/scaler/aspect.h"
-#include "graphics/scaler/downscaler.h"
-#include "graphics/surface.h"
-
-static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
- {"1x", "Fullscreen", GFX_NORMAL},
- {"½x", "Downscale", GFX_HALF},
- {0, 0, 0}
-};
-
-LinuxmotoSdlGraphicsManager::LinuxmotoSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window)
- : SurfaceSdlGraphicsManager(sdlEventSource, window) {
-}
-
-const OSystem::GraphicsMode *LinuxmotoSdlGraphicsManager::getSupportedGraphicsModes() const {
- return s_supportedGraphicsModes;
-}
-
-int LinuxmotoSdlGraphicsManager::getDefaultGraphicsMode() const {
- return GFX_NORMAL;
-}
-
-int LinuxmotoSdlGraphicsManager::getGraphicsModeScale(int mode) const {
- int scale;
- switch (mode) {
- case GFX_NORMAL:
- case GFX_HALF:
- scale = 1;
- break;
- default:
- scale = -1;
- }
-
- return scale;
-}
-
-ScalerProc *LinuxmotoSdlGraphicsManager::getGraphicsScalerProc(int mode) const {
- ScalerProc *newScalerProc = 0;
- switch (_videoMode.mode) {
- case GFX_NORMAL:
- newScalerProc = Normal1x;
- break;
- case GFX_HALF:
- newScalerProc = DownscaleAllByHalf;
- break;
- }
-
- return newScalerProc;
-}
-
-void LinuxmotoSdlGraphicsManager::initSize(uint w, uint h, const Graphics::PixelFormat *format) {
- assert(_transactionMode == kTransactionActive);
-
- _gameScreenShakeXOffset = 0;
- _gameScreenShakeYOffset = 0;
-
-#ifdef USE_RGB_COLOR
- // Avoid redundant format changes
- Graphics::PixelFormat newFormat;
- if (!format)
- newFormat = Graphics::PixelFormat::createFormatCLUT8();
- else
- newFormat = *format;
-
- assert(newFormat.bytesPerPixel > 0);
-
- if (newFormat != _videoMode.format) {
- _videoMode.format = newFormat;
- _transactionDetails.formatChanged = true;
- _screenFormat = newFormat;
- }
-#endif
-
-
- // Avoid redundant res changes
- if ((int)w == _videoMode.screenWidth && (int)h == _videoMode.screenHeight)
- return;
-
- _videoMode.screenWidth = w;
- _videoMode.screenHeight = h;
-
- if (w > 320 || h > 240) {
- setGraphicsMode(GFX_HALF);
- setGraphicsModeIntern();
- _window->toggleMouseGrab();
- }
-
- _transactionDetails.sizeChanged = true;
-}
-
-bool LinuxmotoSdlGraphicsManager::loadGFXMode() {
- debug("Game ScreenMode = %d*%d",_videoMode.screenWidth, _videoMode.screenHeight);
-
- if (_videoMode.screenWidth > 320 || _videoMode.screenHeight > 240) {
- _videoMode.aspectRatioCorrection = false;
- setGraphicsMode(GFX_HALF);
- debug("GraphicsMode set to HALF");
- } else {
- setGraphicsMode(GFX_NORMAL);
- debug("GraphicsMode set to NORMAL");
- }
-
- if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
- _videoMode.overlayWidth = 320;
- _videoMode.overlayHeight = 240;
- _videoMode.fullscreen = true;
- } else {
-
- _videoMode.overlayWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
- _videoMode.overlayHeight = _videoMode.screenHeight * _videoMode.scaleFactor;
-
- if (_videoMode.aspectRatioCorrection)
- _videoMode.overlayHeight = real2Aspect(_videoMode.overlayHeight);
-
- _videoMode.hardwareWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
- _videoMode.hardwareHeight = _videoMode.hardwareHeight;
- }
-
- return SurfaceSdlGraphicsManager::loadGFXMode();
-}
-
-void LinuxmotoSdlGraphicsManager::drawMouse() {
- if (!_cursorVisible || !_mouseSurface || !_mouseCurState.w || !_mouseCurState.h) {
- _mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0;
- return;
- }
-
- SDL_Rect dst;
- int scale;
- int hotX, hotY;
-
- const Common::Point virtualCursor = convertWindowToVirtual(_cursorX, _cursorY);
-
- if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
- dst.x = virtualCursor.x / 2;
- dst.y = virtualCursor.y / 2;
- } else {
- dst.x = virtualCursor.x;
- dst.y = virtualCursor.y;
- }
-
- if (!_overlayVisible) {
- scale = _videoMode.scaleFactor;
- dst.w = _mouseCurState.vW;
- dst.h = _mouseCurState.vH;
- hotX = _mouseCurState.vHotX;
- hotY = _mouseCurState.vHotY;
- } else {
- scale = 1;
- dst.w = _mouseCurState.rW;
- dst.h = _mouseCurState.rH;
- hotX = _mouseCurState.rHotX;
- hotY = _mouseCurState.rHotY;
- }
-
- // The mouse is undrawn using virtual coordinates, i.e. they may be
- // scaled and aspect-ratio corrected.
-
- _mouseBackup.x = dst.x - hotX;
- _mouseBackup.y = dst.y - hotY;
- _mouseBackup.w = dst.w;
- _mouseBackup.h = dst.h;
-
- // We draw the pre-scaled cursor image, so now we need to adjust for
- // scaling, shake position and aspect ratio correction manually.
-
- dst.x += _currentShakeXOffset;
- dst.y += _currentShakeYOffset;
-
- if (_videoMode.aspectRatioCorrection && !_overlayVisible)
- dst.y = real2Aspect(dst.y);
-
- dst.x = scale * dst.x - _mouseCurState.rHotX;
- dst.y = scale * dst.y - _mouseCurState.rHotY;
- dst.w = _mouseCurState.rW;
- dst.h = _mouseCurState.rH;
-
- // Note that SDL_BlitSurface() and addDirtyRect() will both perform any
- // clipping necessary
-
- if (SDL_BlitSurface(_mouseSurface, nullptr, _hwScreen, &dst) != 0)
- error("SDL_BlitSurface failed: %s", SDL_GetError());
-
- // The screen will be updated using real surface coordinates, i.e.
- // they will not be scaled or aspect-ratio corrected.
- addDirtyRect(dst.x, dst.y, dst.w, dst.h, true);
-}
-
-void LinuxmotoSdlGraphicsManager::undrawMouse() {
- const int x = _mouseBackup.x;
- const int y = _mouseBackup.y;
-
- // When we switch bigger overlay off mouse jumps. Argh!
- // This is intended to prevent undrawing offscreen mouse
- if (!_overlayVisible && (x >= _videoMode.screenWidth || y >= _videoMode.screenHeight))
- return;
-
- if (_mouseBackup.w != 0 && _mouseBackup.h != 0) {
- if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
- addDirtyRect(x * 2, y * 2, _mouseBackup.w * 2, _mouseBackup.h * 2);
- } else {
- addDirtyRect(x, y, _mouseBackup.w, _mouseBackup.h);
- }
- }
-}
-
-void LinuxmotoSdlGraphicsManager::internUpdateScreen() {
- SDL_Surface *srcSurf, *origSurf;
- int height, width;
- ScalerProc *scalerProc;
- int scale1;
-
-#if defined(DEBUG)
- assert(_hwScreen != NULL);
- assert(_hwScreen->map->sw_data != NULL);
-#endif
-
- // If the shake position changed, fill the dirty area with blackness
- if (_currentShakeXOffset != _gameScreenShakeXOffset ||
- (_cursorNeedsRedraw && _mouseBackup.x <= _currentShakeXOffset)) {
- SDL_Rect blackrect = {0, 0, (Uint16)(_gameScreenShakeXOffset * _videoMode.scaleFactor), (Uint16)(_videoMode.screenHeight * _videoMode.scaleFactor)};
-
- if (_videoMode.aspectRatioCorrection && !_overlayVisible)
- blackrect.h = real2Aspect(blackrect.h - 1) + 1;
-
- SDL_FillRect(_hwScreen, &blackrect, 0);
-
- _currentShakeXOffset = _gameScreenShakeXOffset;
-
- _forceRedraw = true;
- }
- if (_currentShakeYOffset != _gameScreenShakeYOffset ||
- (_cursorNeedsRedraw && _mouseBackup.y <= _currentShakeYOffset)) {
- SDL_Rect blackrect = {0, 0, (Uint16)(_videoMode.screenWidth * _videoMode.scaleFactor), (Uint16)(_gameScreenShakeYOffset * _videoMode.scaleFactor)};
-
- if (_videoMode.aspectRatioCorrection && !_overlayVisible)
- blackrect.h = real2Aspect(blackrect.h - 1) + 1;
-
- SDL_FillRect(_hwScreen, &blackrect, 0);
-
- _currentShakeYOffset = _gameScreenShakeYOffset;
-
- _forceRedraw = true;
- }
-
- // Check whether the palette was changed in the meantime and update the
- // screen surface accordingly.
- if (_screen && _paletteDirtyEnd != 0) {
- SDL_SetColors(_screen, _currentPalette + _paletteDirtyStart,
- _paletteDirtyStart,
- _paletteDirtyEnd - _paletteDirtyStart);
-
- _paletteDirtyEnd = 0;
-
- _forceRedraw = true;
- }
-
- if (!_overlayVisible) {
- origSurf = _screen;
- srcSurf = _tmpscreen;
- width = _videoMode.screenWidth;
- height = _videoMode.screenHeight;
- scalerProc = _scalerProc;
- scale1 = _videoMode.scaleFactor;
- } else {
- origSurf = _overlayscreen;
- srcSurf = _tmpscreen2;
- width = _videoMode.overlayWidth;
- height = _videoMode.overlayHeight;
- scalerProc = Normal1x;
- scale1 = 1;
- }
-
- // Add the area covered by the mouse cursor to the list of dirty rects if
- // we have to redraw the mouse.
- if (_cursorNeedsRedraw)
- undrawMouse();
-
-#ifdef USE_OSD
- updateOSD();
-#endif
-
- // Force a full redraw if requested
- if (_forceRedraw) {
- _numDirtyRects = 1;
- _dirtyRectList[0].x = 0;
- _dirtyRectList[0].y = 0;
- _dirtyRectList[0].w = width;
- _dirtyRectList[0].h = height;
- }
-
- // Only draw anything if necessary
- if (_numDirtyRects > 0 || _cursorNeedsRedraw) {
- SDL_Rect *r;
- SDL_Rect dst;
- uint32 srcPitch, dstPitch;
- SDL_Rect *lastRect = _dirtyRectList + _numDirtyRects;
-
- for (r = _dirtyRectList; r != lastRect; ++r) {
- dst = *r;
- dst.x++; // Shift rect by one since 2xSai needs to access the data around
- dst.y++; // any pixel to scale it, and we want to avoid mem access crashes.
-
- if (SDL_BlitSurface(origSurf, r, srcSurf, &dst) != 0)
- error("SDL_BlitSurface failed: %s", SDL_GetError());
- }
-
- SDL_LockSurface(srcSurf);
- SDL_LockSurface(_hwScreen);
-
- srcPitch = srcSurf->pitch;
- dstPitch = _hwScreen->pitch;
-
- for (r = _dirtyRectList; r != lastRect; ++r) {
- int dst_y = r->y + _currentShakeYOffset;
- int dst_h = 0;
- int dst_w = 0;
- int orig_dst_y = 0;
- int dst_x = r->x + _currentShakeXOffset;
- int src_y;
- int src_x;
-
- if (dst_x < width && dst_y < height) {
- dst_w = r->w;
- if (dst_w > width - dst_x)
- dst_w = width - dst_x;
-
- dst_h = r->h;
- if (dst_h > height - dst_y)
- dst_h = height - dst_y;
-
- orig_dst_y = dst_y;
- src_x = dst_x;
- src_y = dst_y;
-
- if (_videoMode.aspectRatioCorrection && !_overlayVisible)
- dst_y = real2Aspect(dst_y);
-
- assert(scalerProc != NULL);
-
- if (_videoMode.mode == GFX_HALF && scalerProc == DownscaleAllByHalf) {
- if (dst_x % 2 == 1) {
- dst_x--;
- dst_w++;
- }
- if (dst_y % 2 == 1) {
- dst_y--;
- dst_h++;
- }
-
- if (dst_w&1)
- dst_w++;
- if (dst_h&1)
- dst_h++;
-
- src_x = dst_x;
- src_y = dst_y;
- dst_x = dst_x / 2;
- dst_y = dst_y / 2;
- }
- scalerProc((byte *)srcSurf->pixels + (src_x * 2 + 2) + (src_y + 1) * srcPitch, srcPitch,
- (byte *)_hwScreen->pixels + dst_x * 2 + dst_y * dstPitch, dstPitch, dst_w, dst_h);
- }
-
- if (_videoMode.mode == GFX_HALF && scalerProc == DownscaleAllByHalf) {
- r->w = dst_w / 2;
- r->h = dst_h / 2;
- } else {
- r->w = dst_w;
- r->h = dst_h;
- }
-
- r->x = dst_x;
- r->y = dst_y;
-
-#ifdef USE_SCALERS
- if (_videoMode.aspectRatioCorrection && orig_dst_y < height && !_overlayVisible)
- r->h = stretch200To240((uint8 *) _hwScreen->pixels, dstPitch, r->w, r->h, r->x, r->y, orig_dst_y * scale1, _videoMode.filtering);
-#endif
- }
- SDL_UnlockSurface(srcSurf);
- SDL_UnlockSurface(_hwScreen);
-
- // Readjust the dirty rect list in case we are doing a full update.
- // This is necessary if shaking is active.
- if (_forceRedraw) {
- _dirtyRectList[0].x = 0;
- _dirtyRectList[0].y = 0;
- _dirtyRectList[0].w = (_videoMode.mode == GFX_HALF) ? _videoMode.hardwareWidth / 2 : _videoMode.hardwareWidth;
- _dirtyRectList[0].h = (_videoMode.mode == GFX_HALF) ? _videoMode.hardwareHeight / 2 : _videoMode.hardwareHeight;
- }
-
- drawMouse();
-
-#ifdef USE_OSD
- drawOSD();
-#endif
-
- // Finally, blit all our changes to the screen
- SDL_UpdateRects(_hwScreen, _numDirtyRects, _dirtyRectList);
- }
-
- _numDirtyRects = 0;
- _forceRedraw = false;
- _cursorNeedsRedraw = false;
-}
-
-void LinuxmotoSdlGraphicsManager::showOverlay() {
- if (_videoMode.mode == GFX_HALF) {
- _cursorX /= 2;
- _cursorY /= 2;
- }
- SurfaceSdlGraphicsManager::showOverlay();
-}
-
-void LinuxmotoSdlGraphicsManager::hideOverlay() {
- if (_videoMode.mode == GFX_HALF) {
- _cursorX *= 2;
- _cursorY *= 2;
- }
- SurfaceSdlGraphicsManager::hideOverlay();
-}
-
-void LinuxmotoSdlGraphicsManager::warpMouse(int x, int y) {
- if (_cursorX != x || _cursorY != y) {
- if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
- x /= 2;
- y /= 2;
- }
- }
- SurfaceSdlGraphicsManager::warpMouse(x, y);
-}
-
-void LinuxmotoSdlGraphicsManager::transformMouseCoordinates(Common::Point &point) {
- if (!_overlayVisible) {
- if (_videoMode.mode == GFX_HALF) {
- point.x *= 2;
- point.y *= 2;
- }
- point.x /= _videoMode.scaleFactor;
- point.y /= _videoMode.scaleFactor;
- if (_videoMode.aspectRatioCorrection)
- point.y = aspect2Real(point.y);
- }
-}
-
-#endif
diff --git a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h
deleted file mode 100644
index 0a538bed39..0000000000
--- a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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
- * of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef BACKENDS_GRAPHICS_SDL_LINUXMOTO_H
-#define BACKENDS_GRAPHICS_SDL_LINUXMOTO_H
-
-#include "backends/graphics/surfacesdl/surfacesdl-graphics.h"
-
-enum {
- GFX_HALF = 12
-};
-
-class LinuxmotoSdlGraphicsManager : public SurfaceSdlGraphicsManager {
-public:
- LinuxmotoSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window);
-
- virtual void initSize(uint w, uint h, const Graphics::PixelFormat *format = NULL) override;
- const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
- virtual int getGraphicsModeScale(int mode) const override;
- virtual void internUpdateScreen() override;
- virtual ScalerProc *getGraphicsScalerProc(int mode) const override;
- virtual int getDefaultGraphicsMode() const override;
- virtual bool loadGFXMode() override;
- virtual void drawMouse() override;
- virtual void undrawMouse() override;
- virtual void showOverlay() override;
- virtual void hideOverlay() override;
- virtual void warpMouse(int x, int y) override;
-
- virtual void transformMouseCoordinates(Common::Point &point);
-};
-
-#endif
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index cc9acdd43f..e3d436445b 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -927,7 +927,7 @@ static void fixupResolutionForAspectRatio(AspectRatio desiredAspectRatio, int &w
bool SurfaceSdlGraphicsManager::loadGFXMode() {
_forceRedraw = true;
-#if !defined(__MAEMO__) && !defined(DINGUX) && !defined(GPH_DEVICE) && !defined(LINUXMOTO)
+#if !defined(__MAEMO__) && !defined(DINGUX) && !defined(GPH_DEVICE)
_videoMode.overlayWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
_videoMode.overlayHeight = _videoMode.screenHeight * _videoMode.scaleFactor;
@@ -1349,7 +1349,7 @@ void SurfaceSdlGraphicsManager::internUpdateScreen() {
#ifdef USE_SCALERS
if (_videoMode.aspectRatioCorrection && orig_dst_y < height && !_overlayVisible)
- r->h = stretch200To240((uint8 *) _hwScreen->pixels, dstPitch, r->w, r->h, r->x, r->y, orig_dst_y * scale1, _videoMode.filtering);
+ r->h = stretch200To240((uint8 *) _hwScreen->pixels, dstPitch, r->w, r->h, r->x, r->y, orig_dst_y * scale1, _videoMode.filtering);
#endif
}
SDL_UnlockSurface(srcSurf);
diff --git a/backends/mixer/sdl/sdl-mixer.h b/backends/mixer/sdl/sdl-mixer.h
index 088ebe109e..b967ca318f 100644
--- a/backends/mixer/sdl/sdl-mixer.h
+++ b/backends/mixer/sdl/sdl-mixer.h
@@ -47,7 +47,7 @@ public:
*/
Audio::Mixer *getMixer() { return (Audio::Mixer *)_mixer; }
- // Used by LinuxMoto Port
+ // Used by Event recorder
/**
* Pauses the audio system
diff --git a/backends/module.mk b/backends/module.mk
index 155503d340..5c914d07f8 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -282,12 +282,6 @@ MODULE_OBJS += \
graphics/gph/gph-graphics.o
endif
-ifeq ($(BACKEND),linuxmoto)
-MODULE_OBJS += \
- events/linuxmotosdl/linuxmotosdl-events.o \
- graphics/linuxmotosdl/linuxmotosdl-graphics.o
-endif
-
ifeq ($(BACKEND),maemo)
MODULE_OBJS += \
events/maemosdl/maemosdl-events.o \
diff --git a/backends/platform/linuxmoto/hardwarekeys.cpp b/backends/platform/linuxmoto/hardwarekeys.cpp
deleted file mode 100644
index 449dd3f03b..0000000000
--- a/backends/platform/linuxmoto/hardwarekeys.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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
- * of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "backends/platform/linuxmoto/linuxmoto-sdl.h"
-#include "backends/keymapper/keymapper.h"
-#include "common/keyboard.h"
-
-using namespace Common;
-
-struct Key {
- const char *hwId;
- KeyCode keycode;
- uint16 ascii;
- const char *desc;
- bool shiftable;
-};
-
-static const Key keys[] = {
- { "FIRE", KEYCODE_RETURN, ASCII_RETURN, "Fire", false },
- { "CAMERA", KEYCODE_PAUSE, 0, "Camera", false },
- { "HANGUP", KEYCODE_ESCAPE, ASCII_ESCAPE, "Hangup", false },
- { "CALL", KEYCODE_SPACE, ASCII_SPACE, "Call", false },
- { "PLUS", KEYCODE_PLUS, '+', "+", false },
- { "MINUS", KEYCODE_MINUS, '-', "-", false },
-#ifdef MOTOMAGX
- {"BACKSPACE", KEYCODE_BACKSPACE, ASCII_BACKSPACE, "Backspace", false},
- {"TAB", KEYCODE_TAB, ASCII_TAB, "Tab", false},
- {"HASH", KEYCODE_HASH, '#', "#", false},
- {"ASTERISK", KEYCODE_ASTERISK, '*', "*", false},
- {"LEFTSOFT", KEYCODE_F9, ASCII_F9, "LeftSoft", false},
- {"RIGHTSOFT", KEYCODE_F11, ASCII_F11, "RightSoft", false},
- {"0", KEYCODE_0, '0', "0", false},
- {"1", KEYCODE_1, '1', "1", false},
- {"2", KEYCODE_2, '2', "2", false},
- {"3", KEYCODE_3, '3', "3", false},
- {"4", KEYCODE_4, '4', "4", false},
- {"5", KEYCODE_5, '5', "5", false},
- {"6", KEYCODE_6, '6', "6", false},
- {"7", KEYCODE_7, '7', "7", false},
- {"8", KEYCODE_8, '8', "8", false},
- {"9", KEYCODE_9, '9', "9", false},
-#endif
-#ifdef MOTOEZX
- { "a", KEYCODE_a, 'a', "a", true },
- { "b", KEYCODE_b, 'b', "b", true },
- { "c", KEYCODE_c, 'c', "c", true },
- { "d", KEYCODE_d, 'd', "d", true },
- { "e", KEYCODE_e, 'e', "e", true },
- { "f", KEYCODE_f, 'f', "f", true },
- { "g", KEYCODE_g, 'g', "g", true },
- { "h", KEYCODE_h, 'h', "h", true },
- { "i", KEYCODE_i, 'i', "i", true },
- { "j", KEYCODE_j, 'j', "j", true },
-#endif
- // Numeric keypad
-
- // Arrows + Home/End pad
- {"UP", KEYCODE_UP, 0, "Up", false},
- {"DOWN", KEYCODE_DOWN, 0, "Down", false},
- {"RIGHT", KEYCODE_RIGHT, 0, "Right", false},
- {"LEFT", KEYCODE_LEFT, 0, "Left", false},
-
- // Function keys
-
- // Miscellaneous function keys
-
- {0, KEYCODE_INVALID, 0, 0, false}
-};
-
-struct Mod {
- byte flag;
- const char *id;
- const char *desc;
- bool shiftable;
-};
-
-static const Mod modifiers[] = {
- { 0, "", "", false },
- { KBD_CTRL, "C+", "Ctrl+", false },
- { KBD_ALT, "A+", "Alt+", false },
- { KBD_SHIFT, "", "", true },
- { KBD_CTRL | KBD_ALT, "C+A+", "Ctrl+Alt+", false },
- { KBD_SHIFT | KBD_CTRL, "S+C+", "Shift+Ctrl+", true },
- { KBD_SHIFT | KBD_CTRL | KBD_ALT, "C+A+", "Ctrl+Alt+", true },
- { 0, 0, 0, false }
-};
diff --git a/backends/platform/linuxmoto/linuxmoto-main.cpp b/backends/platform/linuxmoto/linuxmoto-main.cpp
deleted file mode 100644
index 2f14e3d53c..0000000000
--- a/backends/platform/linuxmoto/linuxmoto-main.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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
- * of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "backends/platform/linuxmoto/linuxmoto-sdl.h"
-#include "base/main.h"
-
-int main(int argc, char *argv[]) {
-
- // Create our OSystem instance
- g_system = new OSystem_LINUXMOTO();
- assert(g_system);
-
- // Pre initialize the backend
- ((OSystem_POSIX *)g_system)->init();
-
- // Invoke the actual ScummVM main entry point:
- int res = scummvm_main(argc, argv);
-
- // Free OSystem
- g_system->destroy();
-
- return res;
-}
diff --git a/backends/platform/linuxmoto/linuxmoto-sdl.cpp b/backends/platform/linuxmoto/linuxmoto-sdl.cpp
deleted file mode 100644
index a2b527e6ce..0000000000
--- a/backends/platform/linuxmoto/linuxmoto-sdl.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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
- * of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "backends/platform/linuxmoto/linuxmoto-sdl.h"
-
-#include "backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h"
-#include "backends/events/linuxmotosdl/linuxmotosdl-events.h"
-
-void OSystem_LINUXMOTO::initBackend() {
- // Create the backend custom managers
- if (_eventSource == 0)
- _eventSource = new LinuxmotoSdlEventSource();
-
- if (_graphicsManager == 0)
- _graphicsManager = new LinuxmotoSdlGraphicsManager(_eventSource, _window);
-
- // Call parent implementation of this method
- OSystem_POSIX::initBackend();
-}
diff --git a/backends/platform/linuxmoto/linuxmoto-sdl.h b/backends/platform/linuxmoto/linuxmoto-sdl.h
deleted file mode 100644
index 186bac0103..0000000000
--- a/backends/platform/linuxmoto/linuxmoto-sdl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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
- * of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef PLATFORM_SDL_LINUXMOTO_H
-#define PLATFORM_SDL_LINUXMOTO_H
-
-#include "backends/platform/sdl/posix/posix.h"
-
-class OSystem_LINUXMOTO : public OSystem_POSIX {
-public:
- virtual void initBackend();
-};
-
-#endif
diff --git a/backends/platform/linuxmoto/linuxmoto.mk b/backends/platform/linuxmoto/linuxmoto.mk
deleted file mode 100644
index 0cd02f033a..0000000000
--- a/backends/platform/linuxmoto/linuxmoto.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# Special target to create a motoezx snapshot
-motoezx: $(EXECUTABLE)
- $(MKDIR) release/scummvm
- $(STRIP) $(EXECUTABLE) -o release/scummvm/$(EXECUTABLE)
- $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) release/scummvm/
- $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) release/scummvm/
- $(CP) $(srcdir)/dists/motoezx/* release/scummvm/
- tar -C release -cvzf release/ScummVM-motoezx.pkg scummvm
- $(RM) -r release/scummvm
-
-# Special target to create a motomagx snapshot
-motomagx-mpkg: $(EXECUTABLE)
- $(MKDIR) release/scummvm
- $(STRIP) $(EXECUTABLE) -o release/scummvm/$(EXECUTABLE)
- $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) release/scummvm/
- $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) release/scummvm/
- $(CP) $(srcdir)/dists/motomagx/mpkg/* release/scummvm/
- tar -C release -cvzf release/ScummVM-motomagx.mpkg scummvm
- $(RM) -r release/scummvm
-
-motomagx-mgx: $(EXECUTABLE)
- $(MKDIR) release/scummvm
- $(STRIP) $(EXECUTABLE) -o release/scummvm/$(EXECUTABLE)
- $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) release/scummvm/
- $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) release/scummvm/
- $(CP) $(srcdir)/dists/motomagx/mgx/* release/scummvm/
- tar -C release -cvf release/ScummVM-motomagx.mgx scummvm
- $(RM) -r release/scummvm
-
-motomagx-pep: $(EXECUTABLE)
- $(MKDIR) release/pep
- $(CP) -r $(srcdir)/dists/motomagx/pep/* release/pep
- $(RM) -r release/pep/app/.svn
- $(STRIP) $(EXECUTABLE) -o release/pep/app/$(EXECUTABLE)
- $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) release/pep/app
- $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) release/pep/app
- tar -C release/pep -czvf release/ScummVM-motomagx.pep app description.ini scummvm_big_usr.png scummvm_small_usr.png
- $(RM) -r release/pep
-
-.PHONY: motoezx motomagx-mpkg motomagx-mgx motomagx-pep
diff --git a/backends/platform/linuxmoto/module.mk b/backends/platform/linuxmoto/module.mk
deleted file mode 100644
index 4c81aac3f2..0000000000
--- a/backends/platform/linuxmoto/module.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-MODULE := backends/platform/linuxmoto
-
-MODULE_OBJS := \
- linuxmoto-main.o \
- linuxmoto-sdl.o \
- hardwarekeys.o
-
-# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
-MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))
-OBJS := $(MODULE_OBJS) $(OBJS)
-MODULE_DIRS += $(sort $(dir $(MODULE_OBJS)))
-
-# Hack to ensure the SDL backend is built so we can use OSystem_SDL.
--include $(srcdir)/backends/platform/sdl/module.mk
diff --git a/backends/platform/sdl/posix/posix-main.cpp b/backends/platform/sdl/posix/posix-main.cpp
index 72b1a66443..736af75b8e 100644
--- a/backends/platform/sdl/posix/posix-main.cpp
+++ b/backends/platform/sdl/posix/posix-main.cpp
@@ -22,7 +22,7 @@
#include "common/scummsys.h"
-#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3) && !defined(PSP2) && !defined(ANDROIDSDL) && !defined(NINTENDO_SWITCH)
+#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(WEBOS) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3) && !defined(PSP2) && !defined(ANDROIDSDL) && !defined(NINTENDO_SWITCH)
#include "backends/platform/sdl/posix/posix.h"
#include "backends/plugins/sdl/sdl-provider.h"
diff --git a/configure b/configure
index 0dfe8059f9..4c8f954665 100755
--- a/configure
+++ b/configure
@@ -940,7 +940,7 @@ Usage: $0 [OPTIONS]...
Configuration:
-h, --help display this help and exit
--backend=BACKEND backend to build (3ds, android, dc, dingux, ds, gcw0,
- gph, iphone, ios7, linuxmoto, maemo, n64, null, openpandora,
+ gph, iphone, ios7, maemo, n64, null, openpandora,
ps2, psp, psp2, samsungtv, sdl, switch, tizen, webos, wii) [sdl]
Installation directories:
@@ -988,8 +988,6 @@ Special configuration feature:
iphone for Apple iPhone (iOS <= 6)
ios7 for Apple iPhone / iPad (iOS >= 7)
maemo for Nokia Maemo
- motoezx for MotoEZX
- motomagx for MotoMAGX
n64 for Nintendo 64
openpandora for OpenPandora
ouya for OUYA
@@ -1696,16 +1694,6 @@ maemo)
datadir=/opt/scummvm/share
docdir='${datarootdir}/doc/scummvm'
;;
-motoezx)
- _host_os=linux
- _host_cpu=arm
- _host_alias=arm-linux-gnu
- ;;
-motomagx)
- _host_os=linux
- _host_cpu=arm
- _host_alias=arm-linux-gnueabi
- ;;
n64)
_host_os=n64
_host_cpu=mips
@@ -3316,26 +3304,6 @@ if test -n "$_host"; then
append_var LDFLAGS "-static-libgcc"
append_var LIBS "-laudio"
;;
- motoezx)
- append_var DEFINES "-DMOTOEZX"
- append_var ASFLAGS "-mfpu=vfp"
- _backend="linuxmoto"
- _build_hq_scalers=no
- _mt32emu=no
- _vkeybd=yes
- _seq_midi=no
- _port_mk="backends/platform/linuxmoto/linuxmoto.mk"
- ;;
- motomagx)
- append_var DEFINES "-DMOTOMAGX"
- append_var ASFLAGS "-mfpu=vfp"
- _backend="linuxmoto"
- _build_hq_scalers=no
- _mt32emu=no
- _vkeybd=yes
- _seq_midi=no
- _port_mk="backends/platform/linuxmoto/linuxmoto.mk"
- ;;
n64)
append_var CXXFLAGS "-mno-extern-sdata"
append_var CXXFLAGS "--param max-inline-insns-auto=20"
@@ -3605,10 +3573,6 @@ case $_backend in
append_var CXXFLAGS "-isysroot $SDKROOT -I$SDKROOT/usr/include/c++/4.2.1 -F$SDKROOT/System/Library/Frameworks"
fi
;;
- linuxmoto)
- append_var DEFINES "-DLINUXMOTO"
- _sdl=auto
- ;;
maemo)
append_var DEFINES "-DMAEMO"
_sdl=auto
diff --git a/dists/motoezx/readme-motoezx.txt b/dists/motoezx/readme-motoezx.txt
deleted file mode 100644
index 472da095a5..0000000000
--- a/dists/motoezx/readme-motoezx.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-1. Install:
-
-motoezx-platform
-pkg-package for devices: Motorola A1200, ROKR E6, A1600
-Requirements:
-games folder on memory card
-ezx-lib-enviroment - http://www.motoezx.at.ua/load/2-1-0-6
-
-
-2. Game Control:
-
-(pkg) A1200, E6, A1600 (motoezx)
-
-menu - call key
-skip scene - hangup key
-virtual keyboard - camera key
-left mouse click - joy(fire) or volume '-'
-right mouse click - volume '+'
-quit - mod+camera key (mod - key beetwin vol'+' & vol'-')
diff --git a/dists/motoezx/scummvm-sm.png b/dists/motoezx/scummvm-sm.png
deleted file mode 100644
index b4bf5d0bc9..0000000000
Binary files a/dists/motoezx/scummvm-sm.png and /dev/null differ
diff --git a/dists/motoezx/scummvm.desktop b/dists/motoezx/scummvm.desktop
deleted file mode 100644
index ddd8ad7f57..0000000000
--- a/dists/motoezx/scummvm.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-BigIcon=scummvm.png
-Comment=ScummVM
-Exec=scummvm.lin
-Icon=scummvm-sm.png
-Name=ScummVM
-OsVersion=0.1
-Shared=0
-Type=Application
diff --git a/dists/motoezx/scummvm.lin b/dists/motoezx/scummvm.lin
deleted file mode 100644
index 83d3fcf0ed..0000000000
--- a/dists/motoezx/scummvm.lin
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-mypath=${0%/*}
-LIBDIR1=/ezxlocal/download/mystuff/games/lib
-LIBDIR2=/mmc/mmca1/games/lib
-LIBDIR3=/mmc/mmca1/.Games/.lib
-#LIBDIR3=/mmc/mmca1/.system/lib
-LIBDIR4=$mypath/lib
-#export SDL_QT_INVERT_ROTATION=1
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR1:$LIBDIR2:$LIBDIR3:$LIBDIR4
-export HOME=$mypath
-cd $mypath
-exec $mypath/scummvm --gfx-mode=1x > $mypath/scummvm.log
diff --git a/dists/motoezx/scummvm.png b/dists/motoezx/scummvm.png
deleted file mode 100644
index f3aed970e5..0000000000
Binary files a/dists/motoezx/scummvm.png and /dev/null differ
diff --git a/dists/motomagx/mgx/icon.png b/dists/motomagx/mgx/icon.png
deleted file mode 100644
index 5f7e9e5960..0000000000
Binary files a/dists/motomagx/mgx/icon.png and /dev/null differ
diff --git a/dists/motomagx/mgx/readme-motomagx-mgx.txt b/dists/motomagx/mgx/readme-motomagx-mgx.txt
deleted file mode 100644
index 9659e00552..0000000000
--- a/dists/motomagx/mgx/readme-motomagx-mgx.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-1. Install:
-
-motomagx-platform:
-
-mgx-package for Motorola E8, EM30, U9, ZN5
-Requirements:
-
-for Motorola E8, EM30:
-e8, em30 libpack - http://www.mediafire.com/download.php?mhlldhdmzde
-Unpack lib folder to /mmc/mmca1/games
-
-for Motorola U9, ZN5
-zn5, u9 libpack - http://www.mediafire.com/download.php?nmqzc5lizuy
-Unpack lib folder to /mmc/mmca1/games
-
-
-2. Game Control:
-
-(mgx) E8, EM30 (motomagx)
-use internal scummvm keymapper
-after first start scummvm keys assingned randomly
-for remapping key, must edited file
-games/.scummvmrc
-after line [keymapper]
-
-KeyMap setting tested with Motorola Z6 (pep build) by Pantamorph
-
-[keymapper]
-keymap_global_SKCT=BACKSPACE
-keymap_global_MENU=SPACE
-keymap_global_REMP=ASTERISK
-keymap_global_VIRT=F9
-keymap_gui_CLOS=ESCAPE
-keymap_gui_CLIK=BACKSPACE
-keymap_global_PAUS=TAB
-keymap_global_SKLI=2
-keymap_gui_VIRT=F9
-keymap_gui_REMP=SPACE
-
-(mgx) U9, ZN5 (motomagx)
-use internal scummvm keymapper
-after first start scummvm keys assingned randomly
-for remapping key, must edited file
-games/.scummvmrc
-after line [keymapper]
-
-KeyMap setting tested with Motorola ZN5 (mgx build) by Junior Passos
-
-[keymapper]
-keymap_global_SKCT=BACKSPACE
-keymap_global_PAUS=F9
-keymap_global_REMP=HASH
-keymap_global_VIRT=TAB
-keymap_gui_CLOS=ESCAPE
-keymap_gui_CLIK=BACKSPACE
-keymap_global_MENU=ESCAPE
-keymap_global_SKLI=ASTERISK
-keymap_gui_VIRT=TAB
-keymap_gui_REMP=CLEAR
diff --git a/dists/motomagx/mgx/scummvm.cfg b/dists/motomagx/mgx/scummvm.cfg
deleted file mode 100644
index 8780ba2115..0000000000
--- a/dists/motomagx/mgx/scummvm.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-Name = ScummVM
-Exec = scummvm.lin
-Icon = icon.png
-Author = ScummVM Team
-Version = trunk
-Comment = ScummVM
diff --git a/dists/motomagx/mgx/scummvm.lin b/dists/motomagx/mgx/scummvm.lin
deleted file mode 100644
index 83d3fcf0ed..0000000000
--- a/dists/motomagx/mgx/scummvm.lin
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-mypath=${0%/*}
-LIBDIR1=/ezxlocal/download/mystuff/games/lib
-LIBDIR2=/mmc/mmca1/games/lib
-LIBDIR3=/mmc/mmca1/.Games/.lib
-#LIBDIR3=/mmc/mmca1/.system/lib
-LIBDIR4=$mypath/lib
-#export SDL_QT_INVERT_ROTATION=1
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR1:$LIBDIR2:$LIBDIR3:$LIBDIR4
-export HOME=$mypath
-cd $mypath
-exec $mypath/scummvm --gfx-mode=1x > $mypath/scummvm.log
diff --git a/dists/motomagx/mpkg/mySDL.cfg b/dists/motomagx/mpkg/mySDL.cfg
deleted file mode 100644
index f3f4ad860b..0000000000
--- a/dists/motomagx/mpkg/mySDL.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-[SDL]
-LeftSoftkey = F9
-RightSoftkey = F11
-Up = UP
-Down = DOWN
-Left = LEFT
-Right = RIGHT
-Center = RETURN
-VolumeUp = PLUS
-VolumeDown = MINUS
-SideKey = SPACE
-Music = F10
-Call = TAB
-Red = ESCAPE
-C = BACKSPACE
-Camera = PAUSE
-Slider = 0
-0 = 0
-1 = 1
-2 = 2
-3 = 3
-4 = 4
-5 = 5
-6 = 6
-7 = 7
-8 = 8
-9 = 9
-Asterisk = ASTERISK
-Numeral = HASH
diff --git a/dists/motomagx/mpkg/readme-motomagx-mpkg.txt b/dists/motomagx/mpkg/readme-motomagx-mpkg.txt
deleted file mode 100644
index 16646fab73..0000000000
--- a/dists/motomagx/mpkg/readme-motomagx-mpkg.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-1. Install:
-
-motomagx-platform:
-
-mpkg-package for devices: Motorola Z6, V8
-Requirements:
-z6,v8 libpack - http://www.mediafire.com/download.php?zwndhmyotom
-Unpack lib folder to /mmc/mmca1/.system
-
-2. Game Control:
-
-(mpkg) Z6,V8 (motomagx)
-
-menu - Slider key
-skip scene - call key
-virtual keyboard - camera key
-left mouse click - joy(fire) or volume '-'
-right mouse click - volume '+'
-quit - hangup key
-
-easy reconfig control: mySDL.cfg in scummvm directory
diff --git a/dists/motomagx/mpkg/scummvm.desktop b/dists/motomagx/mpkg/scummvm.desktop
deleted file mode 100644
index 9165967434..0000000000
--- a/dists/motomagx/mpkg/scummvm.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-BigIcon = scummvm_usr.png
-Directory = scummvm
-Exec = scummvm.sh
-AniIcon = scummvm_usr.png
-Name = ScummVM
diff --git a/dists/motomagx/mpkg/scummvm.sh b/dists/motomagx/mpkg/scummvm.sh
deleted file mode 100644
index 1f09e7eaae..0000000000
--- a/dists/motomagx/mpkg/scummvm.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-mypath=${0%/*}
-LIBDIR1=/ezxlocal/download/mystuff/games/lib
-LIBDIR2=/mmc/mmca1/games/lib
-#LIBDIR3=/mmc/mmca1/.Games/.lib
-LIBDIR3=/mmc/mmca1/.system/lib
-LIBDIR4=$mypath/lib
-#export SDL_QT_INVERT_ROTATION=1
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR1:$LIBDIR2:$LIBDIR3:$LIBDIR4
-export HOME=$mypath
-rm /mmc/mmca1/.system/mySDL.cfg
-cp $mypath/mySDL.cfg /mmc/mmca1/.system/mySDL.cfg
-cd $mypath
-exec $mypath/scummvm --gfx-mode=1x > $mypath/scummvm.log
diff --git a/dists/motomagx/mpkg/scummvm_usr.png b/dists/motomagx/mpkg/scummvm_usr.png
deleted file mode 100644
index 5f7e9e5960..0000000000
Binary files a/dists/motomagx/mpkg/scummvm_usr.png and /dev/null differ
diff --git a/dists/motomagx/pep/app/scummvm.sh b/dists/motomagx/pep/app/scummvm.sh
deleted file mode 100644
index 83d3fcf0ed..0000000000
--- a/dists/motomagx/pep/app/scummvm.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-mypath=${0%/*}
-LIBDIR1=/ezxlocal/download/mystuff/games/lib
-LIBDIR2=/mmc/mmca1/games/lib
-LIBDIR3=/mmc/mmca1/.Games/.lib
-#LIBDIR3=/mmc/mmca1/.system/lib
-LIBDIR4=$mypath/lib
-#export SDL_QT_INVERT_ROTATION=1
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR1:$LIBDIR2:$LIBDIR3:$LIBDIR4
-export HOME=$mypath
-cd $mypath
-exec $mypath/scummvm --gfx-mode=1x > $mypath/scummvm.log
diff --git a/dists/motomagx/pep/description.ini b/dists/motomagx/pep/description.ini
deleted file mode 100644
index 8daa626ea7..0000000000
--- a/dists/motomagx/pep/description.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[Actions]
-Silent=0
-InstallApp = 1
-AddAppToMenu = 1
-
-[InstallApp]
-Name = ScummVM
-Exec = scummvm.sh
-InstallPath = ../../mmc/mmca1/.Games/ScummVM/
-AppLockable = 1
-Author = ScummVM Team
-Version = trunk
-Daemon = 1
-BigIcon= scummvm_big_usr.png
-AniIcon= scummvm_big_usr.png
-Icon= scummvm_small_usr.png
-
-[AddAppToMenu]
-ParentFolder= root
diff --git a/dists/motomagx/pep/readme-motomagx-pep.txt b/dists/motomagx/pep/readme-motomagx-pep.txt
deleted file mode 100644
index 77b028c189..0000000000
--- a/dists/motomagx/pep/readme-motomagx-pep.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-1. Install:
-
-motomagx-platform:
-
-- pep-package for devices: Motorola Z6, V8
-Requirements:
-z6,v8 libpack - http://www.mediafire.com/download.php?jzz2dnzezgo
-Unpack libs to /mmc/mmca1/.Games/lib
-
-2. Game Control:
-
-(pep) Z6, V8 (motomagx)
-use internal scummvm keymapper
-after first start scummvm keys assingned randomly
-for remapping key, must edited file
-.Games/.scummvmrc
-after line [keymapper]
-
-KeyMap setting tested with Motorola Z6 (pep build) by Pantamorph
-
-[keymapper]
-keymap_global_SKCT=BACKSPACE
-keymap_global_MENU=SPACE
-keymap_global_REMP=ASTERISK
-keymap_global_VIRT=F9
-keymap_gui_CLOS=ESCAPE
-keymap_gui_CLIK=BACKSPACE
-keymap_global_PAUS=TAB
-keymap_global_SKLI=2
-keymap_gui_VIRT=F9
-keymap_gui_REMP=SPACE
diff --git a/dists/motomagx/pep/scummvm_big_usr.png b/dists/motomagx/pep/scummvm_big_usr.png
deleted file mode 100644
index d826b5f30e..0000000000
Binary files a/dists/motomagx/pep/scummvm_big_usr.png and /dev/null differ
diff --git a/dists/motomagx/pep/scummvm_small_usr.png b/dists/motomagx/pep/scummvm_small_usr.png
deleted file mode 100644
index 44daba4429..0000000000
Binary files a/dists/motomagx/pep/scummvm_small_usr.png and /dev/null differ
diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp
index bd0c41c4ff..9231471c3b 100644
--- a/engines/cge/snail.cpp
+++ b/engines/cge/snail.cpp
@@ -497,7 +497,7 @@ void CGEEngine::snGame(Sprite *spr, int num) {
// the test has been restricted to some specific OSes
// in order to avoid some obvious issues (like Android, iOS, NDS, N64...)
// Not perfect, but at least better than nothing.
-#if defined(WIN32) || defined(UNIX) || defined(MACOSX) || defined(MOTOEZX) || defined(LINUXMOTO_SDL)
+#if defined(WIN32) || defined(UNIX) || defined(MACOSX)
if (spr->_ref == 1 && _keyboard->_keyAlt) {
#else
if (spr->_ref == 1 && _gameCase2Cpt > 1) {
More information about the Scummvm-git-logs
mailing list