1
=== modified file 'src/server/frontend/wayland/wayland_connector.cpp'
2
--- src/server/frontend/wayland/wayland_connector.cpp	2017-09-22 15:51:22 +0000
3
+++ src/server/frontend/wayland/wayland_connector.cpp	2017-09-22 15:51:22 +0000
4
@@ -786,6 +786,29 @@
5
786
            });
786
            });
6
787
    }
787
    }
7
788
788
8
789
    void handle_event(MirWindowEvent const* event, wl_resource* target)
9
790
    {
10
791
        if (mir_window_event_get_attribute(event) == mir_window_attrib_focus)
11
792
        {
12
793
            executor->spawn(
13
794
               [resource = resource, serial = wl_display_next_serial(wl_client_get_display(client)),
14
795
                target = target, focussed = mir_window_event_get_attribute_value(event)]()
15
796
                {
16
797
                    if (focussed)
17
798
                    {
18
799
                        wl_array key_state;
19
800
                        wl_array_init(&key_state);
20
801
                        wl_keyboard_send_enter(resource, serial, target, &key_state);
21
802
                        wl_array_release(&key_state);
22
803
                    }
23
804
                    else
24
805
                    {
25
806
                        wl_keyboard_send_leave(resource, serial, target);
26
807
                    }
27
808
                });
28
809
        }
29
810
    }
30
811
31
789
private:
812
private:
32
790
    std::shared_ptr<mir::Executor> const executor;
813
    std::shared_ptr<mir::Executor> const executor;
33
791
814
34
@@ -998,6 +1021,14 @@
35
998
        }
1021
        }
36
999
    }
1022
    }
37
1000
1023
38
1024
    void handle_event(MirWindowEvent const* event, wl_resource* target) const
39
1025
    {
40
1026
        for (auto& listener : listeners)
41
1027
        {
42
1028
            listener->handle_event(event, target);
43
1029
        }
44
1030
    }
45
1031
46
1001
private:
1032
private:
47
1002
    std::vector<std::shared_ptr<InputInterface>> listeners;
1033
    std::vector<std::shared_ptr<InputInterface>> listeners;
48
1003
};
1034
};
49
@@ -1214,6 +1245,13 @@
50
1214
        default:
1245
        default:
51
1215
            break;
1246
            break;
52
1216
        }
1247
        }
53
1248
        break;
54
1249
    }
55
1250
    case mir_event_type_window:
56
1251
    {
57
1252
        auto const wev = mir_event_get_window_event(&event);
58
1253
59
1254
        seat->acquire_keyboard_reference(client).handle_event(wev, target);
60
1217
    }
1255
    }
61
1218
    default:
1256
    default:
62
1219
        break;
1257
        break;
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2017-09-23
Gerry Boland (community)		2017-09-22	Approve on 2017-09-22
Review via email: mp+331205@code.launchpad.net