Changeset 2773 for trunk

Timestamp:

Aug 20, 2006, 9:49:41 AM (19 years ago)

Author:

bird

Message:

No tabs. Adjusted debug logging levels.

File:

• trunk/synergy/lib/platform/CPMKeyState.cpp (modified) (24 diffs)

trunk/synergy/lib/platform/CPMKeyState.cpp

@@ -115 +115 @@
         m_eventTarget(eventTarget),
         m_fakeMsg(fakeMsg),
-    m_lastButton(0),
+        m_lastButton(0),
         m_fixTimer(NULL),
         m_lastDown(kKeyNone),
@@ -122 +122 @@
         m_originalSavedModifiers(0)
 {
-    LOG((CLOG_DEBUG "CPMKeyState:"));
+    LOG((CLOG_DEBUG2 "CPMKeyState:"));
 }
 
 CPMKeyState::~CPMKeyState()
 {
-    LOG((CLOG_DEBUG "~CPMKeyState:"));
+    LOG((CLOG_DEBUG2 "~CPMKeyState:"));
         disable();
 }
@@ -134 +134 @@
 CPMKeyState::disable()
 {
-    LOG((CLOG_DEBUG "disable:"));
+    LOG((CLOG_DEBUG2 "disable:"));
         if (m_fixTimer != NULL) {
                 EVENTQUEUE->removeHandler(CEvent::kTimer, m_fixTimer);
@@ -146 +146 @@
 CPMKeyState::virtualKeyToButton(ULONG virtualKey) const
 {
-    LOG((CLOG_DEBUG "virtualKeyToButton:"));
+    LOG((CLOG_DEBUG2 "virtualKeyToButton:"));
         return m_virtualKeyToButton[virtualKey & 0xffu];
 }
@@ -153 +153 @@
 CPMKeyState::testAutoRepeat(bool press, bool isRepeat, KeyButton button)
 {
-    LOG((CLOG_DEBUG "testAutoRepeat:"));
+    LOG((CLOG_DEBUG2 "testAutoRepeat:"));
         if (!isRepeat)
                 isRepeat = press && button == m_lastDown && button != kKeyNone;
@@ -163 +163 @@
 CPMKeyState::saveModifiers()
 {
-    LOG((CLOG_DEBUG "saveModifiers:"));
+    LOG((CLOG_DEBUG2 "saveModifiers:"));
         m_savedModifiers         = getActiveModifiers();
         m_originalSavedModifiers = m_savedModifiers;
@@ -171 +171 @@
 CPMKeyState::useSavedModifiers(bool enable)
 {
-    LOG((CLOG_DEBUG "useSavedModifiers:"));
+    LOG((CLOG_DEBUG2 "useSavedModifiers:"));
         if (enable != m_useSavedModifiers) {
                 m_useSavedModifiers = enable;
@@ -185 +185 @@
 CPMKeyState::mapKeyFromEvent(USHORT fsFlags, UCHAR ucRepeat, UCHAR ucScanCode, USHORT usch, USHORT usvk, KeyModifierMask* maskOut) const
 {
-    LOG((CLOG_DEBUG "mapKeyFromEvent:"));
+    LOG((CLOG_DEBUG2 "mapKeyFromEvent:"));
 #if 0 /** @todo */
         static const KeyModifierMask s_controlAlt = KeyModifierControl | KeyModifierAlt;
@@ -241 +241 @@
 CPMKeyState::mapKeyToVirtualKey(KeyID key) const
 {
-    LOG((CLOG_DEBUG "mapKeyToVirtualKey:"));
+    LOG((CLOG_DEBUG2 "mapKeyToVirtualKey:"));
         if (key == kKeyNone)
                 return 0;
@@ -256 +256 @@
                                                         SInt32 count, KeyButton button)
 {
-    LOG((CLOG_DEBUG "sendKeyEvent:"));
+    LOG((CLOG_DEBUG2 "sendKeyEvent:"));
         if (press || isAutoRepeat) {
                 // send key
@@ -278 +278 @@
 CPMKeyState::fakeKeyDown(KeyID id, KeyModifierMask mask, KeyButton button)
 {
-    LOG((CLOG_DEBUG "fakeKeyDown: id=%#x mask=%#x button=%#x", id, mask, button));
+    LOG((CLOG_DEBUG2 "fakeKeyDown: id=%#x mask=%#x button=%#x", id, mask, button));
         CKeyState::fakeKeyDown(id, mask, button);
 }
@@ -285 +285 @@
 CPMKeyState::fakeKeyRepeat(KeyID id, KeyModifierMask mask, SInt32 count, KeyButton button)
 {
-    LOG((CLOG_DEBUG "fakeKeyRepeat: id=%#x mask=%#x count=%d button=%#x", id, mask, count, button));
+    LOG((CLOG_DEBUG2 "fakeKeyRepeat: id=%#x mask=%#x count=%d button=%#x", id, mask, count, button));
         CKeyState::fakeKeyRepeat(id, mask, count, button);
 }
@@ -292 +292 @@
 CPMKeyState::fakeCtrlAltDel()
 {
-    LOG((CLOG_DEBUG "fakeCtrlAltDel:"));
+    LOG((CLOG_DEBUG2 "fakeCtrlAltDel:"));
     fakeKeyDown(kKeyDelete, KeyModifierControl | KeyModifierAlt, virtualKeyToButton(VK_DELETE));
 }
@@ -299 +299 @@
 CPMKeyState::pollActiveModifiers() const
 {
-    LOG((CLOG_DEBUG "pollActiveModifiers:"));
+    LOG((CLOG_DEBUG2 "pollActiveModifiers:"));
         KeyModifierMask state = 0;
 
@@ -323 +323 @@
 CPMKeyState::pollActiveGroup() const
 {
-    LOG((CLOG_DEBUG "pollActiveGroup:"));
+    LOG((CLOG_DEBUG2 "pollActiveGroup:"));
 #if 0
         HKL hkl            = GetKeyboardLayout(targetThread);
@@ -343 +343 @@
 CPMKeyState::pollPressedKeys(KeyButtonSet& pressedKeys) const
 {
-    LOG((CLOG_DEBUG "pollPressedKeys:"));
+    LOG((CLOG_DEBUG2 "pollPressedKeys:"));
         BYTE keyState[256];
     if (WinSetKeyboardStateTable(HWND_DESKTOP, keyState, FALSE)) {
@@ -454 +454 @@
 CPMKeyState::getKeyMap(CKeyMap& keyMap)
 {
-    LOG((CLOG_DEBUG "getKeyMap:"));
+    LOG((CLOG_DEBUG2 "getKeyMap:"));
 #if 0
         // update keyboard groups
@@ -828 +828 @@
 CPMKeyState::fakeKey(const Keystroke& keystroke)
 {
-    LOG((CLOG_DEBUG "fakeKey:"));
+    LOG((CLOG_DEBUG2 "fakeKey:"));
         switch (keystroke.m_type) {
         case Keystroke::kButton: {
-                LOG((CLOG_DEBUG1 "  %03x (%08llx) %s%s", keystroke.m_data.m_button.m_button, keystroke.m_data.m_button.m_client,
+                LOG((CLOG_DEBUG2 "  %03x (%08llx) %s%s", keystroke.m_data.m_button.m_button, keystroke.m_data.m_button.m_client,
              keystroke.m_data.m_button.m_press ? "down" : "up", keystroke.m_data.m_button.m_repeat ? " repeate" : ""));
                 KeyButton button = keystroke.m_data.m_button.m_button;
@@ -1008 +1008 @@
 CPMKeyState::getActiveModifiersRValue()
 {
-    LOG((CLOG_DEBUG "getActiveModifiersRValue:"));
+    LOG((CLOG_DEBUG2 "getActiveModifiersRValue:"));
         if (m_useSavedModifiers) {
                 return m_savedModifiers;
@@ -1018 +1018 @@
 CPMKeyState::getKeyID(ULONG virtualKey, KeyButton button, bool numpad, USHORT usChar)
 {
-    LOG((CLOG_DEBUG "getKeyID:"));
+    LOG((CLOG_DEBUG2 "getKeyID:"));
     if (virtualKey < sizeof(s_virtualKey) / sizeof(s_virtualKey[0])) {
 
@@ -1085 +1085 @@
                                 PBYTE keyState) const
 {
-    LOG((CLOG_DEBUG "getIDForKey:"));
+    LOG((CLOG_DEBUG2 "getIDForKey:"));
 #if 0
         int n;
@@ -1139 +1139 @@
 {
         ClientData data; data.u = item.m_client; assert(sizeof(data.u) == sizeof(data));
-    LOG((CLOG_DEBUG
+    LOG((CLOG_DEBUG1
          "addKeyEntry: scan=%02x+%02x req=%c%c%c%c%c%c[%c%c%c%c%c%c]{%x} id=%04x(%c) xlatChar=%02x(%c) scan=%02x xlatScan=%02x [%s]%s%s%s%s%s%s",
          item.m_button, convertKeyModiferMaskToTCF(item.m_required),
@@ -1167 +1167 @@
          ));
         if (data.s.scan2 || data.s.xlatScan2) {
-                LOG((CLOG_DEBUG
+                LOG((CLOG_DEBUG1
                          "addKeyEntry: xlatChar2=%02x(%c) scan2=%02x xlatScan2=%02x",
                          data.s.xlatChar2, data.s.xlatChar2 < 128 && isprint(data.s.xlatChar2) ? data.s.xlatChar2 : '.',
@@ -1174 +1174 @@
 
         if (!keyMap.addKeyEntry(item)) {
-                LOG((CLOG_DEBUG "!not accepted!"));
+                LOG((CLOG_DEBUG1 "!not accepted!"));
     }
         if (item.m_group == 0) {