diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2010-08-10 13:56:39 +0400 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2010-08-10 13:56:39 +0400 |
| commit | 1c2d36344ca1dbeb8e1517c3e58590728109eccc (patch) | |
| tree | 38a2f731accb5b0a402e62d7419383fa5199165b | |
| parent | 4bf887d4d3592e955144388305ae801040a57701 (diff) | |
Linux compiles again, no SpaceNav yet.
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index e658df3ce95..dc519039af6 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -75,7 +75,7 @@ typedef struct NDOFPlatformInfo { Display *display; Window window; -// volatile GHOST_TEventNDOFData *currValues; + volatile GHOST_TEventNDOFMotionData *currValues; Atom cmdAtom; Atom motionAtom; Atom btnPressAtom; @@ -173,7 +173,7 @@ init( if (success) { - m_ndofManager = new GHOST_NDOFManagerX11; + m_ndofManager = new GHOST_NDOFManagerX11(*this); m_displayManager = new GHOST_DisplayManagerX11(this); @@ -656,8 +656,8 @@ GHOST_SystemX11::processEvent(XEvent *xe) // [mce] look into this soon, as in find out why some values // are shifted and where this message originates. - m_ndofManager->updateTranslation(t, getMilliseconds); - m_ndofManager->updateRotation(r, getMilliseconds); + m_ndofManager->updateTranslation(t, getMilliSeconds()); + m_ndofManager->updateRotation(r, getMilliSeconds()); // g_event = new GHOST_EventNDOF(getMilliSeconds(), // GHOST_kEventNDOFMotion, @@ -670,7 +670,7 @@ GHOST_SystemX11::processEvent(XEvent *xe) // data.buttons = xcme.data.s[2]; unsigned short buttons = xcme.data.s[2]; - m_ndofManager->updateButtons(buttons, getMilliseconds()); + m_ndofManager->updateButtons(buttons, getMilliSeconds()); // g_event = new GHOST_EventNDOF(getMilliSeconds(), // GHOST_kEventNDOFButton, |