1
=== modified file 'src/common/events/CMakeLists.txt'
2
--- src/common/events/CMakeLists.txt	2016-04-06 19:10:13 +0000
3
+++ src/common/events/CMakeLists.txt	2016-04-06 19:10:13 +0000
4
@@ -15,6 +15,7 @@
5
15
# Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
15
# Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
6
16
16
7
17
set(EVENT_SOURCES
17
set(EVENT_SOURCES
8
18
  capnp_enums_aligned_asserts.cpp
9
18
  close_surface_event.cpp
19
  close_surface_event.cpp
10
19
  event.cpp
20
  event.cpp
11
20
  input_configuration_event.cpp
21
  input_configuration_event.cpp
12
21
22
13
=== added file 'src/common/events/capnp_enums_aligned_asserts.cpp'
14
--- src/common/events/capnp_enums_aligned_asserts.cpp	1970-01-01 00:00:00 +0000
15
+++ src/common/events/capnp_enums_aligned_asserts.cpp	2016-04-06 19:10:13 +0000
16
@@ -0,0 +1,82 @@
17
1
/*
18
2
 * Copyright © 2016 Canonical Ltd.
19
3
 *
20
4
 * This program is free software: you can redistribute it and/or modify it
21
5
 * under the terms of the GNU Lesser General Public License version 3,
22
6
 * as published by the Free Software Foundation.
23
7
 *
24
8
 * This program is distributed in the hope that it will be useful,
25
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
26
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27
11
 * GNU Lesser General Public License for more details.
28
12
 *
29
13
 * You should have received a copy of the GNU Lesser General Public License
30
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
31
15
 *
32
16
 * Authored by: Brandon Schaefer <brandon.schaefer@canonical.com>
33
17
 */
34
18
35
19
#include "mir/events/event_private.h"
36
20
#include "mir_event.capnp.h"
37
21
38
22
namespace mcap = mir::capnp;
39
23
40
24
/* Static asserts that our capnp enums are equal to the c api enums.
41
25
   This way we can tell on compile time if any of the enums are incorrect.
42
26
*/
43
27
namespace
44
28
{
45
29
static_assert(static_cast<MirKeyboardAction>(mcap::KeyboardEvent::Action::UP) ==
46
30
    mir_keyboard_action_up, "");
47
31
static_assert(static_cast<MirKeyboardAction>(mcap::KeyboardEvent::Action::DOWN) ==
48
32
    mir_keyboard_action_down, "");
49
33
static_assert(static_cast<MirKeyboardAction>(mcap::KeyboardEvent::Action::REPEAT) ==
50
34
    mir_keyboard_action_repeat, "");
51
35
52
36
static_assert(static_cast<MirTouchTooltype>(mcap::MotionSetEvent::Motion::ToolType::UNKNOWN) ==
53
37
    mir_touch_tooltype_unknown, "");
54
38
static_assert(static_cast<MirTouchTooltype>(mcap::MotionSetEvent::Motion::ToolType::FINGER) ==
55
39
    mir_touch_tooltype_finger, "");
56
40
static_assert(static_cast<MirTouchTooltype>(mcap::MotionSetEvent::Motion::ToolType::STYLUS) ==
57
41
    mir_touch_tooltype_stylus, "");
58
42
59
43
static_assert(static_cast<MirInputConfigurationAction>(mcap::InputConfigurationEvent::Action::CONFIGURATION_CHANGED) ==
60
44
    mir_input_configuration_action_configuration_changed, "");
61
45
static_assert(static_cast<MirInputConfigurationAction>(mcap::InputConfigurationEvent::Action::DEVICE_RESET) ==
62
46
    mir_input_configuration_action_device_reset, "");
63
47
64
48
static_assert(static_cast<MirSurfaceAttrib>(mcap::SurfaceEvent::Attrib::TYPE) ==
65
49
    mir_surface_attrib_type, "");
66
50
static_assert(static_cast<MirSurfaceAttrib>(mcap::SurfaceEvent::Attrib::STATE) ==
67
51
    mir_surface_attrib_state, "");
68
52
static_assert(static_cast<MirSurfaceAttrib>(mcap::SurfaceEvent::Attrib::SWAP_INTERVAL) ==
69
53
    mir_surface_attrib_swapinterval, "");
70
54
static_assert(static_cast<MirSurfaceAttrib>(mcap::SurfaceEvent::Attrib::FOCUS) ==
71
55
    mir_surface_attrib_focus, "");
72
56
static_assert(static_cast<MirSurfaceAttrib>(mcap::SurfaceEvent::Attrib::DPI) ==
73
57
    mir_surface_attrib_dpi, "");
74
58
static_assert(static_cast<MirSurfaceAttrib>(mcap::SurfaceEvent::Attrib::VISIBILITY) ==
75
59
    mir_surface_attrib_visibility, "");
76
60
static_assert(static_cast<MirSurfaceAttrib>(mcap::SurfaceEvent::Attrib::PREFERRED_ORIENTATION) ==
77
61
    mir_surface_attrib_preferred_orientation, "");
78
62
79
63
static_assert(static_cast<MirPromptSessionState>(mcap::PromptSessionEvent::State::STOPPED) ==
80
64
    mir_prompt_session_state_stopped, "");
81
65
static_assert(static_cast<MirPromptSessionState>(mcap::PromptSessionEvent::State::STARTED) ==
82
66
    mir_prompt_session_state_started, "");
83
67
static_assert(static_cast<MirPromptSessionState>(mcap::PromptSessionEvent::State::SUSPENDED) ==
84
68
    mir_prompt_session_state_suspended, "");
85
69
86
70
static_assert(static_cast<MirFormFactor>(mcap::SurfaceOutputEvent::FormFactor::UNKNOWN) ==
87
71
    mir_form_factor_unknown, "");
88
72
static_assert(static_cast<MirFormFactor>(mcap::SurfaceOutputEvent::FormFactor::PHONE) ==
89
73
    mir_form_factor_phone, "");
90
74
static_assert(static_cast<MirFormFactor>(mcap::SurfaceOutputEvent::FormFactor::TABLET) ==
91
75
    mir_form_factor_tablet, "");
92
76
static_assert(static_cast<MirFormFactor>(mcap::SurfaceOutputEvent::FormFactor::MONITOR) ==
93
77
    mir_form_factor_monitor, "");
94
78
static_assert(static_cast<MirFormFactor>(mcap::SurfaceOutputEvent::FormFactor::TV) ==
95
79
    mir_form_factor_tv, "");
96
80
static_assert(static_cast<MirFormFactor>(mcap::SurfaceOutputEvent::FormFactor::PROJECTOR) ==
97
81
    mir_form_factor_projector, "");
98
82
}
Status:	Work in progress
Proposed branch:	lp:~brandontschaefer/mir/capnproto-assert-structures-align
Merge into:	lp:mir
Prerequisite:	lp:~brandontschaefer/mir/mir-event-capnproto
Diff against target:	98 lines (+83/-0) 2 files modified src/common/events/CMakeLists.txt (+1/-0) src/common/events/capnp_enums_aligned_asserts.cpp (+82/-0)
To merge this branch:	bzr merge lp:~brandontschaefer/mir/capnproto-assert-structures-align
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Chris Halse Rogers			Approve on 2016-05-04
Mir CI Bot	continuous-integration		Needs Fixing on 2016-04-06
Cemil Azizoglu (community)		2016-04-01	Approve on 2016-04-04
Review via email: mp+290764@code.launchpad.net