1
=== modified file 'src/server/input/default_configuration.cpp'
2
--- src/server/input/default_configuration.cpp	2017-03-14 16:17:51 +0000
3
+++ src/server/input/default_configuration.cpp	2017-03-24 19:38:19 +0000
4
@@ -150,7 +150,9 @@
5
150
            std::chrono::milliseconds const key_repeat_delay{50};
150
            std::chrono::milliseconds const key_repeat_delay{50};
6
151
151
7
152
            auto const options = the_options();
152
            auto const options = the_options();
9
153
            auto enable_repeat = options->get<bool>(options::enable_key_repeat_opt);
153
            // lp:1675357: Disable generation of key repeat events on nested servers
10
154
            auto enable_repeat = options->get<bool>(options::enable_key_repeat_opt) &&
11
155
                !options->is_set(options::host_socket_opt);
12
154
156
13
155
            return std::make_shared<mi::KeyRepeatDispatcher>(
157
            return std::make_shared<mi::KeyRepeatDispatcher>(
14
156
                the_event_filter_chain_dispatcher(), the_main_loop(), the_cookie_authority(),
158
                the_event_filter_chain_dispatcher(), the_main_loop(), the_cookie_authority(),
15
@@ -323,7 +325,9 @@
16
323
               the_key_mapper(),
325
               the_key_mapper(),
17
324
               the_server_status_listener());
326
               the_server_status_listener());
18
325
327
20
326
           if (key_repeater && !the_options()->is_set(options::host_socket_opt))
328
           // lp:1675357: KeyRepeatDispatcher must be informed about removed input devices, otherwise
21
329
           // pressed keys get repeated indefinitely
22
330
           if (key_repeater)
23
327
               key_repeater->set_input_device_hub(hub);
331
               key_repeater->set_input_device_hub(hub);
24
328
           return hub;
332
           return hub;
25
329
       });
333
       });
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-03-24
Kevin DuBois (community)		2017-03-24	Approve on 2017-03-24
Review via email: mp+320971@code.launchpad.net