1
=== modified file 'src/client/input/xkb_mapper.cpp'
2
--- src/client/input/xkb_mapper.cpp	2016-06-24 07:41:32 +0000
3
+++ src/client/input/xkb_mapper.cpp	2016-07-15 05:00:26 +0000
4
@@ -42,8 +42,8 @@
5
42
    case XKB_KEY_Alt_L: return mir_input_event_modifier_alt_left;
42
    case XKB_KEY_Alt_L: return mir_input_event_modifier_alt_left;
6
43
    case XKB_KEY_Control_R: return mir_input_event_modifier_ctrl_right;
43
    case XKB_KEY_Control_R: return mir_input_event_modifier_ctrl_right;
7
44
    case XKB_KEY_Control_L: return mir_input_event_modifier_ctrl_left;
44
    case XKB_KEY_Control_L: return mir_input_event_modifier_ctrl_left;
10
45
    case XKB_KEY_Meta_L: return mir_input_event_modifier_meta_left;
45
    case XKB_KEY_Super_L: return mir_input_event_modifier_meta_left;
11
46
    case XKB_KEY_Meta_R: return mir_input_event_modifier_meta_right;
46
    case XKB_KEY_Super_R: return mir_input_event_modifier_meta_right;
12
47
    case XKB_KEY_Caps_Lock: return mir_input_event_modifier_caps_lock;
47
    case XKB_KEY_Caps_Lock: return mir_input_event_modifier_caps_lock;
13
48
    case XKB_KEY_Scroll_Lock: return mir_input_event_modifier_scroll_lock;
48
    case XKB_KEY_Scroll_Lock: return mir_input_event_modifier_scroll_lock;
14
49
    default: return MirInputEventModifiers{0};
49
    default: return MirInputEventModifiers{0};
15
50
50
16
=== modified file 'tests/unit-tests/client/input/test_xkb_mapper.cpp'
17
--- tests/unit-tests/client/input/test_xkb_mapper.cpp	2016-06-24 06:43:18 +0000
18
+++ tests/unit-tests/client/input/test_xkb_mapper.cpp	2016-07-15 05:00:26 +0000
19
@@ -104,6 +104,9 @@
20
104
    EXPECT_EQ(XKB_KEY_dollar, map_key(mir_keyboard_action_up, KEY_4));
104
    EXPECT_EQ(XKB_KEY_dollar, map_key(mir_keyboard_action_up, KEY_4));
21
105
    EXPECT_EQ(XKB_KEY_Shift_L, map_key(mir_keyboard_action_up, KEY_LEFTSHIFT));
105
    EXPECT_EQ(XKB_KEY_Shift_L, map_key(mir_keyboard_action_up, KEY_LEFTSHIFT));
22
106
    EXPECT_EQ(XKB_KEY_4, map_key(mir_keyboard_action_down, KEY_4));
106
    EXPECT_EQ(XKB_KEY_4, map_key(mir_keyboard_action_down, KEY_4));
23
107
24
108
    EXPECT_EQ(XKB_KEY_Super_L, map_key(mir_keyboard_action_down, KEY_LEFTMETA));
25
109
    EXPECT_EQ(XKB_KEY_Super_R, map_key(mir_keyboard_action_down, KEY_RIGHTMETA));
26
107
}
110
}
27
108
111
28
109
TEST_F(XKBMapper, when_surface_keymap_is_set_maps_generic_us_english_keys)
112
TEST_F(XKBMapper, when_surface_keymap_is_set_maps_generic_us_english_keys)
29
@@ -116,6 +119,9 @@
30
116
    EXPECT_EQ(XKB_KEY_dollar, map_key(mir_keyboard_action_up, KEY_4));
119
    EXPECT_EQ(XKB_KEY_dollar, map_key(mir_keyboard_action_up, KEY_4));
31
117
    EXPECT_EQ(XKB_KEY_Shift_L, map_key(mir_keyboard_action_up, KEY_LEFTSHIFT));
120
    EXPECT_EQ(XKB_KEY_Shift_L, map_key(mir_keyboard_action_up, KEY_LEFTSHIFT));
32
118
    EXPECT_EQ(XKB_KEY_4, map_key(mir_keyboard_action_down, KEY_4));
121
    EXPECT_EQ(XKB_KEY_4, map_key(mir_keyboard_action_down, KEY_4));
33
122
34
123
    EXPECT_EQ(XKB_KEY_Super_L, map_key(mir_keyboard_action_down, KEY_LEFTMETA));
35
124
    EXPECT_EQ(XKB_KEY_Super_R, map_key(mir_keyboard_action_down, KEY_RIGHTMETA));
36
119
}
125
}
37
120
126
38
121
TEST_F(XKBMapper, key_repeats_do_not_recurse_modifier_state)
127
TEST_F(XKBMapper, key_repeats_do_not_recurse_modifier_state)
39
@@ -174,6 +180,28 @@
40
174
    map_event(keyboard_us, mir_keyboard_action_up, KEY_LEFTSHIFT);
180
    map_event(keyboard_us, mir_keyboard_action_up, KEY_LEFTSHIFT);
41
175
}
181
}
42
176
182
43
183
TEST_F(XKBMapper, maps_kernel_meta_to_mir_meta)  // AKA "Super"
44
184
{   // Regression test for LP: #1602966
45
185
    const MirInputEventModifiers meta_left =
46
186
        mir_input_event_modifier_meta_left | mir_input_event_modifier_meta;
47
187
    const MirInputEventModifiers meta_right =
48
188
        mir_input_event_modifier_meta_right | mir_input_event_modifier_meta;
49
189
50
190
    InSequence seq;
51
191
    EXPECT_CALL(*this, mapped_event(mt::KeyWithModifiers(meta_left)));
52
192
    EXPECT_CALL(*this, mapped_event(mt::KeyWithModifiers(mir_input_event_modifier_none)));
53
193
54
194
    EXPECT_CALL(*this, mapped_event(mt::KeyWithModifiers(meta_right)));
55
195
    EXPECT_CALL(*this, mapped_event(mt::KeyWithModifiers(mir_input_event_modifier_none)));
56
196
57
197
    auto keyboard_us = MirInputDeviceId{0};
58
198
    mapper.set_keymap_for_device(keyboard_us, mi::Keymap{});
59
199
    map_event(keyboard_us, mir_keyboard_action_down, KEY_LEFTMETA);
60
200
    map_event(keyboard_us, mir_keyboard_action_up, KEY_LEFTMETA);
61
201
    map_event(keyboard_us, mir_keyboard_action_down, KEY_RIGHTMETA);
62
202
    map_event(keyboard_us, mir_keyboard_action_up, KEY_RIGHTMETA);
63
203
}
64
204
65
177
TEST_F(XKBMapper, maps_modifier_keys_according_to_keymap)
205
TEST_F(XKBMapper, maps_modifier_keys_according_to_keymap)
66
178
{
206
{
67
179
    auto keyboard_us = MirInputDeviceId{0};
207
    auto keyboard_us = MirInputDeviceId{0};
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-07-15
Cemil Azizoglu (community)		2016-07-14	Approve on 2016-07-14
Review via email: mp+300047@code.launchpad.net