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

Win32 launcher changes for ignore NumLock option.

This commit is contained in:
crs 2003-07-12 22:41:07 +00:00
parent faff28de44
commit c22059b433
3 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/launcher/launcher.cpp
View File

@ -540,14 +540,10 @@ getCommandLine(HWND hwnd, bool testing)
SetFocus(child); SetFocus(child);
return CString(); return CString();
} }
if (testing) {
cmdLine += " --no-camp";
}
} }
// debug level // debug level. always include this.
if (testing) { if (true) {
HWND child = getItem(hwnd, IDC_MAIN_DEBUG); HWND child = getItem(hwnd, IDC_MAIN_DEBUG);
DWORD debug = SendMessage(child, CB_GETCURSEL, 0, 0); DWORD debug = SendMessage(child, CB_GETCURSEL, 0, 0);
cmdLine += " --debug "; cmdLine += " --debug ";
@ -828,6 +824,10 @@ addDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
index->second != 0)); index->second != 0));
child = getItem(hwnd, IDC_ADD_HD_NUM_CHECK); child = getItem(hwnd, IDC_ADD_HD_NUM_CHECK);
index = info->m_options.find(kOptionHalfDuplexNumLock); 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() && setItemChecked(child, (index != info->m_options.end() &&
index->second != 0)); index->second != 0));
@ -939,6 +939,13 @@ addDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
else { else {
info->m_options.erase(kOptionHalfDuplexNumLock); 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 // save modifier options
child = getItem(hwnd, IDC_ADD_HD_CAPS_CHECK); child = getItem(hwnd, IDC_ADD_HD_CAPS_CHECK);

40
cmd/launcher/launcher.rc
View File

@ -94,8 +94,8 @@ BEGIN
PUSHBUTTON "Adva&nced...",IDC_MAIN_ADVANCED,68,191,50,14 PUSHBUTTON "Adva&nced...",IDC_MAIN_ADVANCED,68,191,50,14
LTEXT "Automatic Startup:",IDC_STATIC,138,193,59,8 LTEXT "Automatic Startup:",IDC_STATIC,138,193,59,8
PUSHBUTTON "Con&figure...",IDC_MAIN_AUTOSTART,202,191,50,14 PUSHBUTTON "Con&figure...",IDC_MAIN_AUTOSTART,202,191,50,14
LTEXT "Test &Debug Level:",IDC_STATIC,12,216,60,8 LTEXT "Lo&gging Level:",IDC_STATIC,12,216,48,8
COMBOBOX IDC_MAIN_DEBUG,78,213,61,60,CBS_DROPDOWNLIST | COMBOBOX IDC_MAIN_DEBUG,68,213,61,60,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Sa&ve",IDC_MAIN_SAVE,75,241,50,14 PUSHBUTTON "Sa&ve",IDC_MAIN_SAVE,75,241,50,14
DEFPUSHBUTTON "&Test",IDC_MAIN_TEST,131,241,50,14 DEFPUSHBUTTON "&Test",IDC_MAIN_TEST,131,241,50,14
@ -103,7 +103,7 @@ BEGIN
PUSHBUTTON "Quit",IDCANCEL,243,241,50,14 PUSHBUTTON "Quit",IDCANCEL,243,241,50,14
END END
IDD_ADD DIALOG DISCARDABLE 0, 0, 192, 236 IDD_ADD DIALOG DISCARDABLE 0, 0, 192, 270
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "Add Screen" CAPTION "Add Screen"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
@ -113,31 +113,35 @@ BEGIN
LTEXT "&Aliases:",IDC_STATIC,7,25,25,8 LTEXT "&Aliases:",IDC_STATIC,7,25,25,8
EDITTEXT IDC_ADD_ALIASES_EDIT,79,26,106,40,ES_MULTILINE | EDITTEXT IDC_ADD_ALIASES_EDIT,79,26,106,40,ES_MULTILINE |
ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
GROUPBOX "Options",IDC_STATIC,7,72,178,64 GROUPBOX "Options",IDC_STATIC,7,72,178,97
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.", 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 IDC_STATIC,13,82,165,25
CONTROL "Half-duplex &Caps Lock",IDC_ADD_HD_CAPS_CHECK,"Button", CONTROL "Half-duplex &Caps Lock",IDC_ADD_HD_CAPS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,13,110,165,10 BS_AUTOCHECKBOX | WS_TABSTOP,13,110,165,10
CONTROL "Half-duplex &Num Lock",IDC_ADD_HD_NUM_CHECK,"Button", CONTROL "Half-duplex &Num Lock",IDC_ADD_HD_NUM_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,13,122,165,10 BS_AUTOCHECKBOX | WS_TABSTOP,13,122,165,10
GROUPBOX "Modifiers",IDC_STATIC,7,139,178,65 LTEXT "Use this to leave the client's Num Lock state alone.\nThis is primarily useful on laptops.",
LTEXT "Shift",IDC_STATIC,13,155,15,8 IDC_STATIC,13,136,166,17
COMBOBOX IDC_ADD_MOD_SHIFT,37,152,48,60,CBS_DROPDOWNLIST | 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 |
WS_VSCROLL | WS_TABSTOP WS_VSCROLL | WS_TABSTOP
LTEXT "Ctrl",IDC_STATIC,13,170,11,8 LTEXT "Ctrl",IDC_STATIC,13,203,11,8
COMBOBOX IDC_ADD_MOD_CTRL,37,168,48,60,CBS_DROPDOWNLIST | COMBOBOX IDC_ADD_MOD_CTRL,37,201,48,60,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP WS_VSCROLL | WS_TABSTOP
LTEXT "Alt",IDC_STATIC,13,186,9,8 LTEXT "Alt",IDC_STATIC,13,219,9,8
COMBOBOX IDC_ADD_MOD_ALT,37,184,48,60,CBS_DROPDOWNLIST | COMBOBOX IDC_ADD_MOD_ALT,37,217,48,60,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP WS_VSCROLL | WS_TABSTOP
LTEXT "Meta",IDC_STATIC,101,154,17,8 LTEXT "Meta",IDC_STATIC,101,187,17,8
COMBOBOX IDC_ADD_MOD_META,125,152,48,60,CBS_DROPDOWNLIST | COMBOBOX IDC_ADD_MOD_META,125,185,48,60,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP WS_VSCROLL | WS_TABSTOP
LTEXT "Super",IDC_STATIC,101,170,20,8 LTEXT "Super",IDC_STATIC,101,203,20,8
COMBOBOX IDC_ADD_MOD_SUPER,125,168,48,60,CBS_DROPDOWNLIST | COMBOBOX IDC_ADD_MOD_SUPER,125,201,48,60,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,79,215,50,14 DEFPUSHBUTTON "OK",IDOK,79,249,50,14
PUSHBUTTON "Cancel",IDCANCEL,135,215,50,14 PUSHBUTTON "Cancel",IDCANCEL,135,249,50,14
END END
IDD_WAIT DIALOG DISCARDABLE 0, 0, 186, 54 IDD_WAIT DIALOG DISCARDABLE 0, 0, 186, 54
@ -247,7 +251,7 @@ BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 185 RIGHTMARGIN, 185
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 229 BOTTOMMARGIN, 263
END END
IDD_WAIT, DIALOG IDD_WAIT, DIALOG

3
cmd/launcher/resource.h
View File

@ -99,6 +99,7 @@
#define IDC_ADD_MOD_SUPER 1047 #define IDC_ADD_MOD_SUPER 1047
#define IDC_GLOBAL_SCREENSAVER_SYNC 1047 #define IDC_GLOBAL_SCREENSAVER_SYNC 1047
#define IDC_ADVANCED_DEFAULTS 1049 #define IDC_ADVANCED_DEFAULTS 1049
#define IDC_ADD_IGNORE_NUM_LOCK 1052
// Next default values for new objects // Next default values for new objects
// //
@ -107,7 +108,7 @@
#define _APS_NO_MFC 1 #define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 110 #define _APS_NEXT_RESOURCE_VALUE 110
#define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1052 #define _APS_NEXT_CONTROL_VALUE 1053
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif
#endif #endif