diff options
author | Robert Holcomb <bob_holcomb@hotmail.com> | 2007-03-24 21:41:54 +0300 |
---|---|---|
committer | Robert Holcomb <bob_holcomb@hotmail.com> | 2007-03-24 21:41:54 +0300 |
commit | 808a5fc05a3e242661228ae0637fa47e4e41860b (patch) | |
tree | defa1d65e2d8a936265717a75f6ee375c7479c63 /intern | |
parent | d193ce012a8dc674211d9241213fbc16b7798303 (diff) |
Scons build system. MSVC 7.1 in a moment.
Diffstat (limited to 'intern')
-rwxr-xr-x | intern/ghost/intern/GHOST_SystemX11.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 9b5c2d12149..14383ad3624 100755 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -328,10 +328,8 @@ processEvents( } void -GHOST_SystemX11:: -processEvent( - XEvent *xe -){ +GHOST_SystemX11::processEvent(XEvent *xe) +{ GHOST_WindowX11 * window = findGhostWindow(xe->xany.window); GHOST_Event * g_event = NULL; @@ -507,17 +505,22 @@ processEvent( case ReparentNotify: break; - default: { - if(xe->type == window->GetXTablet().MotionEvent) { + default: { + if(xe->type == window->GetXTablet().MotionEvent) + { XDeviceMotionEvent* data = (XDeviceMotionEvent*)xe; - window->GetXTablet().CommonData.Pressure= 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); - window->GetXTablet().CommonData.Ytilt= (short)(data->axis_data[4]&0xffff)/((float)window->GetXTablet().YtiltLevels); + window->GetXTablet().CommonData.Pressure= + 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); + window->GetXTablet().CommonData.Ytilt= + (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; if(data->deviceid == window->GetXTablet().StylusID) window->GetXTablet().CommonData.Active= 1; |