1
=== modified file 'src/server/frontend/wayland/wayland_connector.cpp'
2
--- src/server/frontend/wayland/wayland_connector.cpp	2017-09-15 16:34:13 +0000
3
+++ src/server/frontend/wayland/wayland_connector.cpp	2017-09-21 11:34:58 +0000
4
@@ -795,28 +795,6 @@
5
795
{
795
{
6
796
}
796
}
7
797
797
8
798
namespace
9
799
{
10
800
uint32_t calc_button_difference(MirPointerButtons old, MirPointerButtons updated)
11
801
{
12
802
    switch (old ^ updated)
13
803
    {
14
804
    case mir_pointer_button_primary:
15
805
        return 272; // No, I have *no* idea why GTK expects 271 to be the primary button.
16
806
    case mir_pointer_button_secondary:
17
807
        return 274;
18
808
    case mir_pointer_button_tertiary:
19
809
        return 273;
20
810
    case mir_pointer_button_back:
21
811
        return 275; // I dunno. It's a number, I guess.
22
812
    case mir_pointer_button_forward:
23
813
        return 276; // I dunno. It's a number, I guess.
24
814
    default:
25
815
        throw std::logic_error("Whoops, I misunderstand how Mir pointer events work");
26
816
    }
27
817
}
28
818
}
29
819
30
820
class WlPointer : public wayland::Pointer
798
class WlPointer : public wayland::Pointer
31
821
{
799
{
32
822
public:
800
public:
33
@@ -844,27 +822,33 @@
34
844
                switch(mir_pointer_event_action(pointer_event))
822
                switch(mir_pointer_event_action(pointer_event))
35
845
                {
823
                {
36
846
                    case mir_pointer_action_button_down:
824
                    case mir_pointer_action_button_down:
37
847
                    {
38
848
                        auto button = calc_button_difference(last_set, mir_pointer_event_buttons(pointer_event));
39
849
                        wl_pointer_send_button(
40
850
                            resource,
41
851
                            serial,
42
852
                            mir_input_event_get_event_time(event) / 1000,
43
853
                            button,
44
854
                            WL_POINTER_BUTTON_STATE_PRESSED);
45
855
                        last_set = mir_pointer_event_buttons(pointer_event);
46
856
                        break;
47
857
                    }
48
858
                    case mir_pointer_action_button_up:
825
                    case mir_pointer_action_button_up:
49
859
                    {
826
                    {
58
860
                        auto button = calc_button_difference(last_set, mir_pointer_event_buttons(pointer_event));
827
                        auto const current_set  = mir_pointer_event_buttons(pointer_event);
59
861
                        wl_pointer_send_button(
828
                        auto const current_time = mir_input_event_get_event_time(event) / 1000;
60
862
                            resource,
829
61
863
                            serial,
830
                        auto button = 272;  // No, I have *no* idea why GTK expects 272 to be the primary button.
62
864
                            mir_input_event_get_event_time(event) / 1000,
831
                        // NB button is incremented in the loop and the order mir_pointer_button_XXX matters
63
865
                            button,
832
                        for (auto mir_button :
64
866
                            WL_POINTER_BUTTON_STATE_RELEASED);
833
                            {mir_pointer_button_primary,    // 272
65
867
                        last_set = mir_pointer_event_buttons(pointer_event);
834
                             mir_pointer_button_tertiary,   // 273
66
835
                             mir_pointer_button_secondary,  // 274
67
836
                             mir_pointer_button_back,       // 275
68
837
                             mir_pointer_button_forward})   // 276
69
838
                        {
70
839
                            if (mir_button & (current_set ^ last_set))
71
840
                            {
72
841
                                auto const action = (mir_button & current_set) ?
73
842
                                                    WL_POINTER_BUTTON_STATE_PRESSED :
74
843
                                                    WL_POINTER_BUTTON_STATE_RELEASED;
75
844
76
845
                                wl_pointer_send_button(resource, serial, current_time, button, action);
77
846
                            }
78
847
79
848
                            ++button;
80
849
                        }
81
850
82
851
                        last_set = current_set;
83
868
                        break;
852
                        break;
84
869
                    }
853
                    }
85
870
                    case mir_pointer_action_enter:
854
                    case mir_pointer_action_enter:
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-09-22
Gerry Boland (community)		2017-09-21	Approve on 2017-09-21
Review via email: mp+331139@code.launchpad.net