diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp index 12e68b1c4..97111075e 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp @@ -36,6 +36,8 @@ # include # endif # include +# define _NET_WM_STATE_REMOVE 0 +# define _NET_WM_STATE_ADD 1 #endif // NL_OS_UNIX #include "nel/misc/mouse_device.h" diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp index f814b130f..0e14e0a74 100644 --- a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp +++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp @@ -101,7 +101,7 @@ void CUnixEventEmitter::submitEvents(CEventServer & server, bool allWindows) } else { - processMessage (Event, server); + processMessage (Event, &server); } } } @@ -382,7 +382,7 @@ TKey getKeyFromKeySym (KeySym keysym) return KeyNOKEY; } -void CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server) +bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server) { if (!server) server=&_InternalServer; @@ -437,7 +437,7 @@ void CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server) } break; } - Case(MotionNotify) + case MotionNotify: { TMouseButton button=getMouseButton (event.xbutton.state); diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.h b/code/nel/src/3d/driver/opengl/unix_event_emitter.h index bb4e6db94..5b038813d 100644 --- a/code/nel/src/3d/driver/opengl/unix_event_emitter.h +++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.h @@ -93,10 +93,10 @@ private: Display* _dpy; Window _win; - TKey _PreviousKey; + TKey _PreviousKey; XIM _im; XIC _ic; - bool _emulateRawMode; + bool _emulateRawMode; NL3D::IDriver* _driver; CUnixEventServer _InternalServer; };