# error You must set wxUSE_JOYSTICK to 1 in setup.h
#endif
-#if !wxUSE_STATUSBAR
-# error You must set wxUSE_STATUSBAR to 1 in setup.h
-#endif
-
-#include "wx/wave.h"
+#include "wx/sound.h"
#include "wx/joystick.h"
#include "joytest.h"
int winNumber = 1;
+int nButtons = 0;
// Initialise this in OnInit, not statically
bool MyApp::OnInit()
{
if (!stick.IsOk())
{
wxMessageBox(_T("No joystick detected!"));
- return FALSE;
+ return false;
}
-#if wxUSE_WAVE
- m_fire.Create(_T("gun.wav"));
-#endif // wxUSE_WAVE
+#if wxUSE_SOUND
+ m_fire.Create(_T("buttonpress.wav"));
+#endif // wxUSE_SOUND
+ m_minX = stick.GetXMin();
+ m_minY = stick.GetYMin();
m_maxX = stick.GetXMax();
m_maxY = stick.GetYMax();
// Associate the menu bar with the frame
frame->SetMenuBar(menu_bar);
+#if wxUSE_STATUSBAR
frame->CreateStatusBar();
+ frame->SetStatusText(wxString::Format(wxT("Device [%s] (PID:[%i] MID:[%i]) Ready... # of joysticks:[%i]"), stick.GetProductName().c_str(), stick.GetProductId(), stick.GetManufacturerId(), stick.GetNumberJoysticks()));
+#endif // wxUSE_STATUSBAR
frame->CenterOnScreen();
- frame->Show(TRUE);
+ frame->Show(true);
SetTopWindow(frame);
- return TRUE;
+ return true;
}
BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
// Define a constructor for my canvas
MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):
- wxScrolledWindow(parent, -1, pos, size, wxSUNKEN_BORDER)
+ wxScrolledWindow(parent, wxID_ANY, pos, size, wxSUNKEN_BORDER)
{
- wxJoystick joystick(wxJOYSTICK1);
- joystick.SetCapture(this);
+ m_stick = new wxJoystick(wxJOYSTICK1);
+ nButtons = m_stick->GetNumberButtons();
+ m_stick->SetCapture(this, 10);
}
MyCanvas::~MyCanvas()
{
- wxJoystick joystick(wxJOYSTICK1);
- joystick.ReleaseCapture();
+ m_stick->ReleaseCapture();
+ delete m_stick;
}
void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
wxPoint pt(event.GetPosition());
+ // if negative positions are possible then shift everything up
+ int xmin = wxGetApp().m_minX;
+ int xmax = wxGetApp().m_maxX;
+ int ymin = wxGetApp().m_minY;
+ int ymax = wxGetApp().m_maxY;
+ if (xmin < 0) {
+ xmax += abs(xmin);
+ pt.x += abs(xmin);
+ }
+ if (ymin < 0) {
+ ymax += abs(ymin);
+ pt.y += abs(ymin);
+ }
+
// Scale to canvas size
int cw, ch;
GetSize(&cw, &ch);
- pt.x = (long) (((double)pt.x/(double)wxGetApp().m_maxX) * cw);
- pt.y = (long) (((double)pt.y/(double)wxGetApp().m_maxY) * ch);
+ pt.x = (long) (((double)pt.x/(double)xmax) * cw);
+ pt.y = (long) (((double)pt.y/(double)ymax) * ch);
if (xpos > -1 && ypos > -1 && event.IsMove() && event.ButtonIsDown())
{
xpos = pt.x;
ypos = pt.y;
+#if wxUSE_STATUSBAR
wxString buf;
if (event.ButtonDown())
- buf.Printf(_T("Joystick (%d, %d) Fire!"), pt.x, pt.y);
+ buf.Printf(_T("Joystick (%d, %d) #%i Fire!"), pt.x, pt.y, event.GetButtonChange());
else
- buf.Printf(_T("Joystick (%d, %d)"), pt.x, pt.y);
+ buf.Printf(_T("Joystick (%d, %d) "), pt.x, pt.y);
+
+/*
+ for(int i = 0; i < nButtons; ++i)
+ {
+ buf += wxString(wxT("[")) +
+ ((event.GetButtonState() & (1 << i)) ? wxT("Y") : wxT("N")) + wxString(wxT("]"));
+ }
+*/
frame->SetStatusText(buf);
+#endif // wxUSE_STATUSBAR
-#if wxUSE_WAVE
+#if wxUSE_SOUND
if (event.ButtonDown() && wxGetApp().m_fire.IsOk())
{
wxGetApp().m_fire.Play();
}
-#endif // wxUSE_WAVE
+#endif // wxUSE_SOUND
}
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
MyFrame::MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos,
const wxSize& size, const long style)
- : wxFrame(parent, -1, title, pos, size, style)
+ : wxFrame(parent, wxID_ANY, title, pos, size, style)
{
canvas = new MyCanvas(this);
}
-MyFrame::~MyFrame()
-{
- // Empty
-}
-
-void MyFrame::OnQuit(wxCommandEvent& event)
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
- Close(TRUE);
+ Close(true);
}
void MyFrame::OnActivate(wxActivateEvent& event)