diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-18 07:15:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-18 07:15:12 +0400 |
| commit | a4ff2b914049f3c7af6b06034f7a569b19ad8e7a (patch) | |
| tree | 1226954b80dd48c84c672ee5f386e657a13b48cd /intern | |
| parent | 7a06630411be281c775136cddad1efc745e9f2e0 (diff) | |
code cleanup: warnings
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 17 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.h | 6 |
2 files changed, 11 insertions, 12 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index e75ecfb641e..232bea6749b 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -983,8 +983,7 @@ GHOST_SystemX11::processEvent(XEvent *xe) default: { #ifdef WITH_X11_XINPUT - if (xe->type == window->GetXTablet().MotionEvent) - { + if (xe->type == window->GetXTablet().MotionEvent) { XDeviceMotionEvent *data = (XDeviceMotionEvent *)xe; /* stroke might begin without leading ProxyIn event, @@ -993,23 +992,23 @@ GHOST_SystemX11::processEvent(XEvent *xe) setTabletMode(window, data->deviceid); window->GetXTablet().CommonData.Pressure = - data->axis_data[2] / ((float)window->GetXTablet().PressureLevels); - + data->axis_data[2] / ((float)window->GetXTablet().PressureLevels); + /* the (short) cast and the &0xffff is bizarre and unexplained anywhere, * but I got garbage data without it. Found it in the xidump.c source --matt */ window->GetXTablet().CommonData.Xtilt = - (short)(data->axis_data[3] & 0xffff) / ((float)window->GetXTablet().XtiltLevels); + (short)(data->axis_data[3] & 0xffff) / ((float)window->GetXTablet().XtiltLevels); window->GetXTablet().CommonData.Ytilt = - (short)(data->axis_data[4] & 0xffff) / ((float)window->GetXTablet().YtiltLevels); + (short)(data->axis_data[4] & 0xffff) / ((float)window->GetXTablet().YtiltLevels); } - else if (xe->type == window->GetXTablet().ProxInEvent) - { + else if (xe->type == window->GetXTablet().ProxInEvent) { XProximityNotifyEvent *data = (XProximityNotifyEvent *)xe; setTabletMode(window, data->deviceid); } - else if (xe->type == window->GetXTablet().ProxOutEvent) + else if (xe->type == window->GetXTablet().ProxOutEvent) { window->GetXTablet().CommonData.Active = GHOST_kTabletModeNone; + } #endif // WITH_X11_XINPUT break; } diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index 92bffe46357..bc556490d12 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -210,8 +210,8 @@ public: #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING) XIM - getX11_XIM( - ) { + getX11_XIM() + { return m_xim; } #endif @@ -235,7 +235,7 @@ public: */ void putClipboard(GHOST_TInt8 *buffer, bool selection) const; -#if WITH_XDND +#ifdef WITH_XDND /** * Creates a drag'n'drop event and pushes it immediately onto the event queue. * Called by GHOST_DropTargetX11 class. |