diff --git a/cmd/launcher/launcher.cpp b/cmd/launcher/launcher.cpp index 12d9543b..0c4b4597 100644 --- a/cmd/launcher/launcher.cpp +++ b/cmd/launcher/launcher.cpp @@ -824,10 +824,6 @@ addDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) index->second != 0)); child = getItem(hwnd, IDC_ADD_HD_NUM_CHECK); index = info->m_options.find(kOptionHalfDuplexNumLock); - setItemChecked(child, (index != info->m_options.end() && - index->second != 0)); - child = getItem(hwnd, IDC_ADD_IGNORE_NUM_LOCK); - index = info->m_options.find(kOptionIgnoreNumLock); setItemChecked(child, (index != info->m_options.end() && index->second != 0)); @@ -939,13 +935,6 @@ addDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) else { info->m_options.erase(kOptionHalfDuplexNumLock); } - child = getItem(hwnd, IDC_ADD_IGNORE_NUM_LOCK); - if (isItemChecked(child)) { - info->m_options[kOptionIgnoreNumLock] = 1; - } - else { - info->m_options.erase(kOptionIgnoreNumLock); - } // save modifier options child = getItem(hwnd, IDC_ADD_HD_CAPS_CHECK); diff --git a/cmd/launcher/launcher.rc b/cmd/launcher/launcher.rc index b811362c..a8bf8c7b 100644 --- a/cmd/launcher/launcher.rc +++ b/cmd/launcher/launcher.rc @@ -103,7 +103,7 @@ BEGIN PUSHBUTTON "Quit",IDCANCEL,243,241,50,14 END -IDD_ADD DIALOG DISCARDABLE 0, 0, 192, 270 +IDD_ADD DIALOG DISCARDABLE 0, 0, 192, 236 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "Add Screen" FONT 8, "MS Sans Serif" @@ -113,35 +113,31 @@ BEGIN LTEXT "&Aliases:",IDC_STATIC,7,25,25,8 EDITTEXT IDC_ADD_ALIASES_EDIT,79,26,106,40,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN - GROUPBOX "Options",IDC_STATIC,7,72,178,97 + GROUPBOX "Options",IDC_STATIC,7,72,178,64 LTEXT "If your Caps Lock or Num Lock keys behave strangely on this client screen then try turning the half-duplex options on and reconnect the client.", IDC_STATIC,13,82,165,25 CONTROL "Half-duplex &Caps Lock",IDC_ADD_HD_CAPS_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,110,165,10 CONTROL "Half-duplex &Num Lock",IDC_ADD_HD_NUM_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,122,165,10 - LTEXT "Use this to leave the client's Num Lock state alone.\nThis is primarily useful on laptops.", - IDC_STATIC,13,136,166,17 - CONTROL "&Ignore Num Lock",IDC_ADD_IGNORE_NUM_LOCK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,14,155,71,10 - GROUPBOX "Modifiers",IDC_STATIC,7,172,178,65 - LTEXT "Shift",IDC_STATIC,13,188,15,8 - COMBOBOX IDC_ADD_MOD_SHIFT,37,185,48,60,CBS_DROPDOWNLIST | + GROUPBOX "Modifiers",IDC_STATIC,7,139,178,65 + LTEXT "Shift",IDC_STATIC,13,155,15,8 + COMBOBOX IDC_ADD_MOD_SHIFT,37,152,48,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Ctrl",IDC_STATIC,13,203,11,8 - COMBOBOX IDC_ADD_MOD_CTRL,37,201,48,60,CBS_DROPDOWNLIST | + LTEXT "Ctrl",IDC_STATIC,13,170,11,8 + COMBOBOX IDC_ADD_MOD_CTRL,37,168,48,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Alt",IDC_STATIC,13,219,9,8 - COMBOBOX IDC_ADD_MOD_ALT,37,217,48,60,CBS_DROPDOWNLIST | + LTEXT "Alt",IDC_STATIC,13,186,9,8 + COMBOBOX IDC_ADD_MOD_ALT,37,184,48,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Meta",IDC_STATIC,101,187,17,8 - COMBOBOX IDC_ADD_MOD_META,125,185,48,60,CBS_DROPDOWNLIST | + LTEXT "Meta",IDC_STATIC,101,154,17,8 + COMBOBOX IDC_ADD_MOD_META,125,152,48,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Super",IDC_STATIC,101,203,20,8 - COMBOBOX IDC_ADD_MOD_SUPER,125,201,48,60,CBS_DROPDOWNLIST | + LTEXT "Super",IDC_STATIC,101,170,20,8 + COMBOBOX IDC_ADD_MOD_SUPER,125,168,48,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,79,249,50,14 - PUSHBUTTON "Cancel",IDCANCEL,135,249,50,14 + DEFPUSHBUTTON "OK",IDOK,79,215,50,14 + PUSHBUTTON "Cancel",IDCANCEL,135,215,50,14 END IDD_WAIT DIALOG DISCARDABLE 0, 0, 186, 54 @@ -251,7 +247,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 185 TOPMARGIN, 7 - BOTTOMMARGIN, 263 + BOTTOMMARGIN, 229 END IDD_WAIT, DIALOG diff --git a/cmd/launcher/resource.h b/cmd/launcher/resource.h index d108d170..2885b2f0 100644 --- a/cmd/launcher/resource.h +++ b/cmd/launcher/resource.h @@ -99,7 +99,6 @@ #define IDC_ADD_MOD_SUPER 1047 #define IDC_GLOBAL_SCREENSAVER_SYNC 1047 #define IDC_ADVANCED_DEFAULTS 1049 -#define IDC_ADD_IGNORE_NUM_LOCK 1052 // Next default values for new objects // @@ -108,7 +107,7 @@ #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 110 #define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1053 +#define _APS_NEXT_CONTROL_VALUE 1052 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/lib/client/CServerProxy.cpp b/lib/client/CServerProxy.cpp index 9b242e7d..435cdc55 100644 --- a/lib/client/CServerProxy.cpp +++ b/lib/client/CServerProxy.cpp @@ -445,11 +445,6 @@ CServerProxy::enter() m_seqNum = seqNum; } - // ignore num lock if so desired - if (m_ignoreNumLock) { - mask &= ~KeyModifierNumLock; - } - // forward getClient()->enter(x, y, seqNum, static_cast(mask), false); } @@ -525,12 +520,6 @@ CServerProxy::keyDown() mask2 != static_cast(mask)) LOG((CLOG_DEBUG1 "key down translated to id=%d, mask=0x%04x", id2, mask2)); - // ignore num lock if so desired - if (id2 == kKeyNumLock && m_ignoreNumLock) { - LOG((CLOG_DEBUG1 "ignoring num lock")); - return; - } - // forward getClient()->keyDown(id2, mask2, button); } @@ -555,12 +544,6 @@ CServerProxy::keyRepeat() mask2 != static_cast(mask)) LOG((CLOG_DEBUG1 "key repeat translated to id=%d, mask=0x%04x", id2, mask2)); - // ignore num lock if so desired - if (id2 == kKeyNumLock && m_ignoreNumLock) { - LOG((CLOG_DEBUG1 "ignoring num lock")); - return; - } - // forward getClient()->keyRepeat(id2, mask2, count, button); } @@ -584,12 +567,6 @@ CServerProxy::keyUp() mask2 != static_cast(mask)) LOG((CLOG_DEBUG1 "key up translated to id=%d, mask=0x%04x", id2, mask2)); - // ignore num lock if so desired - if (id2 == kKeyNumLock && m_ignoreNumLock) { - LOG((CLOG_DEBUG1 "ignoring num lock")); - return; - } - // forward getClient()->keyUp(id2, mask2, button); } @@ -707,9 +684,6 @@ CServerProxy::resetOptions() if (m_heartRate >= 0.0) { CProtocolUtil::writef(getOutputStream(), kMsgCNoop); } - - // don't ignore num lock - m_ignoreNumLock = false; } void @@ -752,9 +726,6 @@ CServerProxy::setOptions() CProtocolUtil::writef(getOutputStream(), kMsgCNoop); } } - else if (options[i] == kOptionIgnoreNumLock) { - m_ignoreNumLock = true; - } if (id != kKeyModifierIDNull) { m_modifierTranslationTable[id] = static_cast(options[i + 1]); diff --git a/lib/client/CServerProxy.h b/lib/client/CServerProxy.h index 423cdf56..cbb58f1b 100644 --- a/lib/client/CServerProxy.h +++ b/lib/client/CServerProxy.h @@ -128,7 +128,6 @@ private: SInt32 m_xMouse, m_yMouse; bool m_ignoreMouse; - bool m_ignoreNumLock; KeyModifierID m_modifierTranslationTable[kKeyModifierIDLast]; double m_heartRate; diff --git a/lib/server/CConfig.cpp b/lib/server/CConfig.cpp index 04a2dc72..89417b28 100644 --- a/lib/server/CConfig.cpp +++ b/lib/server/CConfig.cpp @@ -646,9 +646,6 @@ CConfig::getOptionName(OptionID id) if (id == kOptionXTestXineramaUnaware) { return "xtestIsXineramaUnaware"; } - if (id == kOptionIgnoreNumLock) { - return "ignoreNumLock"; - } return NULL; } @@ -658,8 +655,7 @@ CConfig::getOptionValue(OptionID id, OptionValue value) if (id == kOptionHalfDuplexCapsLock || id == kOptionHalfDuplexNumLock || id == kOptionScreenSaverSync || - id == kOptionXTestXineramaUnaware || - id == kOptionIgnoreNumLock) { + id == kOptionXTestXineramaUnaware) { return (value != 0) ? "true" : "false"; } if (id == kOptionModifierMapForShift || @@ -895,10 +891,6 @@ CConfig::readSectionScreens(std::istream& s) addOption(screen, kOptionXTestXineramaUnaware, parseBoolean(value)); } - else if (name == "ignoreNumLock") { - addOption(screen, kOptionIgnoreNumLock, - parseBoolean(value)); - } else { // unknown argument throw XConfigRead("unknown argument"); diff --git a/lib/synergy/OptionTypes.h b/lib/synergy/OptionTypes.h index 27e1f837..aaefe7fa 100644 --- a/lib/synergy/OptionTypes.h +++ b/lib/synergy/OptionTypes.h @@ -55,7 +55,6 @@ static const OptionID kOptionScreenSwitchDelay = OPTION_CODE("SSWT"); static const OptionID kOptionScreenSwitchTwoTap = OPTION_CODE("SSTT"); static const OptionID kOptionScreenSaverSync = OPTION_CODE("SSVR"); static const OptionID kOptionXTestXineramaUnaware = OPTION_CODE("XTXU"); -static const OptionID kOptionIgnoreNumLock = OPTION_CODE("IGNL"); //@} #undef OPTION_CODE