Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1028 Implement GlWndProc for X11

Browse source
This commit is contained in:
kervala 2010-07-24 23:59:11 +02:00
parent b3af4428bc
commit 6183a77273
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
View file

@ -36,6 +36,8 @@
# include <X11/extensions/Xrandr.h> # include <X11/extensions/Xrandr.h>
# endif # endif
# include <X11/Xatom.h> # include <X11/Xatom.h>
# define _NET_WM_STATE_REMOVE 0
# define _NET_WM_STATE_ADD 1
#endif // NL_OS_UNIX #endif // NL_OS_UNIX
#include "nel/misc/mouse_device.h" #include "nel/misc/mouse_device.h"

6
code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
View file

@ -101,7 +101,7 @@ void CUnixEventEmitter::submitEvents(CEventServer & server, bool allWindows)
} }
else else
{ {
processMessage (Event, server); processMessage (Event, &server);
} }
} }
} }
@ -382,7 +382,7 @@ TKey getKeyFromKeySym (KeySym keysym)
return KeyNOKEY; return KeyNOKEY;
} }
void CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server) bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
{ {
if (!server) if (!server)
server=&_InternalServer; server=&_InternalServer;
@ -437,7 +437,7 @@ void CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
} }
break; break;
} }
Case(MotionNotify) case MotionNotify:
{ {
TMouseButton button=getMouseButton (event.xbutton.state); TMouseButton button=getMouseButton (event.xbutton.state);

4
code/nel/src/3d/driver/opengl/unix_event_emitter.h
View file

@ -93,10 +93,10 @@ private:
Display* _dpy; Display* _dpy;
Window _win; Window _win;
TKey _PreviousKey; TKey _PreviousKey;
XIM _im; XIM _im;
XIC _ic; XIC _ic;
bool _emulateRawMode; bool _emulateRawMode;
NL3D::IDriver* _driver; NL3D::IDriver* _driver;
CUnixEventServer _InternalServer; CUnixEventServer _InternalServer;
}; };