X11: Better timestamp handling for _NET_ACTIVE_WINDOW

ui/events/platform/x11/x11_event_source.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/platform/x11/x11_event_source.h"
 
+#include <X11/Xatom.h>
 #include <X11/XKBlib.h>
 #include <X11/Xlib.h>
 
 #include "base/logging.h"
+#include "base/metrics/histogram_macros.h"
 #include "ui/events/devices/x11/device_data_manager_x11.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/events/platform/x11/x11_hotplug_event_handler.h"
 
 namespace ui {
 
 namespace {
 
 bool InitializeXkb(XDisplay* display) {
@@ skipping 98 matching lines @@
 void X11EventSource::BlockUntilWindowMapped(XID window) {
   XEvent event;
   do {
     // Block until there's a message of |event_mask| type on |w|. Then remove
     // it from the queue and stuff it in |event|.
     XWindowEvent(display_, window, StructureNotifyMask, &event);
     ExtractCookieDataDispatchEvent(&event);
   } while (event.type != MapNotify);
 }
 
+static Bool is_property_notify_for_timestamp(Display* display,
+                                             XEvent* event,
+                                             XPointer arg) {
+  return event->type == PropertyNotify &&
+      event->xproperty.window == DefaultRootWindow(display) &&
+      event->xproperty.atom == *(Atom*)arg;
+}
+
+Time X11EventSource::UpdateServerTime() {
+  base::TimeTicks start = base::TimeTicks::Now();
+
+  const char kAtomStr[] = __FILE__ " CHROMIUM_DUMMY_ATOM";
+
+  DCHECK(display_);
+  Window window = DefaultRootWindow(display_);
+  const unsigned char dummyData = 0;
+  Atom dummyAtom = XInternAtom(display_, kAtomStr, False);
+
+  XSelectInput(display_, window, PropertyChangeMask);
+
+  XChangeProperty(display_, window, dummyAtom, XA_INTEGER, 8, PropModeReplace,
+                  &dummyData, 1);
+
+  XEvent event;
+  XIfEvent(display_, &event, is_property_notify_for_timestamp,
+           (XPointer)&dummyAtom);
+
+  XDeleteProperty(display_, window, dummyAtom);

[Tom (Use chromium acct), 2016/05/06 20:42:00]

For some reason, XDeleteProperty doesn't actually delete the property in the
root window (but I can delete it using xprop -root -remove "xyz").  Anyone know
why this might be happening?

[piman, 2016/05/06 21:23:00]

Maybe need an XFlush ?

[Tom (Use chromium acct), 2016/05/06 22:09:43]

That worked! Done.

+
+  last_seen_server_time_ = event.xproperty.time;
+
+  UMA_HISTOGRAM_TIMES("Event.Latency.X11EventSource.UpdateServerTime",
+                      base::TimeTicks::Now() - start);
+  return last_seen_server_time_;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // X11EventSource, protected
 
 void X11EventSource::ExtractCookieDataDispatchEvent(XEvent* xevent) {
   bool have_cookie = false;
   if (xevent->type == GenericEvent &&
       XGetEventData(xevent->xgeneric.display, &xevent->xcookie)) {
     have_cookie = true;
   }
   Time event_time = ExtractTimeFromXEvent(*xevent);
@@ skipping 36 matching lines @@
 
 void X11EventSource::OnDispatcherListChanged() {
   if (!hotplug_event_handler_) {
     hotplug_event_handler_.reset(new X11HotplugEventHandler());
     // Force the initial device query to have an update list of active devices.
     hotplug_event_handler_->OnHotplugEvent();
   }
 }
 
 }  // namespace ui