rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed: nothing happens on osx 10.6

This commit is contained in:
Nick Bolton 2014-02-17 19:38:26 +00:00
parent 5bb7a9fc7c
commit 75d2c5abf1
11 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/base/CEventQueue.cpp
View File

@ -96,6 +96,8 @@ CEventQueue::~CEventQueue()
void
CEventQueue::loop()
{
m_buffer->init();
CEvent event;
getEvent(event);
while (event.getType() != CEvent::kQuit) {
@ -594,9 +596,3 @@ CEventQueue::CTimer::operator<(const CTimer& t) const
{
return m_time < t.m_time;
}
void
CEventQueue::cacheCurrentEventQueueRef()
{
m_buffer->cacheCurrentEventQueueRef();
}

2
src/lib/base/CEventQueue.h
View File

@ -60,8 +60,6 @@ public:
virtual CEvent::Type
getRegisteredType(const CString& name) const;
void* getSystemTarget();
void cacheCurrentEventQueueRef();
private:
UInt32 saveEvent(const CEvent& event);

2
src/lib/base/CSimpleEventQueueBuffer.h
View File

@ -33,6 +33,7 @@ public:
~CSimpleEventQueueBuffer();
// IEventQueueBuffer overrides
void init() { }
virtual void waitForEvent(double timeout);
virtual Type getEvent(CEvent& event, UInt32& dataID);
virtual bool addEvent(UInt32 dataID);
@ -40,7 +41,6 @@ public:
virtual CEventQueueTimer*
newTimer(double duration, bool oneShot) const;
virtual void deleteTimer(CEventQueueTimer*) const;
void cacheCurrentEventQueueRef() { }
private:
typedef std::deque<UInt32> CEventDeque;

2
src/lib/base/IEventQueue.h
View File

@ -176,8 +176,6 @@ public:
virtual CEvent::Type
registerTypeOnce(CEvent::Type& type,
const char* name) = 0;
virtual void cacheCurrentEventQueueRef() = 0;
//@}
//! @name accessors

8
src/lib/base/IEventQueueBuffer.h
View File

@ -39,6 +39,12 @@ public:
//! @name manipulators
//@{
//! Initialize
/*!
Useful for platform-specific initialisation from a specific thread.
*/
virtual void init() = 0;
//! Block waiting for an event
/*!
@ -66,8 +72,6 @@ public:
return at some future time if it's blocked waiting on an event.
*/
virtual bool addEvent(UInt32 dataID) = 0;
virtual void cacheCurrentEventQueueRef() = 0;
//@}
//! @name accessors

3
src/lib/platform/CMSWindowsEventQueueBuffer.h
View File

@ -32,6 +32,7 @@ public:
virtual ~CMSWindowsEventQueueBuffer();
// IEventQueueBuffer overrides
virtual void init() { }
virtual void waitForEvent(double timeout);
virtual Type getEvent(CEvent& event, UInt32& dataID);
virtual bool addEvent(UInt32 dataID);
@ -40,8 +41,6 @@ public:
newTimer(double duration, bool oneShot) const;
virtual void deleteTimer(CEventQueueTimer*) const;
virtual void cacheCurrentEventQueueRef() {}
private:
DWORD m_thread;
UINT m_userEvent;

26
src/lib/platform/COSXEventQueueBuffer.cpp
View File

@ -33,7 +33,7 @@ class CEventQueueTimer { };
COSXEventQueueBuffer::COSXEventQueueBuffer(IEventQueue* events) :
m_eventQueue(events),
m_event(NULL),
m_threadEventQueueRef(NULL)
m_carbonEventQueue(NULL)
{
// do nothing
}
@ -46,6 +46,12 @@ COSXEventQueueBuffer::~COSXEventQueueBuffer()
}
}
void
COSXEventQueueBuffer::init()
{
m_carbonEventQueue = GetCurrentEventQueue();
}
void
COSXEventQueueBuffer::waitForEvent(double timeout)
{
@ -100,9 +106,15 @@ COSXEventQueueBuffer::addEvent(UInt32 dataID)
kEventAttributeNone,
&event);
if (error == noErr & m_threadEventQueueRef != NULL) {
error = PostEventToQueue(m_threadEventQueueRef, event,
kEventPriorityStandard);
if (error == noErr) {
assert(m_carbonEventQueue != NULL);
error = PostEventToQueue(
m_carbonEventQueue,
event,
kEventPriorityStandard);
ReleaseEvent(event);
}
@ -128,9 +140,3 @@ COSXEventQueueBuffer::deleteTimer(CEventQueueTimer* timer) const
{
delete timer;
}
void
COSXEventQueueBuffer::cacheCurrentEventQueueRef()
{
m_threadEventQueueRef = GetCurrentEventQueue();
}

4
src/lib/platform/COSXEventQueueBuffer.h
View File

@ -31,6 +31,7 @@ public:
virtual ~COSXEventQueueBuffer();
// IEventQueueBuffer overrides
virtual void init();
virtual void waitForEvent(double timeout);
virtual Type getEvent(CEvent& event, UInt32& dataID);
virtual bool addEvent(UInt32 dataID);
@ -38,12 +39,11 @@ public:
virtual CEventQueueTimer*
newTimer(double duration, bool oneShot) const;
virtual void deleteTimer(CEventQueueTimer*) const;
virtual void cacheCurrentEventQueueRef();
private:
EventRef m_event;
IEventQueue* m_eventQueue;
EventQueueRef m_threadEventQueueRef;
EventQueueRef m_carbonEventQueue;
};
#endif

3
src/lib/platform/CXWindowsEventQueueBuffer.h
View File

@ -37,6 +37,7 @@ public:
virtual ~CXWindowsEventQueueBuffer();
// IEventQueueBuffer overrides
virtual void init() { }
virtual void waitForEvent(double timeout);
virtual Type getEvent(CEvent& event, UInt32& dataID);
virtual bool addEvent(UInt32 dataID);
@ -45,8 +46,6 @@ public:
newTimer(double duration, bool oneShot) const;
virtual void deleteTimer(CEventQueueTimer*) const;
virtual void cacheCurrentEventQueueRef() {}
private:
void flush();

19
src/lib/synergy/CApp.cpp
View File

@ -182,18 +182,18 @@ CApp::parseArg(const int& argc, const char* const* argv, int& i)
#endif
#ifdef WINAPI_MSWINDOWS
OSVERSIONINFO osvi;
ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&osvi);
#ifdef WINAPI_MSWINDOWS
OSVERSIONINFO osvi;
ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&osvi);
if (osvi.dwMajorVersion < 6) {
useDragDrop = false;
LOG((CLOG_INFO "ignoring --enable-drag-drop, not supported below vista."));
}
#endif
}
#endif
if (useDragDrop) {
argsBase().m_enableDragDrop = true;
@ -415,7 +415,6 @@ CApp::handleIpcMessage(const CEvent& e, void*)
void
CApp::runEventsLoop(void*)
{
m_events->cacheCurrentEventQueueRef();
m_events->loop();
#if defined(MAC_OS_X_VERSION_10_7)

1
src/test/unittests/synergy/CMockEventQueue.h
View File

@ -61,7 +61,6 @@ public:
MOCK_METHOD0(forIKeyState, IKeyStateEvents&());
MOCK_METHOD0(forIPrimaryScreen, IPrimaryScreenEvents&());
MOCK_METHOD0(forIScreen, IScreenEvents&());
MOCK_METHOD0(cacheCurrentEventQueueRef, void());
};
#endif