mirror of https://github.com/stella-emu/stella.git
Made joystick button 0 act as left mouse button when in
various GUI modes. This means mouse emulation is fully functional. One can simulate mouse movement with the joystick directions, and use button 0 to 'click' on an item. Added NTSC/PAL toggle, palette toggle, 'rom reload' and 'exit to launcher' to the CommandDialog. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@752 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena
parent
9c90b0d093
commit
01adac3679
|
|
@ -13,7 +13,7 @@
|
|||
// See the file "license" for information on usage and redistribution of
|
||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//
|
||||
// $Id: EventHandler.cxx,v 1.91 2005-08-30 17:51:26 stephena Exp $
|
||||
// $Id: EventHandler.cxx,v 1.92 2005-08-30 23:32:42 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
#include <algorithm>
|
||||
|
|
@ -541,29 +541,30 @@ void EventHandler::poll(uInt32 time)
|
|||
|
||||
code = event.jbutton.button;
|
||||
state = event.jbutton.state == SDL_PRESSED ? 1 : 0;
|
||||
//#ifdef PSP
|
||||
handleWarpMouseButton(code,state);
|
||||
//#endif
|
||||
|
||||
handleJoyEvent(stick, code, state);
|
||||
break;
|
||||
|
||||
case SDL_JOYAXISMOTION:
|
||||
axis = event.jaxis.axis;
|
||||
value = event.jaxis.value;
|
||||
//#ifdef PSP
|
||||
// if(state != S_EMULATE)
|
||||
|
||||
// Handle emulation of mouse using the joystick
|
||||
if(myState == S_EMULATE)
|
||||
{
|
||||
if(axis == 0) // x-axis
|
||||
{
|
||||
handleJoyEvent(stick, kJAxisLeft, (value < -16384) ? 1 : 0);
|
||||
handleJoyEvent(stick, kJAxisRight, (value > 16384) ? 1 : 0);
|
||||
}
|
||||
else if(axis == 1) // y-axis
|
||||
{
|
||||
handleJoyEvent(stick, kJAxisUp, (value < -16384) ? 1 : 0);
|
||||
handleJoyEvent(stick, kJAxisDown, (value > 16384) ? 1 : 0);
|
||||
}
|
||||
}
|
||||
else
|
||||
handleMouseWarp(stick, axis, value);
|
||||
//#endif
|
||||
if(axis == 0) // x-axis
|
||||
{
|
||||
handleJoyEvent(stick, kJAxisLeft, (value < -16384) ? 1 : 0);
|
||||
handleJoyEvent(stick, kJAxisRight, (value > 16384) ? 1 : 0);
|
||||
}
|
||||
else if(axis == 1) // y-axis
|
||||
{
|
||||
handleJoyEvent(stick, kJAxisUp, (value < -16384) ? 1 : 0);
|
||||
handleJoyEvent(stick, kJAxisDown, (value > 16384) ? 1 : 0);
|
||||
}
|
||||
break;
|
||||
}
|
||||
break; // Regular joystick
|
||||
|
|
@ -938,102 +939,6 @@ void EventHandler::handleJoyMouse(uInt32 time)
|
|||
}
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void EventHandler::handleWarpMouseButton(uInt8 event_button, uInt8 state)
|
||||
{
|
||||
// FIXME - this will disappear, and be integrated directly into handleJoyEvent()
|
||||
#if 0
|
||||
// Determine which mode we're in, then send the event to the appropriate place
|
||||
switch(myState)
|
||||
{
|
||||
case S_EMULATE:
|
||||
{
|
||||
/* map joypad button to sdl key events*/
|
||||
if (event_button == 11){ /*start*/
|
||||
handleKeyEvent(0,SDLK_ESCAPE,(SDLMod)0,state);
|
||||
} else if (event_button == 10){ /*select*/
|
||||
handleKeyEvent(0,SDLK_TAB,(SDLMod)0,state);
|
||||
} else if (event_button == 6){
|
||||
handleKeyEvent(0,SDLK_UP,(SDLMod)0,state);
|
||||
} else if (event_button == 8){
|
||||
handleKeyEvent(0,SDLK_DOWN,(SDLMod)0,state);
|
||||
} else if (event_button == 9){
|
||||
handleKeyEvent(0,SDLK_RIGHT,(SDLMod)0,state);
|
||||
} else if (event_button == 7){
|
||||
handleKeyEvent(0,SDLK_LEFT,(SDLMod)0,state);
|
||||
} else if (event_button == 0){ /*triangle*/
|
||||
handleKeyEvent(0,SDLK_PAUSE,(SDLMod)0,state);
|
||||
} else if (event_button == 2){ /*cross*/
|
||||
handleKeyEvent(0,SDLK_SPACE,(SDLMod)0,state);
|
||||
} else if (event_button == 1){ /*circle*/
|
||||
handleKeyEvent(0,SDLK_F12,(SDLMod)0,state);
|
||||
} else if (event_button == 3 && state){ /*square*/
|
||||
myOSystem->console().toggleFormat();
|
||||
} else if (event_button == 4){ /*left trigger*/
|
||||
handleKeyEvent(0,SDLK_F11,(SDLMod)0,state);
|
||||
} else if (event_button == 5){ /*right trigger*/
|
||||
handleKeyEvent(0,SDLK_F9,(SDLMod)0,state);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case S_MENU:
|
||||
case S_LAUNCHER:
|
||||
case S_DEBUGGER:
|
||||
{
|
||||
/* map up and down buttions to sdl events */
|
||||
if (event_button == 8){
|
||||
handleKeyEvent(0,SDLK_UP,(SDLMod)0,state);
|
||||
break;
|
||||
} else if (event_button == 6){
|
||||
handleKeyEvent(0,SDLK_DOWN,(SDLMod)0,state);
|
||||
break;
|
||||
}
|
||||
Int32 x = myMouseX;
|
||||
Int32 y = myMouseY;
|
||||
myOSystem->frameBuffer().translateCoords(&x, &y);
|
||||
MouseButton button;
|
||||
|
||||
/* enable 'select' button */
|
||||
if (event_button == 10 && state){
|
||||
handleKeyEvent(0,SDLK_TAB,(SDLMod)0,state);
|
||||
break;
|
||||
}
|
||||
/* map the buttons to sdl mouse buttton events*/
|
||||
if(state)
|
||||
{
|
||||
if(event_button == 2)
|
||||
button = EVENT_LBUTTONDOWN;
|
||||
else if(event_button == 1)
|
||||
button = EVENT_RBUTTONDOWN;
|
||||
else
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(event_button == 2)
|
||||
button = EVENT_LBUTTONUP;
|
||||
else if(event_button == 1)
|
||||
button = EVENT_RBUTTONUP;
|
||||
else
|
||||
break;
|
||||
}
|
||||
|
||||
if(myState == S_MENU)
|
||||
myOSystem->menu().handleMouseButtonEvent(button, x, y, state);
|
||||
else if(myState == S_LAUNCHER)
|
||||
myOSystem->launcher().handleMouseButtonEvent(button, x, y, state);
|
||||
else
|
||||
myOSystem->debugger().handleMouseButtonEvent(button, x, y, state);
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void EventHandler::handleMouseWarp(uInt8 stick, uInt8 axis, Int16 value)
|
||||
{
|
||||
|
|
@ -1077,31 +982,67 @@ void EventHandler::handleMouseWarp(uInt8 stick, uInt8 axis, Int16 value)
|
|||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void EventHandler::handleJoyEvent(uInt8 stick, uInt32 code, uInt8 state)
|
||||
{
|
||||
// Joystick button zero acts as left mouse button and cannot be remapped
|
||||
if(myState != S_EMULATE && code == 0)
|
||||
{
|
||||
// This button acts as mouse button zero, and can never be remapped
|
||||
SDL_MouseButtonEvent mouseEvent;
|
||||
mouseEvent.type = state ? SDL_MOUSEBUTTONDOWN : SDL_MOUSEBUTTONUP;
|
||||
mouseEvent.button = SDL_BUTTON_LEFT;
|
||||
mouseEvent.state = state ? SDL_PRESSED : SDL_RELEASED;
|
||||
mouseEvent.x = myJoyMouse.x;
|
||||
mouseEvent.y = myJoyMouse.y;
|
||||
|
||||
handleMouseButtonEvent((SDL_Event&)mouseEvent, state);
|
||||
return;
|
||||
}
|
||||
|
||||
// Determine which mode we're in, then send the event to the appropriate place
|
||||
// FIXME - this is almost exactly the same as handleKeyEvent
|
||||
// the similar code should be handled in handleEvent ...
|
||||
Event::Type event = myJoyTable[stick*kNumJoyButtons + code];
|
||||
switch(myState)
|
||||
{
|
||||
case S_EMULATE:
|
||||
handleEvent(myJoyTable[stick*kNumJoyButtons + code], state);
|
||||
break;
|
||||
if(event == Event::MenuMode && state == 1 && !myPauseFlag)
|
||||
{
|
||||
enterMenuMode();
|
||||
return;
|
||||
}
|
||||
else if(event == Event::CmdMenuMode && state == 1 && !myPauseFlag)
|
||||
{
|
||||
enterCmdMenuMode();
|
||||
return;
|
||||
}
|
||||
else if(event == Event::DebuggerMode && state == 1 && !myPauseFlag)
|
||||
{
|
||||
enterDebugMode();
|
||||
return;
|
||||
}
|
||||
else
|
||||
handleEvent(event, state);
|
||||
|
||||
break; // S_EMULATE
|
||||
|
||||
// FIXME - remove handleJoyEvent from DialogContainer, have it pass
|
||||
// mouse events instead
|
||||
case S_MENU:
|
||||
if(event == Event::MenuMode && state == 1)
|
||||
{
|
||||
leaveMenuMode();
|
||||
return;
|
||||
}
|
||||
myOSystem->menu().handleJoyEvent(stick, code, state);
|
||||
break;
|
||||
|
||||
case S_LAUNCHER:
|
||||
myOSystem->launcher().handleJoyEvent(stick, code, state);
|
||||
case S_CMDMENU:
|
||||
if(event == Event::CmdMenuMode && state == 1)
|
||||
{
|
||||
leaveCmdMenuMode();
|
||||
return;
|
||||
}
|
||||
myOSystem->commandMenu().handleJoyEvent(stick, code, state);
|
||||
break;
|
||||
|
||||
#ifdef DEVELOPER_SUPPORT
|
||||
case S_DEBUGGER:
|
||||
myOSystem->debugger().handleJoyEvent(stick, code, state);
|
||||
break;
|
||||
#endif
|
||||
|
||||
default:
|
||||
return;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
// See the file "license" for information on usage and redistribution of
|
||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//
|
||||
// $Id: EventHandler.hxx,v 1.48 2005-08-30 01:10:54 stephena Exp $
|
||||
// $Id: EventHandler.hxx,v 1.49 2005-08-30 23:32:42 stephena Exp $
|
||||
//============================================================================
|
||||
|
||||
#ifndef EVENTHANDLER_HXX
|
||||
|
|
@ -74,7 +74,7 @@ struct Stella_Joystick {
|
|||
mapping can take place.
|
||||
|
||||
@author Stephen Anthony
|
||||
@version $Id: EventHandler.hxx,v 1.48 2005-08-30 01:10:54 stephena Exp $
|
||||
@version $Id: EventHandler.hxx,v 1.49 2005-08-30 23:32:42 stephena Exp $
|
||||
*/
|
||||
class EventHandler
|
||||
{
|
||||
|
|
@ -281,8 +281,15 @@ class EventHandler
|
|||
@param state state of code (pressed/released)
|
||||
*/
|
||||
void handleJoyEvent(uInt8 stick, uInt32 code, uInt8 state);
|
||||
|
||||
/**
|
||||
Convert joystick motion events to simulated mouse motion events
|
||||
|
||||
@param stick SDL joystick
|
||||
@param code Event code
|
||||
@param state state of code (pressed/released)
|
||||
*/
|
||||
void handleMouseWarp(uInt8 stick, uInt8 axis, Int16 value);
|
||||
void handleWarpMouseButton(uInt8 event_button, uInt8 state);
|
||||
|
||||
/**
|
||||
Handle joystick movement emulating mouse motion
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
// See the file "license" for information on usage and redistribution of
|
||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//
|
||||
// $Id: CommandDialog.cxx,v 1.1 2005-08-29 18:36:42 stephena Exp $
|
||||
// $Id: CommandDialog.cxx,v 1.2 2005-08-30 23:32:42 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -38,7 +38,11 @@ enum {
|
|||
kSaveStateCmd = 'Csst',
|
||||
kStateSlotCmd = 'Ccst',
|
||||
kLoadStateCmd = 'Clst',
|
||||
kSnapshotCmd = 'Csnp'
|
||||
kSnapshotCmd = 'Csnp',
|
||||
kFormatCmd = 'Cfmt',
|
||||
kPaletteCmd = 'Cpal',
|
||||
kReloadRomCmd = 'Crom',
|
||||
kLauncherCmd = 'Clch'
|
||||
};
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
@ -54,7 +58,7 @@ CommandDialog::CommandDialog(OSystem* osystem, DialogContainer* parent)
|
|||
|
||||
// Set real dimensions
|
||||
_w = 4 * (lwidth) + 5;
|
||||
_h = 3 * (buttonHeight+5) + 5;
|
||||
_h = 4 * (buttonHeight+5) + 5;
|
||||
_x = (osystem->frameBuffer().baseWidth() - _w) / 2;
|
||||
_y = (osystem->frameBuffer().baseHeight() - _h) / 2;
|
||||
|
||||
|
|
@ -98,6 +102,20 @@ CommandDialog::CommandDialog(OSystem* osystem, DialogContainer* parent)
|
|||
xoffset += lwidth;
|
||||
new ButtonWidget(this, xoffset, yoffset, buttonWidth, buttonHeight,
|
||||
"Snapshot", kSnapshotCmd, 0);
|
||||
|
||||
xoffset = 5; yoffset += buttonHeight + 5;
|
||||
|
||||
new ButtonWidget(this, xoffset, yoffset, buttonWidth, buttonHeight,
|
||||
"NTSC/PAL", kFormatCmd, 0);
|
||||
xoffset += lwidth;
|
||||
new ButtonWidget(this, xoffset, yoffset, buttonWidth, buttonHeight,
|
||||
"Palette", kPaletteCmd, 0);
|
||||
xoffset += lwidth;
|
||||
new ButtonWidget(this, xoffset, yoffset, buttonWidth, buttonHeight,
|
||||
"Reload ROM", kReloadRomCmd, 0);
|
||||
xoffset += lwidth;
|
||||
new ButtonWidget(this, xoffset, yoffset, buttonWidth, buttonHeight,
|
||||
"Exit Game", kLauncherCmd, 0);
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
@ -162,6 +180,28 @@ void CommandDialog::handleCommand(CommandSender* sender, int cmd,
|
|||
event = Event::TakeSnapshot;
|
||||
break;
|
||||
|
||||
case kFormatCmd:
|
||||
instance()->eventHandler().leaveCmdMenuMode();
|
||||
instance()->console().toggleFormat();
|
||||
return;
|
||||
break;
|
||||
|
||||
case kPaletteCmd:
|
||||
instance()->eventHandler().leaveCmdMenuMode();
|
||||
instance()->console().togglePalette();
|
||||
return;
|
||||
break;
|
||||
|
||||
case kReloadRomCmd:
|
||||
instance()->eventHandler().leaveCmdMenuMode();
|
||||
instance()->createConsole();
|
||||
return;
|
||||
break;
|
||||
|
||||
case kLauncherCmd:
|
||||
event = Event::LauncherMode;
|
||||
break;
|
||||
|
||||
default:
|
||||
execute = false;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue