RISCOS: Add Drag and Drop support

This commit is contained in:
Cameron Cawley 2019-04-15 19:09:33 +01:00 committed by Thierry Crozat
parent 9c29b03c43
commit fb0b63ba66
6 changed files with 118 additions and 0 deletions

View file

@ -0,0 +1,67 @@
/* 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(RISCOS) && defined(SDL_BACKEND)
#include "backends/events/riscossdl/riscossdl-events.h"
#include "backends/platform/sdl/riscos/riscos-utils.h"
#include "common/events.h"
#include <swis.h>
RISCOSSdlEventSource::RISCOSSdlEventSource()
: SdlEventSource() {
int messages[2];
messages[0] = 3; // Message_DataLoad
messages[1] = 0;
_swix(Wimp_AddMessages, _IN(0), messages);
SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
}
bool RISCOSSdlEventSource::handleSysWMEvent(SDL_Event &ev, Common::Event &event) {
int eventCode = ev.syswm.msg->eventCode;
int pollBlock[64];
memcpy(pollBlock, ev.syswm.msg->pollBlock, 64 * sizeof(int));
if (eventCode == 17 || eventCode == 18) {
char *filename;
switch (pollBlock[4]) {
case 3: // Message_DataLoad
filename = (char *)(pollBlock) + 44;
event.type = Common::EVENT_DROP_FILE;
event.path = RISCOS_Utils::toUnix(Common::String(filename));
// Acknowledge that the event has been received
pollBlock[4] = 4; // Message_DataLoadAck
pollBlock[3] = pollBlock[2];
_swix(Wimp_SendMessage, _INR(0,2), 19, pollBlock, 0);
return true;
}
}
return false;
}
#endif

View file

@ -0,0 +1,38 @@
/* 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_RISCOS_H) && !defined(DISABLE_DEFAULT_EVENTMANAGER)
#define BACKEND_EVENTS_RISCOS_H
#include "backends/events/sdl/sdl-events.h"
/**
* SDL Events manager for RISC OS.
*/
class RISCOSSdlEventSource : public SdlEventSource {
public:
RISCOSSdlEventSource();
protected:
bool handleSysWMEvent(SDL_Event &ev, Common::Event &event) override;
};
#endif /* BACKEND_EVENTS_RISCOS_H */

View file

@ -567,6 +567,8 @@ bool SdlEventSource::dispatchSDLEvent(SDL_Event &ev, Common::Event &event) {
return handleMouseButtonDown(ev, event); return handleMouseButtonDown(ev, event);
case SDL_MOUSEBUTTONUP: case SDL_MOUSEBUTTONUP:
return handleMouseButtonUp(ev, event); return handleMouseButtonUp(ev, event);
case SDL_SYSWMEVENT:
return handleSysWMEvent(ev, event);
#if SDL_VERSION_ATLEAST(2, 0, 0) #if SDL_VERSION_ATLEAST(2, 0, 0)
case SDL_MOUSEWHEEL: { case SDL_MOUSEWHEEL: {
@ -860,6 +862,10 @@ bool SdlEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) {
return processMouseEvent(event, ev.button.x, ev.button.y); return processMouseEvent(event, ev.button.x, ev.button.y);
} }
bool SdlEventSource::handleSysWMEvent(SDL_Event &ev, Common::Event &event) {
return false;
}
void SdlEventSource::openJoystick(int joystickIndex) { void SdlEventSource::openJoystick(int joystickIndex) {
if (SDL_NumJoysticks() > joystickIndex) { if (SDL_NumJoysticks() > joystickIndex) {
#if SDL_VERSION_ATLEAST(2, 0, 0) #if SDL_VERSION_ATLEAST(2, 0, 0)

View file

@ -137,6 +137,7 @@ protected:
virtual bool handleMouseMotion(SDL_Event &ev, Common::Event &event); virtual bool handleMouseMotion(SDL_Event &ev, Common::Event &event);
virtual bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event); virtual bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event);
virtual bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event); virtual bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event);
virtual bool handleSysWMEvent(SDL_Event &ev, Common::Event &event);
virtual bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event); virtual bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event);
virtual bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event); virtual bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event);
virtual bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event); virtual bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event);

View file

@ -219,6 +219,7 @@ endif
ifdef RISCOS ifdef RISCOS
MODULE_OBJS += \ MODULE_OBJS += \
events/riscossdl/riscossdl-events.o \
fs/riscos/riscos-fs.o \ fs/riscos/riscos-fs.o \
fs/riscos/riscos-fs-factory.o \ fs/riscos/riscos-fs-factory.o \
platform/sdl/riscos/riscos-utils.o platform/sdl/riscos/riscos-utils.o

View file

@ -26,6 +26,7 @@
#include "backends/platform/sdl/riscos/riscos.h" #include "backends/platform/sdl/riscos/riscos.h"
#include "backends/saves/default/default-saves.h" #include "backends/saves/default/default-saves.h"
#include "backends/events/riscossdl/riscossdl-events.h"
#include "backends/fs/riscos/riscos-fs-factory.h" #include "backends/fs/riscos/riscos-fs-factory.h"
#include "backends/fs/riscos/riscos-fs.h" #include "backends/fs/riscos/riscos-fs.h"
@ -51,6 +52,10 @@ void OSystem_RISCOS::init() {
void OSystem_RISCOS::initBackend() { void OSystem_RISCOS::initBackend() {
ConfMan.registerDefault("enable_reporter", false); ConfMan.registerDefault("enable_reporter", false);
// Create the events manager
if (_eventSource == 0)
_eventSource = new RISCOSSdlEventSource();
// Create the savefile manager // Create the savefile manager
if (_savefileManager == 0) { if (_savefileManager == 0) {
Common::String savePath = "/<Choices$Write>/ScummVM/Saves"; Common::String savePath = "/<Choices$Write>/ScummVM/Saves";