OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision9243 (tree)
Time2021-05-10 23:11:51
Authorzmatsuo

Log Message

SHARED_KEYMAP マクロに関する部分を削除

- SHARED_KEYMAP は従来から無効状態だった
- 使用していないAPI を削除

- ttpcmn.dll内
- ChangeDefaultSet()
- GetDefaultSet()

Change Summary

Incremental Difference

--- trunk/teraterm/common/ttcommon.h (revision 9242)
+++ trunk/teraterm/common/ttcommon.h (revision 9243)
@@ -42,9 +42,7 @@
4242 DllExport void PASCAL CopyTTSetToShmem(PTTSet ts);
4343 DllExport BOOL PASCAL StartTeraTerm(PTTSet ts);
4444 DllExport void PASCAL RestartTeraTerm(HWND hwnd, PTTSet ts);
45-DllExport void PASCAL ChangeDefaultSet(PTTSet ts, PKeyMap km);
46-DllExport void PASCAL GetDefaultSet(PTTSet ts);
47-// void PASCAL LoadDefaultSet(PCHAR SetupFName);
45+
4846 DllExport WORD PASCAL GetKeyCode(PKeyMap KeyMap, WORD Scan);
4947 DllExport void PASCAL GetKeyStr(HWND HWin, PKeyMap KeyMap, WORD KeyCode,
5048 BOOL AppliKeyMode, BOOL AppliCursorMode,
--- trunk/teraterm/teraterm/keyboard.c (revision 9242)
+++ trunk/teraterm/teraterm/keyboard.c (revision 9243)
@@ -70,18 +70,6 @@
7070 char TempDir[MAXPATHLEN];
7171 char TempName[MAX_PATH];
7272
73-#ifdef SHARED_KEYMAP
74- if ( strlen(ts.KeyCnfFN)==0 ) return;
75-#else
76- /*
77- if ( strlen(ts.KeyCnfFN)==0 ) {
78- if ( KeyMap != NULL ) {
79- return;
80- }
81- strncpy_s(ts.KeyCnfFN, sizeof(ts.KeyCnfFN),"KEYBOARD.CNF", _TRUNCATE);
82- }
83- */
84-#endif
8573 ExtractFileName(ts.KeyCnfFN,TempName,sizeof(TempName));
8674 ExtractDirName(ts.KeyCnfFN,TempDir);
8775 if (TempDir[0]==0)
@@ -100,15 +88,6 @@
10088 (*ReadKeyboardCnf)(ts.KeyCnfFN, KeyMap, TRUE);
10189 FreeTTSET();
10290 }
103-#ifdef SHARED_KEYMAP
104- if ((_stricmp(TempDir,ts.HomeDir)==0) &&
105- (_stricmp(TempName,"KEYBOARD.CNF")==0))
106- {
107- ChangeDefaultSet(NULL,KeyMap);
108- free(KeyMap);
109- KeyMap = NULL;
110- }
111-#endif
11291 }
11392
11493 void ClearUserKey()
--- trunk/teraterm/teraterm/vtwin.cpp (revision 9242)
+++ trunk/teraterm/teraterm/vtwin.cpp (revision 9243)
@@ -320,10 +320,6 @@
320320 DWORD Style;
321321 char *Param;
322322 int CmdShow;
323-#ifdef SHARED_KEYMAP
324- char Temp[MAX_PATH];
325- PKeyMap tempkm;
326-#endif
327323 int fuLoad = LR_DEFAULTCOLOR;
328324 BOOL isFirstInstance;
329325 m_hInst = hInstance;
@@ -340,26 +336,7 @@
340336 if (LoadTTSET()) {
341337 /* read setup info from "teraterm.ini" */
342338 (*ReadIniFile)(ts.SetupFName, &ts);
343-#ifdef SHARED_KEYMAP
344- /* read keycode map from "keyboard.cnf" */
345- tempkm = (PKeyMap)malloc(sizeof(TKeyMap));
346- if (tempkm!=NULL) {
347- strncpy_s(Temp, sizeof(Temp), ts.HomeDir, _TRUNCATE);
348- AppendSlash(Temp,sizeof(Temp));
349- strncat_s(Temp,sizeof(Temp),"KEYBOARD.CNF",_TRUNCATE);
350- (*ReadKeyboardCnf)(Temp,tempkm,TRUE);
351- }
352-#endif
353339 FreeTTSET();
354-#ifdef SHARED_KEYMAP
355- /* store default sets in TTCMN */
356-#if 0
357- ChangeDefaultSet(&ts,tempkm);
358-#else
359- ChangeDefaultSet(NULL,tempkm);
360-#endif
361- if (tempkm!=NULL) free(tempkm);
362-#endif
363340 }
364341 else {
365342 abort();
@@ -370,23 +347,7 @@
370347 if (LoadTTSET()) {
371348 /* read setup info from "teraterm.ini" */
372349 (*ReadIniFile)(ts.SetupFName, &ts);
373-#ifdef SHARED_KEYMAP
374- /* read keycode map from "keyboard.cnf" */
375- tempkm = (PKeyMap)malloc(sizeof(TKeyMap));
376- if (tempkm!=NULL) {
377- strncpy_s(Temp, sizeof(Temp), ts.HomeDir, _TRUNCATE);
378- AppendSlash(Temp,sizeof(Temp));
379- strncat_s(Temp,sizeof(Temp),"KEYBOARD.CNF",_TRUNCATE);
380- (*ReadKeyboardCnf)(Temp,tempkm,TRUE);
381- }
382-#endif
383350 FreeTTSET();
384-#ifdef SHARED_KEYMAP
385- /* store default sets in TTCMN */
386- if (tempkm!=NULL) {
387- free(tempkm);
388- }
389-#endif
390351 }
391352 else {
392353 abort();
@@ -1264,10 +1225,6 @@
12641225 }
12651226 FreeTTSET();
12661227
1267-#if 0
1268- ChangeDefaultSet(&ts,NULL);
1269-#endif
1270-
12711228 ResetSetup();
12721229 }
12731230
@@ -4838,9 +4795,6 @@
48384795 #endif
48394796 }
48404797
4841-#if 0
4842- ChangeDefaultSet(&ts,NULL);
4843-#endif
48444798 }
48454799
48464800 void CVTWindow::OnSetupRestore()
--- trunk/teraterm/ttpcmn/ttcmn.c (revision 9242)
+++ trunk/teraterm/ttpcmn/ttcmn.c (revision 9243)
@@ -59,8 +59,6 @@
5959 size_t size_tttset; /* sizeof TTTSet */
6060 /* Setup information from "teraterm.ini" */
6161 TTTSet ts;
62- /* Key code map from "keyboard.def" */
63- TKeyMap km;
6462 // Window list
6563 int NWin;
6664 HWND WinList[MAXNWIN];
@@ -186,31 +184,11 @@
186184 }
187185 }
188186
189-void WINAPI ChangeDefaultSet(PTTSet ts, PKeyMap km)
190-{
191- if ((ts!=NULL) &&
192- (_stricmp(ts->SetupFName, pm->ts.SetupFName) == 0)) {
193- memcpy(&(pm->ts),ts,sizeof(TTTSet));
194- }
195- if (km!=NULL) {
196- memcpy(&(pm->km),km,sizeof(TKeyMap));
197- }
198-}
199-
200-void WINAPI GetDefaultSet(PTTSet ts)
201-{
202- memcpy(ts,&(pm->ts),sizeof(TTTSet));
203-}
204-
205-
206187 /* Key scan code -> Tera Term key code */
207188 WORD WINAPI GetKeyCode(PKeyMap KeyMap, WORD Scan)
208189 {
209190 WORD Key;
210191
211- if (KeyMap==NULL) {
212- KeyMap = &(pm->km);
213- }
214192 Key = IdKeyMax;
215193 while ((Key>0) && (KeyMap->Map[Key-1] != Scan)) {
216194 Key--;
@@ -226,10 +204,6 @@
226204 MSG Msg;
227205 char Temp[201];
228206
229- if (KeyMap==NULL) {
230- KeyMap = &(pm->km);
231- }
232-
233207 *Type = IdBinary; // key type
234208 *Len = 0;
235209 switch (KeyCode) {
Show on old repository browser