summaryrefslogtreecommitdiff
path: root/gdk/mir/gdkmireventsource.c
diff options
context:
space:
mode:
authorMarco Trevisan (TreviƱo) <mail@3v1n0.net>2014-12-02 16:25:18 +0100
committerWilliam Hua <william@attente.ca>2015-02-05 17:26:17 +0100
commit7d4066de41209b26759dac6f6ac214a633bcd992 (patch)
treed7d3c4ee3f7ecf58ba246f45ca78f57b5d0ea41e /gdk/mir/gdkmireventsource.c
parent6b6af59b9b7734213b913e1b121ed3f0956879d5 (diff)
downloadgtk+-7d4066de41209b26759dac6f6ac214a633bcd992.tar.gz
mir: add a NANO_TO_MILLI conversion macro
Diffstat (limited to 'gdk/mir/gdkmireventsource.c')
-rw-r--r--gdk/mir/gdkmireventsource.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c
index a02adffc54..701f394be2 100644
--- a/gdk/mir/gdkmireventsource.c
+++ b/gdk/mir/gdkmireventsource.c
@@ -22,6 +22,8 @@
#include "gdkmir.h"
#include "gdkmir-private.h"
+#define NANO_TO_MILLI(x) (x / 1000000)
+
struct _GdkMirWindowReference {
GdkMirEventSource *source;
GdkWindow *window;
@@ -273,7 +275,7 @@ handle_key_event (GdkWindow *window, const MirKeyEvent *event)
event->key_code,
event->scan_code,
is_modifier,
- event->event_time / 1000000);
+ NANO_TO_MILLI (event->event_time));
break;
default:
//case mir_key_action_multiple:
@@ -301,7 +303,7 @@ handle_motion_event (GdkWindow *window, const MirMotionEvent *event)
y = event->pointer_coordinates[0].y;
}
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
counteract this by always generating an enter notify on all other events */