Changed: #1028 Implement GlWndProc for X11
This commit is contained in:
parent
2b74d425ed
commit
b22129a4fb
3 changed files with 7 additions and 5 deletions
|
@ -36,6 +36,8 @@
|
|||
# include <X11/extensions/Xrandr.h>
|
||||
# endif
|
||||
# include <X11/Xatom.h>
|
||||
# define _NET_WM_STATE_REMOVE 0
|
||||
# define _NET_WM_STATE_ADD 1
|
||||
#endif // NL_OS_UNIX
|
||||
|
||||
#include "nel/misc/mouse_device.h"
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue