[Merge] Make mouse buttons 8 - 11 navigate forward and back in history

ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.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/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h"
 
 #include <gestures/gestures.h>
 #include <libevdev/libevdev.h>
 #include <linux/input.h>
 
@@ skipping 183 matching lines @@
   hwstate.finger_cnt = current_finger;
   hwstate.fingers = fingers;
 
   // Buttons.
   if (Event_Get_Button_Left(evdev))
     hwstate.buttons_down |= GESTURES_BUTTON_LEFT;
   if (Event_Get_Button_Middle(evdev))
     hwstate.buttons_down |= GESTURES_BUTTON_MIDDLE;
   if (Event_Get_Button_Right(evdev))
     hwstate.buttons_down |= GESTURES_BUTTON_RIGHT;
+  if (Event_Get_Button(evdev, BTN_SIDE) ||
+      Event_Get_Button(evdev, BTN_BACK)) {
+    hwstate.buttons_down |= GESTURES_BUTTON_BACK;
+  }
+  if (Event_Get_Button(evdev, BTN_EXTRA) ||
+      Event_Get_Button(evdev, BTN_FORWARD)) {
+    hwstate.buttons_down |= GESTURES_BUTTON_FORWARD;
+  }
 
   GestureInterpreterPushHardwareState(interpreter_, &hwstate);
 }
 
 void GestureInterpreterLibevdevCros::OnLibEvdevCrosStopped(
     Evdev* evdev,
     EventStateRec* state) {
   stime_t timestamp = StimeNow();
 
   ReleaseKeys(timestamp);
@@ skipping 98 matching lines @@
 void GestureInterpreterLibevdevCros::OnGestureButtonsChange(
     const Gesture* gesture,
     const GestureButtonsChange* buttons) {
   DVLOG(3) << base::StringPrintf("Gesture Button Change: down=0x%02x up=0x%02x",
                                  buttons->down,
                                  buttons->up);
 
   if (!cursor_)
     return;  // No cursor!
 
-  if (buttons->down & GESTURES_BUTTON_LEFT)
-    DispatchMouseButton(BTN_LEFT, true, gesture->end_time);
-  if (buttons->down & GESTURES_BUTTON_MIDDLE)
-    DispatchMouseButton(BTN_MIDDLE, true, gesture->end_time);
-  if (buttons->down & GESTURES_BUTTON_RIGHT)
-    DispatchMouseButton(BTN_RIGHT, true, gesture->end_time);
-  if (buttons->up & GESTURES_BUTTON_LEFT)
-    DispatchMouseButton(BTN_LEFT, false, gesture->end_time);
-  if (buttons->up & GESTURES_BUTTON_MIDDLE)
-    DispatchMouseButton(BTN_MIDDLE, false, gesture->end_time);
-  if (buttons->up & GESTURES_BUTTON_RIGHT)
-    DispatchMouseButton(BTN_RIGHT, false, gesture->end_time);
+  DispatchChangedMouseButtons(buttons->down, true, gesture->end_time);
+  DispatchChangedMouseButtons(buttons->up, false, gesture->end_time);
 }
 
 void GestureInterpreterLibevdevCros::OnGestureContactInitiated(
     const Gesture* gesture) {
   // TODO(spang): handle contact initiated.
 }
 
 void GestureInterpreterLibevdevCros::OnGestureFling(const Gesture* gesture,
                                                     const GestureFling* fling) {
   DVLOG(3) << base::StringPrintf(
@@ skipping 68 matching lines @@
 void GestureInterpreterLibevdevCros::OnGestureMetrics(
     const Gesture* gesture,
     const GestureMetrics* metrics) {
   DVLOG(3) << base::StringPrintf("Gesture Metrics: [%f, %f] type=%d",
                                  metrics->data[0],
                                  metrics->data[1],
                                  metrics->type);
   NOTIMPLEMENTED();
 }
 
+void GestureInterpreterLibevdevCros::DispatchChangedMouseButtons(
+    unsigned int changed_buttons, bool down, stime_t time) {
+  if (changed_buttons & GESTURES_BUTTON_LEFT)
+    DispatchMouseButton(BTN_LEFT, down, time);
+  if (changed_buttons & GESTURES_BUTTON_MIDDLE)
+    DispatchMouseButton(BTN_MIDDLE, down, time);
+  if (changed_buttons & GESTURES_BUTTON_RIGHT)
+    DispatchMouseButton(BTN_RIGHT, down, time);
+  if (changed_buttons & GESTURES_BUTTON_BACK)
+    DispatchMouseButton(BTN_BACK, down, time);
+  if (changed_buttons & GESTURES_BUTTON_FORWARD)
+    DispatchMouseButton(BTN_FORWARD, down, time);
+}
+
 void GestureInterpreterLibevdevCros::DispatchMouseButton(unsigned int button,
                                                          bool down,
                                                          stime_t time) {
   if (!SetMouseButtonState(button, down))
     return;  // No change.
 
   bool allow_remap = is_mouse_;
   dispatcher_->DispatchMouseButtonEvent(
       MouseButtonEventParams(id_, cursor_->GetLocation(), button, down,
                              allow_remap, StimeToTimedelta(time)));
@@ skipping 44 matching lines @@
 
 bool GestureInterpreterLibevdevCros::SetMouseButtonState(unsigned int button,
                                                          bool down) {
   DCHECK(BTN_MOUSE <= button && button < BTN_JOYSTICK);
   int button_offset = button - BTN_MOUSE;
 
   if (mouse_button_state_.test(button_offset) == down)
     return false;
 
   // State transition: !(down) -> (down)
-  if (down)
-    mouse_button_state_.set(button_offset);
-  else
-    mouse_button_state_.reset(button_offset);
+  mouse_button_state_.set(button_offset, down);
 
   return true;
 }
 
 void GestureInterpreterLibevdevCros::ReleaseMouseButtons(stime_t timestamp) {
   DispatchMouseButton(BTN_LEFT, false /* down */, timestamp);
   DispatchMouseButton(BTN_MIDDLE, false /* down */, timestamp);
   DispatchMouseButton(BTN_RIGHT, false /* down */, timestamp);
+  DispatchMouseButton(BTN_BACK, false /* down */, timestamp);
+  DispatchMouseButton(BTN_FORWARD, false /* down */, timestamp);
 }
 
 }  // namespace ui