Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Unified Diff: remoting/client/normalizing_input_filter_mac.cc

Issue 2900203002: Moving input filter files and keymap to input directory. (Closed)
Patch Set: Fix include for input. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/client/normalizing_input_filter_mac.cc
diff --git a/remoting/client/normalizing_input_filter_mac.cc b/remoting/client/normalizing_input_filter_mac.cc
deleted file mode 100644
index 0b0507f3327d2857833d5faa3cbfe1b8d9aaa540..0000000000000000000000000000000000000000
--- a/remoting/client/normalizing_input_filter_mac.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2015 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 "remoting/client/normalizing_input_filter_mac.h"
-
-#include <map>
-#include <vector>
-
-#include "base/logging.h"
-#include "remoting/proto/event.pb.h"
-#include "ui/events/keycodes/dom/dom_code.h"
-
-namespace remoting {
-
-NormalizingInputFilterMac::NormalizingInputFilterMac(
- protocol::InputStub* input_stub)
- : protocol::InputFilter(input_stub) {
-}
-
-NormalizingInputFilterMac::~NormalizingInputFilterMac() {}
-
-void NormalizingInputFilterMac::InjectKeyEvent(const protocol::KeyEvent& event)
-{
- DCHECK(event.has_usb_keycode());
-
- ui::DomCode dom_code = static_cast<ui::DomCode>(event.usb_keycode());
-
- bool is_special_key =
- dom_code == ui::DomCode::CONTROL_LEFT ||
- dom_code == ui::DomCode::SHIFT_LEFT ||
- dom_code == ui::DomCode::ALT_LEFT ||
- dom_code == ui::DomCode::CONTROL_RIGHT ||
- dom_code == ui::DomCode::SHIFT_RIGHT ||
- dom_code == ui::DomCode::ALT_RIGHT ||
- dom_code == ui::DomCode::TAB;
-
- bool is_cmd_key =
- dom_code == ui::DomCode::META_LEFT ||
- dom_code == ui::DomCode::META_RIGHT;
-
- if (dom_code == ui::DomCode::CAPS_LOCK) {
- // Mac OS X generates keydown/keyup on lock-state transitions, rather than
- // when the key is pressed & released, so fake keydown/keyup on each event.
- protocol::KeyEvent newEvent(event);
-
- newEvent.set_pressed(true);
- InputFilter::InjectKeyEvent(newEvent);
- newEvent.set_pressed(false);
- InputFilter::InjectKeyEvent(newEvent);
-
- return;
- } else if (!is_cmd_key && !is_special_key) {
- // Track keydown/keyup events for non-modifiers, so we can release them if
- // necessary (see below).
- if (event.pressed()) {
- key_pressed_map_[event.usb_keycode()] = event;
- } else {
- key_pressed_map_.erase(event.usb_keycode());
- }
- }
-
- if (is_cmd_key && !event.pressed()) {
- // Mac OS X will not generate release events for keys pressed while Cmd is
- // pressed, so release all pressed keys when Cmd is released.
- GenerateKeyupEvents();
- }
-
- InputFilter::InjectKeyEvent(event);
-}
-
-void NormalizingInputFilterMac::GenerateKeyupEvents() {
- for (KeyPressedMap::iterator i = key_pressed_map_.begin();
- i != key_pressed_map_.end(); ++i) {
- // The generated key up event will have the same key code and lock states
- // as the original key down event.
- protocol::KeyEvent event = i->second;
- event.set_pressed(false);
- InputFilter::InjectKeyEvent(event);
- }
-
- // Clearing the map now that we have released all the pressed keys.
- key_pressed_map_.clear();
-}
-
-} // namespace remoting
« no previous file with comments | « remoting/client/normalizing_input_filter_mac.h ('k') | remoting/client/normalizing_input_filter_mac_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698