1
=== modified file 'examples/CMakeLists.txt'
2
--- examples/CMakeLists.txt	2013-04-01 16:45:07 +0000
3
+++ examples/CMakeLists.txt	2013-04-12 17:40:32 +0000
4
@@ -27,15 +27,11 @@
5
27
  eglapp
27
  eglapp
6
28
)
28
)
7
29
29
11
30
add_executable(
30
add_executable(mir_demo_client
9
31
  mir_demo_client
10
32
12
33
  demo_client.c
31
  demo_client.c
13
34
)
32
)
14
35
33
18
36
target_link_libraries(
34
target_link_libraries(mir_demo_client
16
37
  mir_demo_client
17
38
19
39
  mirclient
35
  mirclient
20
40
  mirprotobuf
36
  mirprotobuf
21
41
37
22
@@ -44,15 +40,11 @@
23
44
  ${CMAKE_THREAD_LIBS_INIT}
40
  ${CMAKE_THREAD_LIBS_INIT}
24
45
)
41
)
25
46
42
29
47
add_executable(
43
add_executable(mir_demo_client_unaccelerated
27
48
  mir_demo_client_unaccelerated
28
49
30
50
  demo_client_unaccelerated.c
44
  demo_client_unaccelerated.c
31
51
)
45
)
32
52
46
36
53
target_link_libraries(
47
target_link_libraries(mir_demo_client_unaccelerated
34
54
  mir_demo_client_unaccelerated
35
55
37
56
  mirclient
48
  mirclient
38
57
  mirprotobuf
49
  mirprotobuf
39
58
50
40
@@ -61,15 +53,11 @@
41
61
  ${CMAKE_THREAD_LIBS_INIT}
53
  ${CMAKE_THREAD_LIBS_INIT}
42
62
)
54
)
43
63
55
47
64
add_executable(
56
add_executable(mir_demo_client_accelerated
45
65
  mir_demo_client_accelerated
46
66
48
67
  demo_client_accelerated.cpp
57
  demo_client_accelerated.cpp
49
68
)
58
)
50
69
59
54
70
target_link_libraries(
60
target_link_libraries(mir_demo_client_accelerated
52
71
  mir_demo_client_accelerated
53
72
55
73
  mirdraw
61
  mirdraw
56
74
  mirclient
62
  mirclient
57
75
  mirprotobuf
63
  mirprotobuf
58
@@ -90,11 +78,11 @@
59
90
)
78
)
60
91
79
61
92
set(RENDER_TO_FB_SOURCES render_to_fb.cpp)
80
set(RENDER_TO_FB_SOURCES render_to_fb.cpp)
67
93
add_executable(render_to_fb ${RENDER_TO_FB_SOURCES})
81
add_executable(render_to_fb 
68
94
82
  ${RENDER_TO_FB_SOURCES}
69
95
target_link_libraries(
83
)
70
96
    render_to_fb
84
71
97
85
target_link_libraries(render_to_fb
72
98
    mirserver
86
    mirserver
73
99
    mirlogging
87
    mirlogging
74
100
    mirdraw
88
    mirdraw
75
@@ -103,18 +91,25 @@
76
103
91
77
104
set(RENDER_SURFACES_SOURCES render_surfaces.cpp buffer_render_target.cpp image_renderer.cpp)
92
set(RENDER_SURFACES_SOURCES render_surfaces.cpp buffer_render_target.cpp image_renderer.cpp)
78
105
add_executable(render_surfaces ${RENDER_SURFACES_SOURCES})
93
add_executable(render_surfaces ${RENDER_SURFACES_SOURCES})
82
106
target_link_libraries(
94
target_link_libraries(render_surfaces
80
107
    render_surfaces
81
108
83
109
    mirserver
95
    mirserver
84
110
    mirshell
96
    mirshell
85
111
    ${Boost_LIBRARIES}
97
    ${Boost_LIBRARIES}
86
112
)
98
)
87
113
99
88
100
add_executable(mir_demo_input_filter
89
101
  demo_input_filter.cpp
90
102
)
91
103
92
104
target_link_libraries(mir_demo_input_filter  
93
105
  mirserver
94
106
)
95
107
96
114
set (DEMO_CLIENTS
108
set (DEMO_CLIENTS
97
115
  mir_demo_client
109
  mir_demo_client
98
116
  mir_demo_client_unaccelerated
110
  mir_demo_client_unaccelerated
99
117
  mir_demo_client_accelerated
111
  mir_demo_client_accelerated
100
112
  mir_demo_input_filter
101
118
  mir_eglflash
113
  mir_eglflash
102
119
  mir_egltriangle
114
  mir_egltriangle
103
120
  mir_eglplasma
115
  mir_eglplasma
104
121
116
105
=== added file 'examples/demo_input_filter.cpp'
106
--- examples/demo_input_filter.cpp	1970-01-01 00:00:00 +0000
107
+++ examples/demo_input_filter.cpp	2013-04-12 17:40:32 +0000
108
@@ -0,0 +1,88 @@
109
1
/*
110
2
 * Copyright © 2013 Canonical Ltd.
111
3
 *
112
4
 * This program is free software: you can redistribute it and/or modify
113
5
 * it under the terms of the GNU General Public License version 3 as
114
6
 * published by the Free Software Foundation.
115
7
 *
116
8
 * This program is distributed in the hope that it will be useful,
117
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
118
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
119
11
 * GNU General Public License for more details.
120
12
 *
121
13
 * You should have received a copy of the GNU General Public License
122
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
123
15
 *
124
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
125
17
 */
126
18
127
19
#include "mir/run_mir.h"
128
20
#include "mir/default_server_configuration.h"
129
21
#include "mir/abnormal_exit.h"
130
22
#include "mir/input/event_filter.h"
131
23
132
24
#include <boost/exception/diagnostic_information.hpp>
133
25
134
26
#include <iostream>
135
27
136
28
namespace mi = mir::input;
137
29
138
30
namespace
139
31
{
140
32
141
33
struct PrintingEventFilter : public mi::EventFilter
142
34
{
143
35
    bool handles(MirEvent const& ev) override
144
36
    {
145
37
        // TODO: Enhance printing
146
38
        if (ev.type == mir_event_type_key)
147
39
        {
148
40
            std::cout << "Handling key event (time, scancode, keycode): " << ev.key.event_time << " " 
149
41
                << ev.key.scan_code << " " << ev.key.key_code << std::endl;
150
42
        }
151
43
        else if (ev.type == mir_event_type_motion)
152
44
        {
153
45
            std::cout << "Handling motion event (time, pointer0_x, pointer0_y): " << ev.motion.event_time << " "
154
46
                << ev.motion.pointer_coordinates[0].x << " " << ev.motion.pointer_coordinates[0].y << std::endl;
155
47
        }
156
48
        return true;
157
49
    }
158
50
};
159
51
160
52
struct DemoServerConfiguration : public mir::DefaultServerConfiguration
161
53
{
162
54
    DemoServerConfiguration(int argc, char const* argv[])
163
55
      : DefaultServerConfiguration(argc, argv),
164
56
        event_filter(std::make_shared<PrintingEventFilter>())
165
57
    {
166
58
    }
167
59
    
168
60
    std::initializer_list<std::shared_ptr<mi::EventFilter> const> the_event_filters() override
169
61
    {
170
62
        static std::initializer_list<std::shared_ptr<mi::EventFilter> const> filter_list = { event_filter };
171
63
        return filter_list;
172
64
    }
173
65
174
66
    std::shared_ptr<PrintingEventFilter> const event_filter;
175
67
};
176
68
177
69
}
178
70
179
71
int main(int argc, char const* argv[])
180
72
try
181
73
{
182
74
    DemoServerConfiguration config(argc, argv);
183
75
184
76
    mir::run_mir(config, [](mir::DisplayServer&) {/* empty init */});
185
77
    return 0;
186
78
}
187
79
catch (mir::AbnormalExit const& error)
188
80
{
189
81
    std::cerr << error.what() << std::endl;
190
82
    return 1;
191
83
}
192
84
catch (std::exception const& error)
193
85
{
194
86
    std::cerr << "ERROR: " << boost::diagnostic_information(error) << std::endl;
195
87
    return 1;
196
88
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-04-12
Alexandros Frantzis (community)			Approve on 2013-04-12
Daniel van Vugt		2013-04-10	Approve on 2013-04-12
Review via email: mp+158199@code.launchpad.net