Consolidate Widget Event code, other cleanup.

views/events/event_gtk.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 "base/logging.h"
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
@@ skipping 59 matching lines @@
     case GDK_ENTER_NOTIFY:
     case GDK_LEAVE_NOTIFY:
       return native_event->crossing.state;
     default:
       NOTREACHED();
       break;
   }
   return 0;
 }
 
+int GetFlagsFromGdkState(unsigned int state) {
+  int flags = 0;
+  flags |= (state & GDK_LOCK_MASK) ? ui::EF_CAPS_LOCK_DOWN : 0;
+  flags |= (state & GDK_CONTROL_MASK) ? ui::EF_CONTROL_DOWN : 0;
+  flags |= (state & GDK_SHIFT_MASK) ? ui::EF_SHIFT_DOWN : 0;
+  flags |= (state & GDK_MOD1_MASK) ? ui::EF_ALT_DOWN : 0;
+  flags |= (state & GDK_BUTTON1_MASK) ? ui::EF_LEFT_BUTTON_DOWN : 0;
+  flags |= (state & GDK_BUTTON2_MASK) ? ui::EF_MIDDLE_BUTTON_DOWN : 0;
+  flags |= (state & GDK_BUTTON3_MASK) ? ui::EF_RIGHT_BUTTON_DOWN : 0;
+  return flags;
+}
+
 #if !defined(TOUCH_UI)
 uint16 GetCharacterFromGdkKeyval(guint keyval) {
   guint32 ch = gdk_keyval_to_unicode(keyval);
 
   // We only support BMP characters.
   return ch < 0xFFFE ? static_cast<uint16>(ch) : 0;
 }
 #endif
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Event, public:
 
 // static
-int Event::GetFlagsFromGdkState(unsigned int state) {
-  int flags = 0;
-  if (state & GDK_LOCK_MASK)
-    flags |= ui::EF_CAPS_LOCK_DOWN;
-  if (state & GDK_CONTROL_MASK)
-    flags |= ui::EF_CONTROL_DOWN;
-  if (state & GDK_SHIFT_MASK)
-    flags |= ui::EF_SHIFT_DOWN;
-  if (state & GDK_MOD1_MASK)
-    flags |= ui::EF_ALT_DOWN;
-  if (state & GDK_BUTTON1_MASK)
-    flags |= ui::EF_LEFT_BUTTON_DOWN;
-  if (state & GDK_BUTTON2_MASK)
-    flags |= ui::EF_MIDDLE_BUTTON_DOWN;
-  if (state & GDK_BUTTON3_MASK)
-    flags |= ui::EF_RIGHT_BUTTON_DOWN;
+int Event::GetFlagsFromGdkEvent(NativeEvent native_event) {
+  int flags = GetFlagsFromGdkState(GetGdkStateFromNative(native_event));
+  if (native_event->type == GDK_2BUTTON_PRESS)
+    flags |= ui::EF_IS_DOUBLE_CLICK;
+  if (native_event->type == GDK_BUTTON_PRESS ||
+      native_event->type == GDK_2BUTTON_PRESS ||
+      native_event->type == GDK_3BUTTON_PRESS ||
+      native_event->type == GDK_BUTTON_RELEASE) {
+    switch (native_event->button.button) {
+      case 1:
+        return flags | ui::EF_LEFT_BUTTON_DOWN;
+      case 2:
+        return flags | ui::EF_MIDDLE_BUTTON_DOWN;
+      case 3:
+        return flags | ui::EF_RIGHT_BUTTON_DOWN;
+    }
+  }
   return flags;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Event, private:
 
 void Event::Init() {
   native_event_ = NULL;
   native_event_2_ = NULL;
 }
@@ skipping 12 matching lines @@
   NOTREACHED();
   native_event_2_ = NULL;
 }
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocatedEvent, protected:
 
 LocatedEvent::LocatedEvent(NativeEvent native_event)
     : Event(native_event, EventTypeFromNative(native_event),
-            GetFlagsFromGdkState(GetGdkStateFromNative(native_event))),
+            GetFlagsFromGdkEvent(native_event)),
       location_(GetMouseEventLocation(native_event)) {
 }
 
 #if !defined(TOUCH_UI)
 LocatedEvent::LocatedEvent(NativeEvent2 native_event_2,
                            FromNativeEvent2 from_native)
     : Event(native_event_2, ui::ET_UNKNOWN, 0, from_native) {
   // No one should ever call this on Gtk-views.
   // TODO(msw): remove once we rid views of Gtk/Gdk.
   NOTREACHED();
@@ skipping 15 matching lines @@
   // TODO(msw): remove once we rid views of Gtk/Gdk.
   NOTREACHED();
 }
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // KeyEvent, public:
 
 KeyEvent::KeyEvent(NativeEvent native_event)
     : Event(native_event, EventTypeFromNative(native_event),
-            GetFlagsFromGdkState(GetGdkStateFromNative(native_event))),
+            GetFlagsFromGdkEvent(native_event)),
       key_code_(ui::KeyboardCodeFromGdkEventKey(
                 GetGdkEventKeyFromNative(native_event))) {
 }
 
 #if !defined(TOUCH_UI)
 KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native)
     : Event(native_event_2, ui::ET_UNKNOWN, 0, from_native) {
   // No one should ever call this on Gtk-views.
   // TODO(beng): remove once we rid views of Gtk/Gdk.
   NOTREACHED();
@@ skipping 49 matching lines @@
 MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2,
                                  FromNativeEvent2 from_native)
     : MouseEvent(native_event_2, from_native) {
   // No one should ever call this on Gtk-views.
   // TODO(msw): remove once we rid views of Gtk/Gdk.
   NOTREACHED();
 }
 #endif
 
 }  // namespace views