diff -r e375a7921169 -r 57c618273d5c windowing/windowserver/nga/SERVER/POINTER.CPP --- a/windowing/windowserver/nga/SERVER/POINTER.CPP Thu Jul 15 20:08:02 2010 +0300 +++ b/windowing/windowserver/nga/SERVER/POINTER.CPP Thu Aug 19 11:11:18 2010 +0300 @@ -532,6 +532,9 @@ break; default:; } +#ifdef LOG_WSERV_EVENTS + RDebug::Printf("{EVNT}TWsPointer::QueuePointerEvent After adding event to clientqueue Event State %d ", iState); +#endif queue->QueueEvent(aEvent,priority); } } @@ -861,6 +864,11 @@ ReLogCurrentWindow(pointerEvent.iPosition,parPos,aForceInGroup); pointerEvent.iParentPosition=parPos; + +#ifdef LOG_WSERV_EVENTS + RDebug::Printf("{EVNT}TWsPointer::ProcessEvent Event send to this window %U", reinterpret_cast(iCurrentWindow)); + RDebug::Printf("{EVNT}TWsPointer::ProcessEvent EventType %d and Event State %d ", eventType, iState); +#endif // update state switch(eventType) { @@ -1012,6 +1020,10 @@ { if (iState != EPointerStateOutOfRange) { +#ifdef LOG_WSERV_EVENTS + RDebug::Printf("{EVNT}TWsPointer::ProcessOutOfRangeEvent Pointer Number = %d, iState =%d ", iNumber, iState); +#endif + // OutOfRange event generated by driver doesn't contain correct coordinates, // we update them from last state in order to deliver event to the proper window. SendEnterExitEvent(EEventPointerExit); @@ -1399,7 +1411,13 @@ TRawEvent::TType type=aRawEvent.Type(); TInt pointerNumber = aRawEvent.PointerNumber(); - + +#ifdef LOG_WSERV_EVENTS + RDebug::Printf("{EVNT}TWsPointer::UpdatePrimaryPointer Current Primary pointer = %d",iPrimaryPointer); + RDebug::Printf("{EVNT}TWsPointer::UpdatePrimaryPointer Pointer Number= %d State = %x XY(%d,%d)",iPointers[0].iNumber,iPointers[0].iState,iPointers[0].iPos.iX,iPointers[0].iPos.iY); + RDebug::Printf("{EVNT}TWsPointer::UpdatePrimaryPointer Pointer Number= %d State = %x XY(%d,%d)",iPointers[1].iNumber,iPointers[1].iState,iPointers[1].iPos.iX,iPointers[1].iPos.iY); +#endif + // If primary pointer is out of range, then the first pointer that will // start being detected (come back in range) will become primary. if (iPointers[iPrimaryPointer].iState == EPointerStateOutOfRange) @@ -1407,6 +1425,9 @@ if (type != TRawEvent::EPointer3DOutOfRange && iPointers[pointerNumber].iState == EPointerStateOutOfRange) { iPrimaryPointer = pointerNumber; +#ifdef LOG_WSERV_EVENTS + RDebug::Printf("{EVNT}TWsPointer::UpdatePrimaryPointer New Primary pointer(case OutRange) = %d",iPrimaryPointer); +#endif } return; } @@ -1415,8 +1436,11 @@ // is not down, then the pointer which has sent EButton1Down becomes primary. if (type == TRawEvent::EButton1Down && iPointers[iPrimaryPointer].iState != EPointerStateDown) - { + { iPrimaryPointer = pointerNumber; +#ifdef LOG_WSERV_EVENTS + RDebug::Printf("{EVNT}TWsPointer::UpdatePrimaryPointer New Primary pointer(case ButtonDown) = %d",iPrimaryPointer); +#endif return; } }