touch: Always expect XInput2 availability.

views/events/event_x.cc

 // Copyright (c) 2011 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 "views/events/event.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
-#if defined(HAVE_XINPUT2)
 #include <X11/extensions/XInput2.h>
-#endif
-#include <X11/Xlib.h>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
+#include "views/touchui/touch_factory.h"
 #include "views/widget/root_view.h"
 
-#if defined(HAVE_XINPUT2)
-#include "views/touchui/touch_factory.h"
-#endif
-
 namespace views {
 
 namespace {
 
 // Scroll amount for each wheelscroll event. 53 is also the value used for GTK+.
 static int kWheelScrollAmount = 53;
 
 int GetEventFlagsFromXState(unsigned int state) {
   int flags = 0;
   if (state & ControlMask)
@@ skipping 29 matching lines @@
     case 2:
       return ui::EF_MIDDLE_BUTTON_DOWN;
     case 3:
       return ui::EF_RIGHT_BUTTON_DOWN;
   }
 
   DLOG(WARNING) << "Unexpected button (" << button << ") received.";
   return 0;
 }
 
-#if defined(HAVE_XINPUT2)
 int GetButtonMaskForX2Event(XIDeviceEvent* xievent) {
   int buttonflags = 0;
 
   for (int i = 0; i < 8 * xievent->buttons.mask_len; i++) {
     if (XIMaskIsSet(xievent->buttons.mask, i)) {
       buttonflags |= GetEventFlagsForButton(i);
     }
   }
 
   return buttonflags;
@@ skipping 31 matching lines @@
 }
 
 int GetTouchIDFromXEvent(XEvent* xev) {
   float slot = 0;
   if (!TouchFactory::GetInstance()->ExtractTouchParam(
         *xev, TouchFactory::TP_SLOT_ID, &slot))
     LOG(ERROR) << "Could not get the slot ID for the event. Using 0.";
   return slot;
 }
 
-#endif  // HAVE_XINPUT2
-
 ui::EventType EventTypeFromNative(NativeEvent2 native_event) {
   switch (native_event->type) {
     case KeyPress:
       return ui::ET_KEY_PRESSED;
     case KeyRelease:
       return ui::ET_KEY_RELEASED;
     case ButtonPress:
       if (native_event->xbutton.button == 4 ||
           native_event->xbutton.button == 5)
         return ui::ET_MOUSEWHEEL;
       return ui::ET_MOUSE_PRESSED;
     case ButtonRelease:
       if (native_event->xbutton.button == 4 ||
           native_event->xbutton.button == 5)
         return ui::ET_MOUSEWHEEL;
       return ui::ET_MOUSE_RELEASED;
     case MotionNotify:
       if (native_event->xmotion.state &
           (Button1Mask | Button2Mask | Button3Mask))
         return ui::ET_MOUSE_DRAGGED;
       return ui::ET_MOUSE_MOVED;
-#if defined(HAVE_XINPUT2)
     case GenericEvent: {
       XIDeviceEvent* xievent =
           static_cast<XIDeviceEvent*>(native_event->xcookie.data);
       if (TouchFactory::GetInstance()->IsTouchDevice(xievent->sourceid))
         return GetTouchEventType(native_event);
       switch (xievent->evtype) {
         case XI_ButtonPress:
           return (xievent->detail == 4 || xievent->detail == 5) ?
               ui::ET_MOUSEWHEEL : ui::ET_MOUSE_PRESSED;
         case XI_ButtonRelease:
           return (xievent->detail == 4 || xievent->detail == 5) ?
               ui::ET_MOUSEWHEEL : ui::ET_MOUSE_RELEASED;
         case XI_Motion:
           return GetButtonMaskForX2Event(xievent) ? ui::ET_MOUSE_DRAGGED :
               ui::ET_MOUSE_MOVED;
       }
     }
-#endif
     default:
       NOTREACHED();
       break;
   }
   return ui::ET_UNKNOWN;
 }
 
 int GetMouseWheelOffset(XEvent* xev) {
-#if defined(HAVE_XINPUT2)
   if (xev->type == GenericEvent) {
     XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(xev->xcookie.data);
     return xiev->detail == 4 ? kWheelScrollAmount : -kWheelScrollAmount;
   }
-#endif
   return xev->xbutton.button == 4 ? kWheelScrollAmount : -kWheelScrollAmount;
 }
 
 gfx::Point GetEventLocation(XEvent* xev) {
   switch (xev->type) {
     case ButtonPress:
     case ButtonRelease:
       return gfx::Point(xev->xbutton.x, xev->xbutton.y);
 
     case MotionNotify:
       return gfx::Point(xev->xmotion.x, xev->xmotion.y);
 
-#if defined(HAVE_XINPUT2)
     case GenericEvent: {
       XIDeviceEvent* xievent =
           static_cast<XIDeviceEvent*>(xev->xcookie.data);
       return gfx::Point(static_cast<int>(xievent->event_x),
                         static_cast<int>(xievent->event_y));
     }
-#endif
   }
 
   return gfx::Point();
 }
 
 int GetLocatedEventFlags(XEvent* xev) {
   switch (xev->type) {
     case ButtonPress:
     case ButtonRelease:
       return GetEventFlagsFromXState(xev->xbutton.state) |
              GetEventFlagsForButton(xev->xbutton.button);
 
     case MotionNotify:
       return GetEventFlagsFromXState(xev->xmotion.state);
 
-#if defined(HAVE_XINPUT2)
     case GenericEvent: {
       XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(xev->xcookie.data);
       bool touch =
           TouchFactory::GetInstance()->IsTouchDevice(xievent->sourceid);
       switch (xievent->evtype) {
         case XI_ButtonPress:
         case XI_ButtonRelease:
           return GetButtonMaskForX2Event(xievent) |
                  GetEventFlagsFromXState(xievent->mods.effective) |
                  (touch ? 0 : GetEventFlagsForButton(xievent->detail));
 
         case XI_Motion:
            return GetButtonMaskForX2Event(xievent) |
                   GetEventFlagsFromXState(xievent->mods.effective);
       }
     }
-#endif
   }
 
   return 0;
 }
 
 uint16 GetCharacterFromXKeyEvent(XKeyEvent* key) {
   char buf[6];
   int bytes_written = XLookupString(key, buf, 6, NULL, NULL);
   DCHECK_LE(bytes_written, 6);
 
   string16 result;
   return (bytes_written > 0 && UTF8ToUTF16(buf, bytes_written, &result) &&
           result.length() == 1) ? result[0] : 0;
 }
 
 float GetTouchRadiusFromXEvent(XEvent* xev) {
   float diameter = 0.0;
-
-#if defined(HAVE_XINPUT2)
   TouchFactory* touch_factory = TouchFactory::GetInstance();
   touch_factory->ExtractTouchParam(*xev, TouchFactory::TP_TOUCH_MAJOR,
                                    &diameter);
-#endif
-
   return diameter / 2.0;
 }
 
 float GetTouchAngleFromXEvent(XEvent* xev) {
   float angle = 0.0;
-
-#if defined(HAVE_XINPUT2)
   TouchFactory* touch_factory = TouchFactory::GetInstance();
   touch_factory->ExtractTouchParam(*xev, TouchFactory::TP_ORIENTATION,
                                    &angle);
-#endif
-
   return angle;
 }
 
 
 float GetTouchRatioFromXEvent(XEvent* xev) {
   float ratio = 1.0;
-
-#if defined(HAVE_XINPUT2)
   TouchFactory* touch_factory = TouchFactory::GetInstance();
   float major_v = -1.0;
   float minor_v = -1.0;
 
   if (!touch_factory->ExtractTouchParam(*xev,
                                         TouchFactory::TP_TOUCH_MAJOR,
                                         &major_v) ||
       !touch_factory->ExtractTouchParam(*xev,
                                         TouchFactory::TP_TOUCH_MINOR,
                                         &minor_v))
     return ratio;
 
   // In case minor axis exists but is zero.
   if (minor_v > 0.0)
     ratio = major_v / minor_v;
-#endif
 
   return ratio;
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Event, private:
 
 void Event::InitWithNativeEvent2(NativeEvent2 native_event_2,
@@ skipping 106 matching lines @@
 
 MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2,
                                  FromNativeEvent2 from_native)
     : MouseEvent(native_event_2, from_native),
       offset_(GetMouseWheelOffset(native_event_2)) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEvent, public:
 
-#if defined(HAVE_XINPUT2)
 TouchEvent::TouchEvent(NativeEvent2 native_event_2,
                        FromNativeEvent2 from_native)
     : LocatedEvent(native_event_2, from_native),
       touch_id_(GetTouchIDFromXEvent(native_event_2)),
       radius_(GetTouchRadiusFromXEvent(native_event_2)),
       angle_(GetTouchAngleFromXEvent(native_event_2)),
       ratio_(GetTouchRatioFromXEvent(native_event_2)) {
   if (type() == ui::ET_TOUCH_PRESSED || type() == ui::ET_TOUCH_RELEASED) {
     TouchFactory* factory = TouchFactory::GetInstance();
     float slot;
     if (factory->ExtractTouchParam(*native_event_2,
                                    TouchFactory::TP_SLOT_ID, &slot)) {
       factory->SetSlotUsed(slot, type() == ui::ET_TOUCH_PRESSED);
     }
   }
 }
-#endif
 
 }  // namespace views