mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-14 00:54:05 +02:00
Code Issues Releases Wiki Activity

Merge pull request #73 from adler3d/patch-1

Browse Source 
Implemented toggle_fullscreen for nix
This commit is contained in:
Timur Gagiev
2017-06-02 07:25:19 +03:00
committed by GitHub
parent 65b73febbc d11c62aa5e
commit c42fdc4e6f
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/platform/nix/build.sh
View File

@@ -1,2 +1,3 @@
set -e
clang++ -std=c++11 -Os -s -fno-exceptions -fno-rtti -ffunction-sections -fdata-sections -Wl,--gc-sections -DNDEBUG main.cpp ../../libs/stb_vorbis/stb_vorbis.c -I../../ -o../../../bin/OpenLara -lX11 -lGL -lm -lpthread -lpulse-simple -lpulse
strip ../../../bin/OpenLara --strip-all --remove-section=.comment --remove-section=.note

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

@@ -99,7 +99,25 @@ InputKey mouseToInputKey(int btn) {
return ikNone;
}
void WndProc(const XEvent &e) {
void toggle_fullscreen(Display* dpy, Window win) {
const size_t _NET_WM_STATE_TOGGLE=2;
XEvent xev;
Atom wm_state = XInternAtom(dpy, "_NET_WM_STATE", False);
Atom scr_full = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
memset(&xev, 0, sizeof(xev));
xev.type = ClientMessage;
xev.xclient.window = win;
xev.xclient.message_type = wm_state;
xev.xclient.format = 32;
xev.xclient.data.l[0] = _NET_WM_STATE_TOGGLE;
xev.xclient.data.l[1] = scr_full;
XSendEvent(dpy, DefaultRootWindow(dpy), False, SubstructureNotifyMask, &xev);
}
void WndProc(const XEvent &e,Display*dpy,Window wnd) {
switch (e.type) {
case ConfigureNotify :
Core::width = e.xconfigure.width;
@@ -108,7 +126,7 @@ void WndProc(const XEvent &e) {
case KeyPress :
case KeyRelease :
if (e.type == KeyPress && (e.xkey.state & Mod1Mask) && e.xkey.keycode == 36) {
// TODO: windowed <-> fullscreen switch
toggle_fullscreen(dpy,wnd);
break;
}
Input::setDown(keyToInputKey(e.xkey.keycode), e.type == KeyPress);
@@ -183,7 +201,7 @@ int main() {
XNextEvent(dpy, &event);
if (event.type == ClientMessage && *event.xclient.data.l == WM_DELETE_WINDOW)
break;
WndProc(event);
WndProc(event,dpy,wnd);
} else {
int time = getTime();
if (time <= lastTime)