nsxiv8017b75
Refactoring
+8 −10
2 files changed
| @@ -1,4 +1,4 @@ | |||
| 1 | − | VERSION = git-20171207 | |
| 1 | + | VERSION = git-20180109 | |
| 2 | 2 | ||
| 3 | 3 | srcdir = . | |
| 4 | 4 | VPATH = $(srcdir) | |
| @@ -566,22 +566,20 @@ end: | |||
| 566 | 566 | void on_keypress(XKeyEvent *kev) | |
| 567 | 567 | { | |
| 568 | 568 | int i; | |
| 569 | − | unsigned int sh; | |
| 569 | + | unsigned int sh = 0; | |
| 570 | 570 | KeySym ksym, shksym; | |
| 571 | − | char key; | |
| 571 | + | char dummy, key; | |
| 572 | 572 | bool dirty = false; | |
| 573 | 573 | ||
| 574 | + | XLookupString(kev, &key, 1, &ksym, NULL); | |
| 575 | + | ||
| 574 | 576 | if (kev->state & ShiftMask) { | |
| 575 | 577 | kev->state &= ~ShiftMask; | |
| 576 | − | XLookupString(kev, &key, 1, &shksym, NULL); | |
| 578 | + | XLookupString(kev, &dummy, 1, &shksym, NULL); | |
| 577 | 579 | kev->state |= ShiftMask; | |
| 578 | − | XLookupString(kev, &key, 1, &ksym, NULL); | |
| 579 | − | sh = ksym != shksym ? ShiftMask : 0; | |
| 580 | − | } else { | |
| 581 | − | XLookupString(kev, &key, 1, &ksym, NULL); | |
| 582 | − | sh = 0; | |
| 580 | + | if (ksym != shksym) | |
| 581 | + | sh = ShiftMask; | |
| 583 | 582 | } | |
| 584 | − | ||
| 585 | 583 | if (IsModifierKey(ksym)) | |
| 586 | 584 | return; | |
| 587 | 585 | if (ksym == XK_Escape && MODMASK(kev->state) == 0) { | |