OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "chrome/browser/chromeos/events/event_rewriter.h" | 5 #include "chrome/browser/chromeos/events/event_rewriter.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/sticky_keys/sticky_keys_controller.h" | 10 #include "ash/sticky_keys/sticky_keys_controller.h" |
(...skipping 1921 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1932 EXPECT_EQ(GetExpectedResultAsString( | 1932 EXPECT_EQ(GetExpectedResultAsString( |
1933 ui::VKEY_BROWSER_BACK, ui::EF_NONE, ui::ET_KEY_PRESSED), | 1933 ui::VKEY_BROWSER_BACK, ui::EF_NONE, ui::ET_KEY_PRESSED), |
1934 GetKeyEventAsString(*static_cast<ui::KeyEvent*>(events[0]))); | 1934 GetKeyEventAsString(*static_cast<ui::KeyEvent*>(events[0]))); |
1935 } | 1935 } |
1936 | 1936 |
1937 TEST_F(EventRewriterTest, TestRewrittenModifierClick) { | 1937 TEST_F(EventRewriterTest, TestRewrittenModifierClick) { |
1938 std::vector<int> device_list; | 1938 std::vector<int> device_list; |
1939 device_list.push_back(10); | 1939 device_list.push_back(10); |
1940 ui::TouchFactory::GetInstance()->SetPointerDeviceForTest(device_list); | 1940 ui::TouchFactory::GetInstance()->SetPointerDeviceForTest(device_list); |
1941 | 1941 |
1942 // Remap Control to Alt. | 1942 // Remap Control to Search. |
1943 TestingPrefServiceSyncable prefs; | 1943 TestingPrefServiceSyncable prefs; |
1944 chromeos::Preferences::RegisterProfilePrefs(prefs.registry()); | 1944 chromeos::Preferences::RegisterProfilePrefs(prefs.registry()); |
1945 IntegerPrefMember control; | 1945 IntegerPrefMember control; |
1946 control.Init(prefs::kLanguageRemapControlKeyTo, &prefs); | 1946 control.Init(prefs::kLanguageRemapControlKeyTo, &prefs); |
1947 control.SetValue(chromeos::input_method::kAltKey); | 1947 control.SetValue(chromeos::input_method::kSearchKey); |
1948 | 1948 |
1949 EventRewriter rewriter(NULL); | 1949 EventRewriter rewriter(NULL); |
1950 rewriter.KeyboardDeviceAddedForTesting(kKeyboardDeviceId, "PC Keyboard"); | 1950 rewriter.KeyboardDeviceAddedForTesting(kKeyboardDeviceId, "PC Keyboard"); |
1951 rewriter.set_pref_service_for_testing(&prefs); | 1951 rewriter.set_pref_service_for_testing(&prefs); |
1952 | 1952 |
1953 // Check that Control + Left Button is converted (via Alt + Left Button) | 1953 // Check that Control + Left Button is converted (via Search + Left Button) |
1954 // to Right Button. | 1954 // to Right Button. |
1955 ui::ScopedXI2Event xev; | 1955 ui::ScopedXI2Event xev; |
1956 xev.InitGenericButtonEvent(10, | 1956 xev.InitGenericButtonEvent(10, |
1957 ui::ET_MOUSE_PRESSED, | 1957 ui::ET_MOUSE_PRESSED, |
1958 gfx::Point(), | 1958 gfx::Point(), |
1959 ui::EF_LEFT_MOUSE_BUTTON | ui::EF_CONTROL_DOWN); | 1959 ui::EF_LEFT_MOUSE_BUTTON | ui::EF_CONTROL_DOWN); |
1960 ui::MouseEvent press(xev); | 1960 ui::MouseEvent press(xev); |
1961 // Sanity check. | 1961 // Sanity check. |
1962 EXPECT_EQ(ui::ET_MOUSE_PRESSED, press.type()); | 1962 EXPECT_EQ(ui::ET_MOUSE_PRESSED, press.type()); |
1963 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_CONTROL_DOWN, press.flags()); | 1963 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_CONTROL_DOWN, press.flags()); |
1964 scoped_ptr<ui::Event> new_event; | 1964 scoped_ptr<ui::Event> new_event; |
1965 const ui::MouseEvent* result = | 1965 const ui::MouseEvent* result = |
1966 RewriteMouseButtonEvent(&rewriter, press, &new_event); | 1966 RewriteMouseButtonEvent(&rewriter, press, &new_event); |
1967 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); | 1967 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); |
1968 EXPECT_FALSE(ui::EF_LEFT_MOUSE_BUTTON & result->flags()); | 1968 EXPECT_FALSE(ui::EF_LEFT_MOUSE_BUTTON & result->flags()); |
1969 EXPECT_FALSE(ui::EF_CONTROL_DOWN & result->flags()); | 1969 EXPECT_FALSE(ui::EF_CONTROL_DOWN & result->flags()); |
1970 EXPECT_FALSE(ui::EF_ALT_DOWN & result->flags()); | 1970 EXPECT_FALSE(ui::EF_COMMAND_DOWN & result->flags()); |
1971 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); | 1971 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); |
1972 } | 1972 } |
1973 | 1973 |
1974 TEST_F(EventRewriterTest, DontRewriteIfNotRewritten) { | 1974 TEST_F(EventRewriterTest, DontRewriteIfNotRewritten) { |
1975 // TODO(kpschoedel): pending changes for crbug.com/360377 | 1975 // TODO(kpschoedel): pending changes for crbug.com/360377 |
1976 // to |chromeos::EventRewriter::RewriteLocatedEvent() | 1976 // to |chromeos::EventRewriter::RewriteLocatedEvent() |
1977 std::vector<int> device_list; | 1977 std::vector<int> device_list; |
1978 device_list.push_back(10); | 1978 device_list.push_back(10); |
1979 device_list.push_back(11); | 1979 device_list.push_back(11); |
1980 ui::TouchFactory::GetInstance()->SetPointerDeviceForTest(device_list); | 1980 ui::TouchFactory::GetInstance()->SetPointerDeviceForTest(device_list); |
1981 TestingPrefServiceSyncable prefs; | 1981 TestingPrefServiceSyncable prefs; |
1982 EventRewriter rewriter(NULL); | 1982 EventRewriter rewriter(NULL); |
1983 rewriter.set_pref_service_for_testing(&prefs); | 1983 rewriter.set_pref_service_for_testing(&prefs); |
1984 const int kLeftAndAltFlag = ui::EF_LEFT_MOUSE_BUTTON | ui::EF_ALT_DOWN; | 1984 const int kLeftAndSearchFlag = ui::EF_LEFT_MOUSE_BUTTON | ui::EF_COMMAND_DOWN; |
1985 | 1985 |
1986 // Test Alt + Left click. | 1986 // Test Search + Left click. |
1987 { | 1987 { |
1988 ui::MouseEvent press(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), | 1988 ui::MouseEvent press(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), |
1989 ui::EventTimeForNow(), kLeftAndAltFlag, | 1989 ui::EventTimeForNow(), kLeftAndSearchFlag, |
1990 ui::EF_LEFT_MOUSE_BUTTON); | 1990 ui::EF_LEFT_MOUSE_BUTTON); |
1991 ui::EventTestApi test_press(&press); | 1991 ui::EventTestApi test_press(&press); |
1992 test_press.set_source_device_id(10); | 1992 test_press.set_source_device_id(10); |
1993 // Sanity check. | 1993 // Sanity check. |
1994 EXPECT_EQ(ui::ET_MOUSE_PRESSED, press.type()); | 1994 EXPECT_EQ(ui::ET_MOUSE_PRESSED, press.type()); |
1995 EXPECT_EQ(kLeftAndAltFlag, press.flags()); | 1995 EXPECT_EQ(kLeftAndSearchFlag, press.flags()); |
1996 scoped_ptr<ui::Event> new_event; | 1996 scoped_ptr<ui::Event> new_event; |
1997 const ui::MouseEvent* result = | 1997 const ui::MouseEvent* result = |
1998 RewriteMouseButtonEvent(&rewriter, press, &new_event); | 1998 RewriteMouseButtonEvent(&rewriter, press, &new_event); |
1999 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); | 1999 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); |
2000 EXPECT_FALSE(kLeftAndAltFlag & result->flags()); | 2000 EXPECT_FALSE(kLeftAndSearchFlag & result->flags()); |
2001 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); | 2001 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); |
2002 } | 2002 } |
2003 { | 2003 { |
2004 ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), | 2004 ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), |
2005 ui::EventTimeForNow(), kLeftAndAltFlag, | 2005 ui::EventTimeForNow(), kLeftAndSearchFlag, |
2006 ui::EF_LEFT_MOUSE_BUTTON); | 2006 ui::EF_LEFT_MOUSE_BUTTON); |
2007 ui::EventTestApi test_release(&release); | 2007 ui::EventTestApi test_release(&release); |
2008 test_release.set_source_device_id(10); | 2008 test_release.set_source_device_id(10); |
2009 scoped_ptr<ui::Event> new_event; | 2009 scoped_ptr<ui::Event> new_event; |
2010 const ui::MouseEvent* result = | 2010 const ui::MouseEvent* result = |
2011 RewriteMouseButtonEvent(&rewriter, release, &new_event); | 2011 RewriteMouseButtonEvent(&rewriter, release, &new_event); |
2012 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); | 2012 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); |
2013 EXPECT_FALSE(kLeftAndAltFlag & result->flags()); | 2013 EXPECT_FALSE(kLeftAndSearchFlag & result->flags()); |
2014 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); | 2014 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); |
2015 } | 2015 } |
2016 #if defined(USE_X11) | 2016 #if defined(USE_X11) |
2017 // Test Alt + Left click, using XI2 native events. | 2017 // Test Search + Left click, using XI2 native events. |
2018 { | 2018 { |
2019 ui::ScopedXI2Event xev; | 2019 ui::ScopedXI2Event xev; |
2020 xev.InitGenericButtonEvent( | 2020 xev.InitGenericButtonEvent(10, ui::ET_MOUSE_PRESSED, gfx::Point(), |
2021 10, ui::ET_MOUSE_PRESSED, gfx::Point(), kLeftAndAltFlag); | 2021 kLeftAndSearchFlag); |
2022 ui::MouseEvent press(xev); | 2022 ui::MouseEvent press(xev); |
2023 // Sanity check. | 2023 // Sanity check. |
2024 EXPECT_EQ(ui::ET_MOUSE_PRESSED, press.type()); | 2024 EXPECT_EQ(ui::ET_MOUSE_PRESSED, press.type()); |
2025 EXPECT_EQ(kLeftAndAltFlag, press.flags()); | 2025 EXPECT_EQ(kLeftAndSearchFlag, press.flags()); |
2026 scoped_ptr<ui::Event> new_event; | 2026 scoped_ptr<ui::Event> new_event; |
2027 const ui::MouseEvent* result = | 2027 const ui::MouseEvent* result = |
2028 RewriteMouseButtonEvent(&rewriter, press, &new_event); | 2028 RewriteMouseButtonEvent(&rewriter, press, &new_event); |
2029 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); | 2029 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); |
2030 EXPECT_FALSE(kLeftAndAltFlag & result->flags()); | 2030 EXPECT_FALSE(kLeftAndSearchFlag & result->flags()); |
2031 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); | 2031 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); |
2032 } | 2032 } |
2033 { | 2033 { |
2034 ui::ScopedXI2Event xev; | 2034 ui::ScopedXI2Event xev; |
2035 xev.InitGenericButtonEvent( | 2035 xev.InitGenericButtonEvent(10, ui::ET_MOUSE_RELEASED, gfx::Point(), |
2036 10, ui::ET_MOUSE_RELEASED, gfx::Point(), kLeftAndAltFlag); | 2036 kLeftAndSearchFlag); |
2037 ui::MouseEvent release(xev); | 2037 ui::MouseEvent release(xev); |
2038 scoped_ptr<ui::Event> new_event; | 2038 scoped_ptr<ui::Event> new_event; |
2039 const ui::MouseEvent* result = | 2039 const ui::MouseEvent* result = |
2040 RewriteMouseButtonEvent(&rewriter, release, &new_event); | 2040 RewriteMouseButtonEvent(&rewriter, release, &new_event); |
2041 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); | 2041 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); |
2042 EXPECT_FALSE(kLeftAndAltFlag & result->flags()); | 2042 EXPECT_FALSE(kLeftAndSearchFlag & result->flags()); |
2043 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); | 2043 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); |
2044 } | 2044 } |
2045 #endif | 2045 #endif |
2046 | 2046 |
2047 // No ALT in frst click. | 2047 // No SEARCH in first click. |
2048 { | 2048 { |
2049 ui::MouseEvent press(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), | 2049 ui::MouseEvent press(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), |
2050 ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, | 2050 ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, |
2051 ui::EF_LEFT_MOUSE_BUTTON); | 2051 ui::EF_LEFT_MOUSE_BUTTON); |
2052 ui::EventTestApi test_press(&press); | 2052 ui::EventTestApi test_press(&press); |
2053 test_press.set_source_device_id(10); | 2053 test_press.set_source_device_id(10); |
2054 scoped_ptr<ui::Event> new_event; | 2054 scoped_ptr<ui::Event> new_event; |
2055 const ui::MouseEvent* result = | 2055 const ui::MouseEvent* result = |
2056 RewriteMouseButtonEvent(&rewriter, press, &new_event); | 2056 RewriteMouseButtonEvent(&rewriter, press, &new_event); |
2057 EXPECT_TRUE(ui::EF_LEFT_MOUSE_BUTTON & result->flags()); | 2057 EXPECT_TRUE(ui::EF_LEFT_MOUSE_BUTTON & result->flags()); |
2058 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags()); | 2058 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags()); |
2059 } | 2059 } |
2060 { | 2060 { |
2061 ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), | 2061 ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), |
2062 ui::EventTimeForNow(), kLeftAndAltFlag, | 2062 ui::EventTimeForNow(), kLeftAndSearchFlag, |
2063 ui::EF_LEFT_MOUSE_BUTTON); | 2063 ui::EF_LEFT_MOUSE_BUTTON); |
2064 ui::EventTestApi test_release(&release); | 2064 ui::EventTestApi test_release(&release); |
2065 test_release.set_source_device_id(10); | 2065 test_release.set_source_device_id(10); |
2066 scoped_ptr<ui::Event> new_event; | 2066 scoped_ptr<ui::Event> new_event; |
2067 const ui::MouseEvent* result = | 2067 const ui::MouseEvent* result = |
2068 RewriteMouseButtonEvent(&rewriter, release, &new_event); | 2068 RewriteMouseButtonEvent(&rewriter, release, &new_event); |
2069 EXPECT_TRUE((ui::EF_LEFT_MOUSE_BUTTON | ui::EF_ALT_DOWN) & result->flags()); | 2069 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_COMMAND_DOWN, result->flags()); |
2070 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags()); | 2070 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags()); |
2071 } | 2071 } |
2072 #if defined(USE_X11) | 2072 #if defined(USE_X11) |
2073 // No ALT in frst click, using XI2 native events. | 2073 // No SEARCH in first click, using XI2 native events. |
2074 { | 2074 { |
2075 ui::ScopedXI2Event xev; | 2075 ui::ScopedXI2Event xev; |
2076 xev.InitGenericButtonEvent( | 2076 xev.InitGenericButtonEvent( |
2077 10, ui::ET_MOUSE_PRESSED, gfx::Point(), ui::EF_LEFT_MOUSE_BUTTON); | 2077 10, ui::ET_MOUSE_PRESSED, gfx::Point(), ui::EF_LEFT_MOUSE_BUTTON); |
2078 ui::MouseEvent press(xev); | 2078 ui::MouseEvent press(xev); |
2079 scoped_ptr<ui::Event> new_event; | 2079 scoped_ptr<ui::Event> new_event; |
2080 const ui::MouseEvent* result = | 2080 const ui::MouseEvent* result = |
2081 RewriteMouseButtonEvent(&rewriter, press, &new_event); | 2081 RewriteMouseButtonEvent(&rewriter, press, &new_event); |
2082 EXPECT_TRUE(ui::EF_LEFT_MOUSE_BUTTON & result->flags()); | 2082 EXPECT_TRUE(ui::EF_LEFT_MOUSE_BUTTON & result->flags()); |
2083 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags()); | 2083 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags()); |
2084 } | 2084 } |
2085 { | 2085 { |
2086 ui::ScopedXI2Event xev; | 2086 ui::ScopedXI2Event xev; |
2087 xev.InitGenericButtonEvent( | 2087 xev.InitGenericButtonEvent(10, ui::ET_MOUSE_RELEASED, gfx::Point(), |
2088 10, ui::ET_MOUSE_RELEASED, gfx::Point(), kLeftAndAltFlag); | 2088 kLeftAndSearchFlag); |
2089 ui::MouseEvent release(xev); | 2089 ui::MouseEvent release(xev); |
2090 scoped_ptr<ui::Event> new_event; | 2090 scoped_ptr<ui::Event> new_event; |
2091 const ui::MouseEvent* result = | 2091 const ui::MouseEvent* result = |
2092 RewriteMouseButtonEvent(&rewriter, release, &new_event); | 2092 RewriteMouseButtonEvent(&rewriter, release, &new_event); |
2093 EXPECT_TRUE((ui::EF_LEFT_MOUSE_BUTTON | ui::EF_ALT_DOWN) & result->flags()); | 2093 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_COMMAND_DOWN, result->flags()); |
2094 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags()); | 2094 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags()); |
2095 } | 2095 } |
2096 #endif | 2096 #endif |
2097 | 2097 |
2098 // ALT on different device. | 2098 // SEARCH on different device. |
2099 { | 2099 { |
2100 ui::MouseEvent press(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), | 2100 ui::MouseEvent press(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), |
2101 ui::EventTimeForNow(), kLeftAndAltFlag, | 2101 ui::EventTimeForNow(), kLeftAndSearchFlag, |
2102 ui::EF_LEFT_MOUSE_BUTTON); | 2102 ui::EF_LEFT_MOUSE_BUTTON); |
2103 ui::EventTestApi test_press(&press); | 2103 ui::EventTestApi test_press(&press); |
2104 test_press.set_source_device_id(11); | 2104 test_press.set_source_device_id(11); |
2105 scoped_ptr<ui::Event> new_event; | 2105 scoped_ptr<ui::Event> new_event; |
2106 const ui::MouseEvent* result = | 2106 const ui::MouseEvent* result = |
2107 RewriteMouseButtonEvent(&rewriter, press, &new_event); | 2107 RewriteMouseButtonEvent(&rewriter, press, &new_event); |
2108 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); | 2108 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); |
2109 EXPECT_FALSE(kLeftAndAltFlag & result->flags()); | 2109 EXPECT_FALSE(kLeftAndSearchFlag & result->flags()); |
2110 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); | 2110 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); |
2111 } | 2111 } |
2112 { | 2112 { |
2113 ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), | 2113 ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), |
2114 ui::EventTimeForNow(), kLeftAndAltFlag, | 2114 ui::EventTimeForNow(), kLeftAndSearchFlag, |
2115 ui::EF_LEFT_MOUSE_BUTTON); | 2115 ui::EF_LEFT_MOUSE_BUTTON); |
2116 ui::EventTestApi test_release(&release); | 2116 ui::EventTestApi test_release(&release); |
2117 test_release.set_source_device_id(10); | 2117 test_release.set_source_device_id(10); |
2118 scoped_ptr<ui::Event> new_event; | 2118 scoped_ptr<ui::Event> new_event; |
2119 const ui::MouseEvent* result = | 2119 const ui::MouseEvent* result = |
2120 RewriteMouseButtonEvent(&rewriter, release, &new_event); | 2120 RewriteMouseButtonEvent(&rewriter, release, &new_event); |
2121 EXPECT_TRUE((ui::EF_LEFT_MOUSE_BUTTON | ui::EF_ALT_DOWN) & result->flags()); | 2121 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_COMMAND_DOWN, result->flags()); |
2122 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags()); | 2122 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags()); |
2123 } | 2123 } |
2124 { | 2124 { |
2125 ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), | 2125 ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), |
2126 ui::EventTimeForNow(), kLeftAndAltFlag, | 2126 ui::EventTimeForNow(), kLeftAndSearchFlag, |
2127 ui::EF_LEFT_MOUSE_BUTTON); | 2127 ui::EF_LEFT_MOUSE_BUTTON); |
2128 ui::EventTestApi test_release(&release); | 2128 ui::EventTestApi test_release(&release); |
2129 test_release.set_source_device_id(11); | 2129 test_release.set_source_device_id(11); |
2130 scoped_ptr<ui::Event> new_event; | 2130 scoped_ptr<ui::Event> new_event; |
2131 const ui::MouseEvent* result = | 2131 const ui::MouseEvent* result = |
2132 RewriteMouseButtonEvent(&rewriter, release, &new_event); | 2132 RewriteMouseButtonEvent(&rewriter, release, &new_event); |
2133 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); | 2133 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); |
2134 EXPECT_FALSE(kLeftAndAltFlag & result->flags()); | 2134 EXPECT_FALSE(kLeftAndSearchFlag & result->flags()); |
2135 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); | 2135 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); |
2136 } | 2136 } |
2137 #if defined(USE_X11) | 2137 #if defined(USE_X11) |
2138 // ALT on different device, using XI2 native events. | 2138 // SEARCH on different device, using XI2 native events. |
2139 { | 2139 { |
2140 ui::ScopedXI2Event xev; | 2140 ui::ScopedXI2Event xev; |
2141 xev.InitGenericButtonEvent( | 2141 xev.InitGenericButtonEvent(11, ui::ET_MOUSE_PRESSED, gfx::Point(), |
2142 11, ui::ET_MOUSE_PRESSED, gfx::Point(), kLeftAndAltFlag); | 2142 kLeftAndSearchFlag); |
2143 ui::MouseEvent press(xev); | 2143 ui::MouseEvent press(xev); |
2144 scoped_ptr<ui::Event> new_event; | 2144 scoped_ptr<ui::Event> new_event; |
2145 const ui::MouseEvent* result = | 2145 const ui::MouseEvent* result = |
2146 RewriteMouseButtonEvent(&rewriter, press, &new_event); | 2146 RewriteMouseButtonEvent(&rewriter, press, &new_event); |
2147 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); | 2147 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); |
2148 EXPECT_FALSE(kLeftAndAltFlag & result->flags()); | 2148 EXPECT_FALSE(kLeftAndSearchFlag & result->flags()); |
2149 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); | 2149 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); |
2150 } | 2150 } |
2151 { | 2151 { |
2152 ui::ScopedXI2Event xev; | 2152 ui::ScopedXI2Event xev; |
2153 xev.InitGenericButtonEvent( | 2153 xev.InitGenericButtonEvent(10, ui::ET_MOUSE_RELEASED, gfx::Point(), |
2154 10, ui::ET_MOUSE_RELEASED, gfx::Point(), kLeftAndAltFlag); | 2154 kLeftAndSearchFlag); |
2155 ui::MouseEvent release(xev); | 2155 ui::MouseEvent release(xev); |
2156 scoped_ptr<ui::Event> new_event; | 2156 scoped_ptr<ui::Event> new_event; |
2157 const ui::MouseEvent* result = | 2157 const ui::MouseEvent* result = |
2158 RewriteMouseButtonEvent(&rewriter, release, &new_event); | 2158 RewriteMouseButtonEvent(&rewriter, release, &new_event); |
2159 EXPECT_TRUE((ui::EF_LEFT_MOUSE_BUTTON | ui::EF_ALT_DOWN) & result->flags()); | 2159 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_COMMAND_DOWN, result->flags()); |
2160 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags()); | 2160 EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags()); |
2161 } | 2161 } |
2162 { | 2162 { |
2163 ui::ScopedXI2Event xev; | 2163 ui::ScopedXI2Event xev; |
2164 xev.InitGenericButtonEvent( | 2164 xev.InitGenericButtonEvent(11, ui::ET_MOUSE_RELEASED, gfx::Point(), |
2165 11, ui::ET_MOUSE_RELEASED, gfx::Point(), kLeftAndAltFlag); | 2165 kLeftAndSearchFlag); |
2166 ui::MouseEvent release(xev); | 2166 ui::MouseEvent release(xev); |
2167 scoped_ptr<ui::Event> new_event; | 2167 scoped_ptr<ui::Event> new_event; |
2168 const ui::MouseEvent* result = | 2168 const ui::MouseEvent* result = |
2169 RewriteMouseButtonEvent(&rewriter, release, &new_event); | 2169 RewriteMouseButtonEvent(&rewriter, release, &new_event); |
2170 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); | 2170 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags()); |
2171 EXPECT_FALSE(kLeftAndAltFlag & result->flags()); | 2171 EXPECT_FALSE(kLeftAndSearchFlag & result->flags()); |
2172 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); | 2172 EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags()); |
2173 } | 2173 } |
2174 #endif | 2174 #endif |
2175 } | 2175 } |
2176 | 2176 |
2177 TEST_F(EventRewriterAshTest, StickyKeyEventDispatchImpl) { | 2177 TEST_F(EventRewriterAshTest, StickyKeyEventDispatchImpl) { |
2178 // Test the actual key event dispatch implementation. | 2178 // Test the actual key event dispatch implementation. |
2179 ScopedVector<ui::Event> events; | 2179 ScopedVector<ui::Event> events; |
2180 | 2180 |
2181 SendActivateStickyKeyPattern(ui::VKEY_CONTROL); | 2181 SendActivateStickyKeyPattern(ui::VKEY_CONTROL); |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2465 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN)); | 2465 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN)); |
2466 EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN)); | 2466 EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN)); |
2467 | 2467 |
2468 // Turn off AltGr and Mod3. | 2468 // Turn off AltGr and Mod3. |
2469 sticky_keys_controller_->SetModifiersEnabled(false, false); | 2469 sticky_keys_controller_->SetModifiersEnabled(false, false); |
2470 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN)); | 2470 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN)); |
2471 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN)); | 2471 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN)); |
2472 } | 2472 } |
2473 | 2473 |
2474 } // namespace chromeos | 2474 } // namespace chromeos |
OLD | NEW |