Merge branch 'master' of https://github.com/MaxWhere/electron into MaxWhere-master

atom/common/event_types.cc

@@ -0,0 +1,118 @@
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/common/event_types.h"
+#include "third_party/WebKit/public/web/WebInputEvent.h"
+
+namespace atom {
+
+namespace event_types {
+
+const char kMouseDown[] = "down";
+const char kMouseUp[] = "up";
+const char kMouseMove[] = "move";
+const char kMouseEnter[] = "enter";
+const char kMouseLeave[] = "leave";
+const char kContextMenu[] = "context-menu";
+const char kMouseWheel[] = "wheel";
+
+const char kKeyDown[] = "down";
+const char kKeyUp[] = "up";
+const char kChar[] = "char";
+
+const char kMouseLeftButton[] = "left";
+const char kMouseRightButton[] = "right";
+const char kMouseMiddleButton[] = "middle";
+
+const char kModifierLeftButtonDown[] = "left-button-down";
+const char kModifierMiddleButtonDown[] = "middle-button-down";
+const char kModifierRightButtonDown[] = "right-button-down";
+
+const char kModifierShiftKey[] = "shift";
+const char kModifierControlKey[] = "control";
+const char kModifierAltKey[] = "alt";
+const char kModifierMetaKey[] = "meta";
+const char kModifierCapsLockOn[] = "caps-lock";
+const char kModifierNumLockOn[] = "num-lock";
+
+const char kModifierIsKeyPad[] = "keypad";
+const char kModifierIsAutoRepeat[] = "auto-repeat";
+const char kModifierIsLeft[] = "left";
+const char kModifierIsRight[] = "right";
+
+int modifierStrToWebModifier(std::string modifier){
+  if(modifier.compare(event_types::kModifierLeftButtonDown) == 0){
+
+    return blink::WebInputEvent::Modifiers::LeftButtonDown;
+
+  }else if(modifier.compare(event_types::kModifierMiddleButtonDown) == 0){
+
+    return blink::WebInputEvent::Modifiers::MiddleButtonDown;
+
+  }else if(modifier.compare(event_types::kModifierRightButtonDown) == 0){
+
+    return blink::WebInputEvent::Modifiers::RightButtonDown;
+
+  }else if(modifier.compare(event_types::kMouseLeftButton) == 0){
+
+    return blink::WebInputEvent::Modifiers::LeftButtonDown;
+
+  }else if(modifier.compare(event_types::kMouseRightButton) == 0){
+
+    return blink::WebInputEvent::Modifiers::RightButtonDown;
+
+  }else if(modifier.compare(event_types::kMouseMiddleButton) == 0){
+
+    return blink::WebInputEvent::Modifiers::MiddleButtonDown;
+
+  }else if(modifier.compare(event_types::kModifierIsKeyPad) == 0){
+
+    return blink::WebInputEvent::Modifiers::IsKeyPad;
+
+  }else if(modifier.compare(event_types::kModifierIsAutoRepeat) == 0){
+
+    return blink::WebInputEvent::Modifiers::IsAutoRepeat;
+
+  }else if(modifier.compare(event_types::kModifierIsLeft) == 0){
+
+    return blink::WebInputEvent::Modifiers::IsLeft;
+
+  }else if(modifier.compare(event_types::kModifierIsRight) == 0){
+
+    return blink::WebInputEvent::Modifiers::IsRight;
+
+  }else if(modifier.compare(event_types::kModifierShiftKey) == 0){
+
+    return blink::WebInputEvent::Modifiers::ShiftKey;
+
+  }else if(modifier.compare(event_types::kModifierControlKey) == 0){
+
+    return blink::WebInputEvent::Modifiers::ControlKey;
+
+  }else if(modifier.compare(event_types::kModifierAltKey) == 0){
+
+    return blink::WebInputEvent::Modifiers::AltKey;
+
+  }else if(modifier.compare(event_types::kModifierMetaKey) == 0){
+
+    return blink::WebInputEvent::Modifiers::MetaKey;
+
+  }else if(modifier.compare(event_types::kModifierCapsLockOn) == 0){
+
+    return blink::WebInputEvent::Modifiers::CapsLockOn;
+
+  }else if(modifier.compare(event_types::kModifierNumLockOn) == 0){
+
+    return blink::WebInputEvent::Modifiers::NumLockOn;
+
+  }else{
+
+    return 0;
+
+  }
+}
+
+}  // namespace event_types
+
+}  // namespace atom

atom/common/event_types.h

@@ -0,0 +1,52 @@
+// Copyright (c) 2013 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_COMMON_EVENT_TYPES_H_
+#define ATOM_COMMON_EVENT_TYPES_H_
+
+#include "third_party/WebKit/public/web/WebInputEvent.h"
+
+namespace atom {
+
+namespace event_types {
+
+extern const char kMouseDown[];
+extern const char kMouseUp[];
+extern const char kMouseMove[];
+extern const char kMouseEnter[];
+extern const char kMouseLeave[];
+extern const char kContextMenu[];
+extern const char kMouseWheel[];
+
+extern const char kKeyDown[];
+extern const char kKeyUp[];
+extern const char kChar[];
+
+extern const char kMouseLeftButton[];
+extern const char kMouseRightButton[];
+extern const char kMouseMiddleButton[];
+
+extern const char kModifierLeftButtonDown[];
+extern const char kModifierMiddleButtonDown[];
+extern const char kModifierRightButtonDown[];
+
+extern const char kModifierShiftKey[];
+extern const char kModifierControlKey[];
+extern const char kModifierAltKey[];
+extern const char kModifierMetaKey[];
+extern const char kModifierCapsLockOn[];
+extern const char kModifierNumLockOn[];
+
+extern const char kModifierIsKeyPad[];
+extern const char kModifierIsAutoRepeat[];
+extern const char kModifierIsLeft[];
+extern const char kModifierIsRight[];
+
+int modifierStrToWebModifier(std::string modifier);
+
+}  // namespace event_types
+
+}  // namespace atom
+
+#endif  // ATOM_COMMON_EVENT_TYPES_H_

atom/common/options_switches.cc

@@ -116,6 +116,19 @@ const char kRegisterStandardSchemes[] = "register-standard-schemes";
 // The browser process app model ID
 const char kAppUserModelId[] = "app-user-model-id";
 
+const char kOffScreenRender[] = "offscreen-render";
+
+const char kModifiers[] = "modifiers";
+const char kKeyCode[] = "code";
+const char kNativeKeyCode[] = "native";
+
+const char kMovementX[] = "movement-x";
+const char kMovementY[] = "movement-y";
+const char kClickCount[] = "click-count";
+const char kEventType[] = "type";
+const char kMouseEventButton[] = "button";
+const char kMouseWheelPrecise[] = "precise";
+
 }  // namespace switches
 
 }  // namespace atom

atom/common/options_switches.h

@@ -62,6 +62,19 @@ extern const char kRegisterStandardSchemes[];
 
 extern const char kAppUserModelId[];
 
+extern const char kOffScreenRender[];
+
+extern const char kModifiers[];
+extern const char kKeyCode[];
+extern const char kNativeKeyCode[];
+
+extern const char kMovementX[];
+extern const char kMovementY[];
+extern const char kClickCount[];
+extern const char kEventType[];
+extern const char kMouseEventButton[];
+extern const char kMouseWheelPrecise[];
+
 }  // namespace switches
 
 }  // namespace atom