X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f6c54eb076d760cbb6fb15e899f15fbbd575850..a5f5f678f259e401139235d86fb510894bca2ebb:/samples/joytest/joytest.cpp diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp index 189314b3a8..0366659659 100644 --- a/samples/joytest/joytest.cpp +++ b/samples/joytest/joytest.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// @@ -21,10 +21,10 @@ #endif #if !wxUSE_JOYSTICK -#error You must set wxUSE_JOYSTICK to 1 in setup.h! +# error You must set wxUSE_JOYSTICK to 1 in setup.h #endif -#include "wx/wave.h" +#include "wx/sound.h" #include "wx/joystick.h" #include "joytest.h" @@ -39,58 +39,62 @@ long ypos = -1; int winNumber = 1; +int nButtons = 0; // Initialise this in OnInit, not statically -bool MyApp::OnInit(void) +bool MyApp::OnInit() { - wxJoystick stick(wxJOYSTICK1); - if (!stick.IsOk()) - { - wxMessageBox("No joystick detected!"); - return FALSE; - } -#if wxUSE_WAVE - m_fire.Create("gun.wav"); -#endif // wxUSE_WAVE + wxJoystick stick(wxJOYSTICK1); + if (!stick.IsOk()) + { + wxMessageBox(_T("No joystick detected!")); + return false; + } - m_maxX = stick.GetXMax(); - m_maxY = stick.GetYMax(); +#if wxUSE_SOUND + m_fire.Create(_T("buttonpress.wav")); +#endif // wxUSE_SOUND - // Create the main frame window + m_minX = stick.GetXMin(); + m_minY = stick.GetYMin(); + m_maxX = stick.GetXMax(); + m_maxY = stick.GetYMax(); - frame = new MyFrame(NULL, "Joystick Demo", wxPoint(0, 0), wxSize(500, 400), - wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL); + // Create the main frame window + + frame = new MyFrame(NULL, _T("Joystick Demo"), wxDefaultPosition, + wxSize(500, 400), wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL); // Give it an icon (this is ignored in MDI mode: uses resources) #ifdef __WXMSW__ - frame->SetIcon(wxIcon("joyicon")); + frame->SetIcon(wxIcon(_T("joyicon"))); #endif #ifdef __X__ - frame->SetIcon(wxIcon("joyicon.xbm")); + frame->SetIcon(wxIcon(_T("joyicon.xbm"))); #endif - // Make a menubar - wxMenu *file_menu = new wxMenu; - - file_menu->Append(JOYTEST_QUIT, "&Exit"); + // Make a menubar + wxMenu *file_menu = new wxMenu; - wxMenu *help_menu = new wxMenu; - help_menu->Append(JOYTEST_ABOUT, "&About"); + file_menu->Append(JOYTEST_QUIT, _T("&Exit")); - wxMenuBar *menu_bar = new wxMenuBar; + wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); - menu_bar->Append(help_menu, "&Help"); + menu_bar->Append(file_menu, _T("&File")); - // Associate the menu bar with the frame - frame->SetMenuBar(menu_bar); + // Associate the menu bar with the frame + frame->SetMenuBar(menu_bar); - frame->CreateStatusBar(); +#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->Show(TRUE); + frame->CenterOnScreen(); + frame->Show(true); - SetTopWindow(frame); + SetTopWindow(frame); - return TRUE; + return true; } BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) @@ -99,76 +103,99 @@ END_EVENT_TABLE() // 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(void) +MyCanvas::~MyCanvas() { - wxJoystick joystick(wxJOYSTICK1); - joystick.ReleaseCapture(); + m_stick->ReleaseCapture(); + delete m_stick; } void MyCanvas::OnJoystickEvent(wxJoystickEvent& event) { - wxClientDC dc(this); - - wxPoint pt(event.GetPosition()); - - // 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); - - if (xpos > -1 && ypos > -1 && event.IsMove() && event.ButtonIsDown()) - { - dc.SetPen(*wxBLACK_PEN); - dc.DrawLine(xpos, ypos, pt.x, pt.y); - } - xpos = pt.x; - ypos = pt.y; - - char buf[100]; - if (event.ButtonDown()) - sprintf(buf, "Joystick (%d, %d) Fire!", pt.x, pt.y); - else - sprintf(buf, "Joystick (%d, %d)", pt.x, pt.y); - frame->SetStatusText(buf); - -#if wxUSE_WAVE - if (event.ButtonDown() && wxGetApp().m_fire.IsOk()) - { - wxGetApp().m_fire.Play(); - } -#endif // wxUSE_WAVE + wxClientDC dc(this); + + 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)xmax) * cw); + pt.y = (long) (((double)pt.y/(double)ymax) * ch); + + if (xpos > -1 && ypos > -1 && event.IsMove() && event.ButtonIsDown()) + { + dc.SetPen(*wxBLACK_PEN); + dc.DrawLine(xpos, ypos, pt.x, pt.y); + } + + xpos = pt.x; + ypos = pt.y; + +#if wxUSE_STATUSBAR + wxString buf; + if (event.ButtonDown()) + 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); + +/* + 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_SOUND + if (event.ButtonDown() && wxGetApp().m_fire.IsOk()) + { + wxGetApp().m_fire.Play(); + } +#endif // wxUSE_SOUND } BEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU(JOYTEST_QUIT, MyFrame::OnQuit) + EVT_MENU(JOYTEST_QUIT, MyFrame::OnQuit) END_EVENT_TABLE() -MyFrame::MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, -const long style): - wxFrame(parent, -1, title, pos, size, style) -{ - canvas = new MyCanvas(this); -} - -MyFrame::~MyFrame(void) +MyFrame::MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos, + const wxSize& size, const long style) + : wxFrame(parent, wxID_ANY, title, pos, size, style) { + canvas = new MyCanvas(this); } -void MyFrame::OnQuit(wxCommandEvent& event) +void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - Close(TRUE); + Close(true); } void MyFrame::OnActivate(wxActivateEvent& event) { - if (event.GetActive() && canvas) - canvas->SetFocus(); + if (event.GetActive() && canvas) + canvas->SetFocus(); }