Fixed code style
Conflicts: src/lib/arch/win32/ArchPluginWindows.cpp
This commit is contained in:
parent
88214a0d3c
commit
5a9cbc97e3
|
@ -1351,7 +1351,7 @@ void MainWindow::delay(unsigned int s)
|
||||||
{
|
{
|
||||||
QTime dieTime= QTime::currentTime().addSecs(s);
|
QTime dieTime= QTime::currentTime().addSecs(s);
|
||||||
|
|
||||||
while( QTime::currentTime() < dieTime ) {
|
while (QTime::currentTime() < dieTime) {
|
||||||
QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
|
QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,8 +69,8 @@ ArchPluginWindows::load()
|
||||||
void* lib = reinterpret_cast<void*>(library);
|
void* lib = reinterpret_cast<void*>(library);
|
||||||
String filename = synergy::string::removeFileExt(*it);
|
String filename = synergy::string::removeFileExt(*it);
|
||||||
m_pluginTable.insert(std::make_pair(filename, lib));
|
m_pluginTable.insert(std::make_pair(filename, lib));
|
||||||
|
const char* version = (char*)invoke(filename.c_str(), "version",NULL);
|
||||||
|
|
||||||
const char * version = (char*)invoke( filename.c_str(),"version",NULL);
|
|
||||||
if (version == NULL) {
|
if (version == NULL) {
|
||||||
version = kPre174Plugin;
|
version = kPre174Plugin;
|
||||||
}
|
}
|
||||||
|
|
|
@ -810,11 +810,11 @@ MSWindowsKeyState::fakeCtrlAltDel()
|
||||||
// current thread must be on that desktop to do the broadcast
|
// current thread must be on that desktop to do the broadcast
|
||||||
// and we can't switch just any thread because some own windows
|
// and we can't switch just any thread because some own windows
|
||||||
// or hooks. so start a new thread to do the real work.
|
// or hooks. so start a new thread to do the real work.
|
||||||
HANDLE hEvtSendSas = OpenEvent( EVENT_MODIFY_STATE, FALSE, "Global\\SendSAS" );
|
HANDLE hEvtSendSas = OpenEvent(EVENT_MODIFY_STATE, FALSE, "Global\\SendSAS");
|
||||||
if ( hEvtSendSas ) {
|
if (hEvtSendSas) {
|
||||||
LOG((CLOG_DEBUG "found the SendSAS event - signaling my launcher to simulate ctrl+alt+del"));
|
LOG((CLOG_DEBUG "found the SendSAS event - signaling my launcher to simulate ctrl+alt+del"));
|
||||||
SetEvent( hEvtSendSas );
|
SetEvent(hEvtSendSas);
|
||||||
CloseHandle( hEvtSendSas );
|
CloseHandle(hEvtSendSas);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Thread cad(new FunctionJob(&MSWindowsKeyState::ctrlAltDelThread));
|
Thread cad(new FunctionJob(&MSWindowsKeyState::ctrlAltDelThread));
|
||||||
|
|
|
@ -162,7 +162,7 @@ XWindowsEventQueueBuffer::waitForEvent(double dtimeout)
|
||||||
// we want to give the cpu a chance s owe up this to 25ms
|
// we want to give the cpu a chance s owe up this to 25ms
|
||||||
#define TIMEOUT_DELAY 25
|
#define TIMEOUT_DELAY 25
|
||||||
|
|
||||||
while( ((dtimeout < 0.0) || (remaining > 0)) && QLength(m_display)==0 && retval==0){
|
while (((dtimeout < 0.0) || (remaining > 0)) && QLength(m_display)==0 && retval==0){
|
||||||
#if HAVE_POLL
|
#if HAVE_POLL
|
||||||
retval = poll(pfds, 2, TIMEOUT_DELAY); //16ms = 60hz, but we make it > to play nicely with the cpu
|
retval = poll(pfds, 2, TIMEOUT_DELAY); //16ms = 60hz, but we make it > to play nicely with the cpu
|
||||||
if (pfds[1].revents & POLLIN) {
|
if (pfds[1].revents & POLLIN) {
|
||||||
|
|
|
@ -28,7 +28,7 @@ std::stringstream _logStream;
|
||||||
#define LOG(s) \
|
#define LOG(s) \
|
||||||
_logStream.str(""); \
|
_logStream.str(""); \
|
||||||
_logStream << "winmmjoy: " << s << std::endl; \
|
_logStream << "winmmjoy: " << s << std::endl; \
|
||||||
s_log( _logStream.str().c_str())
|
s_log(_logStream.str().c_str())
|
||||||
|
|
||||||
static bool s_running = true;
|
static bool s_running = true;
|
||||||
static void (*s_sendEvent)(const char*, void*) = NULL;
|
static void (*s_sendEvent)(const char*, void*) = NULL;
|
||||||
|
|
|
@ -886,7 +886,7 @@ Server::isSwitchOkay(BaseClientProxy* newScreen,
|
||||||
}
|
}
|
||||||
|
|
||||||
// check for optional needed modifiers
|
// check for optional needed modifiers
|
||||||
KeyModifierMask mods = this->m_primaryClient->getToggleMask( );
|
KeyModifierMask mods = this->m_primaryClient->getToggleMask();
|
||||||
|
|
||||||
if (!preventSwitch && (
|
if (!preventSwitch && (
|
||||||
(this->m_switchNeedsShift && ((mods & KeyModifierShift) != KeyModifierShift)) ||
|
(this->m_switchNeedsShift && ((mods & KeyModifierShift) != KeyModifierShift)) ||
|
||||||
|
|
|
@ -317,7 +317,7 @@ ServerApp::updateStatus()
|
||||||
updateStatus("");
|
updateStatus("");
|
||||||
}
|
}
|
||||||
|
|
||||||
void ServerApp::updateStatus( const String& msg )
|
void ServerApp::updateStatus(const String& msg)
|
||||||
{
|
{
|
||||||
if (m_taskBarReceiver)
|
if (m_taskBarReceiver)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue