diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-26 20:33:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-26 20:33:36 (GMT) |
| commit | 504bc5bedfd67043ba779b992162efdd5adf0302 (patch) | |
| tree | cd8cc2502faf80b61cce5eb2234bc3bf51a7e6bf /win | |
| parent | b5a443a3cf449d0a29cff305026358daebfb0897 (diff) | |
| parent | 176b57b663e02f53cd58f9476bc885b0097fc9a9 (diff) | |
| download | tk-504bc5bedfd67043ba779b992162efdd5adf0302.zip tk-504bc5bedfd67043ba779b992162efdd5adf0302.tar.gz tk-504bc5bedfd67043ba779b992162efdd5adf0302.tar.bz2 | |
Various cleanups in Unicode handling. Note that without Xft on X11 we don't have Emoji.
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinFont.c | 4 | ||||
| -rw-r--r-- | win/tkWinKey.c | 2 | ||||
| -rw-r--r-- | win/tkWinX.c | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/win/tkWinFont.c b/win/tkWinFont.c index 604a667..7b70a08 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.c @@ -2172,9 +2172,9 @@ FontMapLoadPage( { FontFamily *familyPtr; Tcl_Encoding encoding; - char src[XMaxTransChars], buf[16]; - USHORT *startCount, *endCount; int i, j, bitOffset, end, segCount; + USHORT *startCount, *endCount; + char buf[16], src[4]; subFontPtr->fontMap[row] = ckalloc(FONTMAP_BITSPERPAGE / 8); memset(subFontPtr->fontMap[row], 0, FONTMAP_BITSPERPAGE / 8); diff --git a/win/tkWinKey.c b/win/tkWinKey.c index 8a83874..29f2ff0 100644 --- a/win/tkWinKey.c +++ b/win/tkWinKey.c @@ -97,8 +97,8 @@ TkpGetString( * result. */ { XKeyEvent *keyEv = &eventPtr->xkey; - char buf[6]; int len; + char buf[4]; Tcl_DStringInit(dsPtr); if (keyEv->send_event == -1) { diff --git a/win/tkWinX.c b/win/tkWinX.c index c01096e..d2af130 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -1478,8 +1478,7 @@ GetTranslatedKey( if ((msg.message == WM_CHAR) && (msg.lParam & 0x20000000)) { xkey->state = 0; } - xkey->trans_chars[xkey->nbytes] = (char) msg.wParam; - xkey->nbytes++; + xkey->trans_chars[xkey->nbytes++] = (char) msg.wParam; if (((unsigned short) msg.wParam) > ((unsigned short) 0xff)) { /* |