mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-03-13 23:59:41 +01:00
Code Issues Releases Wiki Activity

Linux AZERTY keyboard layout support

Browse Source
This commit is contained in:
XProger 2021-01-03 16:39:21 +03:00
parent 26d226a6df
commit 87bb787032
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/format.h
View File

@ -6301,7 +6301,7 @@ namespace TR {
for (int j = 0; j < animTex.count; j++)
animTex.textures[j] = *(ptr++);
}
delete animTexBlock;
delete[] animTexBlock;
}
if (version & (VER_TR4 | VER_TR5)) {

10
src/platform/nix/main.cpp
View File

@ -78,7 +78,7 @@ void sndFree() {
}
// Input
InputKey keyToInputKey(XKeyEvent event) {
InputKey keyToInputKey(Display *dpy, XKeyEvent event) {
KeySym code = XLookupKeysym(&event, 0);
if (code == XK_Shift_R) code = XK_Shift_L;
@ -96,7 +96,7 @@ InputKey keyToInputKey(XKeyEvent event) {
};
for (int i = 0; i < COUNT(codes); i++) {
if (codes[i] == code) {
if (XKeysymToKeycode(dpy, codes[i]) == event.keycode) {
return (InputKey)(ikLeft + i);
}
}
@ -338,7 +338,7 @@ void toggle_fullscreen(Display* dpy, Window win) {
XSendEvent(dpy, DefaultRootWindow(dpy), False, SubstructureNotifyMask, &xev);
}
void WndProc(const XEvent &e,Display*dpy,Window wnd) {
void WndProc(const XEvent &e, Display* dpy, Window wnd) {
switch (e.type) {
case ConfigureNotify :
Core::width = e.xconfigure.width;
@ -350,7 +350,7 @@ void WndProc(const XEvent &e,Display*dpy,Window wnd) {
toggle_fullscreen(dpy,wnd);
break;
}
Input::setDown(keyToInputKey(e.xkey), e.type == KeyPress);
Input::setDown(keyToInputKey(dpy, e.xkey), e.type == KeyPress);
break;
case ButtonPress :
case ButtonRelease : {
@ -455,7 +455,7 @@ int main(int argc, char **argv) {
XNextEvent(dpy, &event);
if (event.type == ClientMessage && *event.xclient.data.l == WM_DELETE_WINDOW)
Core::quit();
WndProc(event,dpy,wnd);
WndProc(event, dpy, wnd);
} else {
joyUpdate();
bool updated = Game::update();