github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore: Fixed issue with Shift+Ctrl+1 in X11

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11735 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-01-27 12:49:57 +00:00
parent 9e108f105b
commit a5d7644c3b
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
uppsrc/CtrlCore/X11Proc.cpp
View file

@ -141,8 +141,8 @@ void Ctrl::EventProc(XWindow& w, XEvent *event)
ev1->xkey.state != event->xkey.state ||
ev1->xkey.keycode != event->xkey.keycode ||
!IsWaitingEvent()) {
XPutBackEvent(Xdisplay, ev1);
break;
XPutBackEvent(Xdisplay, ev1);
break;
}
do
XNextEvent(Xdisplay, ev2);
@ -260,8 +260,13 @@ void Ctrl::EventProc(XWindow& w, XEvent *event)
return;
}
}
if(keysym >= 48 && keysym <= 57 && chr == 0) {
DispatchKey(KEYtoK(keysym - 48 + K_0)|up, count);
if(GetCtrl() || GetAlt()) { // fix Ctrl+Shift+1 etc...
keysym = decode(event->xkey.keycode, 0xa, '1', 0xb, '2', 0xc, '3', 0xd, '4',
0xe, '5', 0xf, '6', 0x10, '7', 0x11, '8', 0x12, '9', 0x13, '0',
keysym);
}
if(keysym >= '0' && keysym <= '9' && (chr == 0 || GetCtrl() || GetAlt())) {
DispatchKey(KEYtoK(keysym - '0' + K_0)|up, count);
return;
}
if(chr >= 1 && chr < 32) {