diff options
author | Lars Persson | 2005-12-03 20:13:27 +0000 |
---|---|---|
committer | Lars Persson | 2005-12-03 20:13:27 +0000 |
commit | 02f5921cbeca2352df9fa84628d3e835df15cc2a (patch) | |
tree | 7e604c7c0fb23779c62aeb0af4f666fefec73553 | |
parent | f557976e8869cc7c0395776efeefa1806b1c643d (diff) | |
download | scummvm-rg350-02f5921cbeca2352df9fa84628d3e835df15cc2a.tar.gz scummvm-rg350-02f5921cbeca2352df9fa84628d3e835df15cc2a.tar.bz2 scummvm-rg350-02f5921cbeca2352df9fa84628d3e835df15cc2a.zip |
Remove old source files
svn-id: r19738
-rw-r--r-- | backends/epoc/ScummApp.cpp | 62 | ||||
-rw-r--r-- | backends/epoc/ScummApp.h | 44 | ||||
-rw-r--r-- | backends/epoc/ScummVm.hrh | 29 | ||||
-rw-r--r-- | backends/epoc/SymbianActions.cpp | 185 | ||||
-rw-r--r-- | backends/epoc/SymbianActions.h | 78 | ||||
-rw-r--r-- | backends/epoc/SymbianOS.cpp | 363 | ||||
-rw-r--r-- | backends/epoc/SymbianOS.h | 99 | ||||
-rw-r--r-- | backends/epoc/portdefs.h | 79 |
8 files changed, 0 insertions, 939 deletions
diff --git a/backends/epoc/ScummApp.cpp b/backends/epoc/ScummApp.cpp deleted file mode 100644 index ce40c26ae6..0000000000 --- a/backends/epoc/ScummApp.cpp +++ /dev/null @@ -1,62 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL - * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System - * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005 The ScummVM project - * - * 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. - * - * $Header$ - */ - -#include "backends/epoc/ScummApp.h" - -#include "backends/epoc/ScummVM.hrh" - -#ifdef __WINS__ -extern "C" int _chkstk(int /*a*/) { - return 1; -} -#endif - -#ifdef EPOC_AS_APP -// this function is called by Symbian to deliver the new CApaApplication object -EXPORT_C CApaApplication *NewApplication() { - // Return pointer to newly created CQMApp - return (new CScummApp); -} -#endif - -GLDEF_C TInt E32Dll(TDllReason) { - return KErrNone; -} - -CScummApp::CScummApp() { -} - -CScummApp::~CScummApp() { -} - -/** - * Responsible for returning the unique UID of this application - * @return unique UID for this application in a TUid - **/ -TUid CScummApp::AppDllUid() const { - return TUid::Uid(ScummUid); -} - -///////////////////////////////////////////////////////////////////////////////////////////////// - - diff --git a/backends/epoc/ScummApp.h b/backends/epoc/ScummApp.h deleted file mode 100644 index 385f0ada1d..0000000000 --- a/backends/epoc/ScummApp.h +++ /dev/null @@ -1,44 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL - * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System - * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005 The ScummVM project - * - * 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. - * - * $Header$ - */ - -#ifndef ScummAPPH -#define ScummAPPH - -#include <eikapp.h> -#include <e32base.h> -#include <sdlapp.h> -#ifdef EPOC_AS_APP -#include "ECompXL.h" -#endif - -class CScummApp : public CSDLApp { -public: - CScummApp(); - ~CScummApp(); - - TUid AppDllUid() const; -#ifdef EPOC_AS_APP - TECompXL iECompXL; -#endif -}; -#endif diff --git a/backends/epoc/ScummVm.hrh b/backends/epoc/ScummVm.hrh deleted file mode 100644 index f62ef1b789..0000000000 --- a/backends/epoc/ScummVm.hrh +++ /dev/null @@ -1,29 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL - * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System - * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005 The ScummVM project - * - * 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. - * - * $Header$ - */ - -#ifndef ScummHRH -#define ScummHRH - -#define ScummUid 0x101f9b57 - -#endif diff --git a/backends/epoc/SymbianActions.cpp b/backends/epoc/SymbianActions.cpp deleted file mode 100644 index ee1a6984ee..0000000000 --- a/backends/epoc/SymbianActions.cpp +++ /dev/null @@ -1,185 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2005 The ScummVM project - * - * 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. - * - * $Header$ - * - */ - -#include "common/stdafx.h" -#include "backends/epoc/SymbianActions.h" - -#include "gui/message.h" -#include "scumm/scumm.h" -#include "common/config-manager.h" - -// this next one needs to be replaced with Symbian specific include(s) -//#include "EventsBuffer.h" for //EventsBuffer::simulateKey() -#include <sdl.h> -// and use the correct Symbian calls for: //_mainSystem->fcns() - -namespace GUI { - -// SumthinWicked says: we either split our Actions like WinCE did with Pocket/Smartphone -// or we put them in this file separated by #ifdefs, this one is up to you, AnotherGuest :) - -const Common::String actionNames[] = { - "Up", - "Down", - "Left", - "Right", - "Left Click", - "Right Click", - "Save", - "Skip", - "Zone", - "FT Cheat", - "Swap character", - "Skip text", - "Pause", - "Quit" -}; - -#ifdef UIQ -static const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0x11a, 0x11b, SDLK_MENU, SDLK_PAGEDOWN, 0, 0,SDLK_PAGEUP,0,0}; -#elif defined (S60) -const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0, 0, '*', '#', '0',0,0,0,0,0}; -#else -const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0x11a, 0x11b, SDLK_MENU, SDLK_ESCAPE, 0, 0,0,0,0,0}; -#endif -// creator function according to Factory Pattern -void SymbianActions::init(GameDetector &detector) { - _instance = new SymbianActions(detector); -} - - -Common::String SymbianActions::actionName(ActionType action) { - return actionNames[action]; -} - -int SymbianActions::size() { - return ACTION_LAST; -} - -Common::String SymbianActions::domain() { - return "symbian"; -} - -int SymbianActions::version() { - return ACTION_VERSION; -} - -SymbianActions::SymbianActions(GameDetector &detector) : - Actions(detector) { - int i; - - for (i = 0; i < ACTION_LAST; i++) { - _action_mapping[i] = ACTIONS_DEFAULT[i]; - _action_enabled[i] = false; - } - -} - -void SymbianActions::initInstanceMain(OSystem *mainSystem) { - Actions::initInstanceMain(mainSystem); - - // Mouse Up - _action_enabled[ACTION_UP] = true; - - // Mouse Down - _action_enabled[ACTION_DOWN] = true; - - // Mouse Left - _action_enabled[ACTION_LEFT] = true; - - // Mouse Right - _action_enabled[ACTION_RIGHT] = true; - - // Left Click - _action_enabled[ACTION_LEFTCLICK] = true; - - // Right Click - _action_enabled[ACTION_RIGHTCLICK] = true; - - // Skip - _action_enabled[ACTION_SKIP] = true; - _key_action[ACTION_SKIP].setAscii(SDLK_ESCAPE); -} - -void SymbianActions::initInstanceGame() { - bool is_simon = (strncmp(_detector->_targetName.c_str(), "simon", 5) == 0); - bool is_sky = (_detector->_targetName == "sky"); - bool is_queen = (_detector->_targetName == "queen"); - bool is_gob = (strncmp(_detector->_targetName.c_str(), "gob", 3) == 0); - - Actions::initInstanceGame(); - - // See if a right click mapping could be needed - if (is_sky || _detector->_targetName == "samnmax" || is_gob) - _right_click_needed = true; - - // Initialize keys for different actions - // Save - if (is_simon || is_gob) - _action_enabled[ACTION_SAVE] = false; - else if (is_queen) { - _action_enabled[ACTION_SAVE] = true; - _key_action[ACTION_SAVE].setAscii(SDLK_F1); // F1 key for FOTAQ or F5??!? - } else if (is_sky) { - _action_enabled[ACTION_SAVE] = true; - _key_action[ACTION_SAVE].setAscii(63); - } else { - _action_enabled[ACTION_SAVE] = true; - _key_action[ACTION_SAVE].setAscii(SDLK_F5); // F5 key - } - - // Swap character - _action_enabled[ACTION_SWAPCHAR] = true; - _key_action[ACTION_SWAPCHAR].setAscii('b'); // b - - // Zone - _action_enabled[ACTION_ZONE] = true; - - // FT Cheat - _action_enabled[ACTION_FT_CHEAT] = true; - _key_action[ACTION_FT_CHEAT].setAscii(86); // shift-V - - // Skip text - _action_enabled[ACTION_SKIP_TEXT] = true; - if (is_queen) { - _key_action[ACTION_SKIP_TEXT].setAscii(SDLK_SPACE); - } else { - _key_action[ACTION_SKIP_TEXT].setAscii(SDLK_PERIOD); - } - - // Pause - _key_action[ACTION_PAUSE].setAscii(' '); - _action_enabled[ACTION_PAUSE] = true; - - // Quit - _action_enabled[ACTION_QUIT] = true; -} - - -SymbianActions::~SymbianActions() { -} - -bool SymbianActions::perform(ActionType action, bool pushed) { - - return false; -} - -} // namespace GUI diff --git a/backends/epoc/SymbianActions.h b/backends/epoc/SymbianActions.h deleted file mode 100644 index 74a307c1d7..0000000000 --- a/backends/epoc/SymbianActions.h +++ /dev/null @@ -1,78 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001-2005 The ScummVM project - * - * 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. - * - * $Header$ - * - */ - -#ifndef SYMBIANACTIONS_H -#define SYMBIANACTIONS_H - -#include "common/stdafx.h" -#include "common/scummsys.h" -#include "common/system.h" -#include "base/gameDetector.h" -#include "gui/Key.h" -#include "gui/Actions.h" -//#include "sdl.h" - -namespace GUI { - -#define ACTION_VERSION 6 - -enum actionType { - ACTION_UP = 0, - ACTION_DOWN, - ACTION_LEFT, - ACTION_RIGHT, - ACTION_LEFTCLICK, - ACTION_RIGHTCLICK, - ACTION_SAVE, - ACTION_SKIP, - ACTION_ZONE, - ACTION_FT_CHEAT, - ACTION_SWAPCHAR, - ACTION_SKIP_TEXT, - ACTION_PAUSE, - ACTION_QUIT, - ACTION_LAST -}; - -class SymbianActions : public Actions { -public: - // Actions - bool perform(ActionType action, bool pushed = true); - Common::String actionName(ActionType action); - int size(); - static void init(GameDetector &detector); - void initInstanceMain(OSystem *mainSystem); - void initInstanceGame(); - - // Action domain - Common::String domain(); - int version(); - - ~SymbianActions(); - -private: - SymbianActions(GameDetector &detector); - bool _right_click_needed; -}; - -} // namespace GUI - -#endif diff --git a/backends/epoc/SymbianOS.cpp b/backends/epoc/SymbianOS.cpp deleted file mode 100644 index 06c148a65d..0000000000 --- a/backends/epoc/SymbianOS.cpp +++ /dev/null @@ -1,363 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL - * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System - * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005 The ScummVM project - * - * 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. - * - * $Header$ - */ - -#include "backends/epoc/SymbianOS.h" -#include "backends/epoc/SymbianActions.h" -#include "gui/Actions.h" -#include "gui/Key.h" -#include "gui/message.h" - -static const OSystem::GraphicsMode s_supportedGraphicsModes[] = { - {"1x", "Fullscreen", GFX_NORMAL}, - {0, 0, 0} -}; - -OSystem *OSystem_SymbianOS_create() { - return new OSystem_SDL_Symbian(); -} - - -#include "common/config-manager.h" - -extern Common::ConfigManager *g_config; - -OSystem_SDL_Symbian::zoneDesc OSystem_SDL_Symbian::_zones[TOTAL_ZONES] = { - { 0, 0, 320, 145 }, - { 0, 145, 150, 55 }, - { 150, 145, 170, 55 } -}; - -OSystem_SDL_Symbian::OSystem_SDL_Symbian() : _channels(0), _stereo_mix_buffer(0) { - ConfMan.set("FM_high_quality", false); - ConfMan.set("FM_medium_quality", true); - ConfMan.set("joystick_num" ,0); // Symbian OS should have joystick_num set to 0 in the ini file , but uiq devices might refuse opening the joystick - ConfMan.flushToDisk(); - - // Initialize global key mapping for Smartphones - GUI::Actions *actions = GUI::Actions::Instance(); - actions->initInstanceMain(this); - actions->loadMapping(); - - initZones(); -} - -OSystem_SDL_Symbian::~OSystem_SDL_Symbian() { - delete []_stereo_mix_buffer; -} - -int OSystem_SDL_Symbian::getDefaultGraphicsMode() const { - return GFX_NORMAL; -} - -const OSystem::GraphicsMode *OSystem_SDL_Symbian::getSupportedGraphicsModes() const { - return s_supportedGraphicsModes; -} - -// make sure we always go to normal, even if the string might be set wrong! -bool OSystem_SDL_Symbian::setGraphicsMode(const char *name) { - // let parent OSystem_SDL handle it - return OSystem_SDL::setGraphicsMode(getDefaultGraphicsMode()); -} - -/* - * SumthinWicked says: the stuff below is copied from common/scaler.cpp, - * so we can skip compiling the scalers. ESDL still needs 1x and the scaler - * architecture because we inherit from OSystem_SDL. - */ -int gBitFormat = 565; -void InitScalers(uint32 BitFormat) {} // called by OSystem_SDL functions, not relevant for ESDL - -/** - * Trivial 'scaler' - in fact it doesn't do any scaling but just copies the - * source to the destination. - */ -void Normal1x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, - int width, int height) { - while (height--) { - memcpy(dstPtr, srcPtr, 2 * width); - srcPtr += srcPitch; - dstPtr += dstPitch; - } -} - -bool OSystem_SDL_Symbian::setSoundCallback(SoundProc proc, void *param) { - - // First save the proc and param - _sound_proc_param = param; - _sound_proc = proc; - SDL_AudioSpec desired; - SDL_AudioSpec obtained; - - memset(&desired, 0, sizeof(desired)); - - _samplesPerSec = 0; - - if (ConfMan.hasKey("output_rate")) - _samplesPerSec = ConfMan.getInt("output_rate"); - - if (_samplesPerSec <= 0) - _samplesPerSec = SAMPLES_PER_SEC; - - // Originally, we always used 2048 samples. This loop will produce the - // same result at 22050 Hz, and should hopefully produce something - // sensible for other frequencies. Note that it must be a power of two. - - uint32 samples = 0x8000; - - for (;;) { - if ((1000 * samples) / _samplesPerSec < 100) - break; - samples >>= 1; - } - - desired.freq = _samplesPerSec; - desired.format = AUDIO_S16SYS; - desired.channels = 2; - desired.samples = (uint16)samples; -#ifdef S60 - desired.callback = symbianMixCallback; - desired.userdata = this; -#else - desired.callback = proc; - desired.userdata = param; -#endif - if (SDL_OpenAudio(&desired, &obtained) != 0) { - warning("Could not open audio device: %s", SDL_GetError()); - return false; - } - // Note: This should be the obtained output rate, but it seems that at - // least on some platforms SDL will lie and claim it did get the rate - // even if it didn't. Probably only happens for "weird" rates, though. - _samplesPerSec = obtained.freq; - _channels = obtained.channels; - - // Need to create mixbuffer for stereo mix to downmix - if(_channels != 2) { - _stereo_mix_buffer = new byte [obtained.size * 2]; // *2 for stereo values - } - - SDL_PauseAudio(0); - return true; -} - -/** - * The mixer callback function, passed on to OSystem::setSoundCallback(). - * This simply calls the mix() method. - */ -void OSystem_SDL_Symbian::symbianMixCallback(void *s, byte *samples, int len) { - static_cast <OSystem_SDL_Symbian*>(s)->symbianMix(samples,len); -} - - -/** - * Actual mixing implementation - */ -void OSystem_SDL_Symbian::symbianMix(byte *samples, int len) { - // If not stereo then we need to downmix - if (_channels != 2) { - _sound_proc(_sound_proc_param, _stereo_mix_buffer, len * 2); - int16 *bitmixDst = (int16 *)samples; - int16 *bitmixSrc = (int16 *)_stereo_mix_buffer; - - for (int loop = len / 2; loop >= 0; loop --) { - *bitmixDst = (*bitmixSrc + *(bitmixSrc + 1)) >> 1; - bitmixDst++; - bitmixSrc += 2; - } - } else - _sound_proc(_sound_proc_param, samples, len); -} - -/** - * This is an implementation by the remapKey function - * @param SDL_Event to remap - * @param ScumVM event to modify if special result is requested - * @return true if Event has a valid return status - */ -bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev, Event &event) { - if (GUI::Actions::Instance()->mappingActive() || ev.key.keysym.sym <= SDLK_UNKNOWN) - return false; - - for (TInt loop = 0; loop < GUI::ACTION_LAST; loop++) { - if (GUI::Actions::Instance()->getMapping(loop) == ev.key.keysym.sym && - GUI::Actions::Instance()->isEnabled(loop)) { - // Create proper event instead - switch(loop) { - case GUI::ACTION_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 = EVENT_MOUSEMOVE; - fillMouseEvent(event, _km.x, _km.y); - - return true; - - case GUI::ACTION_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 = EVENT_MOUSEMOVE; - fillMouseEvent(event, _km.x, _km.y); - - return true; - - case GUI::ACTION_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 = EVENT_MOUSEMOVE; - fillMouseEvent(event, _km.x, _km.y); - - return true; - - case GUI::ACTION_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 = EVENT_MOUSEMOVE; - fillMouseEvent(event, _km.x, _km.y); - - return true; - - case GUI::ACTION_LEFTCLICK: - event.type = (ev.type == SDL_KEYDOWN ? EVENT_LBUTTONDOWN : EVENT_LBUTTONUP); - fillMouseEvent(event, _km.x, _km.y); - - return true; - - case GUI::ACTION_RIGHTCLICK: - event.type = (ev.type == SDL_KEYDOWN ? EVENT_RBUTTONDOWN : EVENT_RBUTTONUP); - fillMouseEvent(event, _km.x, _km.y); - - return true; - - case GUI::ACTION_ZONE: - if(ev.type == SDL_KEYDOWN) { - int i; - - for (i=0; i < TOTAL_ZONES; i++) - if (_km.x >= _zones[i].x && _km.y >= _zones[i].y && - _km.x <= _zones[i].x + _zones[i].width && _km.y <= _zones[i].y + _zones[i].height - ) { - _mouseXZone[i] = _km.x; - _mouseYZone[i] = _km.y; - break; - } - _currentZone++; - if (_currentZone >= TOTAL_ZONES) - _currentZone = 0; - event.type = EVENT_MOUSEMOVE; - fillMouseEvent(event, _mouseXZone[_currentZone], _mouseYZone[_currentZone]); - SDL_WarpMouse(event.mouse.x, event.mouse.y); - } - - return true; - - case GUI::ACTION_SAVE: - case GUI::ACTION_SKIP: - case GUI::ACTION_FT_CHEAT: - case GUI::ACTION_SKIP_TEXT: - case GUI::ACTION_PAUSE: - { - GUI::Key &key = GUI::Actions::Instance()->getKeyAction(loop); - ev.key.keysym.sym = (SDLKey)key.ascii(); - ev.key.keysym.scancode= key.keycode(); - ev.key.keysym.mod = (SDLMod)key.flags(); - - return false; - } - - case GUI::ACTION_QUIT: - { - GUI::MessageDialog alert("Do you want to quit ?", "Yes", "No"); - if (alert.runModal() == GUI::kMessageOK) - quit(); - - return true; - } - } - } - } - - return false; -} - -void OSystem_SDL_Symbian::setWindowCaption(const char *caption) { - OSystem_SDL::setWindowCaption(caption); - check_mappings(); -} - -void OSystem_SDL_Symbian::check_mappings() { - if (!GUI::Actions::Instance()->gameDetector()._targetName.size() || GUI::Actions::Instance()->initialized()) - return; - - GUI::Actions::Instance()->initInstanceGame(); -} - -void OSystem_SDL_Symbian::initZones() { - int i; - - _currentZone = 0; - - for (i = 0; i < TOTAL_ZONES; i++) { - _mouseXZone[i] = (_zones[i].x + (_zones[i].width / 2)); - _mouseYZone[i] = (_zones[i].y + (_zones[i].height / 2)); - } -} - -/* -// probably don't need this anymore: will remove later -#define EMPTY_SCALER_IMPLEMENTATION(x) \ - void x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, \ - uint32 dstPitch, int width, int height) {} - -//EMPTY_SCALER_IMPLEMENTATION(_2xSaI); -//EMPTY_SCALER_IMPLEMENTATION(Super2xSaI); -//EMPTY_SCALER_IMPLEMENTATION(SuperEagle); -EMPTY_SCALER_IMPLEMENTATION(AdvMame2x); -EMPTY_SCALER_IMPLEMENTATION(AdvMame3x); -//EMPTY_SCALER_IMPLEMENTATION(Normal1x); -//EMPTY_SCALER_IMPLEMENTATION(Normal2x); -//EMPTY_SCALER_IMPLEMENTATION(Normal3x); -EMPTY_SCALER_IMPLEMENTATION(Normal1o5x); -//EMPTY_SCALER_IMPLEMENTATION(TV2x); -//EMPTY_SCALER_IMPLEMENTATION(DotMatrix); -//EMPTY_SCALER_IMPLEMENTATION(HQ2x); -//EMPTY_SCALER_IMPLEMENTATION(HQ3x); -*/ diff --git a/backends/epoc/SymbianOS.h b/backends/epoc/SymbianOS.h deleted file mode 100644 index b0fd426292..0000000000 --- a/backends/epoc/SymbianOS.h +++ /dev/null @@ -1,99 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL - * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System - * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005 The ScummVM project - * - * 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. - * - * $Header$ - */ - -#ifndef SDLSYMBIANH -#define SDLSYMBIANH - -#include "backends/sdl/sdl-common.h" - -#define TOTAL_ZONES 3 - -class OSystem_SDL_Symbian : public OSystem_SDL { -public: - OSystem_SDL_Symbian(); - ~OSystem_SDL_Symbian(); - - int getDefaultGraphicsMode() const; - const OSystem::GraphicsMode *getSupportedGraphicsModes() const; - bool setGraphicsMode(const char *name); - - // Set function that generates samples - // - // This function is overridden by the symbian port in order to provide MONO audio - // downmix is done by supplying our own audiocallback - // - virtual bool setSoundCallback(SoundProc proc, void *param); // overloaded by CE backend - -protected: - // - // The mixer callback function, passed on to OSystem::setSoundCallback(). - // This simply calls the mix() method. - // and then does downmixing for symbian if needed - // - static void symbianMixCallback(void *s, byte *samples, int len); - - // - // Actual mixing implementation - // - void symbianMix(byte *samples, int len); - - // - // This is an implementation by the remapKey function - // @param SDL_Event to remap - // @param ScumVM event to modify if special result is requested - // @return true if Event has a valid return status - // - bool remapKey(SDL_Event &ev, Event &event); - - void setWindowCaption(const char *caption); - - // - // Used to intialized special game mappings - // - void check_mappings(); - - void initZones(); - - // Audio - int _channels; - - SoundProc _sound_proc; - void *_sound_proc_param; - byte *_stereo_mix_buffer; - - // Used to handle joystick navi zones - int _mouseXZone[TOTAL_ZONES]; - int _mouseYZone[TOTAL_ZONES]; - int _currentZone; - - typedef struct zoneDesc { - int x; - int y; - int width; - int height; - } zoneDesc; - - static zoneDesc _zones[TOTAL_ZONES]; -}; - -#endif diff --git a/backends/epoc/portdefs.h b/backends/epoc/portdefs.h deleted file mode 100644 index 846a916508..0000000000 --- a/backends/epoc/portdefs.h +++ /dev/null @@ -1,79 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL - * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System - * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005 The ScummVM project - * - * 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. - * - * $Header$ - */ - -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <ctype.h> -#include <stdlib.h> -#include <stdio.h> -#include <unistd.h> -#include <e32def.h> - -#include <e32std.h> -#include <math.h> - - -// the place in Symbian FS where scummvm.ini & std***.txt are saved -#define SYMBIAN32_DOC_DIR "C:\\documents\\ScummVM\\" // includes final \\! -#define DISABLE_SCALERS // we only need 1x - -// hack in some tricks to work around not having these fcns for Symbian -// and we _really_ don't wanna link with any other windows LIBC library! -#ifdef __GCC32__ - -#define snprintf(buf,len,args...) sprintf(buf, args) -#define vsnprintf snprintf - -#else // WINS - -// let's just blatantly ignore this for now and just get it to work :P but does n't work from the debug function -int inline scumm_snprintf (char *str, unsigned long /*n*/, char const *fmt, ...) { - va_list args; - va_start(args, fmt); - vsprintf(str, fmt, args); - va_end(args); - - return strlen(str); -} - -#define snprintf scumm_snprintf -#define vsnprintf scumm_snprintf - -#endif - -// somehow nobody has this function... -#define hypot(a, b) sqrt((a) * (a) + (b) * (b)) - -// Symbian bsearch implementation is flawed -void inline *scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)) { - size_t i; - - for (i = 0; i < nmemb; i++) - if (compar(key, (void*)((size_t)base + size * i)) == 0) - return (void*)((size_t)base + size * i); - - return NULL; -} -#define bsearch scumm_bsearch - |