Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Revert part of [27e083eed755bf65], which broke the Windows build. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
63517ff1ceef437058dca3db727da10a |
User & Date: | jan.nijtmans 2020-05-22 08:40:04.903 |
Context
2020-05-22
| ||
12:43 | Don't use TCL_AUTO_LENGTH in Tk any more, just use TCL_INDEX_NONE consistantly everywhere: It's actually the same. check-in: 1c6ef075 user: jan.nijtmans tags: trunk | |
11:32 | More progress check-in: 68e4c6f7 user: jan.nijtmans tags: size-for-sel | |
08:40 | Revert part of [27e083eed755bf65], which broke the Windows build. check-in: 63517ff1 user: jan.nijtmans tags: trunk | |
2020-05-20
| ||
23:02 | Slightly biger "lenght" variables, in case we are using Tcl 9 check-in: d1a2a967 user: jan.nijtmans tags: trunk | |
Changes
Changes to win/tkWinKey.c.
︙ | ︙ | |||
411 412 413 414 415 416 417 | * Refresh the mapping information if it's stale */ if (dispPtr->bindInfoStale) { TkpInitKeymapInfo(dispPtr); } | | | | | 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 | * Refresh the mapping information if it's stale */ if (dispPtr->bindInfoStale) { TkpInitKeymapInfo(dispPtr); } sym = KeycodeToKeysym(eventPtr->xkey.keycode, state, 0); /* * Special handling: if this is a ctrl-alt or shifted key, and there is no * keysym defined, try without the modifiers. */ if ((sym == NoSymbol) && ((state & ControlMask) || (state & Mod2Mask))) { state &= ~(ControlMask | Mod2Mask); sym = KeycodeToKeysym(eventPtr->xkey.keycode, state, 0); } if ((sym == NoSymbol) && (state & ShiftMask)) { state &= ~ShiftMask; sym = KeycodeToKeysym(eventPtr->xkey.keycode, state, 0); } return sym; } /* *-------------------------------------------------------------- * |
︙ | ︙ | |||
473 474 475 476 477 478 479 | dispPtr->lockUsage = LU_IGNORE; codePtr = modMapPtr->modifiermap + modMapPtr->max_keypermod*LockMapIndex; for (count = modMapPtr->max_keypermod; count > 0; count--, codePtr++) { if (*codePtr == 0) { continue; } | | | 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 | dispPtr->lockUsage = LU_IGNORE; codePtr = modMapPtr->modifiermap + modMapPtr->max_keypermod*LockMapIndex; for (count = modMapPtr->max_keypermod; count > 0; count--, codePtr++) { if (*codePtr == 0) { continue; } keysym = KeycodeToKeysym(*codePtr, 0, 1); if (keysym == XK_Shift_Lock) { dispPtr->lockUsage = LU_SHIFT; break; } if (keysym == XK_Caps_Lock) { dispPtr->lockUsage = LU_CAPS; break; |
︙ | ︙ | |||
499 500 501 502 503 504 505 | dispPtr->altModMask = 0; codePtr = modMapPtr->modifiermap; max = 8*modMapPtr->max_keypermod; for (i = 0; i < max; i++, codePtr++) { if (*codePtr == 0) { continue; } | | | 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 | dispPtr->altModMask = 0; codePtr = modMapPtr->modifiermap; max = 8*modMapPtr->max_keypermod; for (i = 0; i < max; i++, codePtr++) { if (*codePtr == 0) { continue; } keysym = KeycodeToKeysym(*codePtr, 0, 1); if (keysym == XK_Mode_switch) { dispPtr->modeModMask |= ShiftMask << (i/modMapPtr->max_keypermod); } if ((keysym == XK_Meta_L) || (keysym == XK_Meta_R)) { dispPtr->metaModMask |= ShiftMask << (i/modMapPtr->max_keypermod); } if ((keysym == XK_Alt_L) || (keysym == XK_Alt_R)) { |
︙ | ︙ |