Merge lp:~chasedouglas/grail/use-sync-event-time into lp:grail

[Chase Douglas]

Make taps more reliably detected by the tools.

[Stephen M. Webb (bregma)]

Nice.

review: Approve

=== modified file 'tools/common/servertime.c'
--- tools/common/servertime.c	2012-01-31 23:47:00 +0000
+++ tools/common/servertime.c	2012-03-23 01:38:19 +0000
@@ -57,21 +57,11 @@
   return -1;
 }
 
-static uint64_t get_server_time(Display *display, XSyncCounter counter) {
-  XSyncValue time;
-
-  if (XSyncQueryCounter(display, counter, &time) != True) {
-    fprintf(stderr, "Warning: failed to get server time\n");
-    return 0;
-  }
-
-  return (uint64_t)XSyncValueHigh32(time) << 32 | XSyncValueLow32(time);
-}
-
-void update_time(UGHandle handle, Display *display, XSyncCounter counter) {
-  uint64_t server_time = get_server_time(display, counter);
-
-  grail_update_time(handle, server_time);
+void update_time(UGHandle handle, XSyncCounterNotifyEvent *event) {
+  XSyncValue value = event->counter_value;
+  uint64_t grail_time = (uint64_t)value.hi << 32 | value.lo;
+
+  grail_update_time(handle, grail_time);
 }
 
 void set_timeout(UGHandle handle, Display *display, XSyncCounter counter) {

=== modified file 'tools/common/servertime.h'
--- tools/common/servertime.h	2012-01-31 22:27:05 +0000
+++ tools/common/servertime.h	2012-03-23 01:38:19 +0000
@@ -27,5 +27,5 @@
 #include <utouch/grail.h>
 
 XSyncCounter get_server_time_counter(Display *display);
-void update_time(UGHandle handle, Display *display, XSyncCounter counter);
+void update_time(UGHandle handle, XSyncCounterNotifyEvent *event);
 void set_timeout(UGHandle handle, Display *display, XSyncCounter counter);

=== modified file 'tools/grail-test-3-1.c'
--- tools/grail-test-3-1.c	2012-02-20 12:53:55 +0000
+++ tools/grail-test-3-1.c	2012-03-23 01:38:19 +0000
@@ -331,7 +331,7 @@
             /* Process any outstanding frame events first */
             process_frame_events(grail_handle, frame_handle, win,
                                  subscriptions);
-            update_time(grail_handle, display, server_time_counter);
+            update_time(grail_handle, (XSyncCounterNotifyEvent *)&event);
           }
           continue;
         }

=== modified file 'tools/grail-test-atomic.c'
--- tools/grail-test-atomic.c	2012-02-20 15:44:58 +0000
+++ tools/grail-test-atomic.c	2012-03-23 01:38:19 +0000
@@ -346,7 +346,7 @@
             /* Process any outstanding frame events first */
             process_frame_events(grail_handle, frame_handle, win,
                                  subscriptions);
-            update_time(grail_handle, display, server_time_counter);
+            update_time(grail_handle, (XSyncCounterNotifyEvent *)&event);
           }
           continue;
         }

=== modified file 'tools/grail-test-edge.c'
--- tools/grail-test-edge.c	2012-02-20 12:53:55 +0000
+++ tools/grail-test-edge.c	2012-03-23 01:38:19 +0000
@@ -345,7 +345,7 @@
             /* Process any outstanding frame events first */
             process_frame_events(grail_handle, frame_handle, win,
                                  subscriptions);
-            update_time(grail_handle, display, server_time_counter);
+            update_time(grail_handle, (XSyncCounterNotifyEvent *)&event);
           }
           continue;
         }

=== modified file 'tools/grail-test-propagation.c'
--- tools/grail-test-propagation.c	2012-02-20 12:53:55 +0000
+++ tools/grail-test-propagation.c	2012-03-23 01:38:19 +0000
@@ -313,7 +313,7 @@
             /* Process any outstanding frame events first */
             process_frame_events(grail_handle, frame_handle, win,
                                  subscriptions);
-            update_time(grail_handle, display, server_time_counter);
+            update_time(grail_handle, (XSyncCounterNotifyEvent *)&event);
           }
           continue;
         }