diff options
Diffstat (limited to 'ui/base/x/events_x.cc')
| -rw-r--r-- | ui/base/x/events_x.cc | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc index 966fec2..765aed3 100644 --- a/ui/base/x/events_x.cc +++ b/ui/base/x/events_x.cc @@ -6,12 +6,17 @@ #include <X11/Xlib.h> #include <X11/extensions/XInput2.h> +#include <string.h> #include "base/logging.h" #include "ui/base/keycodes/keyboard_code_conversion_x.h" #include "ui/base/touch/touch_factory.h" #include "ui/gfx/point.h" +#if !defined(TOOLKIT_USES_GTK) +#include "base/message_pump_x.h" +#endif + namespace { // Scroll amount for each wheelscroll event. 53 is also the value used for GTK+. @@ -356,12 +361,25 @@ float GetTouchForce(const base::NativeEvent& native_event) { } base::NativeEvent CreateNoopEvent() { - static XEvent* noop = new XEvent(); - noop->xclient.type = ClientMessage; - noop->xclient.display = NULL; - noop->xclient.window = None; - noop->xclient.message_type = 0; - noop->xclient.format = 0; + static XEvent* noop = NULL; + if (!noop) { + noop = new XEvent(); + memset(noop, 0, sizeof(XEvent)); + noop->xclient.type = ClientMessage; + noop->xclient.window = None; + noop->xclient.format = 8; + DCHECK(!noop->xclient.display); + } + // TODO(oshima): Remove ifdef once gtk is removed from views. +#if defined(TOOLKIT_USES_GTK) + NOTREACHED(); +#else + // Make sure we use atom from current xdisplay, which may + // change during the test. + noop->xclient.message_type = XInternAtom( + base::MessagePumpX::GetDefaultXDisplay(), + "noop", False); +#endif return noop; } |