| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef WEBKIT_GLUE_WEBINPUTEVENT_H_ | 5 #ifndef WEBKIT_GLUE_WEBINPUTEVENT_H_ |
| 6 #define WEBKIT_GLUE_WEBINPUTEVENT_H_ | 6 #define WEBKIT_GLUE_WEBINPUTEVENT_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 | 9 |
| 10 #if defined(OS_WIN) | 10 #if defined(OS_WIN) |
| 11 #include <windows.h> | 11 #include <windows.h> |
| 12 #elif defined(OS_MACOSX) | 12 #elif defined(OS_MACOSX) |
| 13 #include <vector> | 13 #include <vector> |
| 14 #include <wtf/RetainPtr.h> | |
| 15 #ifdef __OBJC__ | 14 #ifdef __OBJC__ |
| 16 @class NSEvent; | 15 @class NSEvent; |
| 17 @class NSView; | 16 @class NSView; |
| 18 #else | 17 #else |
| 19 class NSEvent; | 18 class NSEvent; |
| 20 class NSView; | 19 class NSView; |
| 21 #endif // __OBJC__ | 20 #endif // __OBJC__ |
| 22 #elif defined(OS_LINUX) | 21 #elif defined(OS_LINUX) |
| 23 typedef struct _GdkEventButton GdkEventButton; | 22 typedef struct _GdkEventButton GdkEventButton; |
| 24 typedef struct _GdkEventMotion GdkEventMotion; | 23 typedef struct _GdkEventMotion GdkEventMotion; |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 ALT_KEY = 1 << 2, | 62 ALT_KEY = 1 << 2, |
| 64 META_KEY = 1 << 3, | 63 META_KEY = 1 << 3, |
| 65 | 64 |
| 66 // modifiers for keyboard events: | 65 // modifiers for keyboard events: |
| 67 IS_KEYPAD = 1 << 4, | 66 IS_KEYPAD = 1 << 4, |
| 68 IS_AUTO_REPEAT = 1 << 5 | 67 IS_AUTO_REPEAT = 1 << 5 |
| 69 }; | 68 }; |
| 70 | 69 |
| 71 Type type; | 70 Type type; |
| 72 int modifiers; | 71 int modifiers; |
| 73 #if defined(OS_MACOSX) | |
| 74 // For now, good enough for the test shell. TODO(avi): Revisit when we need | |
| 75 // to start sending this over an IPC pipe. | |
| 76 RetainPtr<NSEvent> mac_event; | |
| 77 #endif | |
| 78 }; | 72 }; |
| 79 | 73 |
| 80 // WebMouseEvent -------------------------------------------------------------- | 74 // WebMouseEvent -------------------------------------------------------------- |
| 81 | 75 |
| 82 class WebMouseEvent : public WebInputEvent { | 76 class WebMouseEvent : public WebInputEvent { |
| 83 public: | 77 public: |
| 84 // These values defined for WebCore::MouseButton | 78 // These values defined for WebCore::MouseButton |
| 85 enum Button { | 79 enum Button { |
| 86 BUTTON_NONE = -1, | 80 BUTTON_NONE = -1, |
| 87 BUTTON_LEFT, | 81 BUTTON_LEFT, |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 WebKeyboardEvent(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); | 164 WebKeyboardEvent(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); |
| 171 #elif defined(OS_MACOSX) | 165 #elif defined(OS_MACOSX) |
| 172 WebKeyboardEvent(NSEvent *event); | 166 WebKeyboardEvent(NSEvent *event); |
| 173 #elif defined(OS_LINUX) | 167 #elif defined(OS_LINUX) |
| 174 explicit WebKeyboardEvent(const GdkEventKey* event); | 168 explicit WebKeyboardEvent(const GdkEventKey* event); |
| 175 #endif | 169 #endif |
| 176 }; | 170 }; |
| 177 | 171 |
| 178 | 172 |
| 179 #endif // WEBKIT_GLUE_WEBINPUTEVENT_H_ | 173 #endif // WEBKIT_GLUE_WEBINPUTEVENT_H_ |
| OLD | NEW |