fixes.diff
| b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp Sun Jan 23 16:50:51 2011 +0100 | ||
|---|---|---|
| 159 | 158 |
|
| 160 | 159 |
void CUnixEventEmitter::emulateMouseRawMode(bool enable) |
| 161 | 160 |
{
|
| 162 |
_emulateRawMode = enable; |
|
| 163 |
|
|
| 164 |
if(_emulateRawMode) |
|
| 161 |
if(!_emulateRawMode) |
|
| 165 | 162 |
{
|
| 166 | 163 |
XWindowAttributes xwa; |
| 167 | 164 |
XGetWindowAttributes(_dpy, _win, &xwa); |
| ... | ... | |
| 174 | 171 |
XEvent event; |
| 175 | 172 |
while(XCheckIfEvent(_dpy, &event, &isMouseMoveEvent, NULL)) { };
|
| 176 | 173 |
} |
| 174 |
_emulateRawMode = enable; |
|
| 177 | 175 |
} |
| 178 | 176 |
|
| 179 | 177 |
#ifndef AltMask |
| b/code/ryzom/client/src/events_listener.cpp Sun Jan 23 16:50:51 2011 +0100 | ||
|---|---|---|
| 30 | 30 |
#include "input.h" |
| 31 | 31 |
#include "interface_v3/interface_manager.h" |
| 32 | 32 |
|
| 33 |
|
|
| 34 | 33 |
using namespace NLMISC; |
| 35 | 34 |
|
| 36 | 35 |
extern CActionsManager Actions; // Actions Manager. |
| ... | ... | |
| 263 | 262 |
|
| 264 | 263 |
if (ClientCfg.FreeLookSmoothingPeriod == 0 || !_MouseSmoothingOn) |
| 265 | 264 |
{
|
| 266 |
_MouseDeltaAX = x * ClientCfg.FreeLookSpeed; |
|
| 267 |
_MouseDeltaAY = y * ClientCfg.FreeLookSpeed; |
|
| 265 |
_MouseDeltaAX += x * ClientCfg.FreeLookSpeed;
|
|
| 266 |
_MouseDeltaAY += y * ClientCfg.FreeLookSpeed;
|
|
| 268 | 267 |
_FreeLookSmoothed = false; |
| 269 | 268 |
} |
| 270 | 269 |
else |
| ... | ... | |
| 307 | 306 |
{
|
| 308 | 307 |
_MouseAngleX = true; |
| 309 | 308 |
} |
| 310 |
else |
|
| 311 |
{
|
|
| 312 |
_MouseAngleX = false; |
|
| 313 |
} |
|
| 314 | 309 |
|
| 315 | 310 |
// If mouse pos Y changed. |
| 316 | 311 |
if (fabs(_MouseDeltaAY) > epsilon) |
| 317 | 312 |
{
|
| 318 | 313 |
_MouseAngleY = true; |
| 319 | 314 |
} |
| 320 |
else |
|
| 321 |
{
|
|
| 322 |
_MouseAngleY = false; |
|
| 323 |
} |
|
| 324 | 315 |
} |
| 325 | 316 |
|
| 326 | 317 |
// *************************************************************** |
| ... | ... | |
| 426 | 417 |
//--------------------------------------------------- |
| 427 | 418 |
float CEventsListener::getMouseAngleX() |
| 428 | 419 |
{
|
| 429 |
return _MouseDeltaAX; |
|
| 420 |
float MouseDelta=_MouseDeltaAX; |
|
| 421 |
_MouseDeltaAX=0.f; |
|
| 422 |
return MouseDelta; |
|
| 430 | 423 |
}// getMouseAngleX // |
| 431 | 424 |
|
| 432 | 425 |
//--------------------------------------------------- |
| ... | ... | |
| 434 | 427 |
//--------------------------------------------------- |
| 435 | 428 |
float CEventsListener::getMouseAngleY() |
| 436 | 429 |
{
|
| 437 |
return _MouseDeltaAY; |
|
| 430 |
float MouseDelta=_MouseDeltaAY; |
|
| 431 |
_MouseDeltaAY=0.f; |
|
| 432 |
return MouseDelta; |
|
| 438 | 433 |
}// getMouseAngleY // |
| 439 | 434 |
|
| 440 | 435 |
// *************************************************************************** |