luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

increase buffer size, send text to string window, 

retrieve the correct number of byte after utf-8 conversion.

Answering to a promt (e.g. after command 'hardcopy') does not
yet do.
This commit is contained in:
Holger Vogt 2019-12-22 15:53:27 +01:00
parent 4383d4839b
commit 1e08fd6993
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/winmain.c
View File

@ -42,7 +42,7 @@
#define LF 10 // Line Feed #define LF 10 // Line Feed
#define SE 0 // String termination #define SE 0 // String termination
#define BorderSize 8 // Umrandung des Stringfeldes #define BorderSize 8 // Umrandung des Stringfeldes
#define SBufSize 100 // Groesze des Stringbuffers #define SBufSize 300 // Groesze des Stringbuffers
#define IOBufSize 16348 // Groesze des printf-Buffers #define IOBufSize 16348 // Groesze des printf-Buffers
#define HIST_SIZE 20 /* Max # commands held in history */ #define HIST_SIZE 20 /* Max # commands held in history */
#define N_BYTE_HIST_BUF 512 /* Initial size of history buffer in bytes */ #define N_BYTE_HIST_BUF 512 /* Initial size of history buffer in bytes */
@ -578,6 +578,8 @@ StringWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
SetWindowText(hwnd, (i == VK_UP) ? SetWindowText(hwnd, (i == VK_UP) ?
history_get_prev(*pp_hi, NULL) : history_get_prev(*pp_hi, NULL) :
history_get_next(*pp_hi, NULL)); history_get_next(*pp_hi, NULL));
/* Put cursor to end of line */
CallWindowProc(swProc, hwnd, uMsg, (WPARAM) VK_END, lParam);
#else #else
const char *newtext = (i == VK_UP) ? const char *newtext = (i == VK_UP) ?
history_get_prev(*pp_hi, NULL) : history_get_prev(*pp_hi, NULL) :
@ -586,11 +588,11 @@ StringWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
newtextW = TMALLOC(wchar_t, 2 * strlen(newtext) + 1); newtextW = TMALLOC(wchar_t, 2 * strlen(newtext) + 1);
MultiByteToWideChar( MultiByteToWideChar(
CP_UTF8, 0, newtext, -1, newtextW, 2 * (int) strlen(newtext) + 1); CP_UTF8, 0, newtext, -1, newtextW, 2 * (int) strlen(newtext) + 1);
SetWindowTextW(hwSource, newtextW); SetWindowTextW(swString, newtextW);
tfree(newtextW); tfree(newtextW);
#endif
/* Put cursor to end of line */ /* Put cursor to end of line */
CallWindowProc(swProc, hwnd, uMsg, (WPARAM) VK_END, lParam); CallWindowProcW(swProc, hwnd, uMsg, (WPARAM) VK_END, lParam);
#endif
return 0; return 0;
} }
if (i == VK_ESCAPE) { if (i == VK_ESCAPE) {
@ -613,10 +615,11 @@ StringWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
hwnd, SBuffer, sizeof SBuffer - (sizeof CRLF - 1)); hwnd, SBuffer, sizeof SBuffer - (sizeof CRLF - 1));
#else #else
wchar_t *WBuffer = TMALLOC(wchar_t, sizeof(SBuffer)); wchar_t *WBuffer = TMALLOC(wchar_t, sizeof(SBuffer));
const int n_char_returned = GetWindowTextW( /* for utf-8 the number of characters is not the number of bytes returned */
hwnd, WBuffer, sizeof SBuffer - (sizeof CRLF - 1)); GetWindowTextW(hwnd, WBuffer, sizeof SBuffer - (sizeof CRLF - 1));
WideCharToMultiByte(CP_UTF8, 0, WBuffer, -1, SBuffer, /* retrive here the number of bytes returned */
1023, NULL, NULL); const int n_char_returned = WideCharToMultiByte(CP_UTF8, 0, WBuffer,
-1, SBuffer, sizeof SBuffer - 1, NULL, NULL);
tfree(WBuffer); tfree(WBuffer);
#endif #endif
unsigned int n_char_prev_cmd; unsigned int n_char_prev_cmd;
@ -638,7 +641,6 @@ StringWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
history_reset_pos(*pp_hi); history_reset_pos(*pp_hi);
} }
strcpy(SBuffer + n_char_returned, CRLF); strcpy(SBuffer + n_char_returned, CRLF);
ClearInput(); ClearInput();
return 0; return 0;