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

Fix code style

This commit is contained in:
Jerry (Xinyu Hou) 2015-10-20 14:54:51 -07:00
parent 4f1f2dcff0
commit c259af9b41
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/platform/OSXClipboard.cpp
View File

@ -100,13 +100,13 @@ OSXClipboard::add(EFormat format, const String & data)
return; return;
LOG((CLOG_DEBUG "add %d bytes to clipboard format: %d", data.size(), format)); LOG((CLOG_DEBUG "add %d bytes to clipboard format: %d", data.size(), format));
if(format == IClipboard::kText) { if (format == IClipboard::kText) {
LOG((CLOG_DEBUG " format of data to be added to clipboard was kText")); LOG((CLOG_DEBUG " format of data to be added to clipboard was kText"));
} }
else if(format == IClipboard::kBitmap) { else if (format == IClipboard::kBitmap) {
LOG((CLOG_DEBUG " format of data to be added to clipboard was kBitmap")); LOG((CLOG_DEBUG " format of data to be added to clipboard was kBitmap"));
} }
else if(format == IClipboard::kHTML) { else if (format == IClipboard::kHTML) {
LOG((CLOG_DEBUG " format of data to be added to clipboard was kHTML")); LOG((CLOG_DEBUG " format of data to be added to clipboard was kHTML"));
} }

4
src/lib/platform/OSXKeyState.cpp
View File

@ -332,10 +332,10 @@ OSXKeyState::mapKeyFromEvent(KeyIDs& ids,
// choose action // choose action
UInt16 action; UInt16 action;
if(eventKind==kCGEventKeyDown) { if (eventKind==kCGEventKeyDown) {
action = kUCKeyActionDown; action = kUCKeyActionDown;
} }
else if(CGEventGetIntegerValueField(event, kCGKeyboardEventAutorepeat)==1) { else if (CGEventGetIntegerValueField(event, kCGKeyboardEventAutorepeat)==1) {
action = kUCKeyActionAutoKey; action = kUCKeyActionAutoKey;
} }
else { else {

12
src/lib/platform/OSXScreen.cpp
View File

@ -572,8 +572,8 @@ OSXScreen::fakeMouseButton(ButtonID id, bool press)
// increase clickState (double click, triple click, etc) // increase clickState (double click, triple click, etc)
// This will allow for higher than triple click but the quartz documenation // This will allow for higher than triple click but the quartz documenation
// does not specify that this should be limited to triple click // does not specify that this should be limited to triple click
if(press) { if (press) {
if((ARCH->time() - m_lastClickTime) <= clickTime && diff <= maxDiff){ if ((ARCH->time() - m_lastClickTime) <= clickTime && diff <= maxDiff){
m_clickState++; m_clickState++;
} }
else { else {
@ -583,7 +583,7 @@ OSXScreen::fakeMouseButton(ButtonID id, bool press)
m_lastClickTime = ARCH->time(); m_lastClickTime = ARCH->time();
} }
if(m_clickState == 1){ if (m_clickState == 1){
m_lastSingleClickXCursor = m_xCursor; m_lastSingleClickXCursor = m_xCursor;
m_lastSingleClickYCursor = m_yCursor; m_lastSingleClickYCursor = m_yCursor;
} }
@ -942,7 +942,7 @@ OSXScreen::leave()
bool bool
OSXScreen::setClipboard(ClipboardID, const IClipboard* src) OSXScreen::setClipboard(ClipboardID, const IClipboard* src)
{ {
if(src != NULL) { if (src != NULL) {
LOG((CLOG_DEBUG "setting clipboard")); LOG((CLOG_DEBUG "setting clipboard"));
Clipboard::copy(&m_pasteboard, src); Clipboard::copy(&m_pasteboard, src);
} }
@ -2017,7 +2017,7 @@ OSXScreen::handleCGInputEvent(CGEventTapProxy proxy,
LOG((CLOG_WARN "unknown quartz event type: 0x%02x", type)); LOG((CLOG_WARN "unknown quartz event type: 0x%02x", type));
} }
if(screen->m_isOnScreen) { if (screen->m_isOnScreen) {
return event; return event;
} else { } else {
return NULL; return NULL;
@ -2143,7 +2143,7 @@ OSXScreen::waitForCarbonLoop() const
double timeout = ARCH->time() + kCarbonLoopWaitTimeout; double timeout = ARCH->time() + kCarbonLoopWaitTimeout;
while (!m_carbonLoopReady->wait()) { while (!m_carbonLoopReady->wait()) {
if(ARCH->time() > timeout) { if (ARCH->time() > timeout) {
LOG((CLOG_DEBUG "carbon loop not ready, waiting again")); LOG((CLOG_DEBUG "carbon loop not ready, waiting again"));
timeout = ARCH->time() + kCarbonLoopWaitTimeout; timeout = ARCH->time() + kCarbonLoopWaitTimeout;
} }