Open-Source-Software-Entwicklung und Downloads

Tera Term

Browse Subversion Repository

/[ttssh2]/trunk/teraterm/teraterm/addsetting.cpp

Diff of /trunk/teraterm/teraterm/addsetting.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2603 by maya, Sat Nov 1 12:31:02 2008 UTC revision 2619 by doda, Wed Nov 19 11:43:17 2008 UTC
# Line 110  BOOL CGeneralPropPageDlg::OnInitDialog() Line 110  BOOL CGeneralPropPageDlg::OnInitDialog()
110          GetObject(font, sizeof(LOGFONT), &logfont);          GetObject(font, sizeof(LOGFONT), &logfont);
111          if (get_lang_font("DLG_TAHOMA_FONT", GetSafeHwnd(), &logfont, &DlgGeneralFont, ts.UILanguageFile)) {          if (get_lang_font("DLG_TAHOMA_FONT", GetSafeHwnd(), &logfont, &DlgGeneralFont, ts.UILanguageFile)) {
112                  SendDlgItemMessage(IDC_CLICKABLE_URL, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_CLICKABLE_URL, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
                 SendDlgItemMessage(IDC_DELIMITER, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));  
                 SendDlgItemMessage(IDC_DELIM_LIST, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));  
113                  SendDlgItemMessage(IDC_DISABLE_SENDBREAK, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_DISABLE_SENDBREAK, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
114                  SendDlgItemMessage(IDC_ACCEPT_BROADCAST, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0)); // 337: 2007/03/20                  SendDlgItemMessage(IDC_ACCEPT_BROADCAST, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0)); // 337: 2007/03/20
115                  SendDlgItemMessage(IDC_MOUSEWHEEL_SCROLL_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_MOUSEWHEEL_SCROLL_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
116                  SendDlgItemMessage(IDC_SCROLL_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_SCROLL_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
117                  SendDlgItemMessage(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
118                    SendDlgItemMessage(IDC_ACCEPT_MOUSE_EVENT_TRACKING, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
119                    SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING_LABEL, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
120                    SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
121          }          }
122          else {          else {
123                  DlgGeneralFont = NULL;                  DlgGeneralFont = NULL;
# Line 125  BOOL CGeneralPropPageDlg::OnInitDialog() Line 126  BOOL CGeneralPropPageDlg::OnInitDialog()
126          GetDlgItemText(IDC_CLICKABLE_URL, uimsg, sizeof(uimsg));          GetDlgItemText(IDC_CLICKABLE_URL, uimsg, sizeof(uimsg));
127          get_lang_msg("DLG_TAB_GENERAL_CLICKURL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);          get_lang_msg("DLG_TAB_GENERAL_CLICKURL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
128          SetDlgItemText(IDC_CLICKABLE_URL, ts.UIMsg);          SetDlgItemText(IDC_CLICKABLE_URL, ts.UIMsg);
         GetDlgItemText(IDC_DELIMITER, uimsg, sizeof(uimsg));  
         get_lang_msg("DLG_TAB_GENERAL_DEMILITER", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);  
         SetDlgItemText(IDC_DELIMITER, ts.UIMsg);  
129          GetDlgItemText(IDC_DISABLE_SENDBREAK, uimsg, sizeof(uimsg));          GetDlgItemText(IDC_DISABLE_SENDBREAK, uimsg, sizeof(uimsg));
130          get_lang_msg("DLG_TAB_GENERAL_DISABLESENDBREAK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);          get_lang_msg("DLG_TAB_GENERAL_DISABLESENDBREAK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
131          SetDlgItemText(IDC_DISABLE_SENDBREAK, ts.UIMsg);          SetDlgItemText(IDC_DISABLE_SENDBREAK, ts.UIMsg);
# Line 140  BOOL CGeneralPropPageDlg::OnInitDialog() Line 138  BOOL CGeneralPropPageDlg::OnInitDialog()
138          GetDlgItemText(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, uimsg, sizeof(uimsg));          GetDlgItemText(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, uimsg, sizeof(uimsg));
139          get_lang_msg("DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);          get_lang_msg("DLG_TAB_GENERAL_AUTOSCROLL_ONLY_IN_BOTTOM_LINE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
140          SetDlgItemText(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, ts.UIMsg);          SetDlgItemText(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, ts.UIMsg);
   
141          GetDlgItemText(IDC_ACCEPT_MOUSE_EVENT_TRACKING, uimsg, sizeof(uimsg));          GetDlgItemText(IDC_ACCEPT_MOUSE_EVENT_TRACKING, uimsg, sizeof(uimsg));
142          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_MOUSE_EVENT_TRACKING", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_MOUSE_EVENT_TRACKING", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
143          SetDlgItemText(IDC_ACCEPT_MOUSE_EVENT_TRACKING, ts.UIMsg);          SetDlgItemText(IDC_ACCEPT_MOUSE_EVENT_TRACKING, ts.UIMsg);
   
144          GetDlgItemText(IDC_ACCEPT_TITLE_CHANGING_LABEL, uimsg, sizeof(uimsg));          GetDlgItemText(IDC_ACCEPT_TITLE_CHANGING_LABEL, uimsg, sizeof(uimsg));
145          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
146          SetDlgItemText(IDC_ACCEPT_TITLE_CHANGING_LABEL, ts.UIMsg);          SetDlgItemText(IDC_ACCEPT_TITLE_CHANGING_LABEL, ts.UIMsg);
147    
148          SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)"off");          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_OFF", ts.UIMsg, sizeof(ts.UIMsg), "off", ts.UILanguageFile);
149          SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)"overwrite");          SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
150          SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)"before");          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_OVERWRITE", ts.UIMsg, sizeof(ts.UIMsg), "overwrite", ts.UILanguageFile);
151          SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)"after");          SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
152            get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_AHEAD", ts.UIMsg, sizeof(ts.UIMsg), "ahead", ts.UILanguageFile);
153            SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
154            get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_LAST", ts.UIMsg, sizeof(ts.UIMsg), "last", ts.UILanguageFile);
155            SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
156    
157    
158          // (1)DisableAcceleratorSendBreak          // (1)DisableAcceleratorSendBreak
# Line 163  BOOL CGeneralPropPageDlg::OnInitDialog() Line 163  BOOL CGeneralPropPageDlg::OnInitDialog()
163          btn = (CButton *)GetDlgItem(IDC_CLICKABLE_URL);          btn = (CButton *)GetDlgItem(IDC_CLICKABLE_URL);
164          btn->SetCheck(ts.EnableClickableUrl);          btn->SetCheck(ts.EnableClickableUrl);
165    
166          // (3)delimiter characters          // (3)AcceptBroadcast 337: 2007/03/20
         SetDlgItemText(IDC_DELIM_LIST, ts.DelimList);  
   
         // (4)AcceptBroadcast 337: 2007/03/20  
167          btn = (CButton *)GetDlgItem(IDC_ACCEPT_BROADCAST);          btn = (CButton *)GetDlgItem(IDC_ACCEPT_BROADCAST);
168          btn->SetCheck(ts.AcceptBroadcast);          btn->SetCheck(ts.AcceptBroadcast);
169    
170          // (5)IDC_MOUSEWHEEL_SCROLL_LINE          // (4)IDC_MOUSEWHEEL_SCROLL_LINE
171          _snprintf_s(buf, sizeof(buf), "%d", ts.MouseWheelScrollLine);          _snprintf_s(buf, sizeof(buf), "%d", ts.MouseWheelScrollLine);
172          SetDlgItemText(IDC_SCROLL_LINE, buf);          SetDlgItemText(IDC_SCROLL_LINE, buf);
173    
174          // (6)IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE          // (5)IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE
175          btn = (CButton *)GetDlgItem(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE);          btn = (CButton *)GetDlgItem(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE);
176          btn->SetCheck(ts.AutoScrollOnlyInBottomLine);          btn->SetCheck(ts.AutoScrollOnlyInBottomLine);
177    
178          // (7)IDC_ACCEPT_MOUSE_EVENT_TRACKING          // (6)IDC_ACCEPT_MOUSE_EVENT_TRACKING
179          btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING);          btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING);
180          btn->SetCheck(ts.MouseEventTracking);          btn->SetCheck(ts.MouseEventTracking);
181    
182          // (8)IDC_ACCEPT_TITLE_CHANGING          // (7)IDC_ACCEPT_TITLE_CHANGING
183          cmb = (CComboBox *)GetDlgItem(IDC_ACCEPT_TITLE_CHANGING);          cmb = (CComboBox *)GetDlgItem(IDC_ACCEPT_TITLE_CHANGING);
184          cmb->SetCurSel(ts.AcceptTitleChangeRequest);          cmb->SetCurSel(ts.AcceptTitleChangeRequest);
185    
# Line 212  void CGeneralPropPageDlg::OnOK() Line 209  void CGeneralPropPageDlg::OnOK()
209          btn = (CButton *)GetDlgItem(IDC_CLICKABLE_URL);          btn = (CButton *)GetDlgItem(IDC_CLICKABLE_URL);
210          ts.EnableClickableUrl = btn->GetCheck();          ts.EnableClickableUrl = btn->GetCheck();
211    
212          // (3)          // (3) 337: 2007/03/20
         GetDlgItemText(IDC_DELIM_LIST, ts.DelimList, sizeof(ts.DelimList));  
   
         // (4) 337: 2007/03/20  
213          btn = (CButton *)GetDlgItem(IDC_ACCEPT_BROADCAST);          btn = (CButton *)GetDlgItem(IDC_ACCEPT_BROADCAST);
214          ts.AcceptBroadcast = btn->GetCheck();          ts.AcceptBroadcast = btn->GetCheck();
215    
216          // (5)IDC_MOUSEWHEEL_SCROLL_LINE          // (4)IDC_MOUSEWHEEL_SCROLL_LINE
217          GetDlgItemText(IDC_SCROLL_LINE, buf, sizeof(buf));          GetDlgItemText(IDC_SCROLL_LINE, buf, sizeof(buf));
218          val = atoi(buf);          val = atoi(buf);
219          if (val > 0)          if (val > 0)
220                  ts.MouseWheelScrollLine = val;                  ts.MouseWheelScrollLine = val;
221    
222          // (6)IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE          // (5)IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE
223          btn = (CButton *)GetDlgItem(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE);          btn = (CButton *)GetDlgItem(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE);
224          ts.AutoScrollOnlyInBottomLine = btn->GetCheck();          ts.AutoScrollOnlyInBottomLine = btn->GetCheck();
225    
226          // (7)IDC_ACCEPT_MOUSE_EVENT_TRACKING          // (6)IDC_ACCEPT_MOUSE_EVENT_TRACKING
227          btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING);          btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING);
228          ts.MouseEventTracking = btn->GetCheck();          ts.MouseEventTracking = btn->GetCheck();
229    
230          // (8)IDC_ACCEPT_TITLE_CHANGING          // (7)IDC_ACCEPT_TITLE_CHANGING
231          cmb = (CComboBox *)GetDlgItem(IDC_ACCEPT_TITLE_CHANGING);          cmb = (CComboBox *)GetDlgItem(IDC_ACCEPT_TITLE_CHANGING);
232          ts.AcceptTitleChangeRequest = cmb->GetCurSel();          ts.AcceptTitleChangeRequest = cmb->GetCurSel();
233  }  }
# Line 276  BOOL CCopypastePropPageDlg::OnInitDialog Line 270  BOOL CCopypastePropPageDlg::OnInitDialog
270                  SendDlgItemMessage(IDC_CONFIRM_PASTE_RBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_CONFIRM_PASTE_RBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
271                  SendDlgItemMessage(IDC_SELECT_LBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_SELECT_LBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
272                  SendDlgItemMessage(IDC_CONFIRM_CHANGE_PASTE, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_CONFIRM_CHANGE_PASTE, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
273                    SendDlgItemMessage(IDC_DELIMITER, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
274                    SendDlgItemMessage(IDC_DELIM_LIST, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
275          }          }
276          else {          else {
277                  DlgCopypasteFont = NULL;                  DlgCopypasteFont = NULL;
# Line 296  BOOL CCopypastePropPageDlg::OnInitDialog Line 292  BOOL CCopypastePropPageDlg::OnInitDialog
292          GetDlgItemText(IDC_CONFIRM_CHANGE_PASTE, uimsg, sizeof(uimsg));          GetDlgItemText(IDC_CONFIRM_CHANGE_PASTE, uimsg, sizeof(uimsg));
293          get_lang_msg("DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);          get_lang_msg("DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
294          SetDlgItemText(IDC_CONFIRM_CHANGE_PASTE, ts.UIMsg);          SetDlgItemText(IDC_CONFIRM_CHANGE_PASTE, ts.UIMsg);
295            GetDlgItemText(IDC_DELIMITER, uimsg, sizeof(uimsg));
296            get_lang_msg("DLG_TAB_COPYPASTE_DELIMITER", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
297            SetDlgItemText(IDC_DELIMITER, ts.UIMsg);
298    
299          // (1)Enable continued-line copy          // (1)Enable continued-line copy
300          btn = (CButton *)GetDlgItem(IDC_LINECOPY);          btn = (CButton *)GetDlgItem(IDC_LINECOPY);
# Line 322  BOOL CCopypastePropPageDlg::OnInitDialog Line 321  BOOL CCopypastePropPageDlg::OnInitDialog
321          btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);          btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);
322          btn->SetCheck(ts.ConfirmChangePaste);          btn->SetCheck(ts.ConfirmChangePaste);
323    
324            // (6)delimiter characters
325            SetDlgItemText(IDC_DELIM_LIST, ts.DelimList);
326    
327    
328          // ダイアログにフォーカスを当てる          // ダイアログにフォーカスを当てる
329          ::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_LINECOPY));          ::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_LINECOPY));
330    
# Line 370  void CCopypastePropPageDlg::OnOK() Line 373  void CCopypastePropPageDlg::OnOK()
373          // (5)IDC_CONFIRM_CHANGE_PASTE          // (5)IDC_CONFIRM_CHANGE_PASTE
374          btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);          btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);
375          ts.ConfirmChangePaste = btn->GetCheck();          ts.ConfirmChangePaste = btn->GetCheck();
376    
377            // (6)
378            GetDlgItemText(IDC_DELIM_LIST, ts.DelimList, sizeof(ts.DelimList));
379  }  }
380    
381    
# Line 843  BOOL CCygwinPropPageDlg::OnInitDialog() Line 849  BOOL CCygwinPropPageDlg::OnInitDialog()
849                  SendDlgItemMessage(IDC_ENV2, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_ENV2, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
850                  SendDlgItemMessage(IDC_LOGIN_SHELL, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_LOGIN_SHELL, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
851                  SendDlgItemMessage(IDC_HOME_CHDIR, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_HOME_CHDIR, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
852                    SendDlgItemMessage(IDC_AGENT_PROXY, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
853          }          }
854          else {          else {
855                  DlgCygwinFont = NULL;                  DlgCygwinFont = NULL;
# Line 854  BOOL CCygwinPropPageDlg::OnInitDialog() Line 861  BOOL CCygwinPropPageDlg::OnInitDialog()
861    
862          // try to read CygTerm config file          // try to read CygTerm config file
863          memset(&settings, 0, sizeof(settings));          memset(&settings, 0, sizeof(settings));
864          _snprintf_s(settings.term, sizeof(settings.term), _TRUNCATE, ".\\ttermpro.exe %%s %%d /KR=SJIS /KT=SJIS /nossh");          _snprintf_s(settings.term, sizeof(settings.term), _TRUNCATE, "ttermpro.exe %%s %%d /E /KR=SJIS /KT=SJIS /VTICON=CygTerm /nossh");
865          _snprintf_s(settings.term_type, sizeof(settings.term_type), _TRUNCATE, "vt100");          _snprintf_s(settings.term_type, sizeof(settings.term_type), _TRUNCATE, "vt100");
866          _snprintf_s(settings.port_start, sizeof(settings.port_start), _TRUNCATE, "20000");          _snprintf_s(settings.port_start, sizeof(settings.port_start), _TRUNCATE, "20000");
867          _snprintf_s(settings.port_range, sizeof(settings.port_range), _TRUNCATE, "40");          _snprintf_s(settings.port_range, sizeof(settings.port_range), _TRUNCATE, "40");
868          _snprintf_s(settings.shell, sizeof(settings.shell), _TRUNCATE, "/bin/tcsh");          _snprintf_s(settings.shell, sizeof(settings.shell), _TRUNCATE, "auto");
869          _snprintf_s(settings.env1, sizeof(settings.env1), _TRUNCATE, "MAKE_MODE=unix");          _snprintf_s(settings.env1, sizeof(settings.env1), _TRUNCATE, "MAKE_MODE=unix");
870          _snprintf_s(settings.env2, sizeof(settings.env2), _TRUNCATE, "");          _snprintf_s(settings.env2, sizeof(settings.env2), _TRUNCATE, "");
871          settings.login_shell = FALSE;          settings.login_shell = FALSE;
872          settings.home_chdir = FALSE;          settings.home_chdir = FALSE;
873            settings.agent_proxy = FALSE;
874    
875          strncpy_s(cfg, sizeof(cfg), ts.HomeDir, _TRUNCATE);          strncpy_s(cfg, sizeof(cfg), ts.HomeDir, _TRUNCATE);
876          AppendSlash(cfg, sizeof(cfg));          AppendSlash(cfg, sizeof(cfg));
# Line 911  BOOL CCygwinPropPageDlg::OnInitDialog() Line 919  BOOL CCygwinPropPageDlg::OnInitDialog()
919                                          settings.home_chdir = TRUE;                                          settings.home_chdir = TRUE;
920                                  }                                  }
921    
922                            } else if (_stricmp(head, "SSH_AGENT_PROXY") == 0) {
923                                    if (strchr("YyTt", *body)) {
924                                            settings.agent_proxy = TRUE;
925                                    }
926    
927                          } else {                          } else {
928                                  // TODO: error check                                  // TODO: error check
929    
# Line 929  BOOL CCygwinPropPageDlg::OnInitDialog() Line 942  BOOL CCygwinPropPageDlg::OnInitDialog()
942          btn->SetCheck(settings.login_shell);          btn->SetCheck(settings.login_shell);
943          btn = (CButton *)GetDlgItem(IDC_HOME_CHDIR);          btn = (CButton *)GetDlgItem(IDC_HOME_CHDIR);
944          btn->SetCheck(settings.home_chdir);          btn->SetCheck(settings.home_chdir);
945            btn = (CButton *)GetDlgItem(IDC_AGENT_PROXY);
946            btn->SetCheck(settings.agent_proxy);
947    
948          // Cygwin install path          // Cygwin install path
949          SetDlgItemText(IDC_CYGWIN_PATH, ts.CygwinDirectory);          SetDlgItemText(IDC_CYGWIN_PATH, ts.CygwinDirectory);
# Line 980  void CCygwinPropPageDlg::OnOK() Line 995  void CCygwinPropPageDlg::OnOK()
995          settings.login_shell = btn->GetCheck();          settings.login_shell = btn->GetCheck();
996          btn = (CButton *)GetDlgItem(IDC_HOME_CHDIR);          btn = (CButton *)GetDlgItem(IDC_HOME_CHDIR);
997          settings.home_chdir = btn->GetCheck();          settings.home_chdir = btn->GetCheck();
998            btn = (CButton *)GetDlgItem(IDC_AGENT_PROXY);
999            settings.agent_proxy = btn->GetCheck();
1000    
1001          strncpy_s(cfg, sizeof(cfg), ts.HomeDir, _TRUNCATE);          strncpy_s(cfg, sizeof(cfg), ts.HomeDir, _TRUNCATE);
1002          AppendSlash(cfg, sizeof(cfg));          AppendSlash(cfg, sizeof(cfg));
# Line 1045  void CCygwinPropPageDlg::OnOK() Line 1062  void CCygwinPropPageDlg::OnOK()
1062                                          fprintf(tmp_fp, "HOME_CHDIR = %s\n", (settings.home_chdir == TRUE) ? "yes" : "no");                                          fprintf(tmp_fp, "HOME_CHDIR = %s\n", (settings.home_chdir == TRUE) ? "yes" : "no");
1063                                          settings.home_chdir = FALSE;                                          settings.home_chdir = FALSE;
1064                                  }                                  }
1065                                    else if (_stricmp(head, "SSH_AGENT_PROXY") == 0) {
1066                                            fprintf(tmp_fp, "SSH_AGENT_PROXY = %s\n", (settings.agent_proxy == TRUE) ? "yes" : "no");
1067                                            settings.agent_proxy = FALSE;
1068                                    }
1069                                  else {                                  else {
1070                                          fprintf(tmp_fp, "%s = %s\n", head, body);                                          fprintf(tmp_fp, "%s = %s\n", head, body);
1071                                  }                                  }
# Line 1082  void CCygwinPropPageDlg::OnOK() Line 1103  void CCygwinPropPageDlg::OnOK()
1103                  if (settings.home_chdir) {                  if (settings.home_chdir) {
1104                          fprintf(tmp_fp, "HOME_CHDIR = yes\n");                          fprintf(tmp_fp, "HOME_CHDIR = yes\n");
1105                  }                  }
1106                    if (settings.agent_proxy) {
1107                            fprintf(tmp_fp, "SSH_AGENT_PROXY = yes\n");
1108                    }
1109                  fclose(tmp_fp);                  fclose(tmp_fp);
1110    
1111                  if (remove(cfg) != 0 && errno != ENOENT) {                  if (remove(cfg) != 0 && errno != ENOENT) {
Legend:
Removed from v.2603  
changed lines
  Added in v.2619
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
Über OSDN
Software suchen
Entwickeln Software
Hilfeseiten