mir: add a NANO_TO_MILLI conversion macro

This commit is contained in:
Marco Trevisan (Treviño) 2014-12-02 16:25:18 +01:00 committed by William Hua
parent 6b6af59b9b
commit 7d4066de41

View File

@ -22,6 +22,8 @@
#include "gdkmir.h" #include "gdkmir.h"
#include "gdkmir-private.h" #include "gdkmir-private.h"
#define NANO_TO_MILLI(x) (x / 1000000)
struct _GdkMirWindowReference { struct _GdkMirWindowReference {
GdkMirEventSource *source; GdkMirEventSource *source;
GdkWindow *window; GdkWindow *window;
@ -273,7 +275,7 @@ handle_key_event (GdkWindow *window, const MirKeyEvent *event)
event->key_code, event->key_code,
event->scan_code, event->scan_code,
is_modifier, is_modifier,
event->event_time / 1000000); NANO_TO_MILLI (event->event_time));
break; break;
default: default:
//case mir_key_action_multiple: //case mir_key_action_multiple:
@ -301,7 +303,7 @@ handle_motion_event (GdkWindow *window, const MirMotionEvent *event)
y = event->pointer_coordinates[0].y; y = event->pointer_coordinates[0].y;
} }
modifier_state = get_modifier_state (event->modifiers, event->button_state); modifier_state = get_modifier_state (event->modifiers, event->button_state);
event_time = event->event_time / 1000000; event_time = NANO_TO_MILLI (event->event_time);
/* The Mir events generate hover-exits even while inside the window so /* The Mir events generate hover-exits even while inside the window so
counteract this by always generating an enter notify on all other events */ counteract this by always generating an enter notify on all other events */