Differential D2979 Diff 7338 libinput/connection.cpp

Changeset View

Standalone View

View Options

libinput/connection.cpp

Show First 20 Lines • Show All 322 Lines • ▼ Show 20 Line(s)219 switch (event->type()) {
323 } 323​ }
324 case LIBINPUT_EVENT_POINTER_BUTTON: { 324​ case LIBINPUT_EVENT_POINTER_BUTTON: {
325 PointerEvent *pe = static_cast<PointerEvent*>(event.data()); 325​ PointerEvent *pe = static_cast<PointerEvent*>(event.data());
326 emit pointerButtonChanged(pe->button(), pe->buttonState(), pe->time(), pe->device()); 326​ emit pointerButtonChanged(pe->button(), pe->buttonState(), pe->time(), pe->device());
327 break; 327​ break;
328 } 328​ }
329 case LIBINPUT_EVENT_POINTER_MOTION: { 329​ case LIBINPUT_EVENT_POINTER_MOTION: {
330 PointerEvent *pe = static_cast<PointerEvent*>(event.data()); 330​ PointerEvent *pe = static_cast<PointerEvent*>(event.data());
331 QPointF delta = pe->delta(); 331​ auto delta = pe->delta();
332​ auto deltaNonAccel = pe->deltaUnaccelerated();
332 quint32 latestTime = pe->time(); 333​ quint32 latestTime = pe->time();
334​ quint64 latestTimeUsec = pe->timeMicroseconds();
333 auto it = m_eventQueue.begin(); 335​ auto it = m_eventQueue.begin();
334 while (it != m_eventQueue.end()) { 336​ while (it != m_eventQueue.end()) {
335 if ((*it)->type() == LIBINPUT_EVENT_POINTER_MOTION) { 337​ if ((*it)->type() == LIBINPUT_EVENT_POINTER_MOTION) {
336 QScopedPointer<PointerEvent> p(static_cast<PointerEvent*>(*it)); 338​ QScopedPointer<PointerEvent> p(static_cast<PointerEvent*>(*it));
337 delta += p->delta(); 339​ delta += p->delta();
340​ deltaNonAccel += p->deltaUnaccelerated();
338 latestTime = p->time(); 341​ latestTime = p->time();
342​ latestTimeUsec = p->timeMicroseconds();
339 it = m_eventQueue.erase(it); 343​ it = m_eventQueue.erase(it);
340 } else { 344​ } else {
341 break; 345​ break;
342 } 346​ }
343 } 347​ }
344 emit pointerMotion(delta, latestTime, pe->device()); 348​ emit pointerMotion(delta, deltaNonAccel, latestTime, latestTimeUsec, pe->device());
345 break; 349​ break;
346 } 350​ }
347 case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: { 351​ case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: {
348 PointerEvent *pe = static_cast<PointerEvent*>(event.data()); 352​ PointerEvent *pe = static_cast<PointerEvent*>(event.data());
349 emit pointerMotionAbsolute(pe->absolutePos(), pe->absolutePos(m_size), pe->time(), pe->device()); 353​ emit pointerMotionAbsolute(pe->absolutePos(), pe->absolutePos(m_size), pe->time(), pe->device());
350 break; 354​ break;
351 } 355​ }
352 case LIBINPUT_EVENT_TOUCH_DOWN: { 356​ case LIBINPUT_EVENT_TOUCH_DOWN: {
▲ Show 20 Lines • Show All 165 Lines • Show Last 20 Lines