Nux

Merge lp:~3v1n0/nux/x11-timestamps into lp:nux

  1. x11-timestamps
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Christopher Townsend
Approved revision: 824
Merged at revision: 824
Proposed branch: lp:~3v1n0/nux/x11-timestamps
Merge into: lp:nux
Diff against target: 35 lines (+4/-0)
1 file modified
NuxGraphics/GraphicsDisplayX11.cpp (+4/-0)
To merge this branch: bzr merge lp:~3v1n0/nux/x11-timestamps
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+189582@code.launchpad.net

Commit message

GraphicsDisplayX11: set the event timestamp when available

Like in motion, enter/leave and dnd-drop events.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:824
http://10.97.0.26:8080/job/nux-ci/77/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/nux-saucy-amd64-ci/29
    SUCCESS: http://10.97.0.26:8080/job/nux-saucy-armhf-ci/29
    SUCCESS: http://10.97.0.26:8080/job/nux-saucy-i386-ci/29

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/nux-ci/77/rebuild

review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
2--- NuxGraphics/GraphicsDisplayX11.cpp 2013-09-05 20:25:01 +0000
3+++ NuxGraphics/GraphicsDisplayX11.cpp 2013-10-07 12:12:06 +0000
4@@ -1838,6 +1838,7 @@
5 m_pEvent->x_root = 0;
6 m_pEvent->y_root = 0;
7 m_pEvent->key_modifiers = GetModifierKeyState(xevent.xkey.state);
8+ m_pEvent->x11_timestamp = xevent.xmotion.time;
9 MouseMove(xevent, m_pEvent);
10 //nuxDebugMsg("[GraphicsDisplay::ProcessXEvents]: MotionNotify event.");
11 break;
12@@ -1854,6 +1855,7 @@
13 m_pEvent->x_root = 0;
14 m_pEvent->y_root = 0;
15 m_pEvent->key_modifiers = GetModifierKeyState(xevent.xkey.state);
16+ m_pEvent->x11_timestamp = xevent.xcrossing.time;
17 m_pEvent->type = NUX_WINDOW_MOUSELEAVE;
18 //nuxDebugMsg("[GraphicsDisplay::ProcessXEvents]: LeaveNotify event.");
19 break;
20@@ -1869,6 +1871,7 @@
21 m_pEvent->x_root = 0;
22 m_pEvent->y_root = 0;
23 m_pEvent->key_modifiers = GetModifierKeyState(xevent.xkey.state);
24+ m_pEvent->x11_timestamp = xevent.xcrossing.time;
25 MouseMove(xevent, m_pEvent);
26 //nuxDebugMsg("[GraphicsDisplay::ProcessXEvents]: EnterNotify event.");
27 break;
28@@ -2662,6 +2665,7 @@
29 // The drop does not provide(x, y) coordinates of the location of the drop. Use the last DND position.
30 nux_event->x = _last_dnd_position.x;
31 nux_event->y = _last_dnd_position.y;
32+ nux_event->x11_timestamp = _drag_drop_timestamp;
33 }
34
35 void GraphicsDisplay::HandleXDndFinished(XEvent event)

Subscribers

People subscribed via source and target branches