Update XPLM for ARM64
This commit is contained in:
@@ -1,45 +1,56 @@
|
||||
#include "XPCBroadcaster.h"
|
||||
#include "XPCListener.h"
|
||||
|
||||
XPCBroadcaster::XPCBroadcaster() : mIterator(NULL) {}
|
||||
XPCBroadcaster::XPCBroadcaster() :
|
||||
mIterator(NULL)
|
||||
{
|
||||
}
|
||||
|
||||
XPCBroadcaster::~XPCBroadcaster()
|
||||
{
|
||||
ListenerVector::iterator iter;
|
||||
mIterator = &iter;
|
||||
for (iter = mListeners.begin(); iter != mListeners.end(); ++iter) {
|
||||
(*iter)->BroadcasterRemoved(this);
|
||||
}
|
||||
ListenerVector::iterator iter;
|
||||
mIterator = &iter;
|
||||
for (iter = mListeners.begin(); iter != mListeners.end(); ++iter)
|
||||
{
|
||||
(*iter)->BroadcasterRemoved(this);
|
||||
}
|
||||
}
|
||||
|
||||
void XPCBroadcaster::AddListener(XPCListener *inListener)
|
||||
void XPCBroadcaster::AddListener(
|
||||
XPCListener * inListener)
|
||||
{
|
||||
mListeners.push_back(inListener);
|
||||
inListener->BroadcasterAdded(this);
|
||||
}
|
||||
mListeners.push_back(inListener);
|
||||
inListener->BroadcasterAdded(this);
|
||||
}
|
||||
|
||||
void XPCBroadcaster::RemoveListener(XPCListener *inListener)
|
||||
void XPCBroadcaster::RemoveListener(
|
||||
XPCListener * inListener)
|
||||
{
|
||||
ListenerVector::iterator iter =
|
||||
std::find(mListeners.begin(), mListeners.end(), inListener);
|
||||
if (iter == mListeners.end())
|
||||
return;
|
||||
ListenerVector::iterator iter = std::find
|
||||
(mListeners.begin(), mListeners.end(), inListener);
|
||||
if (iter == mListeners.end())
|
||||
return;
|
||||
|
||||
if (mIterator != NULL)
|
||||
{
|
||||
if (*mIterator >= iter)
|
||||
(*mIterator)--;
|
||||
}
|
||||
|
||||
mListeners.erase(iter);
|
||||
inListener->BroadcasterRemoved(this);
|
||||
}
|
||||
|
||||
if (mIterator != NULL) {
|
||||
if (*mIterator >= iter)
|
||||
(*mIterator)--;
|
||||
}
|
||||
|
||||
mListeners.erase(iter);
|
||||
inListener->BroadcasterRemoved(this);
|
||||
}
|
||||
|
||||
void XPCBroadcaster::BroadcastMessage(int inMessage, void *inParam)
|
||||
void XPCBroadcaster::BroadcastMessage(
|
||||
int inMessage,
|
||||
void * inParam)
|
||||
{
|
||||
ListenerVector::iterator iter;
|
||||
mIterator = &iter;
|
||||
for (iter = mListeners.begin(); iter != mListeners.end(); ++iter) {
|
||||
(*iter)->ListenToMessage(inMessage, inParam);
|
||||
}
|
||||
mIterator = NULL;
|
||||
}
|
||||
ListenerVector::iterator iter;
|
||||
mIterator = &iter;
|
||||
for (iter = mListeners.begin(); iter != mListeners.end(); ++iter)
|
||||
{
|
||||
(*iter)->ListenToMessage(inMessage, inParam);
|
||||
}
|
||||
mIterator = NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,31 +1,38 @@
|
||||
#ifndef _XPCBroadcaster_h_
|
||||
#define _XPCBroadcaster_h_
|
||||
|
||||
#include <algorithm>
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
|
||||
class XPCListener;
|
||||
class XPCListener;
|
||||
|
||||
class XPCBroadcaster
|
||||
{
|
||||
class XPCBroadcaster {
|
||||
public:
|
||||
XPCBroadcaster();
|
||||
virtual ~XPCBroadcaster();
|
||||
|
||||
void AddListener(XPCListener *inListener);
|
||||
void RemoveListener(XPCListener *inListener);
|
||||
|
||||
XPCBroadcaster();
|
||||
virtual ~XPCBroadcaster();
|
||||
|
||||
void AddListener(
|
||||
XPCListener * inListener);
|
||||
void RemoveListener(
|
||||
XPCListener * inListener);
|
||||
|
||||
protected:
|
||||
void BroadcastMessage(int inMessage, void *inParam = 0);
|
||||
|
||||
void BroadcastMessage(
|
||||
int inMessage,
|
||||
void * inParam=0);
|
||||
|
||||
private:
|
||||
typedef std::vector<XPCListener *> ListenerVector;
|
||||
|
||||
ListenerVector mListeners;
|
||||
typedef std::vector<XPCListener *> ListenerVector;
|
||||
|
||||
ListenerVector mListeners;
|
||||
|
||||
// Reentrancy support
|
||||
// Reentrancy support
|
||||
|
||||
ListenerVector::iterator * mIterator;
|
||||
|
||||
ListenerVector::iterator *mIterator;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -1,107 +1,104 @@
|
||||
#include "XPCDisplay.h"
|
||||
|
||||
XPCKeySniffer::XPCKeySniffer(int inBeforeWindows)
|
||||
: mBeforeWindows(inBeforeWindows)
|
||||
XPCKeySniffer::XPCKeySniffer(int inBeforeWindows) : mBeforeWindows(inBeforeWindows)
|
||||
{
|
||||
XPLMRegisterKeySniffer(KeySnifferCB,
|
||||
mBeforeWindows,
|
||||
reinterpret_cast<void *>(this));
|
||||
}
|
||||
XPLMRegisterKeySniffer(KeySnifferCB, mBeforeWindows, reinterpret_cast<void *>(this));
|
||||
}
|
||||
|
||||
XPCKeySniffer::~XPCKeySniffer()
|
||||
{
|
||||
XPLMUnregisterKeySniffer(KeySnifferCB,
|
||||
mBeforeWindows,
|
||||
reinterpret_cast<void *>(this));
|
||||
XPLMUnregisterKeySniffer(KeySnifferCB, mBeforeWindows, reinterpret_cast<void *>(this));
|
||||
}
|
||||
|
||||
|
||||
int XPCKeySniffer::KeySnifferCB(char inCharKey,
|
||||
XPLMKeyFlags inFlags,
|
||||
char inVirtualKey,
|
||||
void *inRefCon)
|
||||
int XPCKeySniffer::KeySnifferCB(
|
||||
char inCharKey,
|
||||
XPLMKeyFlags inFlags,
|
||||
char inVirtualKey,
|
||||
void * inRefCon)
|
||||
{
|
||||
XPCKeySniffer *me = reinterpret_cast<XPCKeySniffer *>(inRefCon);
|
||||
return me->HandleKeyStroke(inCharKey, inFlags, inVirtualKey);
|
||||
}
|
||||
XPCKeySniffer * me = reinterpret_cast<XPCKeySniffer *>(inRefCon);
|
||||
return me->HandleKeyStroke(inCharKey, inFlags, inVirtualKey);
|
||||
}
|
||||
|
||||
XPCWindow::XPCWindow(int inLeft,
|
||||
int inTop,
|
||||
int inRight,
|
||||
int inBottom,
|
||||
int inIsVisible)
|
||||
XPCWindow::XPCWindow(
|
||||
int inLeft,
|
||||
int inTop,
|
||||
int inRight,
|
||||
int inBottom,
|
||||
int inIsVisible)
|
||||
{
|
||||
mWindow = XPLMCreateWindow(inLeft,
|
||||
inTop,
|
||||
inRight,
|
||||
inBottom,
|
||||
inIsVisible,
|
||||
DrawCB,
|
||||
HandleKeyCB,
|
||||
MouseClickCB,
|
||||
reinterpret_cast<void *>(this));
|
||||
mWindow = XPLMCreateWindow(inLeft, inTop, inRight, inBottom, inIsVisible,
|
||||
DrawCB, HandleKeyCB, MouseClickCB,
|
||||
reinterpret_cast<void *>(this));
|
||||
}
|
||||
|
||||
XPCWindow::~XPCWindow() { XPLMDestroyWindow(mWindow); }
|
||||
|
||||
void XPCWindow::GetWindowGeometry(int *outLeft,
|
||||
int *outTop,
|
||||
int *outRight,
|
||||
int *outBottom)
|
||||
XPCWindow::~XPCWindow()
|
||||
{
|
||||
XPLMGetWindowGeometry(mWindow, outLeft, outTop, outRight, outBottom);
|
||||
XPLMDestroyWindow(mWindow);
|
||||
}
|
||||
|
||||
void XPCWindow::SetWindowGeometry(int inLeft,
|
||||
int inTop,
|
||||
int inRight,
|
||||
int inBottom)
|
||||
void XPCWindow::GetWindowGeometry(
|
||||
int * outLeft,
|
||||
int * outTop,
|
||||
int * outRight,
|
||||
int * outBottom)
|
||||
{
|
||||
XPLMSetWindowGeometry(mWindow, inLeft, inTop, inRight, inBottom);
|
||||
XPLMGetWindowGeometry(mWindow, outLeft, outTop, outRight, outBottom);
|
||||
}
|
||||
|
||||
int XPCWindow::GetWindowIsVisible(void)
|
||||
|
||||
void XPCWindow::SetWindowGeometry(
|
||||
int inLeft,
|
||||
int inTop,
|
||||
int inRight,
|
||||
int inBottom)
|
||||
{
|
||||
return XPLMGetWindowIsVisible(mWindow);
|
||||
XPLMSetWindowGeometry(mWindow, inLeft, inTop, inRight, inBottom);
|
||||
}
|
||||
|
||||
void XPCWindow::SetWindowIsVisible(int inIsVisible)
|
||||
int XPCWindow::GetWindowIsVisible(void)
|
||||
{
|
||||
XPLMSetWindowIsVisible(mWindow, inIsVisible);
|
||||
return XPLMGetWindowIsVisible(mWindow);
|
||||
}
|
||||
|
||||
void XPCWindow::TakeKeyboardFocus(void) { XPLMTakeKeyboardFocus(mWindow); }
|
||||
|
||||
void XPCWindow::BringWindowToFront(void) { XPLMBringWindowToFront(mWindow); }
|
||||
|
||||
int XPCWindow::IsWindowInFront(void) { return XPLMIsWindowInFront(mWindow); }
|
||||
|
||||
void XPCWindow::DrawCB(XPLMWindowID inWindowID, void *inRefcon)
|
||||
void XPCWindow::SetWindowIsVisible(
|
||||
int inIsVisible)
|
||||
{
|
||||
XPCWindow *me = reinterpret_cast<XPCWindow *>(inRefcon);
|
||||
me->DoDraw();
|
||||
XPLMSetWindowIsVisible(mWindow, inIsVisible);
|
||||
}
|
||||
|
||||
void XPCWindow::TakeKeyboardFocus(void)
|
||||
{
|
||||
XPLMTakeKeyboardFocus(mWindow);
|
||||
}
|
||||
|
||||
void XPCWindow::HandleKeyCB(XPLMWindowID inWindowID,
|
||||
char inKey,
|
||||
XPLMKeyFlags inFlags,
|
||||
char inVirtualKey,
|
||||
void *inRefcon,
|
||||
int losingFocus)
|
||||
void XPCWindow::BringWindowToFront(void)
|
||||
{
|
||||
XPCWindow *me = reinterpret_cast<XPCWindow *>(inRefcon);
|
||||
if (losingFocus)
|
||||
me->LoseFocus();
|
||||
else
|
||||
me->HandleKey(inKey, inFlags, inVirtualKey);
|
||||
XPLMBringWindowToFront(mWindow);
|
||||
}
|
||||
|
||||
int XPCWindow::MouseClickCB(XPLMWindowID inWindowID,
|
||||
int x,
|
||||
int y,
|
||||
XPLMMouseStatus inMouse,
|
||||
void *inRefcon)
|
||||
int XPCWindow::IsWindowInFront(void)
|
||||
{
|
||||
XPCWindow *me = reinterpret_cast<XPCWindow *>(inRefcon);
|
||||
return me->HandleClick(x, y, inMouse);
|
||||
return XPLMIsWindowInFront(mWindow);
|
||||
}
|
||||
|
||||
void XPCWindow::DrawCB(XPLMWindowID inWindowID, void * inRefcon)
|
||||
{
|
||||
XPCWindow * me = reinterpret_cast<XPCWindow *>(inRefcon);
|
||||
me->DoDraw();
|
||||
}
|
||||
|
||||
void XPCWindow::HandleKeyCB(XPLMWindowID inWindowID, char inKey, XPLMKeyFlags inFlags, char inVirtualKey, void * inRefcon, int losingFocus)
|
||||
{
|
||||
XPCWindow * me = reinterpret_cast<XPCWindow *>(inRefcon);
|
||||
if (losingFocus)
|
||||
me->LoseFocus();
|
||||
else
|
||||
me->HandleKey(inKey, inFlags, inVirtualKey);
|
||||
}
|
||||
|
||||
int XPCWindow::MouseClickCB(XPLMWindowID inWindowID, int x, int y, XPLMMouseStatus inMouse, void * inRefcon)
|
||||
{
|
||||
XPCWindow * me = reinterpret_cast<XPCWindow *>(inRefcon);
|
||||
return me->HandleClick(x, y, inMouse);
|
||||
}
|
||||
|
||||
@@ -3,68 +3,71 @@
|
||||
|
||||
#include "XPLMDisplay.h"
|
||||
|
||||
class XPCKeySniffer
|
||||
{
|
||||
class XPCKeySniffer {
|
||||
public:
|
||||
XPCKeySniffer(int inBeforeWindows);
|
||||
virtual ~XPCKeySniffer();
|
||||
|
||||
virtual int HandleKeyStroke(char inCharKey,
|
||||
XPLMKeyFlags inFlags,
|
||||
char inVirtualKey) = 0;
|
||||
XPCKeySniffer(int inBeforeWindows);
|
||||
virtual ~XPCKeySniffer();
|
||||
|
||||
virtual int HandleKeyStroke(
|
||||
char inCharKey,
|
||||
XPLMKeyFlags inFlags,
|
||||
char inVirtualKey)=0;
|
||||
|
||||
private:
|
||||
int mBeforeWindows;
|
||||
|
||||
static int KeySnifferCB(char inCharKey,
|
||||
XPLMKeyFlags inFlags,
|
||||
char inVirtualKey,
|
||||
void *inRefCon);
|
||||
int mBeforeWindows;
|
||||
|
||||
static int KeySnifferCB(
|
||||
char inCharKey,
|
||||
XPLMKeyFlags inFlags,
|
||||
char inVirtualKey,
|
||||
void * inRefCon);
|
||||
};
|
||||
|
||||
|
||||
class XPCWindow
|
||||
{
|
||||
|
||||
class XPCWindow {
|
||||
public:
|
||||
XPCWindow(int inLeft,
|
||||
int inTop,
|
||||
int inRight,
|
||||
int inBottom,
|
||||
int inIsVisible);
|
||||
virtual ~XPCWindow();
|
||||
|
||||
virtual void DoDraw(void) = 0;
|
||||
virtual void
|
||||
HandleKey(char inKey, XPLMKeyFlags inFlags, char inVirtualKey) = 0;
|
||||
virtual void LoseFocus(void) = 0;
|
||||
virtual int HandleClick(int x, int y, XPLMMouseStatus inMouse) = 0;
|
||||
|
||||
void GetWindowGeometry(int *outLeft,
|
||||
int *outTop,
|
||||
int *outRight,
|
||||
int *outBottom);
|
||||
void SetWindowGeometry(int inLeft, int inTop, int inRight, int inBottom);
|
||||
int GetWindowIsVisible(void);
|
||||
void SetWindowIsVisible(int inIsVisible);
|
||||
void TakeKeyboardFocus(void);
|
||||
void BringWindowToFront(void);
|
||||
int IsWindowInFront(void);
|
||||
XPCWindow(
|
||||
int inLeft,
|
||||
int inTop,
|
||||
int inRight,
|
||||
int inBottom,
|
||||
int inIsVisible);
|
||||
virtual ~XPCWindow();
|
||||
|
||||
virtual void DoDraw(void)=0;
|
||||
virtual void HandleKey(char inKey, XPLMKeyFlags inFlags, char inVirtualKey)=0;
|
||||
virtual void LoseFocus(void)=0;
|
||||
virtual int HandleClick(int x, int y, XPLMMouseStatus inMouse)=0;
|
||||
|
||||
void GetWindowGeometry(
|
||||
int * outLeft,
|
||||
int * outTop,
|
||||
int * outRight,
|
||||
int * outBottom);
|
||||
void SetWindowGeometry(
|
||||
int inLeft,
|
||||
int inTop,
|
||||
int inRight,
|
||||
int inBottom);
|
||||
int GetWindowIsVisible(void);
|
||||
void SetWindowIsVisible(
|
||||
int inIsVisible);
|
||||
void TakeKeyboardFocus(void);
|
||||
void BringWindowToFront(void);
|
||||
int IsWindowInFront(void);
|
||||
|
||||
private:
|
||||
XPLMWindowID mWindow;
|
||||
|
||||
static void DrawCB(XPLMWindowID inWindowID, void *inRefcon);
|
||||
static void HandleKeyCB(XPLMWindowID inWindowID,
|
||||
char inKey,
|
||||
XPLMKeyFlags inFlags,
|
||||
char inVirtualKey,
|
||||
void *inRefcon,
|
||||
int losingFocus);
|
||||
static int MouseClickCB(XPLMWindowID inWindowID,
|
||||
int x,
|
||||
int y,
|
||||
XPLMMouseStatus inMouse,
|
||||
void *inRefcon);
|
||||
XPLMWindowID mWindow;
|
||||
|
||||
static void DrawCB(XPLMWindowID inWindowID, void * inRefcon);
|
||||
static void HandleKeyCB(XPLMWindowID inWindowID, char inKey, XPLMKeyFlags inFlags, char inVirtualKey, void * inRefcon, int losingFocus);
|
||||
static int MouseClickCB(XPLMWindowID inWindowID, int x, int y, XPLMMouseStatus inMouse, void * inRefcon);
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -1,23 +1,27 @@
|
||||
#include "XPCListener.h"
|
||||
#include "XPCBroadcaster.h"
|
||||
|
||||
XPCListener::XPCListener() {}
|
||||
XPCListener::XPCListener()
|
||||
{
|
||||
}
|
||||
|
||||
XPCListener::~XPCListener()
|
||||
{
|
||||
while (!mBroadcasters.empty())
|
||||
mBroadcasters.front()->RemoveListener(this);
|
||||
while (!mBroadcasters.empty())
|
||||
mBroadcasters.front()->RemoveListener(this);
|
||||
}
|
||||
|
||||
void XPCListener::BroadcasterAdded(XPCBroadcaster *inBroadcaster)
|
||||
|
||||
void XPCListener::BroadcasterAdded(
|
||||
XPCBroadcaster * inBroadcaster)
|
||||
{
|
||||
mBroadcasters.push_back(inBroadcaster);
|
||||
}
|
||||
mBroadcasters.push_back(inBroadcaster);
|
||||
}
|
||||
|
||||
void XPCListener::BroadcasterRemoved(XPCBroadcaster *inBroadcaster)
|
||||
void XPCListener::BroadcasterRemoved(
|
||||
XPCBroadcaster * inBroadcaster)
|
||||
{
|
||||
BroadcastVector::iterator iter =
|
||||
std::find(mBroadcasters.begin(), mBroadcasters.end(), inBroadcaster);
|
||||
if (iter != mBroadcasters.end())
|
||||
mBroadcasters.erase(iter);
|
||||
}
|
||||
BroadcastVector::iterator iter = std::find(mBroadcasters.begin(),
|
||||
mBroadcasters.end(), inBroadcaster);
|
||||
if (iter != mBroadcasters.end())
|
||||
mBroadcasters.erase(iter);
|
||||
}
|
||||
|
||||
@@ -1,30 +1,36 @@
|
||||
#ifndef _XPCListener_h_
|
||||
#define _XPCListener_h_
|
||||
|
||||
#include <algorithm>
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
|
||||
class XPCBroadcaster;
|
||||
class XPCBroadcaster;
|
||||
|
||||
|
||||
class XPCListener
|
||||
{
|
||||
class XPCListener {
|
||||
public:
|
||||
XPCListener();
|
||||
virtual ~XPCListener();
|
||||
|
||||
virtual void ListenToMessage(int inMessage, void *inParam) = 0;
|
||||
|
||||
XPCListener();
|
||||
virtual ~XPCListener();
|
||||
|
||||
virtual void ListenToMessage(
|
||||
int inMessage,
|
||||
void * inParam)=0;
|
||||
|
||||
private:
|
||||
typedef std::vector<XPCBroadcaster *> BroadcastVector;
|
||||
|
||||
BroadcastVector mBroadcasters;
|
||||
typedef std::vector<XPCBroadcaster *> BroadcastVector;
|
||||
|
||||
BroadcastVector mBroadcasters;
|
||||
|
||||
friend class XPCBroadcaster;
|
||||
friend class XPCBroadcaster;
|
||||
|
||||
void BroadcasterAdded(
|
||||
XPCBroadcaster * inBroadcaster);
|
||||
|
||||
void BroadcasterAdded(XPCBroadcaster *inBroadcaster);
|
||||
|
||||
void BroadcasterRemoved(XPCBroadcaster *inBroadcaster);
|
||||
};
|
||||
void BroadcasterRemoved(
|
||||
XPCBroadcaster * inBroadcaster);
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -1,60 +1,52 @@
|
||||
#include "XPCProcessing.h"
|
||||
#include "XPLMUtilities.h"
|
||||
|
||||
XPCProcess::XPCProcess() : mInCallback(false), mCallbackTime(0)
|
||||
XPCProcess::XPCProcess() :
|
||||
mInCallback(false),
|
||||
mCallbackTime(0)
|
||||
{
|
||||
XPLMRegisterFlightLoopCallback(FlightLoopCB,
|
||||
0,
|
||||
reinterpret_cast<void *>(this));
|
||||
XPLMRegisterFlightLoopCallback(FlightLoopCB, 0, reinterpret_cast<void *>(this));
|
||||
}
|
||||
|
||||
XPCProcess::~XPCProcess()
|
||||
{
|
||||
XPLMUnregisterFlightLoopCallback(FlightLoopCB,
|
||||
reinterpret_cast<void *>(this));
|
||||
XPLMUnregisterFlightLoopCallback(FlightLoopCB, reinterpret_cast<void *>(this));
|
||||
}
|
||||
|
||||
void XPCProcess::StartProcessTime(float inSeconds)
|
||||
{
|
||||
mCallbackTime = inSeconds;
|
||||
if (!mInCallback)
|
||||
XPLMSetFlightLoopCallbackInterval(
|
||||
FlightLoopCB, mCallbackTime, 1/*relative to now*/, reinterpret_cast<void *>(this));
|
||||
}
|
||||
|
||||
void XPCProcess::StartProcessTime(float inSeconds)
|
||||
void XPCProcess::StartProcessCycles(int inCycles)
|
||||
{
|
||||
mCallbackTime = inSeconds;
|
||||
if (!mInCallback)
|
||||
XPLMSetFlightLoopCallbackInterval(FlightLoopCB,
|
||||
mCallbackTime,
|
||||
1 /*relative to now*/,
|
||||
reinterpret_cast<void *>(this));
|
||||
mCallbackTime = -inCycles;
|
||||
if (!mInCallback)
|
||||
XPLMSetFlightLoopCallbackInterval(
|
||||
FlightLoopCB, mCallbackTime, 1/*relative to now*/, reinterpret_cast<void *>(this));
|
||||
}
|
||||
|
||||
void XPCProcess::StartProcessCycles(int inCycles)
|
||||
void XPCProcess::StopProcess(void)
|
||||
{
|
||||
mCallbackTime = -inCycles;
|
||||
if (!mInCallback)
|
||||
XPLMSetFlightLoopCallbackInterval(FlightLoopCB,
|
||||
mCallbackTime,
|
||||
1 /*relative to now*/,
|
||||
reinterpret_cast<void *>(this));
|
||||
}
|
||||
|
||||
void XPCProcess::StopProcess(void)
|
||||
{
|
||||
mCallbackTime = 0;
|
||||
if (!mInCallback)
|
||||
XPLMSetFlightLoopCallbackInterval(FlightLoopCB,
|
||||
mCallbackTime,
|
||||
1 /*relative to now*/,
|
||||
reinterpret_cast<void *>(this));
|
||||
mCallbackTime = 0;
|
||||
if (!mInCallback)
|
||||
XPLMSetFlightLoopCallbackInterval(
|
||||
FlightLoopCB, mCallbackTime, 1/*relative to now*/, reinterpret_cast<void *>(this));
|
||||
}
|
||||
|
||||
|
||||
float XPCProcess::FlightLoopCB(float inElapsedSinceLastCall,
|
||||
float inElapsedTimeSinceLastFlightLoop,
|
||||
int inCounter,
|
||||
void *inRefcon)
|
||||
float XPCProcess::FlightLoopCB(
|
||||
float inElapsedSinceLastCall,
|
||||
float inElapsedTimeSinceLastFlightLoop,
|
||||
int inCounter,
|
||||
void * inRefcon)
|
||||
{
|
||||
XPCProcess *me = reinterpret_cast<XPCProcess *>(inRefcon);
|
||||
me->mInCallback = true;
|
||||
me->DoProcessing(inElapsedSinceLastCall,
|
||||
inElapsedTimeSinceLastFlightLoop,
|
||||
inCounter);
|
||||
me->mInCallback = false;
|
||||
return me->mCallbackTime;
|
||||
XPCProcess * me = reinterpret_cast<XPCProcess *>(inRefcon);
|
||||
me->mInCallback = true;
|
||||
me->DoProcessing(inElapsedSinceLastCall, inElapsedTimeSinceLastFlightLoop, inCounter);
|
||||
me->mInCallback = false;
|
||||
return me->mCallbackTime;
|
||||
}
|
||||
@@ -3,31 +3,35 @@
|
||||
|
||||
#include "XPLMProcessing.h"
|
||||
|
||||
class XPCProcess
|
||||
{
|
||||
class XPCProcess {
|
||||
public:
|
||||
XPCProcess();
|
||||
virtual ~XPCProcess();
|
||||
|
||||
void StartProcessTime(float inSeconds);
|
||||
void StartProcessCycles(int inCycles);
|
||||
void StopProcess(void);
|
||||
XPCProcess();
|
||||
virtual ~XPCProcess();
|
||||
|
||||
void StartProcessTime(float inSeconds);
|
||||
void StartProcessCycles(int inCycles);
|
||||
void StopProcess(void);
|
||||
|
||||
virtual void DoProcessing(float inElapsedSinceLastCall,
|
||||
float inElapsedTimeSinceLastFlightLoop,
|
||||
int inCounter) = 0;
|
||||
virtual void DoProcessing(
|
||||
float inElapsedSinceLastCall,
|
||||
float inElapsedTimeSinceLastFlightLoop,
|
||||
int inCounter)=0;
|
||||
|
||||
private:
|
||||
static float FlightLoopCB(float inElapsedSinceLastCall,
|
||||
float inElapsedTimeSinceLastFlightLoop,
|
||||
int inCounter,
|
||||
void *inRefcon);
|
||||
|
||||
bool mInCallback;
|
||||
float mCallbackTime;
|
||||
static float FlightLoopCB(
|
||||
float inElapsedSinceLastCall,
|
||||
float inElapsedTimeSinceLastFlightLoop,
|
||||
int inCounter,
|
||||
void * inRefcon);
|
||||
|
||||
bool mInCallback;
|
||||
float mCallbackTime;
|
||||
|
||||
XPCProcess(const XPCProcess&);
|
||||
XPCProcess& operator=(const XPCProcess&);
|
||||
|
||||
XPCProcess(const XPCProcess &);
|
||||
XPCProcess &operator=(const XPCProcess &);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,111 +1,123 @@
|
||||
#include "XPCWidget.h"
|
||||
|
||||
XPCWidget::XPCWidget(int inLeft,
|
||||
int inTop,
|
||||
int inRight,
|
||||
int inBottom,
|
||||
bool inVisible,
|
||||
const char *inDescriptor,
|
||||
bool inIsRoot,
|
||||
XPWidgetID inParent,
|
||||
XPWidgetClass inClass)
|
||||
: mWidget(NULL), mOwnsChildren(false), mOwnsWidget(true)
|
||||
XPCWidget::XPCWidget(
|
||||
int inLeft,
|
||||
int inTop,
|
||||
int inRight,
|
||||
int inBottom,
|
||||
bool inVisible,
|
||||
const char * inDescriptor,
|
||||
bool inIsRoot,
|
||||
XPWidgetID inParent,
|
||||
XPWidgetClass inClass) :
|
||||
mWidget(NULL),
|
||||
mOwnsChildren(false),
|
||||
mOwnsWidget(true)
|
||||
{
|
||||
mWidget = XPCreateWidget(inLeft,
|
||||
inTop,
|
||||
inRight,
|
||||
inBottom,
|
||||
inVisible ? 1 : 0,
|
||||
inDescriptor,
|
||||
inIsRoot ? 1 : 0,
|
||||
inIsRoot ? NULL : inParent,
|
||||
inClass);
|
||||
mWidget = XPCreateWidget(
|
||||
inLeft, inTop, inRight, inBottom,
|
||||
inVisible ? 1 : 0,
|
||||
inDescriptor,
|
||||
inIsRoot ? 1 : 0,
|
||||
inIsRoot ? NULL : inParent,
|
||||
inClass);
|
||||
|
||||
XPSetWidgetProperty(mWidget,
|
||||
xpProperty_Object,
|
||||
reinterpret_cast<intptr_t>(this));
|
||||
XPAddWidgetCallback(mWidget, WidgetCallback);
|
||||
}
|
||||
|
||||
XPCWidget::XPCWidget(XPWidgetID inWidget, bool inOwnsWidget)
|
||||
: mWidget(inWidget), mOwnsChildren(false), mOwnsWidget(inOwnsWidget)
|
||||
XPSetWidgetProperty(mWidget, xpProperty_Object, reinterpret_cast<intptr_t>(this));
|
||||
XPAddWidgetCallback(mWidget, WidgetCallback);
|
||||
}
|
||||
|
||||
XPCWidget::XPCWidget(
|
||||
XPWidgetID inWidget,
|
||||
bool inOwnsWidget) :
|
||||
mWidget(inWidget),
|
||||
mOwnsChildren(false),
|
||||
mOwnsWidget(inOwnsWidget)
|
||||
{
|
||||
XPSetWidgetProperty(mWidget,
|
||||
xpProperty_Object,
|
||||
reinterpret_cast<intptr_t>(this));
|
||||
XPAddWidgetCallback(mWidget, WidgetCallback);
|
||||
XPSetWidgetProperty(mWidget, xpProperty_Object, reinterpret_cast<intptr_t>(this));
|
||||
XPAddWidgetCallback(mWidget, WidgetCallback);
|
||||
}
|
||||
|
||||
XPCWidget::~XPCWidget()
|
||||
{
|
||||
if (mOwnsWidget)
|
||||
XPDestroyWidget(mWidget, mOwnsChildren ? 1 : 0);
|
||||
if (mOwnsWidget)
|
||||
XPDestroyWidget(mWidget, mOwnsChildren ? 1 : 0);
|
||||
}
|
||||
|
||||
void XPCWidget::SetOwnsWidget(bool inOwnsWidget) { mOwnsWidget = inOwnsWidget; }
|
||||
|
||||
void XPCWidget::SetOwnsChildren(bool inOwnsChildren)
|
||||
|
||||
void XPCWidget::SetOwnsWidget(
|
||||
bool inOwnsWidget)
|
||||
{
|
||||
mOwnsChildren = inOwnsChildren;
|
||||
mOwnsWidget = inOwnsWidget;
|
||||
}
|
||||
|
||||
XPCWidget::operator XPWidgetID() const { return mWidget; }
|
||||
|
||||
XPWidgetID XPCWidget::Get(void) const { return mWidget; }
|
||||
|
||||
void XPCWidget::AddAttachment(XPCWidgetAttachment *inAttachment,
|
||||
bool inOwnsAttachment,
|
||||
bool inPrefilter)
|
||||
void XPCWidget::SetOwnsChildren(
|
||||
bool inOwnsChildren)
|
||||
{
|
||||
if (inPrefilter) {
|
||||
mAttachments.insert(mAttachments.begin(),
|
||||
AttachmentInfo(inAttachment, inOwnsAttachment));
|
||||
} else {
|
||||
mAttachments.push_back(AttachmentInfo(inAttachment, inOwnsAttachment));
|
||||
}
|
||||
}
|
||||
mOwnsChildren = inOwnsChildren;
|
||||
}
|
||||
|
||||
void XPCWidget::RemoveAttachment(XPCWidgetAttachment *inAttachment)
|
||||
XPCWidget::operator XPWidgetID () const
|
||||
{
|
||||
for (AttachmentVector::iterator iter = mAttachments.begin();
|
||||
iter != mAttachments.end();
|
||||
++iter) {
|
||||
if (iter->first == inAttachment) {
|
||||
mAttachments.erase(iter);
|
||||
return;
|
||||
}
|
||||
}
|
||||
return mWidget;
|
||||
}
|
||||
|
||||
int XPCWidget::HandleWidgetMessage(XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
XPWidgetID XPCWidget::Get(void) const
|
||||
{
|
||||
return 0;
|
||||
return mWidget;
|
||||
}
|
||||
|
||||
int XPCWidget::WidgetCallback(XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
void XPCWidget::AddAttachment(
|
||||
XPCWidgetAttachment * inAttachment,
|
||||
bool inOwnsAttachment,
|
||||
bool inPrefilter)
|
||||
{
|
||||
XPCWidget *me = reinterpret_cast<XPCWidget *>(
|
||||
XPGetWidgetProperty(inWidget, xpProperty_Object, NULL));
|
||||
if (me == NULL)
|
||||
return 0;
|
||||
if (inPrefilter)
|
||||
{
|
||||
mAttachments.insert(mAttachments.begin(), AttachmentInfo(inAttachment, inOwnsAttachment));
|
||||
} else {
|
||||
mAttachments.push_back(AttachmentInfo(inAttachment, inOwnsAttachment));
|
||||
}
|
||||
}
|
||||
|
||||
for (AttachmentVector::iterator iter = me->mAttachments.begin();
|
||||
iter != me->mAttachments.end();
|
||||
++iter) {
|
||||
int result = iter->first->HandleWidgetMessage(me,
|
||||
inMessage,
|
||||
inWidget,
|
||||
inParam1,
|
||||
inParam2);
|
||||
if (result != 0)
|
||||
return result;
|
||||
}
|
||||
void XPCWidget::RemoveAttachment(
|
||||
XPCWidgetAttachment * inAttachment)
|
||||
{
|
||||
for (AttachmentVector::iterator iter = mAttachments.begin();
|
||||
iter != mAttachments.end(); ++iter)
|
||||
{
|
||||
if (iter->first == inAttachment)
|
||||
{
|
||||
mAttachments.erase(iter);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return me->HandleWidgetMessage(inMessage, inWidget, inParam1, inParam2);
|
||||
}
|
||||
int XPCWidget::HandleWidgetMessage(
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
int XPCWidget::WidgetCallback(
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
{
|
||||
XPCWidget * me = reinterpret_cast<XPCWidget *>(XPGetWidgetProperty(inWidget, xpProperty_Object, NULL));
|
||||
if (me == NULL)
|
||||
return 0;
|
||||
|
||||
for (AttachmentVector::iterator iter = me->mAttachments.begin(); iter !=
|
||||
me->mAttachments.end(); ++iter)
|
||||
{
|
||||
int result = iter->first->HandleWidgetMessage(me, inMessage, inWidget, inParam1, inParam2);
|
||||
if (result != 0)
|
||||
return result;
|
||||
}
|
||||
|
||||
return me->HandleWidgetMessage(inMessage, inWidget, inParam1, inParam2);
|
||||
}
|
||||
|
||||
@@ -1,71 +1,84 @@
|
||||
#ifndef _XPCWidget_h_
|
||||
#define _XPCWidget_h_
|
||||
|
||||
#include "XPWidgets.h"
|
||||
#include <algorithm>
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
#include "XPWidgets.h"
|
||||
|
||||
class XPCWidget;
|
||||
class XPCWidget;
|
||||
|
||||
class XPCWidgetAttachment
|
||||
{
|
||||
class XPCWidgetAttachment {
|
||||
public:
|
||||
virtual int HandleWidgetMessage(XPCWidget *inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2) = 0;
|
||||
|
||||
virtual int HandleWidgetMessage(
|
||||
XPCWidget * inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)=0;
|
||||
|
||||
};
|
||||
|
||||
class XPCWidget
|
||||
{
|
||||
class XPCWidget {
|
||||
public:
|
||||
XPCWidget(int inLeft,
|
||||
int inTop,
|
||||
int inRight,
|
||||
int inBottom,
|
||||
bool inVisible,
|
||||
const char *inDescriptor,
|
||||
bool inIsRoot,
|
||||
XPWidgetID inParent,
|
||||
XPWidgetClass inClass);
|
||||
XPCWidget(XPWidgetID inWidget, bool inOwnsWidget);
|
||||
virtual ~XPCWidget();
|
||||
|
||||
void SetOwnsWidget(bool inOwnsWidget);
|
||||
void SetOwnsChildren(bool inOwnsChildren);
|
||||
XPCWidget(
|
||||
int inLeft,
|
||||
int inTop,
|
||||
int inRight,
|
||||
int inBottom,
|
||||
bool inVisible,
|
||||
const char * inDescriptor,
|
||||
bool inIsRoot,
|
||||
XPWidgetID inParent,
|
||||
XPWidgetClass inClass);
|
||||
XPCWidget(
|
||||
XPWidgetID inWidget,
|
||||
bool inOwnsWidget);
|
||||
virtual ~XPCWidget();
|
||||
|
||||
void SetOwnsWidget(
|
||||
bool inOwnsWidget);
|
||||
void SetOwnsChildren(
|
||||
bool inOwnsChildren);
|
||||
|
||||
operator XPWidgetID() const;
|
||||
operator XPWidgetID () const;
|
||||
|
||||
XPWidgetID Get(void) const;
|
||||
|
||||
XPWidgetID Get(void) const;
|
||||
|
||||
void AddAttachment(XPCWidgetAttachment *inAttachment,
|
||||
bool inOwnsAttachment,
|
||||
bool inPrefilter);
|
||||
void RemoveAttachment(XPCWidgetAttachment *inAttachment);
|
||||
|
||||
virtual int HandleWidgetMessage(XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
void AddAttachment(
|
||||
XPCWidgetAttachment * inAttachment,
|
||||
bool inOwnsAttachment,
|
||||
bool inPrefilter);
|
||||
void RemoveAttachment(
|
||||
XPCWidgetAttachment * inAttachment);
|
||||
|
||||
virtual int HandleWidgetMessage(
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
|
||||
private:
|
||||
static int WidgetCallback(XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
|
||||
typedef std::pair<XPCWidgetAttachment *, bool> AttachmentInfo;
|
||||
typedef std::vector<AttachmentInfo> AttachmentVector;
|
||||
static int WidgetCallback(
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
|
||||
typedef std::pair<XPCWidgetAttachment *, bool> AttachmentInfo;
|
||||
typedef std::vector<AttachmentInfo> AttachmentVector;
|
||||
|
||||
AttachmentVector mAttachments;
|
||||
XPWidgetID mWidget;
|
||||
bool mOwnsChildren;
|
||||
bool mOwnsWidget;
|
||||
|
||||
XPCWidget();
|
||||
XPCWidget(const XPCWidget&);
|
||||
XPCWidget& operator=(const XPCWidget&);
|
||||
|
||||
AttachmentVector mAttachments;
|
||||
XPWidgetID mWidget;
|
||||
bool mOwnsChildren;
|
||||
bool mOwnsWidget;
|
||||
|
||||
XPCWidget();
|
||||
XPCWidget(const XPCWidget &);
|
||||
XPCWidget &operator=(const XPCWidget &);
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -2,234 +2,266 @@
|
||||
#include "XPStandardWidgets.h"
|
||||
#include "XPWidgetUtils.h"
|
||||
|
||||
static void XPCGetOrderedSubWidgets(XPWidgetID inWidget,
|
||||
std::vector<XPWidgetID> &outChildren);
|
||||
static void XPCGetOrderedSubWidgets(
|
||||
XPWidgetID inWidget,
|
||||
std::vector<XPWidgetID>& outChildren);
|
||||
|
||||
XPCKeyFilterAttachment::XPCKeyFilterAttachment(const char *inValidKeys,
|
||||
const char *outValidKeys)
|
||||
: mInput(inValidKeys), mOutput(outValidKeys)
|
||||
XPCKeyFilterAttachment::XPCKeyFilterAttachment(
|
||||
const char * inValidKeys,
|
||||
const char * outValidKeys) :
|
||||
mInput(inValidKeys),
|
||||
mOutput(outValidKeys)
|
||||
{
|
||||
}
|
||||
|
||||
XPCKeyFilterAttachment::~XPCKeyFilterAttachment()
|
||||
{
|
||||
}
|
||||
|
||||
XPCKeyFilterAttachment::~XPCKeyFilterAttachment() {}
|
||||
|
||||
int XPCKeyFilterAttachment::HandleWidgetMessage(XPCWidget *inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
int XPCKeyFilterAttachment::HandleWidgetMessage(
|
||||
XPCWidget * inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
{
|
||||
if (inMessage == xpMsg_KeyPress) {
|
||||
char &theKey = KEY_CHAR(inParam1);
|
||||
std::string::size_type pos = mInput.find(theKey);
|
||||
if (pos == std::string::npos)
|
||||
return 1; // Not found; eat the key!
|
||||
else {
|
||||
theKey = mOutput[pos];
|
||||
return 0;
|
||||
} // Let it live.
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
if (inMessage == xpMsg_KeyPress)
|
||||
{
|
||||
char& theKey = KEY_CHAR(inParam1);
|
||||
std::string::size_type pos = mInput.find(theKey);
|
||||
if (pos == std::string::npos)
|
||||
return 1; // Not found; eat the key!
|
||||
else {
|
||||
theKey = mOutput[pos];
|
||||
return 0;
|
||||
} // Let it live.
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
XPCKeyMessageAttachment::XPCKeyMessageAttachment(char inKey,
|
||||
int inMessage,
|
||||
void *inParam,
|
||||
bool inConsume,
|
||||
bool inVkey,
|
||||
XPCListener *inListener)
|
||||
: mKey(inKey), mMsg(inMessage), mParam(inParam), mConsume(inConsume),
|
||||
mVkey(inVkey)
|
||||
XPCKeyMessageAttachment::XPCKeyMessageAttachment(
|
||||
char inKey,
|
||||
int inMessage,
|
||||
void * inParam,
|
||||
bool inConsume,
|
||||
bool inVkey,
|
||||
XPCListener * inListener) :
|
||||
mKey(inKey), mMsg(inMessage), mParam(inParam), mConsume(inConsume),
|
||||
mVkey(inVkey)
|
||||
{
|
||||
if (inListener != NULL)
|
||||
this->AddListener(inListener);
|
||||
}
|
||||
if (inListener != NULL)
|
||||
this->AddListener(inListener);
|
||||
}
|
||||
|
||||
XPCKeyMessageAttachment::~XPCKeyMessageAttachment() {}
|
||||
|
||||
int XPCKeyMessageAttachment::HandleWidgetMessage(XPCWidget *inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
XPCKeyMessageAttachment::~XPCKeyMessageAttachment()
|
||||
{
|
||||
if (inMessage == xpMsg_KeyPress) {
|
||||
char theKey = mVkey ? KEY_VKEY(inParam1) : KEY_CHAR(inParam1);
|
||||
if (theKey != mKey)
|
||||
return 0;
|
||||
if (!(KEY_FLAGS(inParam1) & xplm_DownFlag))
|
||||
return 0;
|
||||
|
||||
BroadcastMessage(mMsg, mParam);
|
||||
return mConsume ? 1 : 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int XPCKeyMessageAttachment::HandleWidgetMessage(
|
||||
XPCWidget * inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
{
|
||||
if (inMessage == xpMsg_KeyPress)
|
||||
{
|
||||
char theKey = mVkey ? KEY_VKEY(inParam1) : KEY_CHAR(inParam1);
|
||||
if (theKey != mKey)
|
||||
return 0;
|
||||
if (!(KEY_FLAGS(inParam1) & xplm_DownFlag))
|
||||
return 0;
|
||||
|
||||
BroadcastMessage(mMsg, mParam);
|
||||
return mConsume ? 1 : 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
XPCPushButtonMessageAttachment::XPCPushButtonMessageAttachment(
|
||||
XPWidgetID inWidget,
|
||||
int inMessage,
|
||||
void *inParam,
|
||||
XPCListener *inListener)
|
||||
: mMsg(inMessage), mParam(inParam), mWidget(inWidget)
|
||||
XPWidgetID inWidget,
|
||||
int inMessage,
|
||||
void * inParam,
|
||||
XPCListener * inListener) :
|
||||
mMsg(inMessage), mParam(inParam), mWidget(inWidget)
|
||||
{
|
||||
if (inListener != NULL)
|
||||
this->AddListener(inListener);
|
||||
if (inListener != NULL)
|
||||
this->AddListener(inListener);
|
||||
}
|
||||
|
||||
XPCPushButtonMessageAttachment::~XPCPushButtonMessageAttachment() {}
|
||||
|
||||
int XPCPushButtonMessageAttachment::HandleWidgetMessage(
|
||||
XPCWidget *inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
XPCPushButtonMessageAttachment::~XPCPushButtonMessageAttachment()
|
||||
{
|
||||
if ((inMessage == xpMsg_PushButtonPressed) &&
|
||||
((XPWidgetID)inParam1 == mWidget)) {
|
||||
BroadcastMessage(mMsg, mParam);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if ((inMessage == xpMsg_ButtonStateChanged) &&
|
||||
((XPWidgetID)inParam1 == mWidget)) {
|
||||
BroadcastMessage(mMsg, mParam);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
XPCSliderMessageAttachment::XPCSliderMessageAttachment(XPWidgetID inWidget,
|
||||
int inMessage,
|
||||
void *inParam,
|
||||
XPCListener *inListener)
|
||||
: mMsg(inMessage), mParam(inParam), mWidget(inWidget)
|
||||
int XPCPushButtonMessageAttachment::HandleWidgetMessage(
|
||||
XPCWidget * inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
{
|
||||
if (inListener != NULL)
|
||||
this->AddListener(inListener);
|
||||
if ((inMessage == xpMsg_PushButtonPressed) && ((XPWidgetID) inParam1 == mWidget))
|
||||
{
|
||||
BroadcastMessage(mMsg, mParam);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if ((inMessage == xpMsg_ButtonStateChanged) && ((XPWidgetID) inParam1 == mWidget))
|
||||
{
|
||||
BroadcastMessage(mMsg, mParam);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
XPCSliderMessageAttachment::XPCSliderMessageAttachment(
|
||||
XPWidgetID inWidget,
|
||||
int inMessage,
|
||||
void * inParam,
|
||||
XPCListener * inListener) :
|
||||
mMsg(inMessage), mParam(inParam), mWidget(inWidget)
|
||||
{
|
||||
if (inListener != NULL)
|
||||
this->AddListener(inListener);
|
||||
}
|
||||
|
||||
XPCSliderMessageAttachment::~XPCSliderMessageAttachment() {}
|
||||
|
||||
int XPCSliderMessageAttachment::HandleWidgetMessage(XPCWidget *inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
XPCSliderMessageAttachment::~XPCSliderMessageAttachment()
|
||||
{
|
||||
if ((inMessage == xpMsg_ScrollBarSliderPositionChanged) &&
|
||||
((XPWidgetID)inParam1 == mWidget)) {
|
||||
BroadcastMessage(mMsg, mParam);
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int XPCSliderMessageAttachment::HandleWidgetMessage(
|
||||
XPCWidget * inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
{
|
||||
if ((inMessage == xpMsg_ScrollBarSliderPositionChanged) && ((XPWidgetID) inParam1 == mWidget))
|
||||
{
|
||||
BroadcastMessage(mMsg, mParam);
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
XPCCloseButtonMessageAttachment::XPCCloseButtonMessageAttachment(
|
||||
XPWidgetID inWidget,
|
||||
int inMessage,
|
||||
void *inParam,
|
||||
XPCListener *inListener)
|
||||
: mMsg(inMessage), mParam(inParam), mWidget(inWidget)
|
||||
XPWidgetID inWidget,
|
||||
int inMessage,
|
||||
void * inParam,
|
||||
XPCListener * inListener) :
|
||||
mMsg(inMessage), mParam(inParam), mWidget(inWidget)
|
||||
{
|
||||
if (inListener != NULL)
|
||||
this->AddListener(inListener);
|
||||
if (inListener != NULL)
|
||||
this->AddListener(inListener);
|
||||
}
|
||||
|
||||
XPCCloseButtonMessageAttachment::~XPCCloseButtonMessageAttachment() {}
|
||||
|
||||
int XPCCloseButtonMessageAttachment::HandleWidgetMessage(
|
||||
XPCWidget *inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
XPCCloseButtonMessageAttachment::~XPCCloseButtonMessageAttachment()
|
||||
{
|
||||
if ((inMessage == xpMessage_CloseButtonPushed) &&
|
||||
((XPWidgetID)inParam1 == mWidget)) {
|
||||
BroadcastMessage(mMsg, mParam);
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
XPCTabGroupAttachment::XPCTabGroupAttachment() {}
|
||||
|
||||
XPCTabGroupAttachment::~XPCTabGroupAttachment() {}
|
||||
|
||||
int XPCTabGroupAttachment::HandleWidgetMessage(XPCWidget *inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
int XPCCloseButtonMessageAttachment::HandleWidgetMessage(
|
||||
XPCWidget * inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
{
|
||||
if ((inMessage == xpMsg_KeyPress) && (KEY_CHAR(inParam1) == XPLM_KEY_TAB) &&
|
||||
((KEY_FLAGS(inParam1) & xplm_UpFlag) == 0)) {
|
||||
bool backwards = (KEY_FLAGS(inParam1) & xplm_ShiftFlag) != 0;
|
||||
std::vector<XPWidgetID> widgets;
|
||||
XPCGetOrderedSubWidgets(inWidget, widgets);
|
||||
int n, index = 0;
|
||||
XPWidgetID focusWidget = XPGetWidgetWithFocus();
|
||||
std::vector<XPWidgetID>::iterator iter =
|
||||
std::find(widgets.begin(), widgets.end(), focusWidget);
|
||||
if (iter != widgets.end()) {
|
||||
index = std::distance(widgets.begin(), iter);
|
||||
if (backwards)
|
||||
index--;
|
||||
else
|
||||
index++;
|
||||
if (index < 0)
|
||||
index = widgets.size() - 1;
|
||||
if (index >= widgets.size())
|
||||
index = 0;
|
||||
}
|
||||
if ((inMessage == xpMessage_CloseButtonPushed) && ((XPWidgetID) inParam1 == mWidget))
|
||||
{
|
||||
BroadcastMessage(mMsg, mParam);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (backwards) {
|
||||
for (n = index; n >= 0; --n) {
|
||||
if (XPGetWidgetProperty(widgets[n], xpProperty_Enabled, NULL))
|
||||
if (XPSetKeyboardFocus(widgets[n]) != NULL)
|
||||
return 1;
|
||||
}
|
||||
for (n = widgets.size() - 1; n > index; --n) {
|
||||
if (XPGetWidgetProperty(widgets[n], xpProperty_Enabled, NULL))
|
||||
if (XPSetKeyboardFocus(widgets[n]) != NULL)
|
||||
return 1;
|
||||
}
|
||||
} else {
|
||||
for (n = index; n < widgets.size(); ++n) {
|
||||
if (XPGetWidgetProperty(widgets[n], xpProperty_Enabled, NULL))
|
||||
if (XPSetKeyboardFocus(widgets[n]) != NULL)
|
||||
return 1;
|
||||
}
|
||||
for (n = 0; n < index; ++n) {
|
||||
if (XPGetWidgetProperty(widgets[n], xpProperty_Enabled, NULL))
|
||||
if (XPSetKeyboardFocus(widgets[n]) != NULL)
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
XPCTabGroupAttachment::XPCTabGroupAttachment()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
static void XPCGetOrderedSubWidgets(XPWidgetID inWidget,
|
||||
std::vector<XPWidgetID> &outChildren)
|
||||
XPCTabGroupAttachment::~XPCTabGroupAttachment()
|
||||
{
|
||||
outChildren.clear();
|
||||
int count = XPCountChildWidgets(inWidget);
|
||||
for (int n = 0; n < count; ++n) {
|
||||
XPWidgetID child = XPGetNthChildWidget(inWidget, n);
|
||||
outChildren.push_back(child);
|
||||
std::vector<XPWidgetID> grandChildren;
|
||||
XPCGetOrderedSubWidgets(child, grandChildren);
|
||||
|
||||
outChildren.insert(outChildren.end(),
|
||||
grandChildren.begin(),
|
||||
grandChildren.end());
|
||||
}
|
||||
}
|
||||
|
||||
int XPCTabGroupAttachment::HandleWidgetMessage(
|
||||
XPCWidget * inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2)
|
||||
{
|
||||
if ((inMessage == xpMsg_KeyPress) && (KEY_CHAR(inParam1) == XPLM_KEY_TAB) &&
|
||||
((KEY_FLAGS(inParam1) & xplm_UpFlag) == 0))
|
||||
{
|
||||
bool backwards = (KEY_FLAGS(inParam1) & xplm_ShiftFlag) != 0;
|
||||
std::vector<XPWidgetID> widgets;
|
||||
XPCGetOrderedSubWidgets(inWidget, widgets);
|
||||
int n, index = 0;
|
||||
XPWidgetID focusWidget = XPGetWidgetWithFocus();
|
||||
std::vector<XPWidgetID>::iterator iter = std::find(widgets.begin(), widgets.end(), focusWidget);
|
||||
if (iter != widgets.end())
|
||||
{
|
||||
index = std::distance(widgets.begin(), iter);
|
||||
if (backwards)
|
||||
index--;
|
||||
else
|
||||
index++;
|
||||
if (index < 0)
|
||||
index = widgets.size() - 1;
|
||||
if (index >= widgets.size())
|
||||
index = 0;
|
||||
}
|
||||
|
||||
if (backwards)
|
||||
{
|
||||
for (n = index; n >= 0; --n)
|
||||
{
|
||||
if (XPGetWidgetProperty(widgets[n], xpProperty_Enabled, NULL))
|
||||
if (XPSetKeyboardFocus(widgets[n]) != NULL)
|
||||
return 1;
|
||||
}
|
||||
for (n = widgets.size() - 1; n > index; --n)
|
||||
{
|
||||
if (XPGetWidgetProperty(widgets[n], xpProperty_Enabled, NULL))
|
||||
if (XPSetKeyboardFocus(widgets[n]) != NULL)
|
||||
return 1;
|
||||
}
|
||||
} else {
|
||||
for (n = index; n < widgets.size(); ++n)
|
||||
{
|
||||
if (XPGetWidgetProperty(widgets[n], xpProperty_Enabled, NULL))
|
||||
if (XPSetKeyboardFocus(widgets[n]) != NULL)
|
||||
return 1;
|
||||
}
|
||||
for (n = 0; n < index; ++n)
|
||||
{
|
||||
if (XPGetWidgetProperty(widgets[n], xpProperty_Enabled, NULL))
|
||||
if (XPSetKeyboardFocus(widgets[n]) != NULL)
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void XPCGetOrderedSubWidgets(
|
||||
XPWidgetID inWidget,
|
||||
std::vector<XPWidgetID>& outChildren)
|
||||
{
|
||||
outChildren.clear();
|
||||
int count = XPCountChildWidgets(inWidget);
|
||||
for (int n = 0; n < count; ++n)
|
||||
{
|
||||
XPWidgetID child = XPGetNthChildWidget(inWidget, n);
|
||||
outChildren.push_back(child);
|
||||
std::vector<XPWidgetID> grandChildren;
|
||||
XPCGetOrderedSubWidgets(child, grandChildren);
|
||||
|
||||
outChildren.insert(outChildren.end(), grandChildren.begin(), grandChildren.end());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,130 +3,144 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "XPCBroadcaster.h"
|
||||
#include "XPCWidget.h"
|
||||
#include "XPCBroadcaster.h"
|
||||
|
||||
class XPCKeyFilterAttachment : public XPCWidgetAttachment
|
||||
{
|
||||
class XPCKeyFilterAttachment : public XPCWidgetAttachment {
|
||||
public:
|
||||
XPCKeyFilterAttachment(const char *inValidKeys, const char *outValidKeys);
|
||||
virtual ~XPCKeyFilterAttachment();
|
||||
|
||||
virtual int HandleWidgetMessage(XPCWidget *inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
XPCKeyFilterAttachment(
|
||||
const char * inValidKeys,
|
||||
const char * outValidKeys);
|
||||
virtual ~XPCKeyFilterAttachment();
|
||||
|
||||
virtual int HandleWidgetMessage(
|
||||
XPCWidget * inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
|
||||
private:
|
||||
std::string mInput;
|
||||
std::string mOutput;
|
||||
|
||||
std::string mInput;
|
||||
std::string mOutput;
|
||||
|
||||
};
|
||||
|
||||
|
||||
class XPCKeyMessageAttachment : public XPCWidgetAttachment,
|
||||
public XPCBroadcaster
|
||||
{
|
||||
class XPCKeyMessageAttachment : public XPCWidgetAttachment, public XPCBroadcaster {
|
||||
public:
|
||||
XPCKeyMessageAttachment(char inKey,
|
||||
int inMessage,
|
||||
void *inParam,
|
||||
bool inConsume,
|
||||
bool inVkey,
|
||||
XPCListener *inListener);
|
||||
virtual ~XPCKeyMessageAttachment();
|
||||
|
||||
virtual int HandleWidgetMessage(XPCWidget *inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
XPCKeyMessageAttachment(
|
||||
char inKey,
|
||||
int inMessage,
|
||||
void * inParam,
|
||||
bool inConsume,
|
||||
bool inVkey,
|
||||
XPCListener * inListener);
|
||||
virtual ~XPCKeyMessageAttachment();
|
||||
|
||||
virtual int HandleWidgetMessage(
|
||||
XPCWidget * inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
|
||||
private:
|
||||
char mKey;
|
||||
bool mVkey;
|
||||
int mMsg;
|
||||
void *mParam;
|
||||
bool mConsume;
|
||||
|
||||
char mKey;
|
||||
bool mVkey;
|
||||
int mMsg;
|
||||
void * mParam;
|
||||
bool mConsume;
|
||||
|
||||
};
|
||||
|
||||
class XPCPushButtonMessageAttachment : public XPCWidgetAttachment,
|
||||
XPCBroadcaster
|
||||
{
|
||||
class XPCPushButtonMessageAttachment : public XPCWidgetAttachment, XPCBroadcaster {
|
||||
public:
|
||||
XPCPushButtonMessageAttachment(XPWidgetID inWidget,
|
||||
int inMessage,
|
||||
void *inParam,
|
||||
XPCListener *inListener);
|
||||
virtual ~XPCPushButtonMessageAttachment();
|
||||
|
||||
virtual int HandleWidgetMessage(XPCWidget *inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
XPCPushButtonMessageAttachment(
|
||||
XPWidgetID inWidget,
|
||||
int inMessage,
|
||||
void * inParam,
|
||||
XPCListener * inListener);
|
||||
virtual ~XPCPushButtonMessageAttachment();
|
||||
|
||||
virtual int HandleWidgetMessage(
|
||||
XPCWidget * inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
|
||||
private:
|
||||
XPWidgetID mWidget;
|
||||
int mMsg;
|
||||
void *mParam;
|
||||
XPWidgetID mWidget;
|
||||
int mMsg;
|
||||
void * mParam;
|
||||
};
|
||||
|
||||
class XPCSliderMessageAttachment : public XPCWidgetAttachment, XPCBroadcaster
|
||||
{
|
||||
class XPCSliderMessageAttachment : public XPCWidgetAttachment, XPCBroadcaster {
|
||||
public:
|
||||
XPCSliderMessageAttachment(XPWidgetID inWidget,
|
||||
int inMessage,
|
||||
void *inParam,
|
||||
XPCListener *inListener);
|
||||
virtual ~XPCSliderMessageAttachment();
|
||||
|
||||
virtual int HandleWidgetMessage(XPCWidget *inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
XPCSliderMessageAttachment(
|
||||
XPWidgetID inWidget,
|
||||
int inMessage,
|
||||
void * inParam,
|
||||
XPCListener * inListener);
|
||||
virtual ~XPCSliderMessageAttachment();
|
||||
|
||||
virtual int HandleWidgetMessage(
|
||||
XPCWidget * inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
|
||||
private:
|
||||
XPWidgetID mWidget;
|
||||
int mMsg;
|
||||
void *mParam;
|
||||
XPWidgetID mWidget;
|
||||
int mMsg;
|
||||
void * mParam;
|
||||
};
|
||||
|
||||
|
||||
class XPCCloseButtonMessageAttachment : public XPCWidgetAttachment,
|
||||
XPCBroadcaster
|
||||
{
|
||||
class XPCCloseButtonMessageAttachment : public XPCWidgetAttachment, XPCBroadcaster {
|
||||
public:
|
||||
XPCCloseButtonMessageAttachment(XPWidgetID inWidget,
|
||||
int inMessage,
|
||||
void *inParam,
|
||||
XPCListener *inListener);
|
||||
virtual ~XPCCloseButtonMessageAttachment();
|
||||
|
||||
virtual int HandleWidgetMessage(XPCWidget *inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
XPCCloseButtonMessageAttachment(
|
||||
XPWidgetID inWidget,
|
||||
int inMessage,
|
||||
void * inParam,
|
||||
XPCListener * inListener);
|
||||
virtual ~XPCCloseButtonMessageAttachment();
|
||||
|
||||
virtual int HandleWidgetMessage(
|
||||
XPCWidget * inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
|
||||
private:
|
||||
XPWidgetID mWidget;
|
||||
int mMsg;
|
||||
void *mParam;
|
||||
XPWidgetID mWidget;
|
||||
int mMsg;
|
||||
void * mParam;
|
||||
};
|
||||
|
||||
class XPCTabGroupAttachment : public XPCWidgetAttachment
|
||||
{
|
||||
class XPCTabGroupAttachment : public XPCWidgetAttachment {
|
||||
public:
|
||||
XPCTabGroupAttachment();
|
||||
virtual ~XPCTabGroupAttachment();
|
||||
|
||||
virtual int HandleWidgetMessage(XPCWidget *inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
XPCTabGroupAttachment();
|
||||
virtual ~XPCTabGroupAttachment();
|
||||
|
||||
virtual int HandleWidgetMessage(
|
||||
XPCWidget * inObject,
|
||||
XPWidgetMessage inMessage,
|
||||
XPWidgetID inWidget,
|
||||
intptr_t inParam1,
|
||||
intptr_t inParam2);
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user