1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2017-08-10 10:25:55 +0000
3
+++ CMakeLists.txt	2017-08-29 09:17:20 +0000
4
@@ -81,8 +81,6 @@
5
81
endif()
81
endif()
6
82
82
7
83
# Link time optimization allows leaner, cleaner libraries
83
# Link time optimization allows leaner, cleaner libraries
8
84
message(STATUS "CMAKE_C_COMPILER: " ${CMAKE_C_COMPILER})
9
85
10
86
option(MIR_LINK_TIME_OPTIMIZATION "Enables the linker to optimize binaries." OFF)
84
option(MIR_LINK_TIME_OPTIMIZATION "Enables the linker to optimize binaries." OFF)
11
87
if(MIR_LINK_TIME_OPTIMIZATION)
85
if(MIR_LINK_TIME_OPTIMIZATION)
12
88
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto -ffat-lto-objects")
86
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto -ffat-lto-objects")
13
89
87
14
=== added file 'cmake/FindPIL.cmake'
15
--- cmake/FindPIL.cmake	1970-01-01 00:00:00 +0000
16
+++ cmake/FindPIL.cmake	2017-08-29 09:17:20 +0000
17
@@ -0,0 +1,8 @@
18
1
execute_process(
19
2
  COMMAND python3 -c "from PIL import Image"
20
3
  RESULT_VARIABLE HAVE_PIL
21
4
)
22
5
23
6
if (NOT ${HAVE_PIL} EQUAL 0)
24
7
  message(FATAL_ERROR "Python Imaging Library (PIL) not found")
25
8
endif()
26
0
9
27
=== modified file 'debian/changelog'
28
--- debian/changelog	2017-08-16 13:52:52 +0000
29
+++ debian/changelog	2017-08-29 09:17:20 +0000
30
@@ -1,8 +1,9 @@
32
1
mir (1.0.0-0ubuntu1) UNRELEASED; urgency=medium
1
mir (1:1.0.0-0ubuntu1) UNRELEASED; urgency=medium
33
2
2
34
3
  * New upstream release 1.0.0(https://launchpad.net/mir/+milestone/1.0.0)
3
  * New upstream release 1.0.0(https://launchpad.net/mir/+milestone/1.0.0)
35
4
    - ABI summary:
4
    - ABI summary:
36
5
      . mirclient ABI unchanged at 9
5
      . mirclient ABI unchanged at 9
37
6
      . miral ABI introduced at 2
38
6
      . mirserver ABI bumped to 45
7
      . mirserver ABI bumped to 45
39
7
      . mircommon ABI unchanged at 7
8
      . mircommon ABI unchanged at 7
40
8
      . mirplatform ABI unchanged at 61
9
      . mirplatform ABI unchanged at 61
41
@@ -15,6 +16,8 @@
42
15
      . Update licences to (L)GPL3 or (L)GPL2.
16
      . Update licences to (L)GPL3 or (L)GPL2.
43
16
      . [mir_demo_client_display_config] add orientation changing
17
      . [mir_demo_client_display_config] add orientation changing
44
17
      . RPC: Don't require the server ACK client's buffer-release requests.
18
      . RPC: Don't require the server ACK client's buffer-release requests.
45
19
      . Added libmirclientcpp to Mir source package
46
20
      . Added libmiral to Mir source package
47
18
    - Bugs fixed:
21
    - Bugs fixed:
48
19
      . Fix handling of invalid display configuration. (LP: #1643446)
22
      . Fix handling of invalid display configuration. (LP: #1643446)
49
20
      . Move full responsibility for buffer IPC into frontend. (LP: #1395421)
23
      . Move full responsibility for buffer IPC into frontend. (LP: #1395421)
50
21
24
51
=== modified file 'debian/control'
52
--- debian/control	2017-08-02 13:18:44 +0000
53
+++ debian/control	2017-08-29 09:17:20 +0000
54
@@ -45,6 +45,7 @@
55
45
               libcapnp-dev,
45
               libcapnp-dev,
56
46
               capnproto,
46
               capnproto,
57
47
               libepoxy-dev,
47
               libepoxy-dev,
58
48
               python3-pil:native,
59
48
Standards-Version: 3.9.4
49
Standards-Version: 3.9.4
60
49
Homepage: https://launchpad.net/mir
50
Homepage: https://launchpad.net/mir
61
50
# If you aren't a member of ~mir-team but need to upload packaging changes,
51
# If you aren't a member of ~mir-team but need to upload packaging changes,
62
@@ -477,3 +478,53 @@
63
477
 .
478
 .
64
478
 Contains header files that define the interfaces through which platforms and
479
 Contains header files that define the interfaces through which platforms and
65
479
 renderers access the functionality needed to render with GL.
480
 renderers access the functionality needed to render with GL.
66
481
67
482
Package: libmiral2
68
483
Section: libs
69
484
Architecture: linux-any
70
485
Multi-Arch: same
71
486
Pre-Depends: ${misc:Pre-Depends}
72
487
Depends: ${misc:Depends},
73
488
         ${shlibs:Depends},
74
489
Description: Display server for Ubuntu - ABI preserving abstraction layer
75
490
 MirAL provides an ABI-stable abstraction layer for Mir based shells,
76
491
 insulating them from mirserver ABI breaks.
77
492
 .
78
493
 Contains the shared library containing MirAL abstraction layer.
79
494
80
495
Package: libmiral-dev
81
496
Section: libdevel
82
497
Architecture: linux-any
83
498
Multi-Arch: same
84
499
Pre-Depends: ${misc:Pre-Depends}
85
500
Depends: libmiral2 (= ${binary:Version}),
86
501
         libmirclientcpp-dev (= ${binary:Version}),
87
502
         ${misc:Depends},
88
503
Description: Developer files for the Mir ABI-stable abstraction layer
89
504
 MirAL provides an ABI-stable abstraction layer for Mir based shells,
90
505
 insulating them from mirserver ABI breaks.
91
506
 .
92
507
 Contains header files required for development using the MirAL abstraction
93
508
 layer.
94
509
95
510
Package: libmirclientcpp-dev
96
511
Section: libdevel
97
512
Architecture: linux-any
98
513
Multi-Arch: same
99
514
Pre-Depends: ${misc:Pre-Depends}
100
515
Depends: libmirclient-dev,
101
516
Description: A C++ wrapper for libmirclient-dev
102
517
 Provides RAII (and other facilities) for Mir client library types.
103
518
 .
104
519
 Contains header files useful for C++ development against Mir.
105
520
106
521
Package: miral-examples
107
522
Architecture: linux-any
108
523
Depends: ${misc:Depends},
109
524
         ${shlibs:Depends},
110
525
Recommends: dmz-cursor-theme,
111
526
Description: Display server for Ubuntu - demonstration programs
112
527
 MirAL provides an ABI-stable abstraction layer for Mir based shells,
113
528
 insulating them from mirserver ABI breaks.
114
529
 .
115
530
 Contains demo applications that use the MirAL abstraction layer
116
480
531
117
=== added file 'debian/libmiral-dev.install'
118
--- debian/libmiral-dev.install	1970-01-01 00:00:00 +0000
119
+++ debian/libmiral-dev.install	2017-08-29 09:17:20 +0000
120
@@ -0,0 +1,3 @@
121
1
usr/include/miral/miral/*
122
2
usr/lib/*/pkgconfig/miral.pc
123
3
usr/lib/*/libmiral.so
124
0
4
125
=== added file 'debian/libmiral2.install'
126
--- debian/libmiral2.install	1970-01-01 00:00:00 +0000
127
+++ debian/libmiral2.install	2017-08-29 09:17:20 +0000
128
@@ -0,0 +1,1 @@
129
1
usr/lib/*/libmiral.so.2
130
0
2
131
=== added file 'debian/libmiral2.symbols'
132
--- debian/libmiral2.symbols	1970-01-01 00:00:00 +0000
133
+++ debian/libmiral2.symbols	2017-08-29 09:17:20 +0000
134
@@ -0,0 +1,399 @@
135
1
libmiral.so.2 libmiral2 #MINVER#
136
2
 MIRAL_1.0@MIRAL_1.0 1.0.0
137
3
 (c++)"miral::WindowInfo::height_inc(mir::geometry::detail::IntWrapper<mir::geometry::DeltaYTag>)@MIRAL_1.0" 1.0.0
138
4
 (c++)"miral::WindowInfo::max_aspect(miral::WindowSpecification::AspectRatio)@MIRAL_1.0" 1.0.0
139
5
 (c++)"miral::WindowInfo::max_height(mir::geometry::detail::IntWrapper<mir::geometry::HeightTag>)@MIRAL_1.0" 1.0.0
140
6
 (c++)"miral::WindowInfo::min_aspect(miral::WindowSpecification::AspectRatio)@MIRAL_1.0" 1.0.0
141
7
 (c++)"miral::WindowInfo::min_height(mir::geometry::detail::IntWrapper<mir::geometry::HeightTag>)@MIRAL_1.0" 1.0.0
142
8
 (c++)"miral::WindowInfo::remove_child(miral::Window const&)@MIRAL_1.0" 1.0.0
143
9
 (c++)"miral::WindowInfo::restore_rect(mir::geometry::Rectangle const&)@MIRAL_1.0" 1.0.0
144
10
 (c++)"miral::WindowInfo::needs_titlebar(MirSurfaceType)@MIRAL_1.0" 1.0.0
145
11
 (c++)"miral::WindowInfo::confine_pointer(MirPointerConfinementState)@MIRAL_1.0" 1.0.0
146
12
 (c++)"miral::WindowInfo::preferred_orientation(MirOrientationMode)@MIRAL_1.0" 1.0.0
147
13
 (c++)"miral::WindowInfo::name(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
148
14
 (c++)"miral::WindowInfo::type(MirSurfaceType)@MIRAL_1.0" 1.0.0
149
15
 (c++)"miral::WindowInfo::state(MirSurfaceState)@MIRAL_1.0" 1.0.0
150
16
 (c++)"miral::WindowInfo::parent(miral::Window const&)@MIRAL_1.0" 1.0.0
151
17
 (c++)"miral::WindowInfo::userdata(std::shared_ptr<void>)@MIRAL_1.0" 1.0.0
152
18
 (c++)"miral::WindowInfo::add_child(miral::Window const&)@MIRAL_1.0" 1.0.0
153
19
 (c++)"miral::WindowInfo::max_width(mir::geometry::detail::IntWrapper<mir::geometry::WidthTag>)@MIRAL_1.0" 1.0.0
154
20
 (c++)"miral::WindowInfo::min_width(mir::geometry::detail::IntWrapper<mir::geometry::WidthTag>)@MIRAL_1.0" 1.0.0
155
21
 (c++)"miral::WindowInfo::output_id(mir::optional_value<int>)@MIRAL_1.0" 1.0.0
156
22
 (c++)"miral::WindowInfo::width_inc(mir::geometry::detail::IntWrapper<mir::geometry::DeltaXTag>)@MIRAL_1.0" 1.0.0
157
23
 (c++)"miral::WindowInfo::WindowInfo(miral::Window const&, miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
158
24
 (c++)"miral::WindowInfo::WindowInfo(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
159
25
 (c++)"miral::WindowInfo::WindowInfo()@MIRAL_1.0" 1.0.0
160
26
 (c++)"miral::WindowInfo::WindowInfo(miral::Window const&, miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
161
27
 (c++)"miral::WindowInfo::WindowInfo(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
162
28
 (c++)"miral::WindowInfo::WindowInfo()@MIRAL_1.0" 1.0.0
163
29
 (c++)"miral::WindowInfo::~WindowInfo()@MIRAL_1.0" 1.0.0
164
30
 (c++)"miral::WindowInfo::~WindowInfo()@MIRAL_1.0" 1.0.0
165
31
 (c++)"miral::WindowInfo::operator=(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
166
32
 (c++)"miral::CursorTheme::CursorTheme(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
167
33
 (c++)"miral::CursorTheme::CursorTheme(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
168
34
 (c++)"miral::CursorTheme::~CursorTheme()@MIRAL_1.0" 1.0.0
169
35
 (c++)"miral::CursorTheme::~CursorTheme()@MIRAL_1.0" 1.0.0
170
36
 (c++)"miral::SetTerminator::SetTerminator(std::function<void (int)> const&)@MIRAL_1.0" 1.0.0
171
37
 (c++)"miral::SetTerminator::SetTerminator(std::function<void (int)> const&)@MIRAL_1.0" 1.0.0
172
38
 (c++)"miral::SetTerminator::~SetTerminator()@MIRAL_1.0" 1.0.0
173
39
 (c++)"miral::SetTerminator::~SetTerminator()@MIRAL_1.0" 1.0.0
174
40
 (c++)"miral::DebugExtension::enable()@MIRAL_1.0" 1.0.0
175
41
 (c++)"miral::DebugExtension::disable()@MIRAL_1.0" 1.0.0
176
42
 (c++)"miral::DebugExtension::DebugExtension(miral::DebugExtension const&)@MIRAL_1.0" 1.0.0
177
43
 (c++)"miral::DebugExtension::DebugExtension()@MIRAL_1.0" 1.0.0
178
44
 (c++)"miral::DebugExtension::DebugExtension(miral::DebugExtension const&)@MIRAL_1.0" 1.0.0
179
45
 (c++)"miral::DebugExtension::DebugExtension()@MIRAL_1.0" 1.0.0
180
46
 (c++)"miral::DebugExtension::operator=(miral::DebugExtension const&)@MIRAL_1.0" 1.0.0
181
47
 (c++)"miral::AddInitCallback::AddInitCallback(std::function<void ()> const&)@MIRAL_1.0" 1.0.0
182
48
 (c++)"miral::AddInitCallback::AddInitCallback(std::function<void ()> const&)@MIRAL_1.0" 1.0.0
183
49
 (c++)"miral::AddInitCallback::~AddInitCallback()@MIRAL_1.0" 1.0.0
184
50
 (c++)"miral::AddInitCallback::~AddInitCallback()@MIRAL_1.0" 1.0.0
185
51
 (c++)"miral::ApplicationInfo::add_window(miral::Window const&)@MIRAL_1.0" 1.0.0
186
52
 (c++)"miral::ApplicationInfo::remove_window(miral::Window const&)@MIRAL_1.0" 1.0.0
187
53
 (c++)"miral::ApplicationInfo::userdata(std::shared_ptr<void>)@MIRAL_1.0" 1.0.0
188
54
 (c++)"miral::ApplicationInfo::ApplicationInfo(miral::ApplicationInfo const&)@MIRAL_1.0" 1.0.0
189
55
 (c++)"miral::ApplicationInfo::ApplicationInfo(std::shared_ptr<mir::scene::Session> const&)@MIRAL_1.0" 1.0.0
190
56
 (c++)"miral::ApplicationInfo::ApplicationInfo()@MIRAL_1.0" 1.0.0
191
57
 (c++)"miral::ApplicationInfo::ApplicationInfo(miral::ApplicationInfo const&)@MIRAL_1.0" 1.0.0
192
58
 (c++)"miral::ApplicationInfo::ApplicationInfo(std::shared_ptr<mir::scene::Session> const&)@MIRAL_1.0" 1.0.0
193
59
 (c++)"miral::ApplicationInfo::ApplicationInfo()@MIRAL_1.0" 1.0.0
194
60
 (c++)"miral::ApplicationInfo::~ApplicationInfo()@MIRAL_1.0" 1.0.0
195
61
 (c++)"miral::ApplicationInfo::~ApplicationInfo()@MIRAL_1.0" 1.0.0
196
62
 (c++)"miral::ApplicationInfo::operator=(miral::ApplicationInfo const&)@MIRAL_1.0" 1.0.0
197
63
 (c++)"miral::AppendEventFilter::AppendEventFilter(std::function<int (MirEvent const*)> const&)@MIRAL_1.0" 1.0.0
198
64
 (c++)"miral::AppendEventFilter::AppendEventFilter(std::function<int (MirEvent const*)> const&)@MIRAL_1.0" 1.0.0
199
65
 (c++)"miral::AppendEventFilter::operator()(mir::Server&)@MIRAL_1.0" 1.0.0
200
66
 (c++)"miral::CommandLineOption::CommandLineOption(miral::CommandLineOption const&)@MIRAL_1.0" 1.0.0
201
67
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (mir::optional_value<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
202
68
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (mir::optional_value<bool> const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
203
69
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (mir::optional_value<int> const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
204
70
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*)@MIRAL_1.0" 1.0.0
205
71
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
206
72
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (bool)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
207
73
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (bool)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@MIRAL_1.0" 1.0.0
208
74
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (double)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, double)@MIRAL_1.0" 1.0.0
209
75
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (int)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@MIRAL_1.0" 1.0.0
210
76
 (c++)"miral::CommandLineOption::CommandLineOption(miral::CommandLineOption const&)@MIRAL_1.0" 1.0.0
211
77
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (mir::optional_value<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
212
78
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (mir::optional_value<bool> const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
213
79
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (mir::optional_value<int> const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
214
80
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*)@MIRAL_1.0" 1.0.0
215
81
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
216
82
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (bool)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
217
83
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (bool)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@MIRAL_1.0" 1.0.0
218
84
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (double)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, double)@MIRAL_1.0" 1.0.0
219
85
 (c++)"miral::CommandLineOption::CommandLineOption(std::function<void (int)>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@MIRAL_1.0" 1.0.0
220
86
 (c++)"miral::CommandLineOption::~CommandLineOption()@MIRAL_1.0" 1.0.0
221
87
 (c++)"miral::CommandLineOption::~CommandLineOption()@MIRAL_1.0" 1.0.0
222
88
 (c++)"miral::CommandLineOption::operator=(miral::CommandLineOption const&)@MIRAL_1.0" 1.0.0
223
89
 (c++)"miral::WindowManagerTools::raise_tree(miral::Window const&)@MIRAL_1.0" 1.0.0
224
90
 (c++)"miral::WindowManagerTools::force_close(miral::Window const&)@MIRAL_1.0" 1.0.0
225
91
 (c++)"miral::WindowManagerTools::modify_window(miral::Window const&, miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
226
92
 (c++)"miral::WindowManagerTools::modify_window(miral::WindowInfo&, miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
227
93
 (c++)"miral::WindowManagerTools::active_display()@MIRAL_1.0" 1.0.0
228
94
 (c++)"miral::WindowManagerTools::find_application(std::function<bool (miral::ApplicationInfo const&)> const&)@MIRAL_1.0" 1.0.0
229
95
 (c++)"miral::WindowManagerTools::invoke_under_lock(std::function<void ()> const&)@MIRAL_1.0" 1.0.0
230
96
 (c++)"miral::WindowManagerTools::drag_active_window(mir::geometry::Displacement)@MIRAL_1.0" 1.0.0
231
97
 (c++)"miral::WindowManagerTools::ask_client_to_close(miral::Window const&)@MIRAL_1.0" 1.0.0
232
98
 (c++)"miral::WindowManagerTools::for_each_application(std::function<void (miral::ApplicationInfo&)> const&)@MIRAL_1.0" 1.0.0
233
99
 (c++)"miral::WindowManagerTools::select_active_window(miral::Window const&)@MIRAL_1.0" 1.0.0
234
100
 (c++)"miral::WindowManagerTools::focus_next_application()@MIRAL_1.0" 1.0.0
235
101
 (c++)"miral::WindowManagerTools::focus_next_within_application()@MIRAL_1.0" 1.0.0
236
102
 (c++)"miral::WindowManagerTools::WindowManagerTools(miral::WindowManagerToolsImplementation*)@MIRAL_1.0" 1.0.0
237
103
 (c++)"miral::WindowManagerTools::WindowManagerTools(miral::WindowManagerTools const&)@MIRAL_1.0" 1.0.0
238
104
 (c++)"miral::WindowManagerTools::WindowManagerTools(miral::WindowManagerToolsImplementation*)@MIRAL_1.0" 1.0.0
239
105
 (c++)"miral::WindowManagerTools::WindowManagerTools(miral::WindowManagerTools const&)@MIRAL_1.0" 1.0.0
240
106
 (c++)"miral::WindowManagerTools::~WindowManagerTools()@MIRAL_1.0" 1.0.0
241
107
 (c++)"miral::WindowManagerTools::~WindowManagerTools()@MIRAL_1.0" 1.0.0
242
108
 (c++)"miral::WindowManagerTools::operator=(miral::WindowManagerTools const&)@MIRAL_1.0" 1.0.0
243
109
 (c++)"miral::WindowSpecification::height_inc()@MIRAL_1.0" 1.0.0
244
110
 (c++)"miral::WindowSpecification::input_mode()@MIRAL_1.0" 1.0.0
245
111
 (c++)"miral::WindowSpecification::max_aspect()@MIRAL_1.0" 1.0.0
246
112
 (c++)"miral::WindowSpecification::max_height()@MIRAL_1.0" 1.0.0
247
113
 (c++)"miral::WindowSpecification::min_aspect()@MIRAL_1.0" 1.0.0
248
114
 (c++)"miral::WindowSpecification::min_height()@MIRAL_1.0" 1.0.0
249
115
 (c++)"miral::WindowSpecification::input_shape()@MIRAL_1.0" 1.0.0
250
116
 (c++)"miral::WindowSpecification::shell_chrome()@MIRAL_1.0" 1.0.0
251
117
 (c++)"miral::WindowSpecification::confine_pointer()@MIRAL_1.0" 1.0.0
252
118
 (c++)"miral::WindowSpecification::placement_hints()@MIRAL_1.0" 1.0.0
253
119
 (c++)"miral::WindowSpecification::preferred_orientation()@MIRAL_1.0" 1.0.0
254
120
 (c++)"miral::WindowSpecification::window_placement_gravity()@MIRAL_1.0" 1.0.0
255
121
 (c++)"miral::WindowSpecification::aux_rect_placement_offset()@MIRAL_1.0" 1.0.0
256
122
 (c++)"miral::WindowSpecification::aux_rect_placement_gravity()@MIRAL_1.0" 1.0.0
257
123
 (c++)"miral::WindowSpecification::name[abi:cxx11]()@MIRAL_1.0" 1.0.0
258
124
 (c++)"miral::WindowSpecification::size()@MIRAL_1.0" 1.0.0
259
125
 (c++)"miral::WindowSpecification::type()@MIRAL_1.0" 1.0.0
260
126
 (c++)"miral::WindowSpecification::state()@MIRAL_1.0" 1.0.0
261
127
 (c++)"miral::WindowSpecification::parent()@MIRAL_1.0" 1.0.0
262
128
 (c++)"miral::WindowSpecification::aux_rect()@MIRAL_1.0" 1.0.0
263
129
 (c++)"miral::WindowSpecification::top_left()@MIRAL_1.0" 1.0.0
264
130
 (c++)"miral::WindowSpecification::userdata()@MIRAL_1.0" 1.0.0
265
131
 (c++)"miral::WindowSpecification::max_width()@MIRAL_1.0" 1.0.0
266
132
 (c++)"miral::WindowSpecification::min_width()@MIRAL_1.0" 1.0.0
267
133
 (c++)"miral::WindowSpecification::output_id()@MIRAL_1.0" 1.0.0
268
134
 (c++)"miral::WindowSpecification::width_inc()@MIRAL_1.0" 1.0.0
269
135
 (c++)"miral::WindowSpecification::WindowSpecification(mir::scene::SurfaceCreationParameters const&)@MIRAL_1.0" 1.0.0
270
136
 (c++)"miral::WindowSpecification::WindowSpecification(mir::shell::SurfaceSpecification const&)@MIRAL_1.0" 1.0.0
271
137
 (c++)"miral::WindowSpecification::WindowSpecification(miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
272
138
 (c++)"miral::WindowSpecification::WindowSpecification()@MIRAL_1.0" 1.0.0
273
139
 (c++)"miral::WindowSpecification::WindowSpecification(mir::scene::SurfaceCreationParameters const&)@MIRAL_1.0" 1.0.0
274
140
 (c++)"miral::WindowSpecification::WindowSpecification(mir::shell::SurfaceSpecification const&)@MIRAL_1.0" 1.0.0
275
141
 (c++)"miral::WindowSpecification::WindowSpecification(miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
276
142
 (c++)"miral::WindowSpecification::WindowSpecification()@MIRAL_1.0" 1.0.0
277
143
 (c++)"miral::WindowSpecification::~WindowSpecification()@MIRAL_1.0" 1.0.0
278
144
 (c++)"miral::WindowSpecification::~WindowSpecification()@MIRAL_1.0" 1.0.0
279
145
 (c++)"miral::WindowSpecification::operator=(miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
280
146
 (c++)"miral::ActiveOutputsMonitor::add_listener(miral::ActiveOutputsListener*)@MIRAL_1.0" 1.0.0
281
147
 (c++)"miral::ActiveOutputsMonitor::delete_listener(miral::ActiveOutputsListener*)@MIRAL_1.0" 1.0.0
282
148
 (c++)"miral::ActiveOutputsMonitor::ActiveOutputsMonitor(miral::ActiveOutputsMonitor const&)@MIRAL_1.0" 1.0.0
283
149
 (c++)"miral::ActiveOutputsMonitor::ActiveOutputsMonitor()@MIRAL_1.0" 1.0.0
284
150
 (c++)"miral::ActiveOutputsMonitor::ActiveOutputsMonitor(miral::ActiveOutputsMonitor const&)@MIRAL_1.0" 1.0.0
285
151
 (c++)"miral::ActiveOutputsMonitor::ActiveOutputsMonitor()@MIRAL_1.0" 1.0.0
286
152
 (c++)"miral::ActiveOutputsMonitor::~ActiveOutputsMonitor()@MIRAL_1.0" 1.0.0
287
153
 (c++)"miral::ActiveOutputsMonitor::~ActiveOutputsMonitor()@MIRAL_1.0" 1.0.0
288
154
 (c++)"miral::ActiveOutputsMonitor::operator=(miral::ActiveOutputsMonitor const&)@MIRAL_1.0" 1.0.0
289
155
 (c++)"miral::ActiveOutputsMonitor::operator()(mir::Server&)@MIRAL_1.0" 1.0.0
290
156
 (c++)"miral::ActiveOutputsListener::advise_output_end()@MIRAL_1.0" 1.0.0
291
157
 (c++)"miral::ActiveOutputsListener::advise_output_begin()@MIRAL_1.0" 1.0.0
292
158
 (c++)"miral::ActiveOutputsListener::advise_output_create(miral::Output const&)@MIRAL_1.0" 1.0.0
293
159
 (c++)"miral::ActiveOutputsListener::advise_output_delete(miral::Output const&)@MIRAL_1.0" 1.0.0
294
160
 (c++)"miral::ActiveOutputsListener::advise_output_update(miral::Output const&, miral::Output const&)@MIRAL_1.0" 1.0.0
295
161
 (c++)"miral::SetCommandLineHandler::SetCommandLineHandler(std::function<void (int, char const* const*)> const&)@MIRAL_1.0" 1.0.0
296
162
 (c++)"miral::SetCommandLineHandler::SetCommandLineHandler(std::function<void (int, char const* const*)> const&)@MIRAL_1.0" 1.0.0
297
163
 (c++)"miral::SetCommandLineHandler::~SetCommandLineHandler()@MIRAL_1.0" 1.0.0
298
164
 (c++)"miral::SetCommandLineHandler::~SetCommandLineHandler()@MIRAL_1.0" 1.0.0
299
165
 (c++)"miral::StartupInternalClient::StartupInternalClient(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<void (miral::toolkit::Connection)>, std::function<void (std::weak_ptr<mir::scene::Session>)>)@MIRAL_1.0" 1.0.0
300
166
 (c++)"miral::StartupInternalClient::StartupInternalClient(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<void (miral::toolkit::Connection)>, std::function<void (std::weak_ptr<mir::scene::Session>)>)@MIRAL_1.0" 1.0.0
301
167
 (c++)"miral::StartupInternalClient::~StartupInternalClient()@MIRAL_1.0" 1.0.0
302
168
 (c++)"miral::StartupInternalClient::~StartupInternalClient()@MIRAL_1.0" 1.0.0
303
169
 (c++)"miral::StartupInternalClient::operator()(mir::Server&)@MIRAL_1.0" 1.0.0
304
170
 (c++)"miral::ApplicationCredentials::ApplicationCredentials(mir::frontend::SessionCredentials const&)@MIRAL_1.0" 1.0.0
305
171
 (c++)"miral::ApplicationCredentials::ApplicationCredentials(mir::frontend::SessionCredentials const&)@MIRAL_1.0" 1.0.0
306
172
 (c++)"miral::InternalClientLauncher::InternalClientLauncher()@MIRAL_1.0" 1.0.0
307
173
 (c++)"miral::InternalClientLauncher::InternalClientLauncher()@MIRAL_1.0" 1.0.0
308
174
 (c++)"miral::InternalClientLauncher::~InternalClientLauncher()@MIRAL_1.0" 1.0.0
309
175
 (c++)"miral::InternalClientLauncher::~InternalClientLauncher()@MIRAL_1.0" 1.0.0
310
176
 (c++)"miral::InternalClientLauncher::operator()(mir::Server&)@MIRAL_1.0" 1.0.0
311
177
 (c++)"miral::WindowManagementPolicy::advise_end()@MIRAL_1.0" 1.0.0
312
178
 (c++)"miral::WindowManagementPolicy::advise_begin()@MIRAL_1.0" 1.0.0
313
179
 (c++)"miral::WindowManagementPolicy::advise_raise(std::vector<miral::Window, std::allocator<miral::Window> > const&)@MIRAL_1.0" 1.0.0
314
180
 (c++)"miral::WindowManagementPolicy::advise_resize(miral::WindowInfo const&, mir::geometry::Size const&)@MIRAL_1.0" 1.0.0
315
181
 (c++)"miral::WindowManagementPolicy::advise_move_to(miral::WindowInfo const&, mir::geometry::Point)@MIRAL_1.0" 1.0.0
316
182
 (c++)"miral::WindowManagementPolicy::advise_new_app(miral::ApplicationInfo&)@MIRAL_1.0" 1.0.0
317
183
 (c++)"miral::WindowManagementPolicy::advise_delete_app(miral::ApplicationInfo const&)@MIRAL_1.0" 1.0.0
318
184
 (c++)"miral::WindowManagementPolicy::advise_focus_lost(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
319
185
 (c++)"miral::WindowManagementPolicy::advise_new_window(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
320
186
 (c++)"miral::WindowManagementPolicy::advise_focus_gained(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
321
187
 (c++)"miral::WindowManagementPolicy::advise_state_change(miral::WindowInfo const&, MirSurfaceState)@MIRAL_1.0" 1.0.0
322
188
 (c++)"miral::WindowManagementPolicy::advise_delete_window(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
323
189
 (c++)"miral::equivalent_display_area(miral::Output const&, miral::Output const&)@MIRAL_1.0" 1.0.0
324
190
 (c++)"miral::SetWindowManagmentPolicy::SetWindowManagmentPolicy(std::function<std::unique_ptr<miral::WindowManagementPolicy, std::default_delete<miral::WindowManagementPolicy> > (miral::WindowManagerTools const&)> const&)@MIRAL_1.0" 1.0.0
325
191
 (c++)"miral::SetWindowManagmentPolicy::SetWindowManagmentPolicy(std::function<std::unique_ptr<miral::WindowManagementPolicy, std::default_delete<miral::WindowManagementPolicy> > (miral::WindowManagerTools const&)> const&)@MIRAL_1.0" 1.0.0
326
192
 (c++)"miral::SetWindowManagmentPolicy::~SetWindowManagmentPolicy()@MIRAL_1.0" 1.0.0
327
193
 (c++)"miral::SetWindowManagmentPolicy::~SetWindowManagmentPolicy()@MIRAL_1.0" 1.0.0
328
194
 (c++)"miral::apply_lifecycle_state_to(std::shared_ptr<mir::scene::Session> const&, MirLifecycleState)@MIRAL_1.0" 1.0.0
329
195
 (c++)"miral::CanonicalWindowManagerPolicy::place_new_surface(miral::ApplicationInfo const&, miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
330
196
 (c++)"miral::CanonicalWindowManagerPolicy::advise_focus_gained(miral::WindowInfo const&)@MIRAL_1.0" 1.0.0
331
197
 (c++)"miral::CanonicalWindowManagerPolicy::handle_raise_window(miral::WindowInfo&)@MIRAL_1.0" 1.0.0
332
198
 (c++)"miral::CanonicalWindowManagerPolicy::handle_window_ready(miral::WindowInfo&)@MIRAL_1.0" 1.0.0
333
199
 (c++)"miral::CanonicalWindowManagerPolicy::handle_modify_window(miral::WindowInfo&, miral::WindowSpecification const&)@MIRAL_1.0" 1.0.0
334
200
 (c++)"miral::CanonicalWindowManagerPolicy::confirm_inherited_move(miral::WindowInfo const&, mir::geometry::Displacement)@MIRAL_1.0" 1.0.0
335
201
 (c++)"miral::CanonicalWindowManagerPolicy::CanonicalWindowManagerPolicy(miral::WindowManagerTools const&)@MIRAL_1.0" 1.0.0
336
202
 (c++)"miral::CanonicalWindowManagerPolicy::CanonicalWindowManagerPolicy(miral::WindowManagerTools const&)@MIRAL_1.0" 1.0.0
337
203
 (c++)"miral::BasicSetApplicationAuthorizer::BasicSetApplicationAuthorizer(std::function<std::shared_ptr<miral::ApplicationAuthorizer> ()> const&)@MIRAL_1.0" 1.0.0
338
204
 (c++)"miral::BasicSetApplicationAuthorizer::BasicSetApplicationAuthorizer(std::function<std::shared_ptr<miral::ApplicationAuthorizer> ()> const&)@MIRAL_1.0" 1.0.0
339
205
 (c++)"miral::BasicSetApplicationAuthorizer::~BasicSetApplicationAuthorizer()@MIRAL_1.0" 1.0.0
340
206
 (c++)"miral::BasicSetApplicationAuthorizer::~BasicSetApplicationAuthorizer()@MIRAL_1.0" 1.0.0
341
207
 (c++)"miral::BasicSetApplicationAuthorizer::operator()(mir::Server&)@MIRAL_1.0" 1.0.0
342
208
 (c++)"miral::display_configuration_options(mir::Server&)@MIRAL_1.0" 1.0.0
343
209
 (c++)"miral::kill(std::shared_ptr<mir::scene::Session> const&, int)@MIRAL_1.0" 1.0.0
344
210
 (c++)"miral::Keymap::set_keymap(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
345
211
 (c++)"miral::Keymap::Keymap(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
346
212
 (c++)"miral::Keymap::Keymap(miral::Keymap const&)@MIRAL_1.0" 1.0.0
347
213
 (c++)"miral::Keymap::Keymap()@MIRAL_1.0" 1.0.0
348
214
 (c++)"miral::Keymap::Keymap(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@MIRAL_1.0" 1.0.0
349
215
 (c++)"miral::Keymap::Keymap(miral::Keymap const&)@MIRAL_1.0" 1.0.0
350
216
 (c++)"miral::Keymap::Keymap()@MIRAL_1.0" 1.0.0
351
217
 (c++)"miral::Keymap::~Keymap()@MIRAL_1.0" 1.0.0
352
218
 (c++)"miral::Keymap::~Keymap()@MIRAL_1.0" 1.0.0
353
219
 (c++)"miral::Keymap::operator=(miral::Keymap const&)@MIRAL_1.0" 1.0.0
354
220
 (c++)"miral::Output::Output(mir::graphics::DisplayConfigurationOutput const&)@MIRAL_1.0" 1.0.0
355
221
 (c++)"miral::Output::Output(miral::Output const&)@MIRAL_1.0" 1.0.0
356
222
 (c++)"miral::Output::Output(mir::graphics::DisplayConfigurationOutput const&)@MIRAL_1.0" 1.0.0
357
223
 (c++)"miral::Output::Output(miral::Output const&)@MIRAL_1.0" 1.0.0
358
224
 (c++)"miral::Output::~Output()@MIRAL_1.0" 1.0.0
359
225
 (c++)"miral::Output::~Output()@MIRAL_1.0" 1.0.0
360
226
 (c++)"miral::Output::operator=(miral::Output const&)@MIRAL_1.0" 1.0.0
361
227
 (c++)"miral::Window::resize(mir::geometry::Size const&)@MIRAL_1.0" 1.0.0
362
228
 (c++)"miral::Window::move_to(mir::geometry::Point)@MIRAL_1.0" 1.0.0
363
229
 (c++)"miral::Window::Window(std::shared_ptr<mir::scene::Session> const&, std::shared_ptr<mir::scene::Surface> const&)@MIRAL_1.0" 1.0.0
364
230
 (c++)"miral::Window::Window()@MIRAL_1.0" 1.0.0
365
231
 (c++)"miral::Window::Window(std::shared_ptr<mir::scene::Session> const&, std::shared_ptr<mir::scene::Surface> const&)@MIRAL_1.0" 1.0.0
366
232
 (c++)"miral::Window::Window()@MIRAL_1.0" 1.0.0
367
233
 (c++)"miral::Window::~Window()@MIRAL_1.0" 1.0.0
368
234
 (c++)"miral::Window::~Window()@MIRAL_1.0" 1.0.0
369
235
 (c++)"miral::pid_of(std::shared_ptr<mir::scene::Session> const&)@MIRAL_1.0" 1.0.0
370
236
 (c++)"miral::name_of[abi:cxx11](std::shared_ptr<mir::scene::Session> const&)@MIRAL_1.0" 1.0.0
371
237
 (c++)"miral::MirRunner::add_stop_callback(std::function<void ()> const&)@MIRAL_1.0" 1.0.0
372
238
 (c++)"miral::MirRunner::add_start_callback(std::function<void ()> const&)@MIRAL_1.0" 1.0.0
373
239
 (c++)"miral::MirRunner::set_exception_handler(std::function<void ()> const&)@MIRAL_1.0" 1.0.0
374
240
 (c++)"miral::MirRunner::stop()@MIRAL_1.0" 1.0.0
375
241
 (c++)"miral::MirRunner::run_with(std::initializer_list<std::function<void (mir::Server&)> >)@MIRAL_1.0" 1.0.0
376
242
 (c++)"miral::MirRunner::MirRunner(int, char const**)@MIRAL_1.0" 1.0.0
377
243
 (c++)"miral::MirRunner::MirRunner(int, char const**, char const*)@MIRAL_1.0" 1.0.0
378
244
 (c++)"miral::MirRunner::MirRunner(int, char const**)@MIRAL_1.0" 1.0.0
379
245
 (c++)"miral::MirRunner::MirRunner(int, char const**, char const*)@MIRAL_1.0" 1.0.0
380
246
 (c++)"miral::MirRunner::~MirRunner()@MIRAL_1.0" 1.0.0
381
247
 (c++)"miral::MirRunner::~MirRunner()@MIRAL_1.0" 1.0.0
382
248
 (c++)"miral::operator==(miral::Output::PhysicalSizeMM const&, miral::Output::PhysicalSizeMM const&)@MIRAL_1.0" 1.0.0
383
249
 (c++)"miral::operator==(miral::Window const&, std::shared_ptr<mir::scene::Surface> const&)@MIRAL_1.0" 1.0.0
384
250
 (c++)"miral::operator==(miral::Window const&, miral::Window const&)@MIRAL_1.0" 1.0.0
385
251
 (c++)"miral::operator==(std::shared_ptr<mir::scene::Surface> const&, miral::Window const&)@MIRAL_1.0" 1.0.0
386
252
 (c++)"miral::WindowInfo::height_inc() const@MIRAL_1.0" 1.0.0
387
253
 (c++)"miral::WindowInfo::is_visible() const@MIRAL_1.0" 1.0.0
388
254
 (c++)"miral::WindowInfo::max_aspect() const@MIRAL_1.0" 1.0.0
389
255
 (c++)"miral::WindowInfo::max_height() const@MIRAL_1.0" 1.0.0
390
256
 (c++)"miral::WindowInfo::min_aspect() const@MIRAL_1.0" 1.0.0
391
257
 (c++)"miral::WindowInfo::min_height() const@MIRAL_1.0" 1.0.0
392
258
 (c++)"miral::WindowInfo::can_morph_to(MirSurfaceType) const@MIRAL_1.0" 1.0.0
393
259
 (c++)"miral::WindowInfo::restore_rect() const@MIRAL_1.0" 1.0.0
394
260
 (c++)"miral::WindowInfo::can_be_active() const@MIRAL_1.0" 1.0.0
395
261
 (c++)"miral::WindowInfo::has_output_id() const@MIRAL_1.0" 1.0.0
396
262
 (c++)"miral::WindowInfo::confine_pointer() const@MIRAL_1.0" 1.0.0
397
263
 (c++)"miral::WindowInfo::constrain_resize(mir::geometry::Point&, mir::geometry::Size&) const@MIRAL_1.0" 1.0.0
398
264
 (c++)"miral::WindowInfo::must_have_parent() const@MIRAL_1.0" 1.0.0
399
265
 (c++)"miral::WindowInfo::must_not_have_parent() const@MIRAL_1.0" 1.0.0
400
266
 (c++)"miral::WindowInfo::preferred_orientation() const@MIRAL_1.0" 1.0.0
401
267
 (c++)"miral::WindowInfo::name[abi:cxx11]() const@MIRAL_1.0" 1.0.0
402
268
 (c++)"miral::WindowInfo::type() const@MIRAL_1.0" 1.0.0
403
269
 (c++)"miral::WindowInfo::state() const@MIRAL_1.0" 1.0.0
404
270
 (c++)"miral::WindowInfo::parent() const@MIRAL_1.0" 1.0.0
405
271
 (c++)"miral::WindowInfo::window() const@MIRAL_1.0" 1.0.0
406
272
 (c++)"miral::WindowInfo::children() const@MIRAL_1.0" 1.0.0
407
273
 (c++)"miral::WindowInfo::userdata() const@MIRAL_1.0" 1.0.0
408
274
 (c++)"miral::WindowInfo::max_width() const@MIRAL_1.0" 1.0.0
409
275
 (c++)"miral::WindowInfo::min_width() const@MIRAL_1.0" 1.0.0
410
276
 (c++)"miral::WindowInfo::output_id() const@MIRAL_1.0" 1.0.0
411
277
 (c++)"miral::WindowInfo::width_inc() const@MIRAL_1.0" 1.0.0
412
278
 (c++)"miral::CursorTheme::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
413
279
 (c++)"miral::SetTerminator::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
414
280
 (c++)"miral::DebugExtension::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
415
281
 (c++)"miral::AddInitCallback::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
416
282
 (c++)"miral::ApplicationInfo::application() const@MIRAL_1.0" 1.0.0
417
283
 (c++)"miral::ApplicationInfo::name[abi:cxx11]() const@MIRAL_1.0" 1.0.0
418
284
 (c++)"miral::ApplicationInfo::windows() const@MIRAL_1.0" 1.0.0
419
285
 (c++)"miral::ApplicationInfo::userdata() const@MIRAL_1.0" 1.0.0
420
286
 (c++)"miral::CommandLineOption::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
421
287
 (c++)"miral::WindowManagerTools::active_window() const@MIRAL_1.0" 1.0.0
422
288
 (c++)"miral::WindowManagerTools::id_for_window[abi:cxx11](miral::Window const&) const@MIRAL_1.0" 1.0.0
423
289
 (c++)"miral::WindowManagerTools::count_applications() const@MIRAL_1.0" 1.0.0
424
290
 (c++)"miral::WindowManagerTools::info_for_window_id(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@MIRAL_1.0" 1.0.0
425
291
 (c++)"miral::WindowManagerTools::place_and_size_for_state(miral::WindowSpecification&, miral::WindowInfo const&) const@MIRAL_1.0" 1.0.0
426
292
 (c++)"miral::WindowManagerTools::info_for(miral::Window const&) const@MIRAL_1.0" 1.0.0
427
293
 (c++)"miral::WindowManagerTools::info_for(std::weak_ptr<mir::scene::Session> const&) const@MIRAL_1.0" 1.0.0
428
294
 (c++)"miral::WindowManagerTools::info_for(std::weak_ptr<mir::scene::Surface> const&) const@MIRAL_1.0" 1.0.0
429
295
 (c++)"miral::WindowManagerTools::window_at(mir::geometry::Point) const@MIRAL_1.0" 1.0.0
430
296
 (c++)"miral::WindowSpecification::height_inc() const@MIRAL_1.0" 1.0.0
431
297
 (c++)"miral::WindowSpecification::input_mode() const@MIRAL_1.0" 1.0.0
432
298
 (c++)"miral::WindowSpecification::max_aspect() const@MIRAL_1.0" 1.0.0
433
299
 (c++)"miral::WindowSpecification::max_height() const@MIRAL_1.0" 1.0.0
434
300
 (c++)"miral::WindowSpecification::min_aspect() const@MIRAL_1.0" 1.0.0
435
301
 (c++)"miral::WindowSpecification::min_height() const@MIRAL_1.0" 1.0.0
436
302
 (c++)"miral::WindowSpecification::input_shape() const@MIRAL_1.0" 1.0.0
437
303
 (c++)"miral::WindowSpecification::shell_chrome() const@MIRAL_1.0" 1.0.0
438
304
 (c++)"miral::WindowSpecification::confine_pointer() const@MIRAL_1.0" 1.0.0
439
305
 (c++)"miral::WindowSpecification::placement_hints() const@MIRAL_1.0" 1.0.0
440
306
 (c++)"miral::WindowSpecification::preferred_orientation() const@MIRAL_1.0" 1.0.0
441
307
 (c++)"miral::WindowSpecification::window_placement_gravity() const@MIRAL_1.0" 1.0.0
442
308
 (c++)"miral::WindowSpecification::aux_rect_placement_offset() const@MIRAL_1.0" 1.0.0
443
309
 (c++)"miral::WindowSpecification::aux_rect_placement_gravity() const@MIRAL_1.0" 1.0.0
444
310
 (c++)"miral::WindowSpecification::name[abi:cxx11]() const@MIRAL_1.0" 1.0.0
445
311
 (c++)"miral::WindowSpecification::size() const@MIRAL_1.0" 1.0.0
446
312
 (c++)"miral::WindowSpecification::type() const@MIRAL_1.0" 1.0.0
447
313
 (c++)"miral::WindowSpecification::state() const@MIRAL_1.0" 1.0.0
448
314
 (c++)"miral::WindowSpecification::parent() const@MIRAL_1.0" 1.0.0
449
315
 (c++)"miral::WindowSpecification::update(mir::scene::SurfaceCreationParameters&) const@MIRAL_1.0" 1.0.0
450
316
 (c++)"miral::WindowSpecification::aux_rect() const@MIRAL_1.0" 1.0.0
451
317
 (c++)"miral::WindowSpecification::top_left() const@MIRAL_1.0" 1.0.0
452
318
 (c++)"miral::WindowSpecification::userdata() const@MIRAL_1.0" 1.0.0
453
319
 (c++)"miral::WindowSpecification::max_width() const@MIRAL_1.0" 1.0.0
454
320
 (c++)"miral::WindowSpecification::min_width() const@MIRAL_1.0" 1.0.0
455
321
 (c++)"miral::WindowSpecification::output_id() const@MIRAL_1.0" 1.0.0
456
322
 (c++)"miral::WindowSpecification::width_inc() const@MIRAL_1.0" 1.0.0
457
323
 (c++)"miral::ActiveOutputsMonitor::process_outputs(std::function<void (std::vector<miral::Output, std::allocator<miral::Output> > const&)> const&) const@MIRAL_1.0" 1.0.0
458
324
 (c++)"miral::WindowManagerOptions::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
459
325
 (c++)"miral::SetCommandLineHandler::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
460
326
 (c++)"miral::ApplicationCredentials::gid() const@MIRAL_1.0" 1.0.0
461
327
 (c++)"miral::ApplicationCredentials::pid() const@MIRAL_1.0" 1.0.0
462
328
 (c++)"miral::ApplicationCredentials::uid() const@MIRAL_1.0" 1.0.0
463
329
 (c++)"miral::InternalClientLauncher::launch(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::function<void (miral::toolkit::Connection)> const&, std::function<void (std::weak_ptr<mir::scene::Session>)> const&) const@MIRAL_1.0" 1.0.0
464
330
 (c++)"miral::SetWindowManagmentPolicy::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
465
331
 (c++)"miral::BasicSetApplicationAuthorizer::the_application_authorizer() const@MIRAL_1.0" 1.0.0
466
332
 (c++)"miral::Keymap::operator()(mir::Server&) const@MIRAL_1.0" 1.0.0
467
333
 (c++)"miral::Output::power_mode() const@MIRAL_1.0" 1.0.0
468
334
 (c++)"miral::Output::form_factor() const@MIRAL_1.0" 1.0.0
469
335
 (c++)"miral::Output::orientation() const@MIRAL_1.0" 1.0.0
470
336
 (c++)"miral::Output::pixel_format() const@MIRAL_1.0" 1.0.0
471
337
 (c++)"miral::Output::refresh_rate() const@MIRAL_1.0" 1.0.0
472
338
 (c++)"miral::Output::is_same_output(miral::Output const&) const@MIRAL_1.0" 1.0.0
473
339
 (c++)"miral::Output::physical_size_mm() const@MIRAL_1.0" 1.0.0
474
340
 (c++)"miral::Output::type() const@MIRAL_1.0" 1.0.0
475
341
 (c++)"miral::Output::used() const@MIRAL_1.0" 1.0.0
476
342
 (c++)"miral::Output::scale() const@MIRAL_1.0" 1.0.0
477
343
 (c++)"miral::Output::valid() const@MIRAL_1.0" 1.0.0
478
344
 (c++)"miral::Output::extents() const@MIRAL_1.0" 1.0.0
479
345
 (c++)"miral::Output::connected() const@MIRAL_1.0" 1.0.0
480
346
 (c++)"miral::Window::application() const@MIRAL_1.0" 1.0.0
481
347
 (c++)"miral::Window::size() const@MIRAL_1.0" 1.0.0
482
348
 (c++)"miral::Window::top_left() const@MIRAL_1.0" 1.0.0
483
349
 (c++)"miral::Window::operator std::shared_ptr<mir::scene::Surface>() const@MIRAL_1.0" 1.0.0
484
350
 (c++)"miral::Window::operator std::weak_ptr<mir::scene::Surface>() const@MIRAL_1.0" 1.0.0
485
351
 (c++)"miral::Window::operator bool() const@MIRAL_1.0" 1.0.0
486
352
 (c++)"typeinfo for miral::ActiveOutputsListener@MIRAL_1.0" 1.0.0
487
353
 (c++)"typeinfo for miral::WindowManagementPolicy@MIRAL_1.0" 1.0.0
488
354
 (c++)"typeinfo for miral::CanonicalWindowManagerPolicy@MIRAL_1.0" 1.0.0
489
355
 (c++)"vtable for miral::ActiveOutputsListener@MIRAL_1.0" 1.0.0
490
356
 (c++)"vtable for miral::WindowManagementPolicy@MIRAL_1.0" 1.0.0
491
357
 (c++)"vtable for miral::CanonicalWindowManagerPolicy@MIRAL_1.0" 1.0.0
492
358
 MIRAL_1.1@MIRAL_1.1 1.0.0
493
359
 (c++)"miral::WindowInfo::needs_titlebar(MirWindowType)@MIRAL_1.1" 1.0.0
494
360
 (c++)"miral::WindowInfo::type(MirWindowType)@MIRAL_1.1" 1.0.0
495
361
 (c++)"miral::WindowInfo::state(MirWindowState)@MIRAL_1.1" 1.0.0
496
362
 (c++)"miral::WindowManagementPolicy::advise_state_change(miral::WindowInfo const&, MirWindowState)@MIRAL_1.1" 1.0.0
497
363
 (c++)"miral::WindowInfo::can_morph_to(MirWindowType) const@MIRAL_1.1" 1.0.0
498
364
 (c++)"miral::CanonicalWindowManagerPolicy::place_new_window(miral::ApplicationInfo const&, miral::WindowSpecification const&)@MIRAL_1.1" 1.0.0
499
365
 MIRAL_1.2@MIRAL_1.2 1.0.0
500
366
 (c++)"miral::StartupInternalClient::StartupInternalClient(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<void (mir::client::Connection)>, std::function<void (std::weak_ptr<mir::scene::Session>)>)@MIRAL_1.2" 1.0.0
501
367
 (c++)"miral::InternalClientLauncher::launch(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::function<void (mir::client::Connection)> const&, std::function<void (std::weak_ptr<mir::scene::Session>)> const&) const@MIRAL_1.2" 1.0.0
502
368
 (c++)"miral::WindowInfo::shell_chrome(MirShellChrome)@MIRAL_1.2" 1.0.0
503
369
 (c++)"miral::WindowInfo::shell_chrome() const@MIRAL_1.2" 1.0.0
504
370
 (c++)"miral::WindowManagerTools::drag_window(miral::Window const&, mir::geometry::Displacement)@MIRAL_1.2" 1.0.0
505
371
 (c++)"typeinfo for miral::ApplicationAuthorizer@MIRAL_1.0" 1.0.0
506
372
 (c++)"typeinfo for miral::ApplicationAuthorizer1@MIRAL_1.2" 1.0.0
507
373
 MIRAL_1.3@MIRAL_1.3 1.0.0
508
374
 (c++)"miral::operator<(miral::Window const&, miral::Window const&)@MIRAL_1.0" 1.0.0
509
375
 (c++)"miral::WindowManagerTools::create_workspace()@MIRAL_1.3" 1.0.0
510
376
 (c++)"miral::WindowManagerTools::add_tree_to_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0
511
377
 (c++)"miral::WindowManagerTools::focus_prev_within_application()@MIRAL_1.3" 1.0.0
512
378
 (c++)"miral::WindowManagerTools::remove_tree_from_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0
513
379
 (c++)"miral::WindowManagerTools::move_workspace_content_to_workspace(std::shared_ptr<miral::Workspace> const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0
514
380
 (c++)"miral::WorkspacePolicy::advise_adding_to_workspace(std::shared_ptr<miral::Workspace> const&, std::vector<miral::Window, std::allocator<miral::Window> > const&)@MIRAL_1.3" 1.0.0
515
381
 (c++)"miral::WorkspacePolicy::advise_removing_from_workspace(std::shared_ptr<miral::Workspace> const&, std::vector<miral::Window, std::allocator<miral::Window> > const&)@MIRAL_1.3" 1.0.0
516
382
 (c++)"miral::WindowManagerTools::for_each_window_in_workspace(std::shared_ptr<miral::Workspace> const&, std::function<void (miral::Window const&)> const&)@MIRAL_1.3" 1.0.0
517
383
 (c++)"miral::WindowManagerTools::for_each_workspace_containing(miral::Window const&, std::function<void (std::shared_ptr<miral::Workspace> const&)> const&)@MIRAL_1.3" 1.0.0
518
384
 (c++)"typeinfo for miral::WorkspacePolicy@MIRAL_1.3" 1.0.0
519
385
 (c++)"vtable for miral::WorkspacePolicy@MIRAL_1.3" 1.0.0
520
386
 MIRAL_1.3.1@MIRAL_1.3.1 1.0.0
521
387
 (c++)"miral::SetWindowManagementPolicy::SetWindowManagementPolicy(std::function<std::unique_ptr<miral::WindowManagementPolicy, std::default_delete<miral::WindowManagementPolicy> > (miral::WindowManagerTools const&)> const&)@MIRAL_1.3.1" 1.0.0
522
388
 (c++)"miral::SetWindowManagementPolicy::SetWindowManagementPolicy(std::function<std::unique_ptr<miral::WindowManagementPolicy, std::default_delete<miral::WindowManagementPolicy> > (miral::WindowManagerTools const&)> const&)@MIRAL_1.3.1" 1.0.0
523
389
 (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.0.0
524
390
 (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.0.0
525
391
 (c++)"miral::SetWindowManagementPolicy::operator()(mir::Server&) const@MIRAL_1.3.1" 1.0.0
526
392
 MIRAL_1.4.0@MIRAL_1.4.0 1.0.0
527
393
 (c++)"miral::WindowManagerTools::end_drag_and_drop()@MIRAL_1.4.0" 1.0.0
528
394
 (c++)"miral::WindowManagerTools::start_drag_and_drop(miral::WindowInfo&, std::vector<unsigned char, std::allocator<unsigned char> > const&)@MIRAL_1.4.0" 1.0.0
529
395
 (c++)"typeinfo for miral::WindowManagementPolicyAddendum2@MIRAL_1.4.0" 1.0.0
530
396
 MIRAL_1.5.0@MIRAL_1.5.0 1.0.0
531
397
 (c++)"miral::pre_init(miral::CommandLineOption const&)@MIRAL_1.5.0" 1.0.0
532
398
 (c++)"typeinfo for miral::WindowManagementPolicyAddendum3@MIRAL_1.5.0" 1.0.0
533
399
 (c++)"miral::WindowManagerTools::active_output()@MIRAL_1.5.0" 1.0.0
534
0
\ No newline at end of file
400
\ No newline at end of file
535
1
401
536
=== added file 'debian/libmirclientcpp-dev.install'
537
--- debian/libmirclientcpp-dev.install	1970-01-01 00:00:00 +0000
538
+++ debian/libmirclientcpp-dev.install	2017-08-29 09:17:20 +0000
539
@@ -0,0 +1,2 @@
540
1
usr/include/miral/mir/*/*
541
2
usr/lib/*/pkgconfig/mirclientcpp.pc
542
0
3
543
=== added file 'debian/miral-examples.install'
544
--- debian/miral-examples.install	1970-01-01 00:00:00 +0000
545
+++ debian/miral-examples.install	2017-08-29 09:17:20 +0000
546
@@ -0,0 +1,9 @@
547
1
usr/bin/miral-shell
548
2
usr/bin/miral-run
549
3
usr/bin/miral-kiosk
550
4
usr/bin/miral-xrun
551
5
usr/bin/miral-screencast
552
6
usr/bin/miral-desktop
553
7
usr/bin/miral-app
554
8
usr/share/applications/miral-shell.desktop
555
9
usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
556
0
10
557
=== modified file 'examples/CMakeLists.txt'
558
--- examples/CMakeLists.txt	2017-07-14 11:29:56 +0000
559
+++ examples/CMakeLists.txt	2017-08-29 09:17:20 +0000
560
@@ -1,3 +1,6 @@
561
1
add_subdirectory(miral-kiosk)
562
2
add_subdirectory(miral-shell)
563
3
564
1
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -fno-strict-aliasing -Wextra")
4
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -fno-strict-aliasing -Wextra")
565
2
5
566
3
add_library(eglapp STATIC
6
add_library(eglapp STATIC
567
4
7
568
=== added directory 'examples/miral-kiosk'
569
=== added file 'examples/miral-kiosk/CMakeLists.txt'
570
--- examples/miral-kiosk/CMakeLists.txt	1970-01-01 00:00:00 +0000
571
+++ examples/miral-kiosk/CMakeLists.txt	2017-08-29 09:17:20 +0000
572
@@ -0,0 +1,12 @@
573
1
include_directories(
574
2
    ${PROJECT_SOURCE_DIR}/include/miral
575
3
    ${PROJECT_SOURCE_DIR}/include/client
576
4
)
577
5
578
6
mir_add_wrapped_executable(miral-kiosk
579
7
    kiosk_main.cpp
580
8
    kiosk_window_manager.cpp    kiosk_window_manager.h
581
9
    sw_splash.cpp               sw_splash.h
582
10
)
583
11
584
12
target_link_libraries(miral-kiosk miral)
585
0
13
586
=== added file 'examples/miral-kiosk/kiosk_main.cpp'
587
--- examples/miral-kiosk/kiosk_main.cpp	1970-01-01 00:00:00 +0000
588
+++ examples/miral-kiosk/kiosk_main.cpp	2017-08-29 09:17:20 +0000
589
@@ -0,0 +1,94 @@
590
1
/*
591
2
 * Copyright © 2016 Canonical Ltd.
592
3
 *
593
4
 * This program is free software: you can redistribute it and/or modify
594
5
 * under the terms of the GNU General Public License version 2 or 3 as as
595
6
 * published by the Free Software Foundation.
596
7
 *
597
8
 * This program is distributed in the hope that it will be useful,
598
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
599
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
600
11
 * GNU General Public License for more details.
601
12
 *
602
13
 * You should have received a copy of the GNU General Public License
603
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
604
15
 *
605
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
606
17
 */
607
18
608
19
#include "kiosk_window_manager.h"
609
20
610
21
#include <miral/runner.h>
611
22
#include <miral/application_authorizer.h>
612
23
#include <miral/command_line_option.h>
613
24
#include <miral/keymap.h>
614
25
#include <miral/set_window_management_policy.h>
615
26
#include <miral/internal_client.h>
616
27
617
28
#include <unistd.h>
618
29
#include <atomic>
619
30
620
31
namespace
621
32
{
622
33
struct KioskAuthorizer : miral::ApplicationAuthorizer
623
34
{
624
35
    KioskAuthorizer(SwSplash const& splash) : splash{splash}{}
625
36
626
37
    virtual bool connection_is_allowed(miral::ApplicationCredentials const& creds) override
627
38
    {
628
39
        // Allow internal applications and (optionally) only ones that start "immediately"
629
40
        // (For the sake of an example "immediately" means while the spash is running)
630
41
        return getpid() == creds.pid() || !startup_only || splash.session().lock();
631
42
    }
632
43
633
44
    virtual bool configure_display_is_allowed(miral::ApplicationCredentials const& /*creds*/) override
634
45
    {
635
46
        return false;
636
47
    }
637
48
638
49
    virtual bool set_base_display_configuration_is_allowed(miral::ApplicationCredentials const& /*creds*/) override
639
50
    {
640
51
        return false;
641
52
    }
642
53
643
54
    virtual bool screencast_is_allowed(miral::ApplicationCredentials const& /*creds*/) override
644
55
    {
645
56
        return true;
646
57
    }
647
58
648
59
    virtual bool prompt_session_is_allowed(miral::ApplicationCredentials const& /*creds*/) override
649
60
    {
650
61
        return false;
651
62
    }
652
63
653
64
    static std::atomic<bool> startup_only;
654
65
655
66
    SwSplash splash;
656
67
};
657
68
658
69
std::atomic<bool> KioskAuthorizer::startup_only{false};
659
70
}
660
71
661
72
int main(int argc, char const* argv[])
662
73
{
663
74
    using namespace miral;
664
75
665
76
    SwSplash splash;
666
77
667
78
    CommandLineOption startup_only{
668
79
        [&](bool startup_only) {KioskAuthorizer::startup_only = startup_only; },
669
80
        "kiosk-startup-apps-only",
670
81
        "Only allow applications to connect during startup",
671
82
        KioskAuthorizer::startup_only};
672
83
673
84
    return MirRunner{argc, argv}.run_with(
674
85
        {
675
86
            CommandLineOption{[&](std::string const& ) { },
676
87
                              "desktop_file_hint", "Ignored for Unity8 compatability", "miral-shell.desktop"},
677
88
            set_window_management_policy<KioskWindowManagerPolicy>(splash),
678
89
            SetApplicationAuthorizer<KioskAuthorizer>{splash},
679
90
            Keymap{},
680
91
            startup_only,
681
92
            StartupInternalClient{"Intro", splash}
682
93
        });
683
94
}
684
0
95
685
=== added file 'examples/miral-kiosk/kiosk_window_manager.cpp'
686
--- examples/miral-kiosk/kiosk_window_manager.cpp	1970-01-01 00:00:00 +0000
687
+++ examples/miral-kiosk/kiosk_window_manager.cpp	2017-08-29 09:17:20 +0000
688
@@ -0,0 +1,148 @@
689
1
/*
690
2
 * Copyright © 2016 Canonical Ltd.
691
3
 *
692
4
 * This program is free software: you can redistribute it and/or modify it
693
5
 * under the terms of the GNU General Public License version 2 or 3 as
694
6
 * published by the Free Software Foundation.
695
7
 *
696
8
 * This program is distributed in the hope that it will be useful,
697
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
698
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
699
11
 * GNU General Public License for more details.
700
12
 *
701
13
 * You should have received a copy of the GNU General Public License
702
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
703
15
 *
704
16
 * Authored By: Alan Griffiths <alan@octopull.co.uk>
705
17
 */
706
18
707
19
#include "kiosk_window_manager.h"
708
20
709
21
#include <miral/application_info.h>
710
22
#include <miral/window_info.h>
711
23
#include <miral/window_manager_tools.h>
712
24
713
25
#include <linux/input.h>
714
26
715
27
namespace ms = mir::scene;
716
28
using namespace miral;
717
29
718
30
KioskWindowManagerPolicy::KioskWindowManagerPolicy(WindowManagerTools const& tools, SwSplash const& splash) :
719
31
    CanonicalWindowManagerPolicy{tools},
720
32
    splash{splash}
721
33
{
722
34
}
723
35
724
36
bool KioskWindowManagerPolicy::handle_keyboard_event(MirKeyboardEvent const* event)
725
37
{
726
38
    auto const action = mir_keyboard_event_action(event);
727
39
    auto const scan_code = mir_keyboard_event_scan_code(event);
728
40
    auto const modifiers = mir_keyboard_event_modifiers(event) & modifier_mask;
729
41
730
42
    if (action == mir_keyboard_action_down &&
731
43
            modifiers == mir_input_event_modifier_alt &&
732
44
            scan_code == KEY_TAB)
733
45
    {
734
46
        tools.focus_next_application();
735
47
736
48
        return true;
737
49
    }
738
50
    else if (action == mir_keyboard_action_down &&
739
51
            modifiers == mir_input_event_modifier_alt &&
740
52
            scan_code == KEY_GRAVE)
741
53
    {
742
54
        tools.focus_next_within_application();
743
55
744
56
        return true;
745
57
    }
746
58
    else if (action == mir_keyboard_action_down &&
747
59
             modifiers == (mir_input_event_modifier_alt | mir_input_event_modifier_shift) &&
748
60
             scan_code == KEY_GRAVE)
749
61
    {
750
62
        tools.focus_prev_within_application();
751
63
752
64
        return true;
753
65
    }
754
66
    else if (action == mir_keyboard_action_down && scan_code == KEY_F4)
755
67
    {
756
68
        switch (modifiers & modifier_mask)
757
69
        {
758
70
        case mir_input_event_modifier_alt:
759
71
            tools.ask_client_to_close(tools.active_window());;
760
72
            return true;
761
73
762
74
        default:
763
75
            break;
764
76
        }
765
77
    }
766
78
767
79
    return false;
768
80
}
769
81
770
82
bool KioskWindowManagerPolicy::handle_touch_event(MirTouchEvent const* event)
771
83
{
772
84
    auto const count = mir_touch_event_point_count(event);
773
85
774
86
    long total_x = 0;
775
87
    long total_y = 0;
776
88
777
89
    for (auto i = 0U; i != count; ++i)
778
90
    {
779
91
        total_x += mir_touch_event_axis_value(event, i, mir_touch_axis_x);
780
92
        total_y += mir_touch_event_axis_value(event, i, mir_touch_axis_y);
781
93
    }
782
94
783
95
    Point const cursor{total_x/count, total_y/count};
784
96
785
97
    tools.select_active_window(tools.window_at(cursor));
786
98
787
99
    return false;
788
100
}
789
101
790
102
bool KioskWindowManagerPolicy::handle_pointer_event(MirPointerEvent const* event)
791
103
{
792
104
    auto const action = mir_pointer_event_action(event);
793
105
794
106
    Point const cursor{
795
107
        mir_pointer_event_axis_value(event, mir_pointer_axis_x),
796
108
        mir_pointer_event_axis_value(event, mir_pointer_axis_y)};
797
109
798
110
    if (action == mir_pointer_action_button_down)
799
111
    {
800
112
        tools.select_active_window(tools.window_at(cursor));
801
113
    }
802
114
803
115
    return false;
804
116
}
805
117
806
118
void KioskWindowManagerPolicy::advise_focus_gained(WindowInfo const& info)
807
119
{
808
120
    CanonicalWindowManagerPolicy::advise_focus_gained(info);
809
121
810
122
    if (auto session = splash.session().lock())
811
123
    {
812
124
        auto const& app_info = tools.info_for(session);
813
125
814
126
        for (auto const& s : app_info.windows())
815
127
            tools.raise_tree(s);
816
128
    }
817
129
}
818
130
819
131
void KioskWindowManagerPolicy::advise_new_window(WindowInfo const& window_info)
820
132
{
821
133
    // We do this here, not in place_new_window() so that clients get a resize event.
822
134
    // This shouldn't be necessary, but works better with the gtk-mir backend.
823
135
    if (window_info.type() == mir_window_type_normal &&
824
136
        !window_info.parent() &&
825
137
        window_info.state() == mir_window_state_restored)
826
138
    {
827
139
        WindowSpecification specification;
828
140
829
141
        specification.state() = mir_window_state_maximized;
830
142
831
143
        tools.place_and_size_for_state(specification, window_info);
832
144
        tools.modify_window(window_info.window(), specification);
833
145
    }
834
146
835
147
    CanonicalWindowManagerPolicy::advise_new_window(window_info);
836
148
}
837
0
149
838
=== added file 'examples/miral-kiosk/kiosk_window_manager.h'
839
--- examples/miral-kiosk/kiosk_window_manager.h	1970-01-01 00:00:00 +0000
840
+++ examples/miral-kiosk/kiosk_window_manager.h	2017-08-29 09:17:20 +0000
841
@@ -0,0 +1,52 @@
842
1
/*
843
2
 * Copyright © 2016 Canonical Ltd.
844
3
 *
845
4
 * This program is free software: you can redistribute it and/or modify it
846
5
 * under the terms of the GNU General Public License version 2 or 3 as
847
6
 * published by the Free Software Foundation.
848
7
 *
849
8
 * This program is distributed in the hope that it will be useful,
850
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
851
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
852
11
 * GNU General Public License for more details.
853
12
 *
854
13
 * You should have received a copy of the GNU General Public License
855
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
856
15
 *
857
16
 * Authored By: Alan Griffiths <alan@octopull.co.uk>
858
17
 */
859
18
860
19
#ifndef MIRAL_KIOSK_WINDOW_MANAGER_H
861
20
#define MIRAL_KIOSK_WINDOW_MANAGER_H
862
21
863
22
#include "sw_splash.h"
864
23
865
24
#include <miral/canonical_window_manager.h>
866
25
867
26
using namespace mir::geometry;
868
27
869
28
class KioskWindowManagerPolicy : public miral::CanonicalWindowManagerPolicy
870
29
{
871
30
public:
872
31
    KioskWindowManagerPolicy(miral::WindowManagerTools const& tools, SwSplash const&);
873
32
874
33
    void advise_focus_gained(miral::WindowInfo const& info) override;
875
34
876
35
    virtual void advise_new_window(miral::WindowInfo const& window_info) override;
877
36
878
37
    bool handle_keyboard_event(MirKeyboardEvent const* event) override;
879
38
    bool handle_touch_event(MirTouchEvent const* event) override;
880
39
    bool handle_pointer_event(MirPointerEvent const* event) override;
881
40
882
41
private:
883
42
    static const int modifier_mask =
884
43
        mir_input_event_modifier_alt |
885
44
        mir_input_event_modifier_shift |
886
45
        mir_input_event_modifier_sym |
887
46
        mir_input_event_modifier_ctrl |
888
47
        mir_input_event_modifier_meta;
889
48
890
49
    SwSplash const splash;
891
50
};
892
51
893
52
#endif /* MIRAL_KIOSK_WINDOW_MANAGER_H */
894
0
53
895
=== added file 'examples/miral-kiosk/sw_splash.cpp'
896
--- examples/miral-kiosk/sw_splash.cpp	1970-01-01 00:00:00 +0000
897
+++ examples/miral-kiosk/sw_splash.cpp	2017-08-29 09:17:20 +0000
898
@@ -0,0 +1,173 @@
899
1
/*
900
2
 * Copyright © 2016 Canonical Ltd.
901
3
 *
902
4
 * This program is free software: you can redistribute it and/or modify it
903
5
 * under the terms of the GNU General Public License version 2 or 3 as
904
6
 * published by the Free Software Foundation.
905
7
 *
906
8
 * This program is distributed in the hope that it will be useful,
907
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
908
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
909
11
 * GNU General Public License for more details.
910
12
 *
911
13
 * You should have received a copy of the GNU General Public License
912
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
913
15
 *
914
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
915
17
 */
916
18
917
19
#include "sw_splash.h"
918
20
919
21
#include <mir/client/display_config.h>
920
22
#include <mir/client/surface.h>
921
23
#include <mir/client/window.h>
922
24
#include <mir/client/window_spec.h>
923
25
924
26
#include <mir_toolkit/mir_buffer_stream.h>
925
27
926
28
#include <chrono>
927
29
#include <cstring>
928
30
#include <thread>
929
31
#include <mutex>
930
32
931
33
namespace
932
34
{
933
35
MirPixelFormat find_8888_format(MirConnection* connection)
934
36
{
935
37
    unsigned int const num_formats = 32;
936
38
    MirPixelFormat pixel_formats[num_formats];
937
39
    unsigned int valid_formats;
938
40
    mir_connection_get_available_surface_formats(connection, pixel_formats, num_formats, &valid_formats);
939
41
940
42
    for (unsigned int i = 0; i < num_formats; ++i)
941
43
    {
942
44
        MirPixelFormat cur_pf = pixel_formats[i];
943
45
        if (cur_pf == mir_pixel_format_abgr_8888 ||
944
46
            cur_pf == mir_pixel_format_argb_8888)
945
47
        {
946
48
            return cur_pf;
947
49
        }
948
50
    }
949
51
950
52
    for (unsigned int i = 0; i < num_formats; ++i)
951
53
    {
952
54
        MirPixelFormat cur_pf = pixel_formats[i];
953
55
        if (cur_pf == mir_pixel_format_xbgr_8888 ||
954
56
            cur_pf == mir_pixel_format_xrgb_8888)
955
57
        {
956
58
            return cur_pf;
957
59
        }
958
60
    }
959
61
960
62
    return *pixel_formats;
961
63
}
962
64
963
65
auto create_window(MirConnection* connection, mir::client::Surface const& surface) -> mir::client::Window
964
66
{
965
67
    int id = 0;
966
68
    int width = 0;
967
69
    int height = 0;
968
70
969
71
    mir::client::DisplayConfig{connection}.for_each_output([&](MirOutput const* output)
970
72
        {
971
73
            if (mir_output_get_connection_state(output) == mir_output_connection_state_connected &&
972
74
                mir_output_is_enabled(output))
973
75
            {
974
76
                id = mir_output_get_id(output);
975
77
976
78
                MirOutputMode const* mode = mir_output_get_current_mode(output);
977
79
                width = mir_output_mode_get_width(mode);
978
80
                height = mir_output_mode_get_height(mode);
979
81
            }
980
82
        });
981
83
982
84
    return mir::client::WindowSpec::for_normal_window(connection, width, height)
983
85
        .set_name("splash")
984
86
        .set_fullscreen_on_output(id)
985
87
        .add_surface(surface, width, height, 0, 0)
986
88
        .create_window();
987
89
}
988
90
989
91
void render_pattern(MirGraphicsRegion *region, uint8_t pattern[])
990
92
{
991
93
    char *row = region->vaddr;
992
94
993
95
    for (int j = 0; j < region->height; j++)
994
96
    {
995
97
        uint32_t *pixel = (uint32_t*)row;
996
98
997
99
        for (int i = 0; i < region->width; i++)
998
100
            memcpy(pixel+i, pattern, sizeof pixel[i]);
999
101
1000
102
        row += region->stride;
1001
103
    }
1002
104
}
1003
105
}
1004
106
1005
107
struct SwSplash::Self
1006
108
{
1007
109
    std::mutex mutex;
1008
110
    std::weak_ptr<mir::scene::Session> session;
1009
111
};
1010
112
1011
113
SwSplash::SwSplash() : self{std::make_shared<Self>()} {}
1012
114
1013
115
SwSplash::~SwSplash() = default;
1014
116
1015
117
void SwSplash::operator()(std::weak_ptr<mir::scene::Session> const& session)
1016
118
{
1017
119
    std::lock_guard<decltype(self->mutex)> lock{self->mutex};
1018
120
    self->session = session;
1019
121
}
1020
122
1021
123
auto SwSplash::session() const -> std::weak_ptr<mir::scene::Session>
1022
124
{
1023
125
    std::lock_guard<decltype(self->mutex)> lock{self->mutex};
1024
126
    return self->session;
1025
127
}
1026
128
1027
129
void SwSplash::operator()(MirConnection* connection)
1028
130
{
1029
131
    MirPixelFormat pixel_format = find_8888_format(connection);
1030
132
1031
133
    uint8_t pattern[4] = { 0x14, 0x48, 0xDD, 0xFF };
1032
134
1033
135
    switch(pixel_format)
1034
136
    {
1035
137
    case mir_pixel_format_abgr_8888:
1036
138
    case mir_pixel_format_xbgr_8888:
1037
139
        std::swap(pattern[2],pattern[0]);
1038
140
        break;
1039
141
1040
142
    case mir_pixel_format_argb_8888:
1041
143
    case mir_pixel_format_xrgb_8888:
1042
144
        break;
1043
145
1044
146
    default:
1045
147
        return;
1046
148
    };
1047
149
1048
150
1049
151
    mir::client::Surface surface{mir_connection_create_render_surface_sync(connection, 42, 42)};
1050
152
    MirBufferStream* buffer_stream = mir_render_surface_get_buffer_stream(surface, 42, 42, pixel_format);
1051
153
1052
154
    auto const window = create_window(connection, surface);
1053
155
1054
156
    MirGraphicsRegion graphics_region;
1055
157
1056
158
    auto const time_limit = std::chrono::steady_clock::now() + std::chrono::seconds(2);
1057
159
1058
160
    do
1059
161
    {
1060
162
        mir_buffer_stream_get_graphics_region(buffer_stream, &graphics_region);
1061
163
1062
164
        render_pattern(&graphics_region, pattern);
1063
165
        mir_buffer_stream_swap_buffers_sync(buffer_stream);
1064
166
1065
167
        for (auto& x : pattern)
1066
168
            x =  3*x/4;
1067
169
1068
170
        std::this_thread::sleep_for(std::chrono::milliseconds(200));
1069
171
    }
1070
172
    while (std::chrono::steady_clock::now() < time_limit);
1071
173
}
1072
0
174
1073
=== added file 'examples/miral-kiosk/sw_splash.h'
1074
--- examples/miral-kiosk/sw_splash.h	1970-01-01 00:00:00 +0000
1075
+++ examples/miral-kiosk/sw_splash.h	2017-08-29 09:17:20 +0000
1076
@@ -0,0 +1,44 @@
1077
1
/*
1078
2
 * Copyright © 2016 Canonical Ltd.
1079
3
 *
1080
4
 * This program is free software: you can redistribute it and/or modify it
1081
5
 * under the terms of the GNU General Public License version 2 or 3 as
1082
6
 * published by the Free Software Foundation.
1083
7
 *
1084
8
 * This program is distributed in the hope that it will be useful,
1085
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1086
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1087
11
 * GNU General Public License for more details.
1088
12
 *
1089
13
 * You should have received a copy of the GNU General Public License
1090
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1091
15
 *
1092
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
1093
17
 */
1094
18
1095
19
#ifndef MIRAL_SHELL_SW_SPLASH_H
1096
20
#define MIRAL_SHELL_SW_SPLASH_H
1097
21
1098
22
#include <mir_toolkit/client_types.h>
1099
23
1100
24
#include <memory>
1101
25
1102
26
namespace mir { class Server; namespace scene { class Session; }}
1103
27
1104
28
// A very simple s/w rendered splash animation
1105
29
class SwSplash
1106
30
{
1107
31
public:
1108
32
    SwSplash();
1109
33
    ~SwSplash();
1110
34
1111
35
    void operator()(MirConnection* connection);
1112
36
    void operator()(std::weak_ptr<mir::scene::Session> const& session);
1113
37
    auto session() const -> std::weak_ptr<mir::scene::Session>;
1114
38
1115
39
private:
1116
40
    struct Self;
1117
41
    std::shared_ptr<Self> const self;
1118
42
};
1119
43
1120
44
#endif //MIRAL_SHELL_SW_SPLASH_H
1121
0
45
1122
=== added directory 'examples/miral-shell'
1123
=== added file 'examples/miral-shell/CMakeLists.txt'
1124
--- examples/miral-shell/CMakeLists.txt	1970-01-01 00:00:00 +0000
1125
+++ examples/miral-shell/CMakeLists.txt	2017-08-29 09:17:20 +0000
1126
@@ -0,0 +1,65 @@
1127
1
include_directories(
1128
2
        ${PROJECT_SOURCE_DIR}/include/miral
1129
3
        ${PROJECT_SOURCE_DIR}/include/client
1130
4
)
1131
5
1132
6
add_subdirectory(spinner)
1133
7
add_subdirectory(desktop)
1134
8
1135
9
add_custom_target(miral-run ALL
1136
10
    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-run.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-run
1137
11
)
1138
12
1139
13
install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-run
1140
14
    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
1141
15
)
1142
16
1143
17
add_custom_target(miral-xrun ALL
1144
18
    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-xrun.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-xrun
1145
19
)
1146
20
1147
21
install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-xrun
1148
22
    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
1149
23
)
1150
24
1151
25
add_custom_target(miral-screencast ALL
1152
26
    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-screencast.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-screencast
1153
27
)
1154
28
1155
29
install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-screencast
1156
30
    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
1157
31
)
1158
32
1159
33
add_custom_target(miral-desktop ALL
1160
34
    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-desktop.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-desktop
1161
35
)
1162
36
1163
37
install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-desktop
1164
38
    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
1165
39
)
1166
40
1167
41
add_custom_target(miral-app ALL
1168
42
    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-app.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-app
1169
43
)
1170
44
1171
45
install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-app
1172
46
    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
1173
47
)
1174
48
1175
49
mir_add_wrapped_executable(miral-shell
1176
50
    shell_main.cpp
1177
51
    tiling_window_manager.cpp   tiling_window_manager.h
1178
52
        floating_window_manager.cpp floating_window_manager.h
1179
53
    decoration_provider.cpp     decoration_provider.h
1180
54
    titlebar_config.cpp         titlebar_config.h
1181
55
)
1182
56
1183
57
pkg_check_modules(FREETYPE freetype2 REQUIRED)
1184
58
target_include_directories(miral-shell PRIVATE ${FREETYPE_INCLUDE_DIRS})
1185
59
target_compile_definitions(miral-shell PRIVATE -DTYPO_SUPPORTS_FREETYPE)
1186
60
target_link_libraries(miral-shell
1187
61
    miral-spinner
1188
62
    miral
1189
63
    ${FREETYPE_LIBRARIES}
1190
64
)
1191
65
1192
0
66
1193
=== added file 'examples/miral-shell/decoration_provider.cpp'
1194
--- examples/miral-shell/decoration_provider.cpp	1970-01-01 00:00:00 +0000
1195
+++ examples/miral-shell/decoration_provider.cpp	2017-08-29 09:17:20 +0000
1196
@@ -0,0 +1,666 @@
1197
1
/*
1198
2
 * Copyright © 2016-2017 Canonical Ltd.
1199
3
 *
1200
4
 * This program is free software: you can redistribute it and/or modify it
1201
5
 * under the terms of the GNU General Public License version 2 or 3 as
1202
6
 * published by the Free Software Foundation.
1203
7
 *
1204
8
 * This program is distributed in the hope that it will be useful,
1205
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1206
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1207
11
 * GNU General Public License for more details.
1208
12
 *
1209
13
 * You should have received a copy of the GNU General Public License
1210
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1211
15
 *
1212
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
1213
17
 */
1214
18
1215
19
#include "decoration_provider.h"
1216
20
#include "titlebar_config.h"
1217
21
1218
22
#include <mir/client/display_config.h>
1219
23
#include <mir/client/window_spec.h>
1220
24
1221
25
#include <mir_toolkit/mir_buffer_stream.h>
1222
26
1223
27
#include <ft2build.h>
1224
28
#include FT_FREETYPE_H
1225
29
1226
30
#include <locale>
1227
31
#include <codecvt>
1228
32
#include <string>
1229
33
#include <cstring>
1230
34
#include <sstream>
1231
35
1232
36
#include <iostream>
1233
37
1234
38
namespace
1235
39
{
1236
40
int const title_bar_height = 12;
1237
41
char const* const wallpaper_name = "wallpaper";
1238
42
1239
43
void null_window_callback(MirWindow*, void*) {}
1240
44
1241
45
struct preferred_codecvt : std::codecvt_byname<wchar_t, char, std::mbstate_t>
1242
46
{
1243
47
    preferred_codecvt() : std::codecvt_byname<wchar_t, char, std::mbstate_t>("") {}
1244
48
    ~preferred_codecvt() = default;
1245
49
};
1246
50
1247
51
struct Printer
1248
52
{
1249
53
    Printer();
1250
54
    ~Printer();
1251
55
    Printer(Printer const&) = delete;
1252
56
    Printer& operator=(Printer const&) = delete;
1253
57
1254
58
    void print(MirGraphicsRegion const& region, std::string const& title, int const intensity);
1255
59
    void printhelp(MirGraphicsRegion const& region);
1256
60
1257
61
private:
1258
62
    std::wstring_convert<preferred_codecvt> converter;
1259
63
1260
64
    bool working = false;
1261
65
    FT_Library lib;
1262
66
    FT_Face face;
1263
67
};
1264
68
1265
69
void paint_surface(MirBufferStream* buffer_stream, std::string const& title, int const intensity)
1266
70
{
1267
71
    // TODO sometimes buffer_stream is nullptr - find out why (and fix).
1268
72
    // (Only observed when creating a lot of clients at once)
1269
73
    if (!buffer_stream)
1270
74
        return;
1271
75
1272
76
    MirGraphicsRegion region;
1273
77
    mir_buffer_stream_get_graphics_region(buffer_stream, &region);
1274
78
1275
79
    char* row = region.vaddr;
1276
80
1277
81
    for (int j = 0; j != region.height; ++j)
1278
82
    {
1279
83
        memset(row, intensity, 4*region.width);
1280
84
        row += region.stride;
1281
85
    }
1282
86
1283
87
    static Printer printer;
1284
88
    printer.print(region, title, intensity);
1285
89
1286
90
    mir_buffer_stream_swap_buffers_sync(buffer_stream);
1287
91
}
1288
92
1289
93
Printer::Printer()
1290
94
{
1291
95
    if (FT_Init_FreeType(&lib))
1292
96
        return;
1293
97
1294
98
    if (FT_New_Face(lib, titlebar::font_file().c_str(), 0, &face))
1295
99
    {
1296
100
        std::cerr << "WARNING: failed to load titlebar font: \"" <<  titlebar::font_file() << "\"\n";
1297
101
        FT_Done_FreeType(lib);
1298
102
        return;
1299
103
    }
1300
104
1301
105
    FT_Set_Pixel_Sizes(face, 0, 10);
1302
106
    working = true;
1303
107
}
1304
108
1305
109
Printer::~Printer()
1306
110
{
1307
111
    if (working)
1308
112
    {
1309
113
        FT_Done_Face(face);
1310
114
        FT_Done_FreeType(lib);
1311
115
    }
1312
116
}
1313
117
1314
118
void Printer::print(MirGraphicsRegion const& region, std::string const& title_, int const intensity)
1315
119
try
1316
120
{
1317
121
    if (!working)
1318
122
        return;
1319
123
1320
124
    auto title = converter.from_bytes(title_);
1321
125
1322
126
    int base_x = 2;
1323
127
    int base_y = region.height-2;
1324
128
1325
129
    for (auto const& ch : title)
1326
130
    {
1327
131
        FT_Load_Glyph(face, FT_Get_Char_Index(face, ch), FT_LOAD_DEFAULT);
1328
132
        auto const glyph = face->glyph;
1329
133
        FT_Render_Glyph(glyph, FT_RENDER_MODE_NORMAL);
1330
134
1331
135
        auto const& bitmap = glyph->bitmap;
1332
136
        auto const x = base_x + glyph->bitmap_left;
1333
137
1334
138
        if (static_cast<int>(x + bitmap.width) <= region.width)
1335
139
        {
1336
140
            unsigned char* src = bitmap.buffer;
1337
141
1338
142
            auto const y = base_y - glyph->bitmap_top;
1339
143
            char* dest = region.vaddr + y*region.stride + 4*x;
1340
144
1341
145
            for (auto row = 0u; row != std::min(bitmap.rows, glyph->bitmap_top+2u); ++row)
1342
146
            {
1343
147
                for (auto col = 0u; col != bitmap.width; ++col)
1344
148
                    memset(dest+ 4*col, (intensity*(0xff^src[col]))/0xff, 4);
1345
149
1346
150
                src += bitmap.pitch;
1347
151
                dest += region.stride;
1348
152
            }
1349
153
        }
1350
154
1351
155
        base_x += glyph->advance.x >> 6;
1352
156
        base_y += glyph->advance.y >> 6;
1353
157
    }
1354
158
}
1355
159
catch (...)
1356
160
{
1357
161
    std::cerr << "WARNING: failed render title: \"" <<  title_ << "\"\n";
1358
162
}
1359
163
1360
164
void Printer::printhelp(MirGraphicsRegion const& region)
1361
165
{
1362
166
    if (!working)
1363
167
        return;
1364
168
1365
169
    static char const* const helptext[] =
1366
170
        {
1367
171
            "Welcome to miral-shell",
1368
172
            "",
1369
173
            "Keyboard shortcuts:",
1370
174
            "",
1371
175
            "  o Switch apps: Alt-Tab, tap or click on the corresponding window",
1372
176
            "  o Next (previous) app window: Alt-` (Alt-Shift-`)",
1373
177
            "",
1374
178
            "  o Move window: Alt-leftmousebutton drag (three finger drag)",
1375
179
            "  o Resize window: Alt-middle_button drag (three finger pinch)",
1376
180
            "",
1377
181
            "  o Maximize/restore current window (to display size). : Alt-F11",
1378
182
            "  o Maximize/restore current window (to display height): Shift-F11",
1379
183
            "  o Maximize/restore current window (to display width) : Ctrl-F11",
1380
184
            "",
1381
185
            "  o Switch workspace: Meta-Alt-[F1|F2|F3|F4]",
1382
186
            "  o Switch workspace taking active window: Meta-Ctrl-[F1|F2|F3|F4]",
1383
187
            "",
1384
188
            "  o To exit: Ctrl-Alt-BkSp",
1385
189
        };
1386
190
1387
191
    int help_width = 0;
1388
192
    unsigned int help_height = 0;
1389
193
    unsigned int line_height = 0;
1390
194
1391
195
    for (auto const* rawline : helptext)
1392
196
    {
1393
197
        int line_width = 0;
1394
198
1395
199
        auto const line = converter.from_bytes(rawline);
1396
200
1397
201
        auto const fwidth = std::min(region.width / 60, 20);
1398
202
1399
203
        FT_Set_Pixel_Sizes(face, fwidth, 0);
1400
204
1401
205
        for (auto const& ch : line)
1402
206
        {
1403
207
            FT_Load_Glyph(face, FT_Get_Char_Index(face, ch), FT_LOAD_DEFAULT);
1404
208
            auto const glyph = face->glyph;
1405
209
            FT_Render_Glyph(glyph, FT_RENDER_MODE_NORMAL);
1406
210
1407
211
            line_width += glyph->advance.x >> 6;
1408
212
            line_height = std::max(line_height, glyph->bitmap.rows + glyph->bitmap.rows/2);
1409
213
        }
1410
214
1411
215
        if (help_width < line_width) help_width = line_width;
1412
216
        help_height += line_height;
1413
217
    }
1414
218
1415
219
    int base_y = (region.height - help_height)/2;
1416
220
1417
221
    for (auto const* rawline : helptext)
1418
222
    {
1419
223
        int base_x = (region.width - help_width)/2;
1420
224
1421
225
        auto const line = converter.from_bytes(rawline);
1422
226
1423
227
        for (auto const& ch : line)
1424
228
        {
1425
229
            FT_Load_Glyph(face, FT_Get_Char_Index(face, ch), FT_LOAD_DEFAULT);
1426
230
            auto const glyph = face->glyph;
1427
231
            FT_Render_Glyph(glyph, FT_RENDER_MODE_NORMAL);
1428
232
1429
233
            auto const& bitmap = glyph->bitmap;
1430
234
            auto const x = base_x + glyph->bitmap_left;
1431
235
1432
236
            if (static_cast<int>(x + bitmap.width) <= region.width)
1433
237
            {
1434
238
                unsigned char* src = bitmap.buffer;
1435
239
1436
240
                auto const y = base_y - glyph->bitmap_top;
1437
241
                char* dest = region.vaddr + y * region.stride + 4 * x;
1438
242
1439
243
                for (auto row = 0u; row != bitmap.rows; ++row)
1440
244
                {
1441
245
                    for (auto col = 0u; col != 4 * bitmap.width; ++col)
1442
246
                        dest[col] |= src[col / 4]/2;
1443
247
1444
248
                    src += bitmap.pitch;
1445
249
                    dest += region.stride;
1446
250
1447
251
                    if (dest > region.vaddr + region.height * region.stride)
1448
252
                        break;
1449
253
                }
1450
254
            }
1451
255
1452
256
            base_x += glyph->advance.x >> 6;
1453
257
        }
1454
258
        base_y += line_height;
1455
259
    }
1456
260
}
1457
261
1458
262
void render_background(MirBufferStream* buffer_stream, MirGraphicsRegion& graphics_region)
1459
263
{
1460
264
    static uint8_t const pattern[4] = {0x00, 0x00, 0x00, 0x00 };
1461
265
1462
266
    char* row = (&graphics_region)->vaddr;
1463
267
1464
268
    for (int j = 0; j < (&graphics_region)->height; j++)
1465
269
    {
1466
270
        uint32_t* pixel = (uint32_t*)row;
1467
271
1468
272
        for (int i = 0; i < (&graphics_region)->width; i++)
1469
273
            memcpy(pixel + i, pattern, sizeof pixel[i]);
1470
274
1471
275
        row += (&graphics_region)->stride;
1472
276
    }
1473
277
1474
278
    static Printer printer;
1475
279
    printer.printhelp(*&graphics_region);
1476
280
1477
281
    mir_buffer_stream_swap_buffers_sync(buffer_stream);
1478
282
}
1479
283
}
1480
284
1481
285
using namespace mir::client;
1482
286
using namespace mir::geometry;
1483
287
1484
288
DecorationProvider::DecorationProvider(miral::WindowManagerTools const& tools) : tools{tools}
1485
289
{
1486
290
1487
291
}
1488
292
1489
293
DecorationProvider::~DecorationProvider()
1490
294
{
1491
295
}
1492
296
1493
297
void DecorationProvider::stop()
1494
298
{
1495
299
    enqueue_work([this]
1496
300
        {
1497
301
            std::lock_guard<decltype(mutex)> lock{mutex};
1498
302
            window_to_titlebar.clear();
1499
303
        });
1500
304
1501
305
    enqueue_work([this]
1502
306
        {
1503
307
            if (connection)
1504
308
            {
1505
309
                wallpaper.erase(begin(wallpaper), end(wallpaper));
1506
310
            }
1507
311
            connection.reset();
1508
312
        });
1509
313
    stop_work();
1510
314
}
1511
315
1512
316
void DecorationProvider::operator()(Connection connection)
1513
317
{
1514
318
    this->connection = connection;
1515
319
1516
320
    DisplayConfig const display_conf{this->connection};
1517
321
1518
322
    display_conf.for_each_output([this](MirOutput const* output)
1519
323
        {
1520
324
            if (!mir_output_is_enabled(output))
1521
325
                return;
1522
326
1523
327
            auto const mode = mir_output_get_current_mode(output);
1524
328
            auto const output_id = mir_output_get_id(output);
1525
329
            auto const width = mir_output_mode_get_width(mode);
1526
330
            auto const height = mir_output_mode_get_height(mode);
1527
331
1528
332
            Surface surface{mir_connection_create_render_surface_sync(DecorationProvider::connection, width, height)};
1529
333
1530
334
            auto const buffer_stream =
1531
335
                mir_render_surface_get_buffer_stream(surface, width, height, mir_pixel_format_xrgb_8888);
1532
336
1533
337
            auto window = WindowSpec::for_gloss(DecorationProvider::connection, width, height)
1534
338
                .set_fullscreen_on_output(output_id)
1535
339
                .set_event_handler(&handle_event_for_background, this)
1536
340
                .add_surface(surface, width, height, 0, 0)
1537
341
                .set_name(wallpaper_name).create_window();
1538
342
1539
343
            wallpaper.push_back(Wallpaper{surface, window, buffer_stream});
1540
344
1541
345
            MirGraphicsRegion graphics_region;
1542
346
            mir_buffer_stream_get_graphics_region(buffer_stream, &graphics_region);
1543
347
            render_background(buffer_stream, graphics_region);
1544
348
        });
1545
349
1546
350
    start_work();
1547
351
}
1548
352
1549
353
void DecorationProvider::operator()(std::weak_ptr<mir::scene::Session> const& session)
1550
354
{
1551
355
    std::lock_guard<decltype(mutex)> lock{mutex};
1552
356
    this->weak_session = session;
1553
357
}
1554
358
1555
359
auto DecorationProvider::session() const -> std::shared_ptr<mir::scene::Session>
1556
360
{
1557
361
    std::lock_guard<decltype(mutex)> lock{mutex};
1558
362
    return weak_session.lock();
1559
363
}
1560
364
1561
365
void DecorationProvider::handle_event(MirWindow* window, MirEvent const* ev, void* context_)
1562
366
{
1563
367
    auto* const context = (Data*)context_;
1564
368
1565
369
    switch (mir_event_get_type(ev))
1566
370
    {
1567
371
    case mir_event_type_resize:
1568
372
    {
1569
373
        MirResizeEvent const* resize = mir_event_get_resize_event(ev);
1570
374
        int const new_width = mir_resize_event_get_width(resize);
1571
375
        int const new_height = mir_resize_event_get_height(resize);
1572
376
        mir_render_surface_set_size(context->surface, new_width, new_height);
1573
377
        WindowSpec::for_changes(context->connection)
1574
378
            .add_surface(context->surface, new_width, new_height, 0, 0)
1575
379
            .apply_to(window);
1576
380
        break;
1577
381
    }
1578
382
1579
383
    default:
1580
384
        break;
1581
385
    }
1582
386
}
1583
387
1584
388
void DecorationProvider::create_titlebar_for(miral::Window const& window)
1585
389
{
1586
390
    if (is_decoration(window)) return;
1587
391
1588
392
    enqueue_work([this, window]
1589
393
        {
1590
394
            auto const width = window.size().width.as_int();
1591
395
            std::ostringstream buffer;
1592
396
            buffer << std::shared_ptr<mir::scene::Surface>(window).get();
1593
397
1594
398
            Surface surface{mir_connection_create_render_surface_sync(this->connection, width, title_bar_height)};
1595
399
1596
400
            std::lock_guard<decltype(mutex)> lock{mutex};
1597
401
1598
402
            auto const data = &window_to_titlebar[window];
1599
403
            data->connection = connection;
1600
404
            data->surface = surface;
1601
405
            data->stream = mir_render_surface_get_buffer_stream(surface, width, title_bar_height, mir_pixel_format_xrgb_8888);
1602
406
            windows_awaiting_titlebar[buffer.str()] = window;
1603
407
1604
408
            WindowSpec::for_gloss(connection, width, title_bar_height)
1605
409
                .add_surface(surface, width, title_bar_height, 0, 0)
1606
410
                .set_name(buffer.str().c_str())
1607
411
                .set_event_handler(&handle_event, data)
1608
412
                .create_window(insert, data);
1609
413
        });
1610
414
}
1611
415
1612
416
void DecorationProvider::paint_titlebar_for(miral::WindowInfo const& info, int intensity)
1613
417
{
1614
418
    if (auto data = find_titlebar_data(info.window()))
1615
419
    {
1616
420
        data->intensity = intensity;
1617
421
1618
422
        auto const title = info.name();
1619
423
1620
424
        enqueue_work([this, stream=data->stream, title, intensity]{ paint_surface(stream, title, intensity); });
1621
425
    }
1622
426
}
1623
427
1624
428
void DecorationProvider::destroy_titlebar_for(miral::Window const& window)
1625
429
{
1626
430
    if (auto data = find_titlebar_data(window))
1627
431
    {
1628
432
        if (auto surface = data->titlebar.exchange(nullptr))
1629
433
        {
1630
434
            enqueue_work([surface]
1631
435
                 {
1632
436
                     mir_window_release(surface, &null_window_callback, nullptr);
1633
437
                 });
1634
438
        }
1635
439
1636
440
        if (data->titlebar.load())
1637
441
        {
1638
442
            enqueue_work([this, window]
1639
443
                {
1640
444
                    std::lock_guard<decltype(mutex)> lock{mutex};
1641
445
                    window_to_titlebar.erase(window);
1642
446
                });
1643
447
        }
1644
448
        else
1645
449
        {
1646
450
            data->on_create = [this, window](MirWindow*)
1647
451
                {
1648
452
                    enqueue_work([this, window]
1649
453
                        {
1650
454
                            std::lock_guard<decltype(mutex)> lock{mutex};
1651
455
                            window_to_titlebar.erase(window);
1652
456
                        });
1653
457
                };
1654
458
        }
1655
459
    }
1656
460
}
1657
461
1658
462
void DecorationProvider::resize_titlebar_for(miral::WindowInfo const& window_info, Size const& size)
1659
463
{
1660
464
    auto const window = window_info.window();
1661
465
1662
466
    if (window.size().width == size.width)
1663
467
        return;
1664
468
1665
469
    if (auto titlebar_window = find_titlebar_window(window))
1666
470
    {
1667
471
        titlebar_window.resize({size.width, title_bar_height});
1668
472
1669
473
        repaint_titlebar_for(window_info);
1670
474
    }
1671
475
}
1672
476
1673
477
void DecorationProvider::place_new_decoration(miral::WindowSpecification& window_spec)
1674
478
{
1675
479
    auto const name = window_spec.name().value();
1676
480
    if (name == wallpaper_name) return;
1677
481
1678
482
    std::lock_guard<decltype(mutex)> lock{mutex};
1679
483
1680
484
    auto const scene_surface = windows_awaiting_titlebar[name].lock();
1681
485
    windows_awaiting_titlebar.erase(name);
1682
486
1683
487
    auto& parent_info = tools.info_for(scene_surface);
1684
488
    auto const parent_window = parent_info.window();
1685
489
1686
490
    window_spec.parent() = scene_surface;
1687
491
    window_spec.size() = Size{parent_window.size().width, Height{title_bar_height}};
1688
492
    window_spec.top_left() = parent_window.top_left() - Displacement{0, title_bar_height};
1689
493
}
1690
494
1691
495
void DecorationProvider::advise_new_titlebar(miral::WindowInfo const& window_info)
1692
496
{
1693
497
    if (window_info.name() == wallpaper_name) return;
1694
498
1695
499
    {
1696
500
        std::lock_guard<decltype(mutex)> lock{mutex};
1697
501
1698
502
        window_to_titlebar[window_info.parent()].window = window_info.window();
1699
503
    }
1700
504
1701
505
    tools.raise_tree(window_info.parent());
1702
506
}
1703
507
1704
508
void DecorationProvider::advise_state_change(miral::WindowInfo const& window_info, MirWindowState state)
1705
509
{
1706
510
    if (auto titlebar = find_titlebar_window(window_info.window()))
1707
511
    {
1708
512
        miral::WindowSpecification modifications;
1709
513
        switch (state)
1710
514
        {
1711
515
        case mir_window_state_hidden:
1712
516
        case mir_window_state_minimized:
1713
517
        case mir_window_state_fullscreen:
1714
518
            modifications.state() = mir_window_state_hidden;
1715
519
            break;
1716
520
1717
521
        default:
1718
522
            modifications.state() = mir_window_state_restored;
1719
523
            break;
1720
524
        }
1721
525
1722
526
        tools.modify_window(titlebar, modifications);
1723
527
        repaint_titlebar_for(window_info);
1724
528
    }
1725
529
}
1726
530
1727
531
void DecorationProvider::repaint_titlebar_for(miral::WindowInfo const& window_info)
1728
532
{
1729
533
    if (auto data = find_titlebar_data(window_info.window()))
1730
534
    {
1731
535
        auto const title = window_info.name();
1732
536
1733
537
        enqueue_work([this, stream=data->stream, title, intensity=data->intensity.load()]
1734
538
            { paint_surface(stream, title, intensity); });
1735
539
    }
1736
540
}
1737
541
1738
542
DecorationProvider::Data::~Data()
1739
543
{
1740
544
    if (auto surface = titlebar.exchange(nullptr))
1741
545
        mir_window_release(surface, &null_window_callback, nullptr);
1742
546
}
1743
547
1744
548
void DecorationProvider::insert(MirWindow* surface, Data* data)
1745
549
{
1746
550
    data->on_create(surface);
1747
551
    data->titlebar = surface;
1748
552
}
1749
553
1750
554
DecorationProvider::Data* DecorationProvider::find_titlebar_data(miral::Window const& window)
1751
555
{
1752
556
    std::lock_guard<decltype(mutex)> lock{mutex};
1753
557
1754
558
    auto const find = window_to_titlebar.find(window);
1755
559
1756
560
    return (find != window_to_titlebar.end()) ? &find->second : nullptr;
1757
561
}
1758
562
1759
563
miral::Window DecorationProvider::find_titlebar_window(miral::Window const& window) const
1760
564
{
1761
565
    std::lock_guard<decltype(mutex)> lock{mutex};
1762
566
1763
567
    auto const find = window_to_titlebar.find(window);
1764
568
1765
569
    return (find != window_to_titlebar.end()) ? find->second.window : miral::Window{};
1766
570
}
1767
571
1768
572
bool DecorationProvider::is_decoration(miral::Window const& window) const
1769
573
{
1770
574
    return window.application() == session();
1771
575
}
1772
576
1773
577
bool DecorationProvider::is_titlebar(miral::WindowInfo const& window_info) const
1774
578
{
1775
579
    return window_info.window().application() == session() && window_info.name() != wallpaper_name;
1776
580
}
1777
581
1778
582
void DecorationProvider::handle_event_for_background(MirWindow* window, MirEvent const* event, void* context)
1779
583
{
1780
584
    static_cast<DecorationProvider*>(context)->handle_event_for_background(window, event);
1781
585
}
1782
586
1783
587
void DecorationProvider::handle_event_for_background(MirWindow* window, MirEvent const* ev)
1784
588
{
1785
589
    switch (mir_event_get_type(ev))
1786
590
    {
1787
591
    case mir_event_type_resize:
1788
592
    {
1789
593
        MirResizeEvent const* resize = mir_event_get_resize_event(ev);
1790
594
        int const new_width = mir_resize_event_get_width(resize);
1791
595
        int const new_height = mir_resize_event_get_height(resize);
1792
596
1793
597
        enqueue_work([window, new_width, new_height, this]()
1794
598
            {
1795
599
                auto found = find_if(begin(wallpaper), end(wallpaper), [&](Wallpaper const& w) { return w.window == window;});
1796
600
                if (found == end(wallpaper)) return;
1797
601
1798
602
                mir_buffer_stream_set_size(found->stream, new_width, new_height);
1799
603
                mir_render_surface_set_size(found->surface, new_width, new_height);
1800
604
1801
605
                WindowSpec::for_changes(connection)
1802
606
                    .add_surface(found->surface, new_width, new_height, 0, 0)
1803
607
                    .apply_to(window);
1804
608
1805
609
                MirGraphicsRegion graphics_region;
1806
610
1807
611
                // We expect a buffer of the right size so we shouldn't need to limit repaints
1808
612
                // but we also to avoid an infinite loop.
1809
613
                int repaint_limit = 3;
1810
614
1811
615
                do
1812
616
                {
1813
617
                    mir_buffer_stream_get_graphics_region(found->stream, &graphics_region);
1814
618
                    render_background(found->stream, graphics_region);
1815
619
                }
1816
620
                while ((new_width != graphics_region.width || new_height != graphics_region.height)
1817
621
                       && --repaint_limit != 0);
1818
622
            });
1819
623
        break;
1820
624
    }
1821
625
1822
626
    default:
1823
627
        break;
1824
628
    }
1825
629
}
1826
630
1827
631
Worker::~Worker()
1828
632
{
1829
633
}
1830
634
1831
635
void Worker::do_work()
1832
636
{
1833
637
    while (!work_done)
1834
638
    {
1835
639
        WorkQueue::value_type work;
1836
640
        {
1837
641
            std::unique_lock<decltype(work_mutex)> lock{work_mutex};
1838
642
            work_cv.wait(lock, [this] { return !work_queue.empty(); });
1839
643
            work = work_queue.front();
1840
644
            work_queue.pop();
1841
645
        }
1842
646
1843
647
        work();
1844
648
    }
1845
649
}
1846
650
1847
651
void Worker::enqueue_work(std::function<void()> const& functor)
1848
652
{
1849
653
    std::lock_guard<decltype(work_mutex)> lock{work_mutex};
1850
654
    work_queue.push(functor);
1851
655
    work_cv.notify_one();
1852
656
}
1853
657
1854
658
void Worker::start_work()
1855
659
{
1856
660
    do_work();
1857
661
}
1858
662
1859
663
void Worker::stop_work()
1860
664
{
1861
665
    enqueue_work([this] { work_done = true; });
1862
666
}
1863
0
667
1864
=== added file 'examples/miral-shell/decoration_provider.h'
1865
--- examples/miral-shell/decoration_provider.h	1970-01-01 00:00:00 +0000
1866
+++ examples/miral-shell/decoration_provider.h	2017-08-29 09:17:20 +0000
1867
@@ -0,0 +1,119 @@
1868
1
/*
1869
2
 * Copyright © 2016-2017 Canonical Ltd.
1870
3
 *
1871
4
 * This program is free software: you can redistribute it and/or modify it
1872
5
 * under the terms of the GNU General Public License version 2 or 3 as
1873
6
 * published by the Free Software Foundation.
1874
7
 *
1875
8
 * This program is distributed in the hope that it will be useful,
1876
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1877
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1878
11
 * GNU General Public License for more details.
1879
12
 *
1880
13
 * You should have received a copy of the GNU General Public License
1881
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1882
15
 *
1883
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
1884
17
 */
1885
18
1886
19
#ifndef MIRAL_SHELL_DECORATION_PROVIDER_H
1887
20
#define MIRAL_SHELL_DECORATION_PROVIDER_H
1888
21
1889
22
1890
23
#include <miral/window_manager_tools.h>
1891
24
1892
25
#include <mir/client/connection.h>
1893
26
#include <mir/client/surface.h>
1894
27
#include <mir/client/window.h>
1895
28
1896
29
#include <mir/geometry/rectangle.h>
1897
30
#include <mir_toolkit/client_types.h>
1898
31
1899
32
#include <atomic>
1900
33
#include <map>
1901
34
#include <mutex>
1902
35
#include <condition_variable>
1903
36
#include <queue>
1904
37
1905
38
class Worker
1906
39
{
1907
40
public:
1908
41
    ~Worker();
1909
42
1910
43
    void start_work();
1911
44
    void enqueue_work(std::function<void()> const& functor);
1912
45
    void stop_work();
1913
46
1914
47
private:
1915
48
    using WorkQueue = std::queue<std::function<void()>>;
1916
49
1917
50
    std::mutex mutable work_mutex;
1918
51
    std::condition_variable work_cv;
1919
52
    WorkQueue work_queue;
1920
53
    bool work_done = false;
1921
54
1922
55
    void do_work();
1923
56
};
1924
57
1925
58
class DecorationProvider : Worker
1926
59
{
1927
60
public:
1928
61
    DecorationProvider(miral::WindowManagerTools const& tools);
1929
62
    ~DecorationProvider();
1930
63
1931
64
    void operator()(mir::client::Connection connection);
1932
65
    void operator()(std::weak_ptr<mir::scene::Session> const& session);
1933
66
1934
67
    auto session() const -> std::shared_ptr<mir::scene::Session>;
1935
68
1936
69
    void create_titlebar_for(miral::Window const& window);
1937
70
    void place_new_decoration(miral::WindowSpecification& window_spec);
1938
71
    void paint_titlebar_for(miral::WindowInfo const& window, int intensity);
1939
72
    void destroy_titlebar_for(miral::Window const& window);
1940
73
    void resize_titlebar_for(miral::WindowInfo const& window_info, mir::geometry::Size const& size);
1941
74
    void advise_new_titlebar(miral::WindowInfo const& window_info);
1942
75
    void advise_state_change(miral::WindowInfo const& window_info, MirWindowState state);
1943
76
1944
77
    void stop();
1945
78
1946
79
    bool is_decoration(miral::Window const& window) const;
1947
80
    bool is_titlebar(miral::WindowInfo const& window_info) const;
1948
81
1949
82
private:
1950
83
    struct Data
1951
84
    {
1952
85
        MirConnection* connection{nullptr};
1953
86
        mir::client::Surface surface;
1954
87
        MirBufferStream* stream{nullptr};
1955
88
        std::atomic<MirWindow*> titlebar{nullptr};
1956
89
        std::atomic<int> intensity{0xff};
1957
90
        std::function<void(MirWindow* surface)> on_create{[](MirWindow*){}};
1958
91
        miral::Window window;
1959
92
1960
93
        ~Data();
1961
94
    };
1962
95
1963
96
    using SurfaceMap = std::map<std::weak_ptr<mir::scene::Surface>, Data, std::owner_less<std::weak_ptr<mir::scene::Surface>>>;
1964
97
    using TitleMap = std::map<std::string, std::weak_ptr<mir::scene::Surface>>;
1965
98
1966
99
    miral::WindowManagerTools tools;
1967
100
    std::mutex mutable mutex;
1968
101
    mir::client::Connection connection;
1969
102
    struct Wallpaper { mir::client::Surface surface; mir::client::Window window; MirBufferStream* stream; };
1970
103
    std::vector<Wallpaper> wallpaper;
1971
104
    std::weak_ptr<mir::scene::Session> weak_session;
1972
105
1973
106
    SurfaceMap window_to_titlebar;
1974
107
    TitleMap windows_awaiting_titlebar;
1975
108
1976
109
    static void insert(MirWindow* surface, Data* data);
1977
110
    Data* find_titlebar_data(miral::Window const& window);
1978
111
    miral::Window find_titlebar_window(miral::Window const& window) const;
1979
112
    void repaint_titlebar_for(miral::WindowInfo const& window_info);
1980
113
    static void handle_event(MirWindow* window, MirEvent const* ev, void* context_);
1981
114
    static void handle_event_for_background(MirWindow* window, MirEvent const* event, void* context_);
1982
115
    void handle_event_for_background(MirWindow* window, MirEvent const* ev);
1983
116
};
1984
117
1985
118
1986
119
#endif //MIRAL_SHELL_DECORATION_PROVIDER_H
1987
0
120
1988
=== added directory 'examples/miral-shell/desktop'
1989
=== added file 'examples/miral-shell/desktop/CMakeLists.txt'
1990
--- examples/miral-shell/desktop/CMakeLists.txt	1970-01-01 00:00:00 +0000
1991
+++ examples/miral-shell/desktop/CMakeLists.txt	2017-08-29 09:17:20 +0000
1992
@@ -0,0 +1,12 @@
1993
1
set(ICON_NAME ubuntu-logo)
1994
2
set(PROGRAM_NAME miral-app)
1995
3
1996
4
configure_file(miral-shell.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/miral-shell.desktop @ONLY)
1997
5
1998
6
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miral-shell.desktop
1999
7
    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
2000
8
)
2001
9
2002
10
install(FILES ${ICON_NAME}.svg
2003
11
    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
2004
12
)
2005
0
13
2006
=== added file 'examples/miral-shell/desktop/miral-shell.desktop.in'
2007
--- examples/miral-shell/desktop/miral-shell.desktop.in	1970-01-01 00:00:00 +0000
2008
+++ examples/miral-shell/desktop/miral-shell.desktop.in	2017-08-29 09:17:20 +0000
2009
@@ -0,0 +1,18 @@
2010
1
[Desktop Entry]
2011
2
Version=1.0
2012
3
Name=Miral Shell
2013
4
GenericName=Mir Shell
2014
5
Comment=A Mir Shell
2015
6
Keywords=Mir;Server;Shell
2016
7
Type=Application
2017
8
Icon=@ICON_NAME@
2018
9
Exec=@PROGRAM_NAME@
2019
10
Terminal=false
2020
11
Categories=Utility
2021
12
#MimeType=
2022
13
X-Ubuntu-Touch=true
2023
14
X-Ubuntu-Gettext-Domain=miral-shell
2024
15
X-Ubuntu-Single-Instance=true
2025
16
X-Ubuntu-Default-Department-ID=miral-shell
2026
17
#X-Screenshot=
2027
18
X-Ubuntu-Splash-Color=#FFFFFF
2028
0
19
2029
=== added file 'examples/miral-shell/desktop/ubuntu-logo.svg'
2030
--- examples/miral-shell/desktop/ubuntu-logo.svg	1970-01-01 00:00:00 +0000
2031
+++ examples/miral-shell/desktop/ubuntu-logo.svg	2017-08-29 09:17:20 +0000
2032
@@ -0,0 +1,27 @@
2033
1
<?xml version="1.0" encoding="utf-8"?>
2034
2
<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
2035
3
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
2036
4
	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
2037
5
]>
2038
6
<svg version="1.1"
2039
7
	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
2040
8
	 x="0px" y="0px" width="285px" height="285px" viewBox="-0.866 -0.866 285 285" enable-background="new -0.866 -0.866 285 285"
2041
9
	 xml:space="preserve">
2042
10
<defs>
2043
11
</defs>
2044
12
<path fill="#DD4814" d="M283.465,141.734c0,78.273-63.457,141.73-141.734,141.73S0,220.008,0,141.734C0,63.455,63.453,0,141.73,0
2045
13
	S283.465,63.455,283.465,141.734z"/>
2046
14
<path fill="#FFFFFF" d="M45.356,122.812c-10.453,0-18.923,8.47-18.923,18.923c0,10.449,8.47,18.92,18.923,18.92
2047
15
	c10.449,0,18.92-8.471,18.92-18.92C64.276,131.281,55.806,122.812,45.356,122.812z M180.463,208.814
2048
16
	c-9.051,5.225-12.149,16.793-6.926,25.84c5.226,9.051,16.793,12.151,25.844,6.926c9.048-5.224,12.148-16.792,6.923-25.842
2049
17
	C201.08,206.691,189.511,203.59,180.463,208.814z M86.458,141.732c0-18.701,9.293-35.219,23.504-45.221L96.128,73.338
2050
18
	c-16.56,11.064-28.878,27.978-33.995,47.788c5.977,4.872,9.796,12.291,9.796,20.608c0,8.315-3.819,15.734-9.797,20.605
2051
19
	c5.116,19.812,17.435,36.726,33.995,47.789l13.835-23.175C95.751,176.953,86.458,160.436,86.458,141.732z M141.733,86.457
2052
20
	c28.877,0,52.564,22.141,55.047,50.373l26.968-0.394c-1.327-20.844-10.432-39.562-24.425-53.319
2053
21
	c-7.194,2.718-15.505,2.306-22.688-1.842c-7.192-4.152-11.705-11.156-12.941-18.757c-6.992-1.935-14.351-2.99-21.96-2.99
2054
22
	c-13.086,0-25.449,3.072-36.431,8.512l13.146,23.56C125.526,88.307,133.412,86.457,141.733,86.457z M141.733,197.008
2055
23
	c-8.322,0-16.207-1.85-23.285-5.143L105.3,215.427c10.983,5.438,23.347,8.511,36.433,8.511c7.609,0,14.968-1.055,21.961-2.99
2056
24
	c1.236-7.601,5.75-14.605,12.943-18.76c7.183-4.146,15.494-4.558,22.688-1.839c13.992-13.758,23.097-32.476,24.422-53.32
2057
25
	l-26.968-0.394C194.298,174.871,170.61,197.008,141.733,197.008z M180.46,74.649c9.05,5.227,20.619,2.126,25.842-6.921
2058
26
	c5.226-9.051,2.128-20.619-6.923-25.845c-9.049-5.224-20.617-2.124-25.843,6.927C168.312,57.857,171.412,69.426,180.46,74.649z"/>
2059
27
</svg>
2060
0
28
2061
=== added file 'examples/miral-shell/floating_window_manager.cpp'
2062
--- examples/miral-shell/floating_window_manager.cpp	1970-01-01 00:00:00 +0000
2063
+++ examples/miral-shell/floating_window_manager.cpp	2017-08-29 09:17:20 +0000
2064
@@ -0,0 +1,801 @@
2065
1
/*
2066
2
 * Copyright © 2016-2017 Canonical Ltd.
2067
3
 *
2068
4
 * This program is free software: you can redistribute it and/or modify it
2069
5
 * under the terms of the GNU General Public License version 2 or 3 as
2070
6
 * published by the Free Software Foundation.
2071
7
 *
2072
8
 * This program is distributed in the hope that it will be useful,
2073
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2074
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2075
11
 * GNU General Public License for more details.
2076
12
 *
2077
13
 * You should have received a copy of the GNU General Public License
2078
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2079
15
 *
2080
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
2081
17
 */
2082
18
2083
19
#include "floating_window_manager.h"
2084
20
#include "decoration_provider.h"
2085
21
2086
22
#include <miral/application_info.h>
2087
23
#include <miral/internal_client.h>
2088
24
#include <miral/window_info.h>
2089
25
#include <miral/window_manager_tools.h>
2090
26
2091
27
#include <linux/input.h>
2092
28
#include <csignal>
2093
29
2094
30
using namespace miral;
2095
31
2096
32
namespace
2097
33
{
2098
34
DeltaY const title_bar_height{12};
2099
35
2100
36
struct PolicyData
2101
37
{
2102
38
    bool in_hidden_workspace{false};
2103
39
2104
40
    MirWindowState old_state;
2105
41
};
2106
42
2107
43
inline PolicyData& policy_data_for(WindowInfo const& info)
2108
44
{
2109
45
    return *std::static_pointer_cast<PolicyData>(info.userdata());
2110
46
}
2111
47
}
2112
48
2113
49
FloatingWindowManagerPolicy::FloatingWindowManagerPolicy(
2114
50
    WindowManagerTools const& tools,
2115
51
    SpinnerSplash const& spinner,
2116
52
    miral::InternalClientLauncher const& launcher,
2117
53
    std::function<void()>& shutdown_hook) :
2118
54
    CanonicalWindowManagerPolicy(tools),
2119
55
    spinner{spinner},
2120
56
    decoration_provider{std::make_unique<DecorationProvider>(tools)}
2121
57
{
2122
58
    launcher.launch("decorations", *decoration_provider);
2123
59
    shutdown_hook = [this] { decoration_provider->stop(); };
2124
60
2125
61
    for (auto key : {KEY_F1, KEY_F2, KEY_F3, KEY_F4})
2126
62
        key_to_workspace[key] = this->tools.create_workspace();
2127
63
2128
64
    active_workspace = key_to_workspace[KEY_F1];
2129
65
}
2130
66
2131
67
FloatingWindowManagerPolicy::~FloatingWindowManagerPolicy() = default;
2132
68
2133
69
bool FloatingWindowManagerPolicy::handle_pointer_event(MirPointerEvent const* event)
2134
70
{
2135
71
    auto const action = mir_pointer_event_action(event);
2136
72
    auto const modifiers = mir_pointer_event_modifiers(event) & modifier_mask;
2137
73
    Point const cursor{
2138
74
        mir_pointer_event_axis_value(event, mir_pointer_axis_x),
2139
75
        mir_pointer_event_axis_value(event, mir_pointer_axis_y)};
2140
76
2141
77
    bool consumes_event = false;
2142
78
    bool is_resize_event = false;
2143
79
2144
80
    if (action == mir_pointer_action_button_down)
2145
81
    {
2146
82
        if (auto const window = tools.window_at(cursor))
2147
83
            tools.select_active_window(window);
2148
84
    }
2149
85
    else if (action == mir_pointer_action_motion &&
2150
86
             modifiers == mir_input_event_modifier_alt)
2151
87
    {
2152
88
        if (mir_pointer_event_button_state(event, mir_pointer_button_primary))
2153
89
        {
2154
90
            if (auto const target = tools.window_at(old_cursor))
2155
91
            {
2156
92
                if (tools.select_active_window(target) == target)
2157
93
                    tools.drag_active_window(cursor - old_cursor);
2158
94
            }
2159
95
            consumes_event = true;
2160
96
        }
2161
97
2162
98
        if (mir_pointer_event_button_state(event, mir_pointer_button_tertiary))
2163
99
        {
2164
100
            {   // Workaround for lp:1627697
2165
101
                auto now = std::chrono::steady_clock::now();
2166
102
                if (resizing && now < last_resize+std::chrono::milliseconds(20))
2167
103
                    return true;
2168
104
2169
105
                last_resize = now;
2170
106
            }
2171
107
2172
108
            if (!resizing)
2173
109
                tools.select_active_window(tools.window_at(old_cursor));
2174
110
            is_resize_event = resize(tools.active_window(), cursor, old_cursor);
2175
111
            consumes_event = true;
2176
112
        }
2177
113
    }
2178
114
2179
115
    if (!consumes_event && action == mir_pointer_action_motion && !modifiers)
2180
116
    {
2181
117
        if (mir_pointer_event_button_state(event, mir_pointer_button_primary))
2182
118
        {
2183
119
            if (auto const possible_titlebar = tools.window_at(old_cursor))
2184
120
            {
2185
121
                auto const& info = tools.info_for(possible_titlebar);
2186
122
                if (decoration_provider->is_titlebar(info))
2187
123
                {
2188
124
                    if (tools.select_active_window(info.parent()) == info.parent())
2189
125
                        tools.drag_active_window(cursor - old_cursor);
2190
126
                    consumes_event = true;
2191
127
                }
2192
128
            }
2193
129
        }
2194
130
    }
2195
131
2196
132
    if (resizing && !is_resize_event)
2197
133
        end_resize();
2198
134
2199
135
    resizing = is_resize_event;
2200
136
    old_cursor = cursor;
2201
137
    return consumes_event;
2202
138
}
2203
139
2204
140
void FloatingWindowManagerPolicy::end_resize()
2205
141
{
2206
142
    if (!resizing  && !pinching)
2207
143
        return;
2208
144
2209
145
    if (auto window = tools.active_window())
2210
146
    {
2211
147
        auto& window_info = tools.info_for(window);
2212
148
2213
149
        auto new_size = window.size();
2214
150
        auto new_pos  = window.top_left();
2215
151
        window_info.constrain_resize(new_pos, new_size);
2216
152
2217
153
        WindowSpecification modifications;
2218
154
        modifications.top_left() = new_pos;
2219
155
        modifications.size() = new_size;
2220
156
        tools.modify_window(window_info, modifications);
2221
157
    }
2222
158
2223
159
    resizing = false;
2224
160
    pinching = false;
2225
161
}
2226
162
2227
163
bool FloatingWindowManagerPolicy::handle_touch_event(MirTouchEvent const* event)
2228
164
{
2229
165
    auto const count = mir_touch_event_point_count(event);
2230
166
2231
167
    long total_x = 0;
2232
168
    long total_y = 0;
2233
169
2234
170
    for (auto i = 0U; i != count; ++i)
2235
171
    {
2236
172
        total_x += mir_touch_event_axis_value(event, i, mir_touch_axis_x);
2237
173
        total_y += mir_touch_event_axis_value(event, i, mir_touch_axis_y);
2238
174
    }
2239
175
2240
176
    Point cursor{total_x/count, total_y/count};
2241
177
2242
178
    bool is_drag = true;
2243
179
    for (auto i = 0U; i != count; ++i)
2244
180
    {
2245
181
        switch (mir_touch_event_action(event, i))
2246
182
        {
2247
183
        case mir_touch_action_up:
2248
184
            return false;
2249
185
2250
186
        case mir_touch_action_down:
2251
187
            is_drag = false;
2252
188
            continue;
2253
189
2254
190
        default:
2255
191
            continue;
2256
192
        }
2257
193
    }
2258
194
2259
195
    int touch_pinch_top = std::numeric_limits<int>::max();
2260
196
    int touch_pinch_left = std::numeric_limits<int>::max();
2261
197
    int touch_pinch_width = 0;
2262
198
    int touch_pinch_height = 0;
2263
199
2264
200
    for (auto i = 0U; i != count; ++i)
2265
201
    {
2266
202
        for (auto j = 0U; j != i; ++j)
2267
203
        {
2268
204
            int dx = mir_touch_event_axis_value(event, i, mir_touch_axis_x) -
2269
205
                     mir_touch_event_axis_value(event, j, mir_touch_axis_x);
2270
206
2271
207
            int dy = mir_touch_event_axis_value(event, i, mir_touch_axis_y) -
2272
208
                     mir_touch_event_axis_value(event, j, mir_touch_axis_y);
2273
209
2274
210
            if (touch_pinch_width < dx)
2275
211
                touch_pinch_width = dx;
2276
212
2277
213
            if (touch_pinch_height < dy)
2278
214
                touch_pinch_height = dy;
2279
215
        }
2280
216
2281
217
        int const x = mir_touch_event_axis_value(event, i, mir_touch_axis_x);
2282
218
2283
219
        int const y = mir_touch_event_axis_value(event, i, mir_touch_axis_y);
2284
220
2285
221
        if (touch_pinch_top > y)
2286
222
            touch_pinch_top = y;
2287
223
2288
224
        if (touch_pinch_left > x)
2289
225
            touch_pinch_left = x;
2290
226
    }
2291
227
2292
228
    bool consumes_event = false;
2293
229
    if (is_drag)
2294
230
    {
2295
231
        if (count == 3)
2296
232
        {
2297
233
            if (auto window = tools.active_window())
2298
234
            {
2299
235
                auto const old_size = window.size();
2300
236
                auto const delta_width = DeltaX{touch_pinch_width - old_touch_pinch_width};
2301
237
                auto const delta_height = DeltaY{touch_pinch_height - old_touch_pinch_height};
2302
238
2303
239
                auto new_width = std::max(old_size.width + delta_width, Width{5});
2304
240
                auto new_height = std::max(old_size.height + delta_height, Height{5});
2305
241
                Displacement movement{
2306
242
                    DeltaX{touch_pinch_left - old_touch_pinch_left},
2307
243
                    DeltaY{touch_pinch_top  - old_touch_pinch_top}};
2308
244
2309
245
                auto& window_info = tools.info_for(window);
2310
246
                keep_window_within_constraints(window_info, movement, new_width, new_height);
2311
247
2312
248
                auto new_pos = window.top_left() + movement;
2313
249
                Size new_size{new_width, new_height};
2314
250
2315
251
                {   // Workaround for lp:1627697
2316
252
                    auto now = std::chrono::steady_clock::now();
2317
253
                    if (pinching && now < last_resize+std::chrono::milliseconds(20))
2318
254
                        return true;
2319
255
2320
256
                    last_resize = now;
2321
257
                }
2322
258
2323
259
                WindowSpecification modifications;
2324
260
                modifications.top_left() = new_pos;
2325
261
                modifications.size() = new_size;
2326
262
                tools.modify_window(window_info, modifications);
2327
263
                pinching = true;
2328
264
            }
2329
265
            consumes_event = true;
2330
266
        }
2331
267
    }
2332
268
    else
2333
269
    {
2334
270
        if (auto const& window = tools.window_at(cursor))
2335
271
            tools.select_active_window(window);
2336
272
    }
2337
273
2338
274
    if (!consumes_event && pinching)
2339
275
        end_resize();
2340
276
2341
277
    old_cursor = cursor;
2342
278
    old_touch_pinch_top = touch_pinch_top;
2343
279
    old_touch_pinch_left = touch_pinch_left;
2344
280
    old_touch_pinch_width = touch_pinch_width;
2345
281
    old_touch_pinch_height = touch_pinch_height;
2346
282
    return consumes_event;
2347
283
}
2348
284
2349
285
void FloatingWindowManagerPolicy::advise_new_window(WindowInfo const& window_info)
2350
286
{
2351
287
    CanonicalWindowManagerPolicy::advise_new_window(window_info);
2352
288
2353
289
    auto const parent = window_info.parent();
2354
290
2355
291
    if (decoration_provider->is_titlebar(window_info))
2356
292
    {
2357
293
        decoration_provider->advise_new_titlebar(window_info);
2358
294
2359
295
        if (tools.active_window() == parent)
2360
296
            decoration_provider->paint_titlebar_for(tools.info_for(parent), 0xFF);
2361
297
        else
2362
298
            decoration_provider->paint_titlebar_for(tools.info_for(parent), 0x3F);
2363
299
    }
2364
300
2365
301
    if (!parent)
2366
302
        tools.add_tree_to_workspace(window_info.window(), active_workspace);
2367
303
    else
2368
304
    {
2369
305
        if (policy_data_for(tools.info_for(parent)).in_hidden_workspace)
2370
306
            apply_workspace_hidden_to(window_info.window());
2371
307
    }
2372
308
}
2373
309
2374
310
void FloatingWindowManagerPolicy::handle_window_ready(WindowInfo& window_info)
2375
311
{
2376
312
    if (window_info.window().application() != spinner.session() && window_info.needs_titlebar(window_info.type()))
2377
313
        decoration_provider->create_titlebar_for(window_info.window());
2378
314
2379
315
    CanonicalWindowManagerPolicy::handle_window_ready(window_info);
2380
316
    keep_spinner_on_top();
2381
317
}
2382
318
2383
319
void FloatingWindowManagerPolicy::advise_focus_lost(WindowInfo const& info)
2384
320
{
2385
321
    CanonicalWindowManagerPolicy::advise_focus_lost(info);
2386
322
2387
323
    decoration_provider->paint_titlebar_for(info, 0x3F);
2388
324
}
2389
325
2390
326
void FloatingWindowManagerPolicy::advise_focus_gained(WindowInfo const& info)
2391
327
{
2392
328
    CanonicalWindowManagerPolicy::advise_focus_gained(info);
2393
329
2394
330
    decoration_provider->paint_titlebar_for(info, 0xFF);
2395
331
    keep_spinner_on_top();
2396
332
}
2397
333
2398
334
void FloatingWindowManagerPolicy::keep_spinner_on_top()
2399
335
{
2400
336
    // Frig to force the spinner to the top
2401
337
    if (auto const spinner_session = spinner.session())
2402
338
    {
2403
339
        auto const& spinner_info = tools.info_for(spinner_session);
2404
340
2405
341
        for (auto const& window : spinner_info.windows())
2406
342
            tools.raise_tree(window);
2407
343
    }
2408
344
}
2409
345
2410
346
void FloatingWindowManagerPolicy::advise_state_change(WindowInfo const& window_info, MirWindowState state)
2411
347
{
2412
348
    CanonicalWindowManagerPolicy::advise_state_change(window_info, state);
2413
349
2414
350
    decoration_provider->advise_state_change(window_info, state);
2415
351
}
2416
352
2417
353
void FloatingWindowManagerPolicy::advise_resize(WindowInfo const& window_info, Size const& new_size)
2418
354
{
2419
355
    CanonicalWindowManagerPolicy::advise_resize(window_info, new_size);
2420
356
2421
357
    decoration_provider->resize_titlebar_for(window_info, new_size);
2422
358
}
2423
359
2424
360
void FloatingWindowManagerPolicy::advise_delete_window(WindowInfo const& window_info)
2425
361
{
2426
362
    CanonicalWindowManagerPolicy::advise_delete_window(window_info);
2427
363
2428
364
    decoration_provider->destroy_titlebar_for(window_info.window());
2429
365
}
2430
366
2431
367
bool FloatingWindowManagerPolicy::handle_keyboard_event(MirKeyboardEvent const* event)
2432
368
{
2433
369
    auto const action = mir_keyboard_event_action(event);
2434
370
    auto const scan_code = mir_keyboard_event_scan_code(event);
2435
371
    auto const modifiers = mir_keyboard_event_modifiers(event) & modifier_mask;
2436
372
2437
373
    // Switch workspaces
2438
374
    if (action == mir_keyboard_action_down &&
2439
375
        modifiers == (mir_input_event_modifier_alt | mir_input_event_modifier_meta))
2440
376
    {
2441
377
        auto const found = key_to_workspace.find(scan_code);
2442
378
2443
379
        if (found != key_to_workspace.end())
2444
380
        {
2445
381
            switch_workspace_to(found->second);
2446
382
            return true;
2447
383
        }
2448
384
    }
2449
385
2450
386
    // Switch workspace taking the active window
2451
387
    if (action == mir_keyboard_action_down &&
2452
388
        modifiers == (mir_input_event_modifier_ctrl | mir_input_event_modifier_meta))
2453
389
    {
2454
390
        auto const found = key_to_workspace.find(scan_code);
2455
391
2456
392
        if (found != key_to_workspace.end())
2457
393
        {
2458
394
            switch_workspace_to(found->second, tools.active_window());
2459
395
            return true;
2460
396
        }
2461
397
    }
2462
398
2463
399
    if (action != mir_keyboard_action_repeat)
2464
400
        end_resize();
2465
401
2466
402
    if (action == mir_keyboard_action_down && scan_code == KEY_F11)
2467
403
    {
2468
404
        switch (modifiers)
2469
405
        {
2470
406
        case mir_input_event_modifier_alt:
2471
407
            toggle(mir_window_state_maximized);
2472
408
            return true;
2473
409
2474
410
        case mir_input_event_modifier_shift:
2475
411
            toggle(mir_window_state_vertmaximized);
2476
412
            return true;
2477
413
2478
414
        case mir_input_event_modifier_ctrl:
2479
415
            toggle(mir_window_state_horizmaximized);
2480
416
            return true;
2481
417
2482
418
        case mir_input_event_modifier_meta:
2483
419
            toggle(mir_window_state_fullscreen);
2484
420
            return true;
2485
421
2486
422
        default:
2487
423
            break;
2488
424
        }
2489
425
    }
2490
426
    else if (action == mir_keyboard_action_down && scan_code == KEY_F4)
2491
427
    {
2492
428
        switch (modifiers)
2493
429
        {
2494
430
        case mir_input_event_modifier_alt|mir_input_event_modifier_shift:
2495
431
            if (auto const& window = tools.active_window())
2496
432
                kill(window.application(), SIGTERM);
2497
433
            return true;
2498
434
2499
435
        case mir_input_event_modifier_alt:
2500
436
            tools.ask_client_to_close(tools.active_window());;
2501
437
            return true;
2502
438
2503
439
        default:
2504
440
            break;
2505
441
        }
2506
442
    }
2507
443
    else if (action == mir_keyboard_action_down &&
2508
444
             modifiers == mir_input_event_modifier_alt &&
2509
445
             scan_code == KEY_TAB)
2510
446
    {
2511
447
        tools.focus_next_application();
2512
448
2513
449
        return true;
2514
450
    }
2515
451
    else if (action == mir_keyboard_action_down &&
2516
452
             modifiers == mir_input_event_modifier_alt &&
2517
453
             scan_code == KEY_GRAVE)
2518
454
    {
2519
455
        tools.focus_next_within_application();
2520
456
2521
457
        return true;
2522
458
    }
2523
459
    else if (action == mir_keyboard_action_down &&
2524
460
             modifiers == (mir_input_event_modifier_alt | mir_input_event_modifier_shift) &&
2525
461
             scan_code == KEY_GRAVE)
2526
462
    {
2527
463
        tools.focus_prev_within_application();
2528
464
2529
465
        return true;
2530
466
    }
2531
467
    else if (action == mir_keyboard_action_down &&
2532
468
             modifiers == (mir_input_event_modifier_ctrl|mir_input_event_modifier_meta))
2533
469
    {
2534
470
        if (auto active_window = tools.active_window())
2535
471
        {
2536
472
            auto active_output = tools.active_output();
2537
473
            auto& window_info = tools.info_for(active_window);
2538
474
            WindowSpecification modifications;
2539
475
2540
476
            switch (scan_code)
2541
477
            {
2542
478
            case KEY_LEFT:
2543
479
                modifications.state() = mir_window_state_vertmaximized;
2544
480
                tools.place_and_size_for_state(modifications, window_info);
2545
481
                modifications.top_left() = active_output.top_left + title_bar_height;
2546
482
                break;
2547
483
2548
484
            case KEY_RIGHT:
2549
485
                modifications.state() = mir_window_state_vertmaximized;
2550
486
                tools.place_and_size_for_state(modifications, window_info);
2551
487
                modifications.top_left() = active_output.top_right() -
2552
488
                    as_displacement({active_window.size().width, 0}) + title_bar_height;
2553
489
                break;
2554
490
2555
491
            case KEY_UP:
2556
492
                modifications.state() = mir_window_state_horizmaximized;
2557
493
                tools.place_and_size_for_state(modifications, window_info);
2558
494
2559
495
                modifications.top_left() = active_output.top_left + title_bar_height;
2560
496
                break;
2561
497
2562
498
            case KEY_DOWN:
2563
499
                modifications.state() = mir_window_state_horizmaximized;
2564
500
                tools.place_and_size_for_state(modifications, window_info);
2565
501
2566
502
                modifications.top_left() = active_output.bottom_right() - as_displacement(
2567
503
                    modifications.size().is_set() ? modifications.size().value() : active_window.size());
2568
504
                break;
2569
505
2570
506
            default:
2571
507
                return false;
2572
508
            }
2573
509
2574
510
            tools.modify_window(window_info, modifications);
2575
511
            return true;
2576
512
        }
2577
513
    }
2578
514
2579
515
    return false;
2580
516
}
2581
517
2582
518
void FloatingWindowManagerPolicy::toggle(MirWindowState state)
2583
519
{
2584
520
    if (auto const window = tools.active_window())
2585
521
    {
2586
522
        auto& info = tools.info_for(window);
2587
523
2588
524
        WindowSpecification modifications;
2589
525
2590
526
        modifications.state() = (info.state() == state) ? mir_window_state_restored : state;
2591
527
        tools.place_and_size_for_state(modifications, info);
2592
528
        tools.modify_window(info, modifications);
2593
529
    }
2594
530
}
2595
531
2596
532
bool FloatingWindowManagerPolicy::resize(Window const& window, Point cursor, Point old_cursor)
2597
533
{
2598
534
    if (!window)
2599
535
        return false;
2600
536
2601
537
    auto& window_info = tools.info_for(window);
2602
538
2603
539
    auto const top_left = window.top_left();
2604
540
    Rectangle const old_pos{top_left, window.size()};
2605
541
2606
542
    if (!resizing)
2607
543
    {
2608
544
        auto anchor = old_pos.bottom_right();
2609
545
2610
546
        for (auto const& corner : {
2611
547
            old_pos.top_right(),
2612
548
            old_pos.bottom_left(),
2613
549
            top_left})
2614
550
        {
2615
551
            if ((old_cursor - anchor).length_squared() <
2616
552
                (old_cursor - corner).length_squared())
2617
553
            {
2618
554
                anchor = corner;
2619
555
            }
2620
556
        }
2621
557
2622
558
        left_resize = anchor.x != top_left.x;
2623
559
        top_resize  = anchor.y != top_left.y;
2624
560
    }
2625
561
2626
562
    int const x_sign = left_resize? -1 : 1;
2627
563
    int const y_sign = top_resize?  -1 : 1;
2628
564
2629
565
    auto movement = cursor-old_cursor;
2630
566
2631
567
    auto new_width = old_pos.size.width + x_sign * movement.dx;
2632
568
    auto new_height = old_pos.size.height + y_sign * movement.dy;
2633
569
2634
570
    keep_window_within_constraints(window_info, movement, new_width, new_height);
2635
571
2636
572
    Size new_size{new_width, new_height};
2637
573
    Point new_pos = top_left + left_resize*movement.dx + top_resize*movement.dy;
2638
574
2639
575
    WindowSpecification modifications;
2640
576
    modifications.top_left() = new_pos;
2641
577
    modifications.size() = new_size;
2642
578
    tools.modify_window(window, modifications);
2643
579
2644
580
    return true;
2645
581
}
2646
582
2647
583
void FloatingWindowManagerPolicy::keep_window_within_constraints(
2648
584
    WindowInfo const& window_info, Displacement& movement, Width& new_width, Height& new_height) const
2649
585
{
2650
586
    switch (window_info.state())
2651
587
    {
2652
588
    case mir_window_state_maximized:
2653
589
    case mir_window_state_fullscreen:
2654
590
        new_width = window_info.window().size().width;
2655
591
        new_height = window_info.window().size().height;
2656
592
        movement = {0, 0};
2657
593
        break;
2658
594
2659
595
    case mir_window_state_vertmaximized:
2660
596
        new_height = window_info.window().size().height;
2661
597
        movement.dy = DeltaY{0};
2662
598
        break;
2663
599
2664
600
    case mir_window_state_horizmaximized:
2665
601
        new_width = window_info.window().size().width;
2666
602
        movement.dx - DeltaX{0};
2667
603
        break;
2668
604
2669
605
    default:;
2670
606
    }
2671
607
2672
608
    auto const min_width  = std::max(window_info.min_width(), Width{5});
2673
609
    auto const min_height = std::max(window_info.min_height(), Height{5});
2674
610
2675
611
    if (new_width < min_width)
2676
612
    {
2677
613
        new_width = min_width;
2678
614
        if (movement.dx > DeltaX{0})
2679
615
            movement.dx = DeltaX{0};
2680
616
    }
2681
617
2682
618
    if (new_height < min_height)
2683
619
    {
2684
620
        new_height = min_height;
2685
621
        if (movement.dy > DeltaY{0})
2686
622
            movement.dy = DeltaY{0};
2687
623
    }
2688
624
2689
625
    auto const max_width  = window_info.max_width();
2690
626
    auto const max_height = window_info.max_height();
2691
627
2692
628
    if (new_width > max_width)
2693
629
    {
2694
630
        new_width = max_width;
2695
631
        if (movement.dx < DeltaX{0})
2696
632
            movement.dx = DeltaX{0};
2697
633
    }
2698
634
2699
635
    if (new_height > max_height)
2700
636
    {
2701
637
        new_height = max_height;
2702
638
        if (movement.dy < DeltaY{0})
2703
639
            movement.dy = DeltaY{0};
2704
640
    }
2705
641
}
2706
642
2707
643
WindowSpecification FloatingWindowManagerPolicy::place_new_window(
2708
644
    ApplicationInfo const& app_info, WindowSpecification const& request_parameters)
2709
645
{
2710
646
    auto parameters = CanonicalWindowManagerPolicy::place_new_window(app_info, request_parameters);
2711
647
2712
648
    bool const needs_titlebar = WindowInfo::needs_titlebar(parameters.type().value());
2713
649
2714
650
    if (parameters.state().value() != mir_window_state_fullscreen && needs_titlebar)
2715
651
        parameters.top_left() = Point{parameters.top_left().value().x, parameters.top_left().value().y + title_bar_height};
2716
652
2717
653
    if (app_info.application() == decoration_provider->session())
2718
654
        decoration_provider->place_new_decoration(parameters);
2719
655
2720
656
    parameters.userdata() = std::make_shared<PolicyData>();
2721
657
    return parameters;
2722
658
}
2723
659
2724
660
void FloatingWindowManagerPolicy::advise_adding_to_workspace(
2725
661
    std::shared_ptr<Workspace> const& workspace, std::vector<Window> const& windows)
2726
662
{
2727
663
    if (windows.empty())
2728
664
        return;
2729
665
2730
666
    for (auto const& window : windows)
2731
667
    {
2732
668
        if (workspace == active_workspace)
2733
669
        {
2734
670
            apply_workspace_visible_to(window);
2735
671
        }
2736
672
        else
2737
673
        {
2738
674
            apply_workspace_hidden_to(window);
2739
675
        }
2740
676
    }
2741
677
}
2742
678
2743
679
auto FloatingWindowManagerPolicy::confirm_placement_on_display(
2744
680
    miral::WindowInfo const& /*window_info*/, MirWindowState new_state, Rectangle const& new_placement) -> Rectangle
2745
681
{
2746
682
    switch (new_state)
2747
683
    {
2748
684
    default:
2749
685
        return new_placement;
2750
686
2751
687
    case mir_window_state_maximized:
2752
688
    case mir_window_state_vertmaximized:
2753
689
        auto result = new_placement;
2754
690
2755
691
        result.top_left.y = result.top_left.y  + title_bar_height;
2756
692
        result.size.height = result.size.height - title_bar_height;
2757
693
        return result;
2758
694
    }
2759
695
}
2760
696
2761
697
void FloatingWindowManagerPolicy::switch_workspace_to(
2762
698
    std::shared_ptr<Workspace> const& workspace,
2763
699
    Window const& window)
2764
700
{
2765
701
    if (workspace == active_workspace)
2766
702
        return;
2767
703
2768
704
    auto const old_active = active_workspace;
2769
705
    active_workspace = workspace;
2770
706
2771
707
    auto const old_active_window = tools.active_window();
2772
708
2773
709
    if (!old_active_window)
2774
710
    {
2775
711
        // If there's no active window, the first shown grabs focus: get the right one
2776
712
        if (auto const ww = workspace_to_active[workspace])
2777
713
        {
2778
714
            tools.for_each_workspace_containing(ww, [&](std::shared_ptr<miral::Workspace> const& ws)
2779
715
                {
2780
716
                    if (ws == workspace)
2781
717
                    {
2782
718
                        apply_workspace_visible_to(ww);
2783
719
                    }
2784
720
                });
2785
721
        }
2786
722
    }
2787
723
2788
724
    tools.remove_tree_from_workspace(window, old_active);
2789
725
    tools.add_tree_to_workspace(window, active_workspace);
2790
726
2791
727
    tools.for_each_window_in_workspace(active_workspace, [&](Window const& window)
2792
728
        {
2793
729
            if (decoration_provider->is_decoration(window))
2794
730
                return; // decorations are taken care of automatically
2795
731
2796
732
            apply_workspace_visible_to(window);
2797
733
        });
2798
734
2799
735
    bool hide_old_active = false;
2800
736
    tools.for_each_window_in_workspace(old_active, [&](Window const& window)
2801
737
        {
2802
738
            if (decoration_provider->is_decoration(window))
2803
739
                return; // decorations are taken care of automatically
2804
740
2805
741
            if (window == old_active_window)
2806
742
            {
2807
743
                // If we hide the active window focus will shift: do that last
2808
744
                hide_old_active = true;
2809
745
                return;
2810
746
            }
2811
747
2812
748
            apply_workspace_hidden_to(window);
2813
749
        });
2814
750
2815
751
    if (hide_old_active)
2816
752
    {
2817
753
        apply_workspace_hidden_to(old_active_window);
2818
754
2819
755
        // Remember the old active_window when we switch away
2820
756
        workspace_to_active[old_active] = old_active_window;
2821
757
    }
2822
758
}
2823
759
2824
760
void FloatingWindowManagerPolicy::apply_workspace_hidden_to(Window const& window)
2825
761
{
2826
762
    auto const& window_info = tools.info_for(window);
2827
763
    auto& pdata = policy_data_for(window_info);
2828
764
    if (!pdata.in_hidden_workspace)
2829
765
    {
2830
766
        pdata.in_hidden_workspace = true;
2831
767
        pdata.old_state = window_info.state();
2832
768
2833
769
        WindowSpecification modifications;
2834
770
        modifications.state() = mir_window_state_hidden;
2835
771
        tools.place_and_size_for_state(modifications, window_info);
2836
772
        tools.modify_window(window_info.window(), modifications);
2837
773
    }
2838
774
}
2839
775
2840
776
void FloatingWindowManagerPolicy::apply_workspace_visible_to(Window const& window)
2841
777
{
2842
778
    auto const& window_info = tools.info_for(window);
2843
779
    auto& pdata = policy_data_for(window_info);
2844
780
    if (pdata.in_hidden_workspace)
2845
781
    {
2846
782
        pdata.in_hidden_workspace = false;
2847
783
        WindowSpecification modifications;
2848
784
        modifications.state() = pdata.old_state;
2849
785
        tools.place_and_size_for_state(modifications, window_info);
2850
786
        tools.modify_window(window_info.window(), modifications);
2851
787
    }
2852
788
}
2853
789
2854
790
void FloatingWindowManagerPolicy::handle_modify_window(WindowInfo& window_info, WindowSpecification const& modifications)
2855
791
{
2856
792
    auto mods = modifications;
2857
793
2858
794
    auto& pdata = policy_data_for(window_info);
2859
795
2860
796
    if (pdata.in_hidden_workspace && mods.state().is_set())
2861
797
        pdata.old_state = mods.state().consume();
2862
798
2863
799
    CanonicalWindowManagerPolicy::handle_modify_window(window_info, mods);
2864
800
}
2865
801
2866
0
802
2867
=== added file 'examples/miral-shell/floating_window_manager.h'
2868
--- examples/miral-shell/floating_window_manager.h	1970-01-01 00:00:00 +0000
2869
+++ examples/miral-shell/floating_window_manager.h	2017-08-29 09:17:20 +0000
2870
@@ -0,0 +1,146 @@
2871
1
/*
2872
2
 * Copyright © 2016-2017 Canonical Ltd.
2873
3
 *
2874
4
 * This program is free software: you can redistribute it and/or modify it
2875
5
 * under the terms of the GNU General Public License version 2 or 3 as
2876
6
 * published by the Free Software Foundation.
2877
7
 *
2878
8
 * This program is distributed in the hope that it will be useful,
2879
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty ofb
2880
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2881
11
 * GNU General Public License for more details.
2882
12
 *
2883
13
 * You should have received a copy of the GNU General Public License
2884
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2885
15
 *
2886
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
2887
17
 */
2888
18
2889
19
#ifndef MIRAL_SHELL_FLOATING_WINDOW_MANAGER_H
2890
20
#define MIRAL_SHELL_FLOATING_WINDOW_MANAGER_H
2891
21
2892
22
#include <miral/canonical_window_manager.h>
2893
23
#include <miral/window_management_policy_addendum3.h>
2894
24
#include <miral/workspace_policy.h>
2895
25
2896
26
2897
27
#include "spinner/splash.h"
2898
28
2899
29
#include <chrono>
2900
30
#include <map>
2901
31
2902
32
namespace miral { class InternalClientLauncher; }
2903
33
2904
34
using namespace mir::geometry;
2905
35
2906
36
class DecorationProvider;
2907
37
2908
38
class FloatingWindowManagerPolicy : public miral::CanonicalWindowManagerPolicy,
2909
39
    public miral::WorkspacePolicy, public miral::WindowManagementPolicyAddendum3
2910
40
{
2911
41
public:
2912
42
    FloatingWindowManagerPolicy(
2913
43
        miral::WindowManagerTools const& tools,
2914
44
        SpinnerSplash const& spinner,
2915
45
        miral::InternalClientLauncher const& launcher,
2916
46
        std::function<void()>& shutdown_hook);
2917
47
    ~FloatingWindowManagerPolicy();
2918
48
2919
49
    virtual miral::WindowSpecification place_new_window(
2920
50
        miral::ApplicationInfo const& app_info, miral::WindowSpecification const& request_parameters) override;
2921
51
2922
52
    /** @name example event handling:
2923
53
     *  o Switch apps: Alt+Tab, tap or click on the corresponding window
2924
54
     *  o Switch window: Alt+`, tap or click on the corresponding window
2925
55
     *  o Move window: Alt-leftmousebutton drag (three finger drag)
2926
56
     *  o Resize window: Alt-middle_button drag (three finger pinch)
2927
57
     *  o Maximize/restore current window (to display size): Alt-F11
2928
58
     *  o Maximize/restore current window (to display height): Shift-F11
2929
59
     *  o Maximize/restore current window (to display width): Ctrl-F11
2930
60
     *  o Switch workspace . . . . . . . . . . : Meta-Alt-[F1|F2|F3|F4]
2931
61
     *  o Switch workspace taking active window: Meta-Ctrl-[F1|F2|F3|F4]
2932
62
     *  @{ */
2933
63
    bool handle_pointer_event(MirPointerEvent const* event) override;
2934
64
    bool handle_touch_event(MirTouchEvent const* event) override;
2935
65
    bool handle_keyboard_event(MirKeyboardEvent const* event) override;
2936
66
    /** @} */
2937
67
2938
68
    /** @name track events that affect titlebar
2939
69
     *  @{ */
2940
70
    void advise_new_window(miral::WindowInfo const& window_info) override;
2941
71
    void handle_window_ready(miral::WindowInfo& window_info) override;
2942
72
    void advise_focus_lost(miral::WindowInfo const& info) override;
2943
73
    void advise_focus_gained(miral::WindowInfo const& info) override;
2944
74
    void advise_state_change(miral::WindowInfo const& window_info, MirWindowState state) override;
2945
75
    void advise_resize(miral::WindowInfo const& window_info, Size const& new_size) override;
2946
76
    void advise_delete_window(miral::WindowInfo const& window_info) override;
2947
77
2948
78
    void handle_modify_window(miral::WindowInfo& window_info, miral::WindowSpecification const& modifications) override;
2949
79
    /** @} */
2950
80
2951
81
protected:
2952
82
    static const int modifier_mask =
2953
83
        mir_input_event_modifier_alt |
2954
84
        mir_input_event_modifier_shift |
2955
85
        mir_input_event_modifier_sym |
2956
86
        mir_input_event_modifier_ctrl |
2957
87
        mir_input_event_modifier_meta;
2958
88
2959
89
private:
2960
90
    void toggle(MirWindowState state);
2961
91
2962
92
    bool resize(miral::Window const& window, Point cursor, Point old_cursor);
2963
93
2964
94
    Point old_cursor{};
2965
95
2966
96
    bool resizing = false;
2967
97
    bool left_resize = false;
2968
98
    bool top_resize  = false;
2969
99
2970
100
    int old_touch_pinch_top = 0;
2971
101
    int old_touch_pinch_left = 0;
2972
102
    int old_touch_pinch_width = 0;
2973
103
    int old_touch_pinch_height = 0;
2974
104
    bool pinching = false;
2975
105
2976
106
    SpinnerSplash const spinner;
2977
107
2978
108
    std::unique_ptr<DecorationProvider> const decoration_provider;
2979
109
2980
110
    void end_resize();
2981
111
2982
112
    void keep_window_within_constraints(
2983
113
        miral::WindowInfo const& window_info,
2984
114
        Displacement& movement,
2985
115
        Width& new_width,
2986
116
        Height& new_height) const;
2987
117
2988
118
    // Workaround for lp:1627697
2989
119
    std::chrono::steady_clock::time_point last_resize;
2990
120
2991
121
    void advise_adding_to_workspace(
2992
122
        std::shared_ptr<miral::Workspace> const& workspace,
2993
123
        std::vector<miral::Window> const& windows) override;
2994
124
2995
125
    auto confirm_placement_on_display(
2996
126
        miral::WindowInfo const& window_info,
2997
127
        MirWindowState new_state,
2998
128
        Rectangle const& new_placement) -> Rectangle override;
2999
129
3000
130
    // Switch workspace, taking window (if not null)
3001
131
    void switch_workspace_to(
3002
132
        std::shared_ptr<miral::Workspace> const& workspace,
3003
133
        miral::Window const& window = miral::Window{});
3004
134
3005
135
    std::shared_ptr<miral::Workspace> active_workspace;
3006
136
    std::map<int, std::shared_ptr<miral::Workspace>> key_to_workspace;
3007
137
    std::map<std::shared_ptr<miral::Workspace>, miral::Window> workspace_to_active;
3008
138
3009
139
    void apply_workspace_visible_to(miral::Window const& window);
3010
140
3011
141
    void apply_workspace_hidden_to(miral::Window const& window);
3012
142
3013
143
    void keep_spinner_on_top();
3014
144
};
3015
145
3016
146
#endif //MIRAL_SHELL_FLOATING_WINDOW_MANAGER_H
3017
0
147
3018
=== added file 'examples/miral-shell/miral-app.sh'
3019
--- examples/miral-shell/miral-app.sh	1970-01-01 00:00:00 +0000
3020
+++ examples/miral-shell/miral-app.sh	2017-08-29 09:17:20 +0000
3021
@@ -0,0 +1,51 @@
3022
1
#! /bin/bash
3023
2
3024
3
miral_server=miral-shell
3025
4
launcher='gnome-terminal --app-id com.canonical.miral.Terminal'
3026
5
hostsocket=
3027
6
bindir=$(dirname $0)
3028
7
3029
8
if [ -n "${MIR_SOCKET}" ]
3030
9
then
3031
10
  if [ ! -e "${MIR_SOCKET}" ]
3032
11
  then
3033
12
    echo "Error: Host endpoint '${MIR_SOCKET}' does not exists"; exit 1
3034
13
  fi
3035
14
  hostsocket='--host-socket ${MIR_SOCKET}'
3036
15
fi
3037
16
3038
17
socket=${XDG_RUNTIME_DIR}/miral_socket
3039
18
3040
19
while [ $# -gt 0 ]
3041
20
do
3042
21
  if [ "$1" == "--help" -o "$1" == "-h" ]
3043
22
  then
3044
23
    echo "$(basename $0) - Handy launch script for a hosted miral \"desktop session\""
3045
24
    echo "Usage: $(basename $0) [options] [shell options]"
3046
25
    echo "Options are:"
3047
26
    echo "    -kiosk               use miral-kiosk instead of ${miral_server}"
3048
27
    echo "    -launcher <launcher> use <launcher> instead of '${launcher}'"
3049
28
    echo "    -socket   <socket>   set the mir socket [${socket}]"
3050
29
    echo "    -bindir   <bindir>   path to the miral executable [${bindir}]"
3051
30
    exit 0
3052
31
    elif [ "$1" == "-kiosk" ];              then miral_server=miral-kiosk
3053
32
    elif [ "$1" == "-launcher" ];           then shift; launcher=$1
3054
33
    elif [ "$1" == "-socket" ];             then shift; socket=$1
3055
34
    elif [ "$1" == "-bindir" ];             then shift; bindir=$1
3056
35
    elif [ "${1:0:2}" == "--" ];            then break
3057
36
    fi
3058
37
    shift
3059
38
done
3060
39
3061
40
if [ "${bindir}" != "" ]; then bindir="${bindir}/"; fi
3062
41
3063
42
if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
3064
43
3065
44
sh -c "${bindir}${miral_server} $* ${hostsocket} --file ${socket} --desktop_file_hint=miral-shell.desktop"&
3066
45
3067
46
while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
3068
47
3069
48
unset QT_QPA_PLATFORMTHEME
3070
49
MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir dbus-run-session -- ${launcher}
3071
50
killall ${bindir}${miral_server}
3072
51
3073
0
52
3074
=== added file 'examples/miral-shell/miral-desktop.sh'
3075
--- examples/miral-shell/miral-desktop.sh	1970-01-01 00:00:00 +0000
3076
+++ examples/miral-shell/miral-desktop.sh	2017-08-29 09:17:20 +0000
3077
@@ -0,0 +1,45 @@
3078
1
#! /bin/bash
3079
2
3080
3
socket=${XDG_RUNTIME_DIR}/miral_socket
3081
4
miral_server=miral-shell
3082
5
launcher='gnome-terminal --app-id com.canonical.miral.Terminal'
3083
6
bindir=$(dirname $0)
3084
7
vt=4
3085
8
3086
9
while [ $# -gt 0 ]
3087
10
do
3088
11
  if [ "$1" == "--help" -o "$1" == "-h" ]
3089
12
  then
3090
13
    echo "$(basename $0) - Handy launch script for a miral \"desktop session\""
3091
14
    echo "Usage: $(basename $0) [options] [shell options]"
3092
15
    echo "Options are:"
3093
16
    echo "    -kiosk               use miral-kiosk instead of ${miral_server}"
3094
17
    echo "    -launcher <launcher> use <launcher> instead of '${launcher}'"
3095
18
    echo "    -vt       <termid>   set the virtual terminal [${vt}]"
3096
19
    echo "    -socket   <socket>   set the mir socket [${socket}]"
3097
20
    echo "    -bindir   <bindir>   path to the miral executable [${bindir}]"
3098
21
    exit 0
3099
22
    elif [ "$1" == "-kiosk" ];              then miral_server=miral-kiosk
3100
23
    elif [ "$1" == "-launcher" ];           then shift; launcher=$1
3101
24
    elif [ "$1" == "-vt" ];                 then shift; vt=$1
3102
25
    elif [ "$1" == "-socket" ];             then shift; socket=$1
3103
26
    elif [ "$1" == "-bindir" ];             then shift; bindir=$1/
3104
27
    elif [ "${1:0:2}" == "--" ];            then break
3105
28
    fi
3106
29
    shift
3107
30
done
3108
31
3109
32
if [ "${bindir}" != "" ]; then bindir="${bindir}/"; fi
3110
33
3111
34
if [ -e "${socket}" ]; then echo "Error: '${socket}' already exists"; exit 1 ;fi
3112
35
3113
36
sudo ls >> /dev/null
3114
37
oldvt=$(sudo fgconsole)
3115
38
sudo sh -c "LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ${bindir}${miral_server} --vt ${vt} --arw-file --file ${socket} $*; chvt ${oldvt}"&
3116
39
3117
40
while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
3118
41
3119
42
unset QT_QPA_PLATFORMTHEME
3120
43
MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir dbus-run-session -- ${launcher}
3121
44
sudo killall ${bindir}${miral_server}
3122
45
3123
0
46
3124
=== added file 'examples/miral-shell/miral-run.sh'
3125
--- examples/miral-shell/miral-run.sh	1970-01-01 00:00:00 +0000
3126
+++ examples/miral-shell/miral-run.sh	2017-08-29 09:17:20 +0000
3127
@@ -0,0 +1,17 @@
3128
1
#!/bin/sh
3129
2
3130
3
if   [ -e "${XDG_RUNTIME_DIR}/miral_socket" ];
3131
4
then
3132
5
  socket=${XDG_RUNTIME_DIR}/miral_socket
3133
6
elif [ -e "${XDG_RUNTIME_DIR}/mir_socket" ];
3134
7
then
3135
8
  socket=${XDG_RUNTIME_DIR}/mir_socket
3136
9
else
3137
10
  echo "Error: Cannot detect Mir endpoint"; exit 1
3138
11
fi
3139
12
3140
13
if [ "$1" = "gnome-terminal" ]
3141
14
then extras='--app-id com.canonical.miral.Terminal'
3142
15
fi
3143
16
unset QT_QPA_PLATFORMTHEME
3144
17
MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir "$@" ${extras}&
3145
0
18
3146
=== added file 'examples/miral-shell/miral-screencast.sh'
3147
--- examples/miral-shell/miral-screencast.sh	1970-01-01 00:00:00 +0000
3148
+++ examples/miral-shell/miral-screencast.sh	2017-08-29 09:17:20 +0000
3149
@@ -0,0 +1,48 @@
3150
1
#!/bin/bash
3151
2
width=1920
3152
3
height=1080
3153
4
output=screencast.mp4
3154
5
socket=${XDG_RUNTIME_DIR}/miral_socket
3155
6
if [ -v MIR_SERVER ]; then socket=${MIR_SERVER}; fi
3156
7
3157
8
while [ $# -gt 0 ]
3158
9
do
3159
10
  if [ "$1" == "--help" -o "$1" == "-h" ]
3160
11
  then
3161
12
    echo "$(basename $0) - screencast capture script for use with Mir servers"
3162
13
    echo "Usage: $0 [options]"
3163
14
    echo "Options are:"
3164
15
    echo "    --width   set the capture width   [${width}]"
3165
16
    echo "    --height  set the capture height  [${height}]"
3166
17
    echo "    --output  set the output filename [${output}]"
3167
18
    echo "    --socket  set the mir socket      [${socket}]"
3168
19
    echo "    --tmpfile specify the temporary work file"
3169
20
    exit 0
3170
21
  elif [ "$1" == "--socket" ]; then shift; socket=$1
3171
22
  elif [ "$1" == "--output" ]; then shift; output=$1
3172
23
  elif [ "$1" == "--width"  ]; then shift; width=$1
3173
24
  elif [ "$1" == "--height" ]; then shift; height=$1
3174
25
  elif [ "$1" == "--tmpfile" ]; then shift; tempfile=$1
3175
26
  fi
3176
27
  shift
3177
28
done
3178
29
3179
30
echo width = ${width}
3180
31
echo height = ${height}
3181
32
echo output = ${output}
3182
33
echo socket = ${socket}
3183
34
3184
35
if ! which mirscreencast >> /dev/null ; then echo "Need mirscreencast - run \"sudo apt install mir-utils\""; exit 1 ;fi
3185
36
if ! which mencoder >> /dev/null ;      then echo "Need mencoder - run \"sudo apt install mencoder\""; exit 1 ;fi
3186
37
3187
38
if [ -e ${output} ]; then echo "Output exists, moving to ${output}~"; mv ${output} ${output}~ ;fi
3188
39
while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
3189
40
3190
41
if [ ! -v tempfile ]; then tempfile=$(mktemp); fi
3191
42
mirscreencast --size ${width} ${height} -m ${socket} -f ${tempfile}& mirscreencast_pid=$!
3192
43
trap 'kill ${mirscreencast_pid}; rm -f -- "${tempfile}"; exit 0' INT TERM HUP EXIT
3193
44
3194
45
sleep 1; # don't lose the next message in the spew from mirscreencast
3195
46
read -rsp $'\n\nPress enter when recording complete...'
3196
47
3197
48
mencoder -demuxer rawvideo -rawvideo fps=60:w=${width}:h=${height}:format=bgra -ovc x264 -o ${output} ${tempfile}
3198
0
49
3199
=== added file 'examples/miral-shell/miral-xrun.sh'
3200
--- examples/miral-shell/miral-xrun.sh	1970-01-01 00:00:00 +0000
3201
+++ examples/miral-shell/miral-xrun.sh	2017-08-29 09:17:20 +0000
3202
@@ -0,0 +1,45 @@
3203
1
#!/bin/bash
3204
2
port=0
3205
3
3206
4
while [ -e "/tmp/.X11-unix/X${port}" ]; do
3207
5
    let port+=1
3208
6
done
3209
7
3210
8
unset QT_QPA_PLATFORMTHEME
3211
9
unset GDK_BACKEND
3212
10
unset QT_QPA_PLATFORM
3213
11
unset SDL_VIDEODRIVER
3214
12
3215
13
if   [ -e "${XDG_RUNTIME_DIR}/miral_socket" ];
3216
14
then
3217
15
  socket=${XDG_RUNTIME_DIR}/miral_socket
3218
16
elif [ -e "${XDG_RUNTIME_DIR}/mir_socket" ];
3219
17
then
3220
18
  socket=${XDG_RUNTIME_DIR}/mir_socket
3221
19
else
3222
20
  echo "Error: Cannot detect Mir endpoint"; exit 1
3223
21
fi
3224
22
3225
23
while [ $# -gt 0 ]
3226
24
do
3227
25
  if [ "$1" == "--help" -o "$1" == "-h" ]
3228
26
  then
3229
27
    echo "$(basename $0) - Handy launch script for providing an Xmir X11 server"
3230
28
    echo "Usage: $(basename $0) [options] command"
3231
29
    echo "Options are:"
3232
30
    echo "    -force  set toolkit environment variables to force X11 use"
3233
31
    exit 0
3234
32
  elif [ "$1" == "-force" ];
3235
33
  then
3236
34
    export XDG_SESSION_TYPE=x11
3237
35
    export GDK_BACKEND=x11
3238
36
    export QT_QPA_PLATFORM=xcb
3239
37
    export SDL_VIDEODRIVER=x11
3240
38
  else break
3241
39
  fi
3242
40
  shift
3243
41
done
3244
42
3245
43
MIR_SOCKET=${socket} Xmir -rootless :${port} & pid=$!
3246
44
DISPLAY=:${port} "$@"
3247
45
kill ${pid}
3248
0
46
3249
=== added file 'examples/miral-shell/shell_main.cpp'
3250
--- examples/miral-shell/shell_main.cpp	1970-01-01 00:00:00 +0000
3251
+++ examples/miral-shell/shell_main.cpp	2017-08-29 09:17:20 +0000
3252
@@ -0,0 +1,98 @@
3253
1
/*
3254
2
 * Copyright © 2016-2017 Canonical Ltd.
3255
3
 *
3256
4
 * This program is free software: you can redistribute it and/or modify
3257
5
 * under the terms of the GNU General Public License version 2 or 3 as as
3258
6
 * published by the Free Software Foundation.
3259
7
 *
3260
8
 * This program is distributed in the hope that it will be useful,
3261
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3262
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3263
11
 * GNU General Public License for more details.
3264
12
 *
3265
13
 * You should have received a copy of the GNU General Public License
3266
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3267
15
 *
3268
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
3269
17
 */
3270
18
3271
19
#include "tiling_window_manager.h"
3272
20
#include "floating_window_manager.h"
3273
21
#include "titlebar_config.h"
3274
22
#include "spinner/splash.h"
3275
23
3276
24
#include <miral/display_configuration_option.h>
3277
25
#include <miral/runner.h>
3278
26
#include <miral/window_management_options.h>
3279
27
#include <miral/append_event_filter.h>
3280
28
#include <miral/debug_extension.h>
3281
29
#include <miral/internal_client.h>
3282
30
#include <miral/command_line_option.h>
3283
31
#include <miral/cursor_theme.h>
3284
32
#include <miral/keymap.h>
3285
33
3286
34
#include <linux/input.h>
3287
35
3288
36
int main(int argc, char const* argv[])
3289
37
{
3290
38
    using namespace miral;
3291
39
3292
40
    std::function<void()> shutdown_hook{[]{}};
3293
41
3294
42
    SpinnerSplash spinner;
3295
43
    InternalClientLauncher launcher;
3296
44
    ActiveOutputsMonitor outputs_monitor;
3297
45
    WindowManagerOptions window_managers
3298
46
        {
3299
47
            add_window_manager_policy<FloatingWindowManagerPolicy>("floating", spinner, launcher, shutdown_hook),
3300
48
            add_window_manager_policy<TilingWindowManagerPolicy>("tiling", spinner, launcher, outputs_monitor),
3301
49
        };
3302
50
3303
51
    MirRunner runner{argc, argv};
3304
52
3305
53
    runner.add_stop_callback([&] { shutdown_hook(); });
3306
54
3307
55
    auto const quit_on_ctrl_alt_bksp = [&](MirEvent const* event)
3308
56
        {
3309
57
            if (mir_event_get_type(event) != mir_event_type_input)
3310
58
                return false;
3311
59
3312
60
            MirInputEvent const* input_event = mir_event_get_input_event(event);
3313
61
            if (mir_input_event_get_type(input_event) != mir_input_event_type_key)
3314
62
                return false;
3315
63
3316
64
            MirKeyboardEvent const* kev = mir_input_event_get_keyboard_event(input_event);
3317
65
            if (mir_keyboard_event_action(kev) != mir_keyboard_action_down)
3318
66
                return false;
3319
67
3320
68
            MirInputEventModifiers mods = mir_keyboard_event_modifiers(kev);
3321
69
            if (!(mods & mir_input_event_modifier_alt) || !(mods & mir_input_event_modifier_ctrl))
3322
70
                return false;
3323
71
3324
72
            if (mir_keyboard_event_scan_code(kev) != KEY_BACKSPACE)
3325
73
                return false;
3326
74
3327
75
            runner.stop();
3328
76
            return true;
3329
77
        };
3330
78
3331
79
    Keymap config_keymap;
3332
80
    DebugExtension debug_extensions;
3333
81
3334
82
    return runner.run_with(
3335
83
        {
3336
84
            CommandLineOption{[&](std::string const& ) { },
3337
85
                              "desktop_file_hint", "Ignored for Unity8 compatibility", "miral-shell.desktop"},
3338
86
            CursorTheme{"DMZ-White"},
3339
87
            window_managers,
3340
88
            display_configuration_options,
3341
89
            launcher,
3342
90
            outputs_monitor,
3343
91
            config_keymap,
3344
92
            debug_extensions,
3345
93
            AppendEventFilter{quit_on_ctrl_alt_bksp},
3346
94
            StartupInternalClient{"Intro", spinner},
3347
95
            pre_init(CommandLineOption{[&](std::string const& typeface) { ::titlebar::font_file(typeface); },
3348
96
                              "shell-titlebar-font", "font file to use for titlebars", ::titlebar::font_file()})
3349
97
        });
3350
98
}
3351
0
99
3352
=== added directory 'examples/miral-shell/spinner'
3353
=== added file 'examples/miral-shell/spinner/CMakeLists.txt'
3354
--- examples/miral-shell/spinner/CMakeLists.txt	1970-01-01 00:00:00 +0000
3355
+++ examples/miral-shell/spinner/CMakeLists.txt	2017-08-29 09:17:20 +0000
3356
@@ -0,0 +1,67 @@
3357
1
# -*- Mode: CMake; indent-tabs-mode: nil; tab-width: 2 -*-
3358
2
#
3359
3
# Copyright © 2014 Canonical Ltd.
3360
4
#
3361
5
# This program is free software: you can redistribute it and/or modify
3362
6
# it under the terms of the GNU General Public License version 3 as
3363
7
# published by the Free Software Foundation.
3364
8
#
3365
9
# This program is distributed in the hope that it will be useful,
3366
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
3367
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3368
12
# GNU General Public License for more details.
3369
13
#
3370
14
# You should have received a copy of the GNU General Public License
3371
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
3372
16
3373
17
pkg_check_modules(GLIB REQUIRED glib-2.0)
3374
18
find_package(GLESv2 REQUIRED)
3375
19
find_package(PIL REQUIRED)
3376
20
3377
21
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overlength-strings")
3378
22
3379
23
3380
24
function(png2header png header varname)
3381
25
  add_custom_command(
3382
26
    OUTPUT ${header}
3383
27
    COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/png2header.py ${png} ${varname} > ${header}
3384
28
    DEPENDS ${png} ${CMAKE_CURRENT_SOURCE_DIR}/png2header.py
3385
29
  )
3386
30
endfunction()
3387
31
3388
32
png2header(
3389
33
  ${CMAKE_CURRENT_SOURCE_DIR}/spinner-glow.png
3390
34
  ${CMAKE_CURRENT_BINARY_DIR}/spinner_glow.h
3391
35
  spinner_glow
3392
36
)
3393
37
3394
38
png2header(
3395
39
  ${CMAKE_CURRENT_SOURCE_DIR}/spinner-logo.png
3396
40
  ${CMAKE_CURRENT_BINARY_DIR}/spinner_logo.h
3397
41
  spinner_logo
3398
42
)
3399
43
3400
44
include_directories(
3401
45
  ${GLIB_INCLUDE_DIRS}
3402
46
  ${GLESv2_INCLUDE_DIRS}
3403
47
  ${CMAKE_CURRENT_BINARY_DIR}
3404
48
)
3405
49
3406
50
add_library(miral-spinner STATIC
3407
51
  eglapp.cpp
3408
52
  eglapp.h
3409
53
  eglspinner.cpp
3410
54
  miregl.h
3411
55
  miregl.cpp
3412
56
  splash.h
3413
57
  ${CMAKE_CURRENT_BINARY_DIR}/spinner_logo.h
3414
58
  ${CMAKE_CURRENT_BINARY_DIR}/spinner_glow.h
3415
59
)
3416
60
3417
61
target_link_libraries(miral-spinner
3418
62
  mirclientcpp
3419
63
  EGL
3420
64
  ${GLIB_LDFLAGS}
3421
65
  ${GLESv2_LIBRARIES}
3422
66
  ${MIRCLIENT_LDFLAGS}
3423
67
)
3424
0
68
3425
=== added file 'examples/miral-shell/spinner/eglapp.cpp'
3426
--- examples/miral-shell/spinner/eglapp.cpp	1970-01-01 00:00:00 +0000
3427
+++ examples/miral-shell/spinner/eglapp.cpp	2017-08-29 09:17:20 +0000
3428
@@ -0,0 +1,83 @@
3429
1
/*
3430
2
 * Copyright © 2013, 2015 Canonical Ltd.
3431
3
 *
3432
4
 * This program is free software: you can redistribute it and/or modify
3433
5
 * under the terms of the GNU General Public License version 2 or 3 as as
3434
6
 * published by the Free Software Foundation.
3435
7
 *
3436
8
 * This program is distributed in the hope that it will be useful,
3437
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3438
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3439
11
 * GNU General Public License for more details.
3440
12
 *
3441
13
 * You should have received a copy of the GNU General Public License
3442
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3443
15
 */
3444
16
3445
17
#include "eglapp.h"
3446
18
3447
19
#include <mir/client/display_config.h>
3448
20
3449
21
#include "miregl.h"
3450
22
3451
23
3452
24
float mir_eglapp_background_opacity = 1.0f;
3453
25
3454
26
3455
27
namespace
3456
28
{
3457
29
MirPixelFormat select_pixel_format(MirConnection* connection)
3458
30
{
3459
31
    unsigned int format[mir_pixel_formats];
3460
32
    unsigned int nformats;
3461
33
3462
34
    mir_connection_get_available_surface_formats(
3463
35
        connection,
3464
36
        (MirPixelFormat*) format,
3465
37
        mir_pixel_formats,
3466
38
        &nformats);
3467
39
3468
40
    auto const pixel_format = (MirPixelFormat) format[0];
3469
41
3470
42
    printf("Server supports %d of %d surface pixel formats. Using format: %d\n",
3471
43
           nformats, mir_pixel_formats, pixel_format);
3472
44
3473
45
    return pixel_format;
3474
46
}
3475
47
}
3476
48
3477
49
std::vector<std::shared_ptr<MirEglSurface>> mir_eglapp_init(MirConnection* const connection)
3478
50
{
3479
51
    char const * const name = "eglappsurface";
3480
52
3481
53
    if (!mir_connection_is_valid(connection))
3482
54
        throw std::runtime_error("Can't get connection");
3483
55
3484
56
    auto const pixel_format = select_pixel_format(connection);
3485
57
3486
58
    auto const mir_egl_app = make_mir_eglapp(connection, pixel_format);
3487
59
3488
60
    std::vector<std::shared_ptr<MirEglSurface>> result;
3489
61
3490
62
    mir::client::DisplayConfig{connection}.for_each_output([&](MirOutput const* output)
3491
63
        {
3492
64
            if (mir_output_get_connection_state(output) == mir_output_connection_state_connected &&
3493
65
                mir_output_is_enabled(output))
3494
66
            {
3495
67
                auto const mode = mir_output_get_current_mode(output);
3496
68
                auto const output_id = mir_output_get_id(output);
3497
69
3498
70
                printf("Active output [%u] at (%d, %d) is %dx%d\n",
3499
71
                       output_id,
3500
72
                       mir_output_get_position_x(output), mir_output_get_position_y(output),
3501
73
                       mir_output_mode_get_width(mode), mir_output_mode_get_height(mode));
3502
74
3503
75
                result.push_back(std::make_shared<MirEglSurface>(mir_egl_app, name, output));
3504
76
            }
3505
77
        });
3506
78
3507
79
    if (result.empty())
3508
80
        throw std::runtime_error("No active outputs found.");
3509
81
3510
82
    return result;
3511
83
}
3512
0
84
3513
=== added file 'examples/miral-shell/spinner/eglapp.h'
3514
--- examples/miral-shell/spinner/eglapp.h	1970-01-01 00:00:00 +0000
3515
+++ examples/miral-shell/spinner/eglapp.h	2017-08-29 09:17:20 +0000
3516
@@ -0,0 +1,33 @@
3517
1
/*
3518
2
 * Copyright © 2013 Canonical Ltd.
3519
3
 *
3520
4
 * This program is free software: you can redistribute it and/or modify
3521
5
 * under the terms of the GNU General Public License version 2 or 3 as as
3522
6
 * published by the Free Software Foundation.
3523
7
 *
3524
8
 * This program is distributed in the hope that it will be useful,
3525
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3526
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3527
11
 * GNU General Public License for more details.
3528
12
 *
3529
13
 * You should have received a copy of the GNU General Public License
3530
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3531
15
 *
3532
16
 * Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
3533
17
 */
3534
18
3535
19
#ifndef __EGLAPP_H__
3536
20
#define __EGLAPP_H__
3537
21
3538
22
#include <mir_toolkit/client_types.h>
3539
23
3540
24
#include <memory>
3541
25
#include <vector>
3542
26
3543
27
class MirEglSurface;
3544
28
3545
29
extern float mir_eglapp_background_opacity;
3546
30
3547
31
std::vector<std::shared_ptr<MirEglSurface>> mir_eglapp_init(MirConnection* const connection);
3548
32
3549
33
#endif
3550
0
34
3551
=== added file 'examples/miral-shell/spinner/eglspinner.cpp'
3552
--- examples/miral-shell/spinner/eglspinner.cpp	1970-01-01 00:00:00 +0000
3553
+++ examples/miral-shell/spinner/eglspinner.cpp	2017-08-29 09:17:20 +0000
3554
@@ -0,0 +1,372 @@
3555
1
/*
3556
2
 * Copyright © 2013-2015 Canonical Ltd.
3557
3
 *
3558
4
 * This program is free software: you can redistribute it and/or modify
3559
5
 * under the terms of the GNU General Public License version 2 or 3 as as
3560
6
 * published by the Free Software Foundation.
3561
7
 *
3562
8
 * This program is distributed in the hope that it will be useful,
3563
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3564
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3565
11
 * GNU General Public License for more details.
3566
12
 *
3567
13
 * You should have received a copy of the GNU General Public License
3568
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3569
15
 *
3570
16
 * Authors: Daniel van Vugt <daniel.van.vugt@canonical.com>
3571
17
 *          Mirco Müller <mirco.mueller@canonical.com>
3572
18
 *          Alan Griffiths <alan@octopull.co.uk>
3573
19
 *          Kevin DuBois <kevin.dubois@canonical.com>
3574
20
 */
3575
21
3576
22
#include "splash.h"
3577
23
3578
24
#include <chrono>
3579
25
3580
26
#include "eglapp.h"
3581
27
#include "miregl.h"
3582
28
#include <assert.h>
3583
29
#include <glib.h>
3584
30
#include <string.h>
3585
31
#include <GLES2/gl2.h>
3586
32
#include <sys/stat.h>
3587
33
#include <signal.h>
3588
34
#include <atomic>
3589
35
#include <mutex>
3590
36
3591
37
#include <mir_toolkit/mir_client_library.h>
3592
38
3593
39
#include "spinner_glow.h"
3594
40
#include "spinner_logo.h"
3595
41
3596
42
static GLuint load_shader(const char *src, GLenum type)
3597
43
{
3598
44
    GLuint shader = glCreateShader(type);
3599
45
    if (shader)
3600
46
    {
3601
47
        GLint compiled;
3602
48
        glShaderSource(shader, 1, &src, NULL);
3603
49
        glCompileShader(shader);
3604
50
        glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
3605
51
        if (!compiled)
3606
52
        {
3607
53
            GLchar log[1024];
3608
54
            glGetShaderInfoLog(shader, sizeof log - 1, NULL, log);
3609
55
            log[sizeof log - 1] = '\0';
3610
56
            printf("load_shader compile failed: %s\n", log);
3611
57
            glDeleteShader(shader);
3612
58
            shader = 0;
3613
59
        }
3614
60
    }
3615
61
    return shader;
3616
62
}
3617
63
3618
64
// Colours from http://design.ubuntu.com/brand/colour-palette
3619
65
//#define MID_AUBERGINE   0.368627451f, 0.152941176f, 0.31372549f
3620
66
//#define ORANGE          0.866666667f, 0.282352941f, 0.141414141f
3621
67
//#define WARM_GREY       0.682352941f, 0.654901961f, 0.623529412f
3622
68
//#define COOL_GREY       0.2f,         0.2f,         0.2f
3623
69
#define LIGHT_AUBERGINE 0.466666667f, 0.297297297f, 0.435294118f
3624
70
//#define DARK_AUBERGINE  0.17254902f,  0.0f,         0.117647059f
3625
71
//#define BLACK           0.0f,         0.0f,         0.0f
3626
72
//#define WHITE           1.0f,         1.0f,         1.0f
3627
73
3628
74
template <typename Image>
3629
75
void uploadTexture (GLuint id, Image& image)
3630
76
{
3631
77
    glBindTexture(GL_TEXTURE_2D, id);
3632
78
3633
79
    glTexImage2D(GL_TEXTURE_2D,
3634
80
                 0,
3635
81
                 GL_RGBA,
3636
82
                 image.width,
3637
83
                 image.height,
3638
84
                 0,
3639
85
                 GL_RGBA,
3640
86
                 GL_UNSIGNED_BYTE,
3641
87
                 image.pixel_data);
3642
88
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
3643
89
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
3644
90
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
3645
91
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
3646
92
    glBindTexture(GL_TEXTURE_2D, 0);
3647
93
}
3648
94
3649
95
GLuint createShaderProgram(const char* vertexShaderSrc, const char* fragmentShaderSrc)
3650
96
{
3651
97
    if (!vertexShaderSrc || !fragmentShaderSrc)
3652
98
        return 0;
3653
99
3654
100
    GLuint vShaderId = 0;
3655
101
    vShaderId = load_shader(vertexShaderSrc, GL_VERTEX_SHADER);
3656
102
    assert(vShaderId);
3657
103
3658
104
    GLuint fShaderId = 0;
3659
105
    fShaderId = load_shader(fragmentShaderSrc, GL_FRAGMENT_SHADER);
3660
106
    assert(fShaderId);
3661
107
3662
108
    GLuint progId = 0;
3663
109
    progId = glCreateProgram();
3664
110
    assert(progId);
3665
111
    glAttachShader(progId, vShaderId);
3666
112
    glAttachShader(progId, fShaderId);
3667
113
    glLinkProgram(progId);
3668
114
3669
115
    GLint linked = 0;
3670
116
    glGetProgramiv(progId, GL_LINK_STATUS, &linked);
3671
117
    if (!linked)
3672
118
    {
3673
119
        GLchar log[1024];
3674
120
        glGetProgramInfoLog(progId, sizeof log - 1, NULL, log);
3675
121
        log[sizeof log - 1] = '\0';
3676
122
        printf("Link failed: %s\n", log);
3677
123
        return 0;
3678
124
    }
3679
125
3680
126
    return progId;
3681
127
}
3682
128
3683
129
typedef struct _AnimationValues
3684
130
{
3685
131
    double lastTimeStamp;
3686
132
    GLfloat angle;
3687
133
    GLfloat fadeBackground;
3688
134
    GLfloat fadeLogo;
3689
135
    GLfloat fadeGlow;
3690
136
} AnimationValues;
3691
137
3692
138
bool updateAnimation (GTimer* timer, AnimationValues* anim)
3693
139
{
3694
140
    if (!timer || !anim)
3695
141
        return false;
3696
142
3697
143
    //1.) 0.0   - 0.6:   logo fades in fully
3698
144
    //2.) 0.0   - 6.0:   logo does one full spin 360°
3699
145
    //3.) 6.0   - 6.833: glow fades in fully, black-background fades out to 50%
3700
146
    //4.) 6.833 - 7.666: glow fades out fully, black-background fades out to 0% 
3701
147
    //5.) 7.666 - 8.266: logo fades out fully
3702
148
    //8.266..:       now spinner can be closed as all its elements are faded out
3703
149
3704
150
    // Hacked to run three times as fast
3705
151
    double elapsed = 3*g_timer_elapsed (timer, NULL);
3706
152
    double dt = elapsed - anim->lastTimeStamp;
3707
153
    anim->lastTimeStamp = elapsed;
3708
154
3709
155
    // step 1.)
3710
156
    if (elapsed < 0.6f)
3711
157
        anim->fadeLogo += 1.6f * dt;
3712
158
3713
159
    // step 2.)
3714
160
    anim->angle -= (0.017453292519943f * 360.0f / 18.0f) * dt;
3715
161
3716
162
    // step 3.) glow
3717
163
    if (elapsed > 6.0f && elapsed < 6.833f)
3718
164
        anim->fadeGlow += 1.2f * dt;
3719
165
3720
166
    // step 3.) background
3721
167
    if (elapsed > 0.6f && elapsed < 6.833f)
3722
168
    { if (anim->fadeBackground > 0) anim->fadeBackground -= 0.15f * dt; else anim->fadeBackground = 0; }
3723
169
3724
170
    // step 4.) glow
3725
171
    if (elapsed > 7.0f)
3726
172
        anim->fadeGlow -= 0.6f * dt;
3727
173
3728
174
    // step 5.)
3729
175
    if (elapsed > 6.833f)
3730
176
        anim->fadeLogo -= 1.6f * dt;
3731
177
3732
178
    return elapsed < 8.266f;
3733
179
}
3734
180
3735
181
namespace
3736
182
{
3737
183
const char vShaderSrcSpinner[] =
3738
184
    "attribute vec4 vPosition;                       \n"
3739
185
    "attribute vec2 aTexCoords;                      \n"
3740
186
    "uniform float theta;                            \n"
3741
187
    "varying vec2 vTexCoords;                        \n"
3742
188
    "void main()                                     \n"
3743
189
    "{                                               \n"
3744
190
    "    float c = cos(theta);                       \n"
3745
191
    "    float s = sin(theta);                       \n"
3746
192
    "    mat2 m;                                     \n"
3747
193
    "    m[0] = vec2(c, s);                          \n"
3748
194
    "    m[1] = vec2(-s, c);                         \n"
3749
195
    "    vTexCoords = m * aTexCoords + vec2 (0.5, 0.5); \n"
3750
196
    "    gl_Position = vec4(vPosition.xy, -1.0, 1.0); \n"
3751
197
    "}                                               \n";
3752
198
3753
199
const char fShaderSrcGlow[] =
3754
200
    "precision mediump float;                             \n"
3755
201
    "varying vec2 vTexCoords;                             \n"
3756
202
    "uniform sampler2D uSampler;                          \n"
3757
203
    "uniform float uFadeGlow;                             \n"
3758
204
    "void main()                                          \n"
3759
205
    "{                                                    \n"
3760
206
    "    vec4 col = texture2D(uSampler, vTexCoords);      \n"
3761
207
    "    col = col * uFadeGlow;                           \n"
3762
208
    "    gl_FragColor = col;                              \n"
3763
209
    "}                                                    \n";
3764
210
3765
211
const char fShaderSrcLogo[] =
3766
212
    "precision mediump float;                             \n"
3767
213
    "varying vec2 vTexCoords;                             \n"
3768
214
    "uniform sampler2D uSampler;                          \n"
3769
215
    "uniform float uFadeLogo;                             \n"
3770
216
    "void main()                                          \n"
3771
217
    "{                                                    \n"
3772
218
    "    vec4 col = texture2D(uSampler, vTexCoords);      \n"
3773
219
    "    col = col * uFadeLogo;                           \n"
3774
220
    "    gl_FragColor = col;                              \n"
3775
221
    "}                                                    \n";
3776
222
3777
223
std::atomic<bool> dying{false};
3778
224
void lifecycle_event_callback(MirConnection* /*connection*/, MirLifecycleState state, void* context)
3779
225
{
3780
226
    if (state == mir_lifecycle_connection_lost)
3781
227
        static_cast<decltype(dying)*>(context)->store(true);
3782
228
}
3783
229
}
3784
230
3785
231
struct SpinnerSplash::Self
3786
232
{
3787
233
    std::mutex mutex;
3788
234
    std::weak_ptr<mir::scene::Session> session;
3789
235
};
3790
236
3791
237
SpinnerSplash::SpinnerSplash() : self{std::make_shared<Self>()} {}
3792
238
3793
239
SpinnerSplash::~SpinnerSplash() = default;
3794
240
3795
241
void SpinnerSplash::operator()(std::weak_ptr<mir::scene::Session> const& session)
3796
242
{
3797
243
    std::lock_guard<decltype(self->mutex)> lock{self->mutex};
3798
244
    self->session = session;
3799
245
}
3800
246
3801
247
auto SpinnerSplash::session() const
3802
248
-> std::shared_ptr<mir::scene::Session>
3803
249
{
3804
250
    std::lock_guard<decltype(self->mutex)> lock{self->mutex};
3805
251
    return self->session.lock();
3806
252
}
3807
253
3808
254
void SpinnerSplash::operator()(MirConnection* const connection)
3809
255
try
3810
256
{
3811
257
    GLuint prog[2];
3812
258
    GLuint texture[2];
3813
259
    GLint vpos[2];
3814
260
    GLint theta;
3815
261
    GLint fadeGlow;
3816
262
    GLint fadeLogo;
3817
263
    GLint aTexCoords[2];
3818
264
    GLint sampler[2];
3819
265
3820
266
    mir_connection_set_lifecycle_event_callback(connection, &lifecycle_event_callback, &dying);
3821
267
    auto const windows = mir_eglapp_init(connection);
3822
268
3823
269
    if (!windows.size()) return;
3824
270
3825
271
    double pixelSize = 10 * 11.18;
3826
272
    const GLfloat texCoordsSpinner[] =
3827
273
    {
3828
274
        -0.5f, 0.5f,
3829
275
        -0.5f, -0.5f,
3830
276
        0.5f, 0.5f,
3831
277
        0.5f, -0.5f,
3832
278
    };
3833
279
3834
280
    prog[0] = createShaderProgram(vShaderSrcSpinner, fShaderSrcGlow);
3835
281
    prog[1] = createShaderProgram(vShaderSrcSpinner, fShaderSrcLogo);
3836
282
3837
283
    // setup proper GL-blending
3838
284
    glEnable(GL_BLEND);
3839
285
    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3840
286
    glBlendEquation(GL_FUNC_ADD);
3841
287
3842
288
    // get locations of shader-attributes/uniforms
3843
289
    vpos[0] = glGetAttribLocation(prog[0], "vPosition");
3844
290
    aTexCoords[0] = glGetAttribLocation(prog[0], "aTexCoords");
3845
291
    theta = glGetUniformLocation(prog[0], "theta");
3846
292
    sampler[0] = glGetUniformLocation(prog[0], "uSampler");
3847
293
    fadeGlow = glGetUniformLocation(prog[0], "uFadeGlow");
3848
294
    vpos[1] = glGetAttribLocation(prog[1], "vPosition");
3849
295
    aTexCoords[1] = glGetAttribLocation(prog[1], "aTexCoords");
3850
296
    sampler[1] = glGetUniformLocation(prog[1], "uSampler");
3851
297
    fadeLogo = glGetUniformLocation(prog[1], "uFadeLogo");
3852
298
3853
299
    // create and upload spinner-artwork
3854
300
    // note that the embedded image data has pre-multiplied alpha
3855
301
    glGenTextures(2, texture);
3856
302
    uploadTexture(texture[0], spinner_glow);
3857
303
    uploadTexture(texture[1], spinner_logo);
3858
304
3859
305
    // bunch of shader-attributes to enable
3860
306
    glVertexAttribPointer(aTexCoords[0], 2, GL_FLOAT, GL_FALSE, 0, texCoordsSpinner);
3861
307
    glVertexAttribPointer(aTexCoords[1], 2, GL_FLOAT, GL_FALSE, 0, texCoordsSpinner);
3862
308
    glEnableVertexAttribArray(vpos[0]);
3863
309
    glEnableVertexAttribArray(vpos[1]);
3864
310
    glEnableVertexAttribArray(aTexCoords[0]);
3865
311
    glEnableVertexAttribArray(aTexCoords[1]);
3866
312
    glActiveTexture(GL_TEXTURE0);
3867
313
3868
314
    AnimationValues anim = {0.0, 0.0, 1.0, 0.0, 0.0};
3869
315
    GTimer* timer = g_timer_new();
3870
316
3871
317
    do
3872
318
    {
3873
319
        for (auto const& surface : windows)
3874
320
            surface->paint([&](unsigned int width, unsigned int height)
3875
321
            {
3876
322
                GLfloat halfRealWidth = ((2.0 / width) * pixelSize) / 2.0;
3877
323
                GLfloat halfRealHeight = ((2.0 / height) * pixelSize) / 2.0;
3878
324
3879
325
                const GLfloat vertices[] =
3880
326
                    {
3881
327
                        halfRealWidth,  halfRealHeight,
3882
328
                        halfRealWidth, -halfRealHeight,
3883
329
                        -halfRealWidth, halfRealHeight,
3884
330
                        -halfRealWidth,-halfRealHeight,
3885
331
                    };
3886
332
3887
333
                glVertexAttribPointer(vpos[0], 2, GL_FLOAT, GL_FALSE, 0, vertices);
3888
334
                glVertexAttribPointer(vpos[1], 2, GL_FLOAT, GL_FALSE, 0, vertices);
3889
335
3890
336
                glViewport(0, 0, width, height);
3891
337
3892
338
                GLfloat color[] = {LIGHT_AUBERGINE};
3893
339
                for (auto& c : color) { c*= anim.fadeBackground; }
3894
340
3895
341
                glClearColor(color[0], color[1], color[2], anim.fadeBackground);
3896
342
                glClear(GL_COLOR_BUFFER_BIT);
3897
343
3898
344
                // draw glow
3899
345
                glUseProgram(prog[0]);
3900
346
                glBindTexture(GL_TEXTURE_2D, texture[0]);
3901
347
                glUniform1i(sampler[0], 0);
3902
348
                glUniform1f(theta, anim.angle);
3903
349
                glUniform1f(fadeGlow, anim.fadeGlow);
3904
350
                glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
3905
351
3906
352
                // draw logo
3907
353
                glUseProgram(prog[1]);
3908
354
                glBindTexture(GL_TEXTURE_2D, texture[1]);
3909
355
                glUniform1i(sampler[1], 0);
3910
356
                glUniform1f(theta, anim.angle);
3911
357
                glUniform1f(fadeLogo, anim.fadeLogo);
3912
358
                glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
3913
359
            });
3914
360
3915
361
        if (dying.load())
3916
362
            throw std::runtime_error("Server disconnected");
3917
363
    }
3918
364
    while (updateAnimation(timer, &anim));
3919
365
3920
366
    glDeleteTextures(2, texture);
3921
367
    g_timer_destroy (timer);
3922
368
}
3923
369
catch (std::exception const& x)
3924
370
{
3925
371
    printf("%s\n", x.what());
3926
372
}
3927
0
373
3928
=== added file 'examples/miral-shell/spinner/miregl.cpp'
3929
--- examples/miral-shell/spinner/miregl.cpp	1970-01-01 00:00:00 +0000
3930
+++ examples/miral-shell/spinner/miregl.cpp	2017-08-29 09:17:20 +0000
3931
@@ -0,0 +1,239 @@
3932
1
/*
3933
2
 * Copyright © 2015 Canonical Ltd.
3934
3
 *
3935
4
 * This program is free software: you can redistribute it and/or modify
3936
5
 * under the terms of the GNU General Public License version 2 or 3 as as
3937
6
 * published by the Free Software Foundation.
3938
7
 *
3939
8
 * This program is distributed in the hope that it will be useful,
3940
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3941
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3942
11
 * GNU General Public License for more details.
3943
12
 *
3944
13
 * You should have received a copy of the GNU General Public License
3945
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3946
15
 */
3947
16
3948
17
#include "miregl.h"
3949
18
#include <miral/window_specification.h>
3950
19
#include <mir/client/window_spec.h>
3951
20
#include <mir_toolkit/mir_client_library.h>
3952
21
3953
22
#include <cstring>
3954
23
3955
24
#include <GLES2/gl2.h>
3956
25
3957
26
using namespace mir::client;
3958
27
3959
28
class MirEglApp
3960
29
{
3961
30
public:
3962
31
    MirEglApp(MirConnection* const connection, MirPixelFormat pixel_format);
3963
32
3964
33
    EGLSurface create_surface(MirRenderSurface* surface);
3965
34
3966
35
    void make_current(EGLSurface eglsurface) const;
3967
36
3968
37
    void swap_buffers(EGLSurface eglsurface) const;
3969
38
3970
39
    void destroy_surface(EGLSurface eglsurface) const;
3971
40
3972
41
    void get_surface_size(EGLSurface eglsurface, int* width, int* height) const;
3973
42
3974
43
    void set_swap_interval(EGLSurface eglsurface, int interval) const;
3975
44
3976
45
    bool supports_surfaceless_context();
3977
46
3978
47
    ~MirEglApp();
3979
48
3980
49
    MirConnection* const connection;
3981
50
private:
3982
51
    EGLDisplay egldisplay;
3983
52
    EGLContext eglctx;
3984
53
    EGLConfig eglconfig;
3985
54
    EGLint neglconfigs;
3986
55
    EGLSurface dummy_surface;
3987
56
};
3988
57
3989
58
std::shared_ptr<MirEglApp> make_mir_eglapp(
3990
59
    MirConnection* const connection, MirPixelFormat const& pixel_format)
3991
60
{
3992
61
    return std::make_shared<MirEglApp>(connection, pixel_format);
3993
62
}
3994
63
3995
64
MirEglSurface::MirEglSurface(
3996
65
    std::shared_ptr<MirEglApp> const& mir_egl_app,
3997
66
    char const* name,
3998
67
    MirOutput const* output)
3999
68
:
4000
69
    mir_egl_app{mir_egl_app}
4001
70
{
4002
71
    auto const mode = mir_output_get_current_mode(output);
4003
72
    auto const output_id = mir_output_get_id(output);
4004
73
    auto const width = mir_output_mode_get_width(mode);
4005
74
    auto const height = mir_output_mode_get_height(mode);
4006
75
4007
76
    surface = Surface{mir_connection_create_render_surface_sync(mir_egl_app->connection, width, height)};
4008
77
4009
78
    eglsurface = mir_egl_app->create_surface(surface);
4010
79
4011
80
    window = WindowSpec::for_normal_window(mir_egl_app->connection, width, height)
4012
81
        .add_surface(surface, width, height, 0, 0)
4013
82
        .set_name(name)
4014
83
        .set_fullscreen_on_output(output_id)
4015
84
        .create_window();
4016
85
4017
86
    if (!mir_window_is_valid(window))
4018
87
        throw std::runtime_error(std::string("Can't create a window ") + mir_window_get_error_message(window));
4019
88
4020
89
    mir_egl_app->set_swap_interval(eglsurface, -1);
4021
90
}
4022
91
4023
92
MirEglSurface::~MirEglSurface()
4024
93
{
4025
94
    mir_egl_app->destroy_surface(eglsurface);
4026
95
}
4027
96
4028
97
void MirEglSurface::egl_make_current()
4029
98
{
4030
99
    mir_egl_app->get_surface_size(eglsurface, &width_, &height_);
4031
100
    mir_egl_app->make_current(eglsurface);
4032
101
}
4033
102
4034
103
void MirEglSurface::swap_buffers()
4035
104
{
4036
105
    mir_egl_app->swap_buffers(eglsurface);
4037
106
}
4038
107
4039
108
unsigned int MirEglSurface::width() const
4040
109
{
4041
110
    return width_;
4042
111
}
4043
112
4044
113
unsigned int MirEglSurface::height() const
4045
114
{
4046
115
    return height_;
4047
116
}
4048
117
4049
118
MirEglApp::MirEglApp(MirConnection* const connection, MirPixelFormat pixel_format) :
4050
119
    connection{connection},
4051
120
    dummy_surface{EGL_NO_SURFACE}
4052
121
{
4053
122
    unsigned int bpp = 8*MIR_BYTES_PER_PIXEL(pixel_format);
4054
123
4055
124
    EGLint attribs[] =
4056
125
        {
4057
126
            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
4058
127
            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
4059
128
            EGL_COLOR_BUFFER_TYPE, EGL_RGB_BUFFER,
4060
129
            EGL_BUFFER_SIZE, (EGLint) bpp,
4061
130
            EGL_NONE
4062
131
        };
4063
132
4064
133
    egldisplay = eglGetDisplay((EGLNativeDisplayType)(connection));
4065
134
    if (egldisplay == EGL_NO_DISPLAY)
4066
135
        throw std::runtime_error("Can't eglGetDisplay");
4067
136
4068
137
    EGLint major;
4069
138
    EGLint minor;
4070
139
    if (!eglInitialize(egldisplay, &major, &minor))
4071
140
        throw std::runtime_error("Can't eglInitialize");
4072
141
4073
142
    if (major != 1 || minor != 4)
4074
143
        throw std::runtime_error("EGL version is not 1.4");
4075
144
4076
145
    if (!eglChooseConfig(egldisplay, attribs, &eglconfig, 1, &neglconfigs))
4077
146
        throw std::runtime_error("Could not eglChooseConfig");
4078
147
4079
148
    if (neglconfigs == 0)
4080
149
        throw std::runtime_error("No EGL config available");
4081
150
4082
151
    EGLint ctxattribs[] =
4083
152
        {
4084
153
            EGL_CONTEXT_CLIENT_VERSION, 2,
4085
154
            EGL_NONE
4086
155
        };
4087
156
4088
157
    eglctx = eglCreateContext(egldisplay, eglconfig, EGL_NO_CONTEXT, ctxattribs);
4089
158
    if (eglctx == EGL_NO_CONTEXT)
4090
159
        throw std::runtime_error("eglCreateContext failed");
4091
160
4092
161
    if (!supports_surfaceless_context())
4093
162
    {
4094
163
        static EGLint const dummy_pbuffer_attribs[] =
4095
164
        {
4096
165
             EGL_WIDTH, 1,
4097
166
             EGL_HEIGHT, 1,
4098
167
             EGL_NONE
4099
168
        };
4100
169
4101
170
        dummy_surface = eglCreatePbufferSurface(egldisplay, eglconfig, dummy_pbuffer_attribs);
4102
171
        if (dummy_surface == EGL_NO_SURFACE)
4103
172
            throw std::runtime_error("eglCreatePbufferSurface failed");
4104
173
    }
4105
174
4106
175
    make_current(dummy_surface);
4107
176
}
4108
177
4109
178
EGLSurface MirEglApp::create_surface(MirRenderSurface* surface)
4110
179
{
4111
180
    auto const eglsurface = eglCreateWindowSurface(
4112
181
        egldisplay,
4113
182
        eglconfig,
4114
183
        (EGLNativeWindowType)surface, NULL);
4115
184
4116
185
    if (eglsurface == EGL_NO_SURFACE)
4117
186
        throw std::runtime_error("eglCreateWindowSurface failed");
4118
187
4119
188
    return eglsurface;
4120
189
}
4121
190
4122
191
void MirEglApp::make_current(EGLSurface eglsurface) const
4123
192
{
4124
193
    if (!eglMakeCurrent(egldisplay, eglsurface, eglsurface, eglctx))
4125
194
        throw std::runtime_error("Can't eglMakeCurrent");
4126
195
}
4127
196
4128
197
void MirEglApp::swap_buffers(EGLSurface eglsurface) const
4129
198
{
4130
199
    eglSwapBuffers(egldisplay, eglsurface);
4131
200
}
4132
201
4133
202
void MirEglApp::destroy_surface(EGLSurface eglsurface) const
4134
203
{
4135
204
    eglDestroySurface(egldisplay, eglsurface);
4136
205
}
4137
206
4138
207
void MirEglApp::get_surface_size(EGLSurface eglsurface, int* width, int* height) const
4139
208
{
4140
209
    eglQuerySurface(egldisplay, eglsurface, EGL_WIDTH, width);
4141
210
    eglQuerySurface(egldisplay, eglsurface, EGL_HEIGHT, height);
4142
211
}
4143
212
4144
213
void MirEglApp::set_swap_interval(EGLSurface eglsurface, int interval) const
4145
214
{
4146
215
    auto const previous_surface = eglGetCurrentSurface(EGL_DRAW);
4147
216
4148
217
    make_current(eglsurface);
4149
218
    eglSwapInterval(egldisplay, interval);
4150
219
4151
220
    if (previous_surface != EGL_NO_SURFACE)
4152
221
        make_current(previous_surface);
4153
222
}
4154
223
4155
224
bool MirEglApp::supports_surfaceless_context()
4156
225
{
4157
226
    auto const extensions = eglQueryString(egldisplay, EGL_EXTENSIONS);
4158
227
    if (!extensions)
4159
228
        return false;
4160
229
    return std::strstr(extensions, "EGL_KHR_surfaceless_context") != nullptr;
4161
230
}
4162
231
4163
232
MirEglApp::~MirEglApp()
4164
233
{
4165
234
    eglMakeCurrent(egldisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
4166
235
    if (dummy_surface != EGL_NO_SURFACE)
4167
236
        destroy_surface(dummy_surface);
4168
237
    eglDestroyContext(egldisplay, eglctx);
4169
238
    eglTerminate(egldisplay);
4170
239
}
4171
0
240
4172
=== added file 'examples/miral-shell/spinner/miregl.h'
4173
--- examples/miral-shell/spinner/miregl.h	1970-01-01 00:00:00 +0000
4174
+++ examples/miral-shell/spinner/miregl.h	2017-08-29 09:17:20 +0000
4175
@@ -0,0 +1,67 @@
4176
1
/*
4177
2
 * Copyright © 2015 Canonical Ltd.
4178
3
 *
4179
4
 * This program is free software: you can redistribute it and/or modify
4180
5
 * under the terms of the GNU General Public License version 2 or 3 as as
4181
6
 * published by the Free Software Foundation.
4182
7
 *
4183
8
 * This program is distributed in the hope that it will be useful,
4184
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4185
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4186
11
 * GNU General Public License for more details.
4187
12
 *
4188
13
 * You should have received a copy of the GNU General Public License
4189
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4190
15
 */
4191
16
4192
17
#ifndef UNITYSYSTEMCOMPOSITOR_MIREGL_H
4193
18
#define UNITYSYSTEMCOMPOSITOR_MIREGL_H
4194
19
4195
20
#include <mir/client/surface.h>
4196
21
#include <mir/client/window.h>
4197
22
4198
23
#include <EGL/egl.h>
4199
24
4200
25
#include <memory>
4201
26
4202
27
class MirEglApp;
4203
28
class MirEglSurface;
4204
29
4205
30
std::shared_ptr<MirEglApp> make_mir_eglapp(
4206
31
    MirConnection* const connection,
4207
32
    MirPixelFormat const& pixel_format);
4208
33
4209
34
class MirEglSurface
4210
35
{
4211
36
public:
4212
37
    MirEglSurface(
4213
38
        std::shared_ptr<MirEglApp> const& mir_egl_app,
4214
39
        char const* name,
4215
40
        MirOutput const* output);
4216
41
4217
42
    ~MirEglSurface();
4218
43
4219
44
    template<typename Painter>
4220
45
    void paint(Painter const& functor)
4221
46
    {
4222
47
        egl_make_current();
4223
48
        functor(width(), height());
4224
49
        swap_buffers();
4225
50
    }
4226
51
4227
52
private:
4228
53
    void egl_make_current();
4229
54
4230
55
    void swap_buffers();
4231
56
    unsigned int width() const;
4232
57
    unsigned int height() const;
4233
58
4234
59
    std::shared_ptr<MirEglApp> const mir_egl_app;
4235
60
    mir::client::Surface surface;
4236
61
    mir::client::Window window;
4237
62
    EGLSurface eglsurface;
4238
63
    int width_;
4239
64
    int height_;
4240
65
};
4241
66
4242
67
#endif //UNITYSYSTEMCOMPOSITOR_MIREGL_H
4243
0
68
4244
=== added file 'examples/miral-shell/spinner/png2header.py'
4245
--- examples/miral-shell/spinner/png2header.py	1970-01-01 00:00:00 +0000
4246
+++ examples/miral-shell/spinner/png2header.py	2017-08-29 09:17:20 +0000
4247
@@ -0,0 +1,87 @@
4248
1
#!/usr/bin/env python
4249
2
# coding: utf-8
4250
3
4251
4
# Copyright © 2015 Canonical Ltd.
4252
5
#
4253
6
# This program is free software: you can redistribute it and/or modify
4254
7
# it under the terms of the GNU General Public License version 2 or 3
4255
8
# as published by the Free Software Foundation.
4256
9
#
4257
10
# This program is distributed in the hope that it will be useful,
4258
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
4259
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4260
13
# GNU General Public License for more details.
4261
14
#
4262
15
# You should have received a copy of the GNU General Public License
4263
16
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
4264
17
#
4265
18
# Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
4266
19
4267
20
import sys
4268
21
from PIL import Image
4269
22
4270
23
def premultiply(image):
4271
24
    pixels = image.load()
4272
25
    for i in range(image.size[0]):
4273
26
        for j in range(image.size[1]):
4274
27
            orig = pixels[i,j]
4275
28
            m = orig[3] / 255.0
4276
29
            pixels[i,j] = (int(orig[0] * m) , int(orig[1] * m), int(orig[2] * m), orig[3])
4277
30
4278
31
def tocstring(data):
4279
32
    result = ''
4280
33
    line_chars = 0
4281
34
    line_limit = 80
4282
35
4283
36
    for c in data:
4284
37
        if line_chars == 0:
4285
38
            result += '    "'
4286
39
4287
40
        s = '\\%o' % c
4288
41
        result += s
4289
42
        line_chars += len(s)
4290
43
4291
44
        if line_chars >= line_limit:
4292
45
            result += '"\n'
4293
46
            line_chars = 0
4294
47
4295
48
    if line_chars != 0:
4296
49
        result += '"'
4297
50
4298
51
    return result
4299
52
4300
53
def bytes_per_pixel(image):
4301
54
    if image.mode == 'RGBA':
4302
55
        return 4
4303
56
    elif image.mode == 'RGB':
4304
57
        return 3
4305
58
    else:
4306
59
        raise "Unsupported image mode %s" % image.mode
4307
60
4308
61
def export(image, variable_name):
4309
62
    image_info = (image.size[0], image.size[1], bytes_per_pixel(image))
4310
63
    print("static const struct {")
4311
64
    print("    unsigned int width;")
4312
65
    print("    unsigned int height;")
4313
66
    print("    unsigned int bytes_per_pixel; /* 3:RGB, 4:RGBA */")
4314
67
    print("    unsigned char pixel_data[%d * %d * %d + 1];" % image_info)
4315
68
    print("} %s = {" % variable_name)
4316
69
    print("    %d, %d, %d," % image_info)
4317
70
    print(tocstring(image.tobytes()))
4318
71
    print("};")
4319
72
4320
73
def show_usage():
4321
74
    print("Usage: ./png2header.py PNGFILE VARNAME > HEADER_FILE", file=sys.stderr)
4322
75
    print("Convert a PNG image to an embeddable C/C++ header file", file=sys.stderr)
4323
76
4324
77
if len(sys.argv) < 3:
4325
78
    show_usage()
4326
79
    sys.exit(1)
4327
80
4328
81
image_filename = sys.argv[1]
4329
82
variable_name = sys.argv[2]
4330
83
4331
84
image = Image.open(image_filename)
4332
85
if image.mode == 'RGBA':
4333
86
    premultiply(image)
4334
87
export(image, variable_name)
4335
0
88
4336
=== added file 'examples/miral-shell/spinner/spinner-glow.png'
4337
1
Binary files examples/miral-shell/spinner/spinner-glow.png	1970-01-01 00:00:00 +0000 and examples/miral-shell/spinner/spinner-glow.png	2017-08-29 09:17:20 +0000 differ
89
Binary files examples/miral-shell/spinner/spinner-glow.png	1970-01-01 00:00:00 +0000 and examples/miral-shell/spinner/spinner-glow.png	2017-08-29 09:17:20 +0000 differ
4338
=== added file 'examples/miral-shell/spinner/spinner-logo.png'
4339
2
Binary files examples/miral-shell/spinner/spinner-logo.png	1970-01-01 00:00:00 +0000 and examples/miral-shell/spinner/spinner-logo.png	2017-08-29 09:17:20 +0000 differ
90
Binary files examples/miral-shell/spinner/spinner-logo.png	1970-01-01 00:00:00 +0000 and examples/miral-shell/spinner/spinner-logo.png	2017-08-29 09:17:20 +0000 differ
4340
=== added file 'examples/miral-shell/spinner/splash.h'
4341
--- examples/miral-shell/spinner/splash.h	1970-01-01 00:00:00 +0000
4342
+++ examples/miral-shell/spinner/splash.h	2017-08-29 09:17:20 +0000
4343
@@ -0,0 +1,45 @@
4344
1
/*
4345
2
 * Copyright © 2016 Canonical Ltd.
4346
3
 *
4347
4
 * This program is free software: you can redistribute it and/or modify it
4348
5
 * under the terms of the GNU General Public License version 2 or 3 as
4349
6
 * published by the Free Software Foundation.
4350
7
 *
4351
8
 * This program is distributed in the hope that it will be useful,
4352
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4353
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4354
11
 * GNU General Public License for more details.
4355
12
 *
4356
13
 * You should have received a copy of the GNU General Public License
4357
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4358
15
 *
4359
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
4360
17
 */
4361
18
4362
19
#ifndef MIRAL_SHELL_SPINNER_SPLASH_H
4363
20
#define MIRAL_SHELL_SPINNER_SPLASH_H
4364
21
4365
22
#include <mir_toolkit/client_types.h>
4366
23
4367
24
#include <memory>
4368
25
4369
26
namespace mir { namespace scene { class Session; }}
4370
27
4371
28
namespace mir { class Server; namespace scene { class Session; }}
4372
29
4373
30
class SpinnerSplash
4374
31
{
4375
32
public:
4376
33
    SpinnerSplash();
4377
34
    ~SpinnerSplash();
4378
35
4379
36
    void operator()(MirConnection* connection);
4380
37
    void operator()(std::weak_ptr<mir::scene::Session> const& session);
4381
38
    auto session() const -> std::shared_ptr<mir::scene::Session>;
4382
39
4383
40
private:
4384
41
    struct Self;
4385
42
    std::shared_ptr<Self> const self;
4386
43
};
4387
44
4388
45
#endif //MIRAL_SHELL_SPINNER_SPLASH_H
4389
0
46
4390
=== added file 'examples/miral-shell/tiling_window_manager.cpp'
4391
--- examples/miral-shell/tiling_window_manager.cpp	1970-01-01 00:00:00 +0000
4392
+++ examples/miral-shell/tiling_window_manager.cpp	2017-08-29 09:17:20 +0000
4393
@@ -0,0 +1,688 @@
4394
1
/*
4395
2
 * Copyright © 2015-2016 Canonical Ltd.
4396
3
 *
4397
4
 * This program is free software: you can redistribute it and/or modify it
4398
5
 * under the terms of the GNU General Public License version 2 or 3 as
4399
6
 * published by the Free Software Foundation.
4400
7
 *
4401
8
 * This program is distributed in the hope that it will be useful,
4402
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4403
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4404
11
 * GNU General Public License for more details.
4405
12
 *
4406
13
 * You should have received a copy of the GNU General Public License
4407
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4408
15
 *
4409
16
 * Authored By: Alan Griffiths <alan@octopull.co.uk>
4410
17
 */
4411
18
4412
19
#include "tiling_window_manager.h"
4413
20
4414
21
#include <miral/application_info.h>
4415
22
#include <miral/window_info.h>
4416
23
#include <miral/window_manager_tools.h>
4417
24
#include <miral/output.h>
4418
25
4419
26
#include <linux/input.h>
4420
27
#include <algorithm>
4421
28
#include <csignal>
4422
29
4423
30
namespace ms = mir::scene;
4424
31
using namespace miral;
4425
32
4426
33
namespace
4427
34
{
4428
35
struct TilingWindowManagerPolicyData
4429
36
{
4430
37
    Rectangle tile;
4431
38
    Rectangle old_tile;
4432
39
};
4433
40
4434
41
template<class Info>
4435
42
inline Rectangle& tile_for(Info& info)
4436
43
{
4437
44
    return std::static_pointer_cast<TilingWindowManagerPolicyData>(info.userdata())->tile;
4438
45
}
4439
46
4440
47
template<class Info>
4441
48
inline Rectangle const& tile_for(Info const& info)
4442
49
{
4443
50
    return std::static_pointer_cast<TilingWindowManagerPolicyData>(info.userdata())->tile;
4444
51
}
4445
52
}
4446
53
4447
54
void TilingWindowManagerPolicy::MRUTileList::push(std::shared_ptr<void> const& tile)
4448
55
{
4449
56
    tiles.erase(remove(begin(tiles), end(tiles), tile), end(tiles));
4450
57
    tiles.push_back(tile);
4451
58
}
4452
59
4453
60
void TilingWindowManagerPolicy::MRUTileList::erase(std::shared_ptr<void> const& tile)
4454
61
{
4455
62
    tiles.erase(remove(begin(tiles), end(tiles), tile), end(tiles));
4456
63
}
4457
64
4458
65
void TilingWindowManagerPolicy::MRUTileList::enumerate(Enumerator const& enumerator) const
4459
66
{
4460
67
    for (auto i = tiles.rbegin(); i != tiles.rend(); ++i)
4461
68
        enumerator(const_cast<std::shared_ptr<void> const&>(*i));
4462
69
}
4463
70
4464
71
// Demonstrate implementing a simple tiling algorithm
4465
72
4466
73
TilingWindowManagerPolicy::TilingWindowManagerPolicy(
4467
74
    WindowManagerTools const& tools,
4468
75
    SpinnerSplash const& spinner,
4469
76
    miral::InternalClientLauncher const& launcher,
4470
77
    miral::ActiveOutputsMonitor& outputs_monitor) :
4471
78
    tools{tools},
4472
79
    spinner{spinner},
4473
80
    launcher{launcher},
4474
81
    outputs_monitor{outputs_monitor}
4475
82
{
4476
83
    outputs_monitor.add_listener(this);
4477
84
}
4478
85
4479
86
TilingWindowManagerPolicy::~TilingWindowManagerPolicy()
4480
87
{
4481
88
    outputs_monitor.delete_listener(this);
4482
89
}
4483
90
4484
91
void TilingWindowManagerPolicy::click(Point cursor)
4485
92
{
4486
93
    auto const window = tools.window_at(cursor);
4487
94
    tools.select_active_window(window);
4488
95
}
4489
96
4490
97
void TilingWindowManagerPolicy::resize(Point cursor)
4491
98
{
4492
99
    if (auto const application = application_under(cursor))
4493
100
    {
4494
101
        if (application == application_under(old_cursor))
4495
102
        {
4496
103
            if (auto const window = tools.select_active_window(tools.window_at(old_cursor)))
4497
104
            {
4498
105
                resize(window, cursor, old_cursor, tile_for(tools.info_for(application)));
4499
106
            }
4500
107
        }
4501
108
    }
4502
109
}
4503
110
4504
111
auto TilingWindowManagerPolicy::place_new_window(
4505
112
    ApplicationInfo const& app_info,
4506
113
    WindowSpecification const& request_parameters)
4507
114
    -> WindowSpecification
4508
115
{
4509
116
    auto parameters = request_parameters;
4510
117
4511
118
    parameters.userdata() = app_info.userdata();
4512
119
    parameters.state() = parameters.state().is_set() ?
4513
120
                         transform_set_state(parameters.state().value()) : mir_window_state_restored;
4514
121
4515
122
    if (app_info.application() != spinner.session())
4516
123
    {
4517
124
        Rectangle const& tile = tile_for(app_info);
4518
125
4519
126
        if (!parameters.parent().is_set() || !parameters.parent().value().lock())
4520
127
        {
4521
128
            if (app_info.windows().empty())
4522
129
            {
4523
130
                parameters.top_left() = tile.top_left;
4524
131
                parameters.size() = tile.size;
4525
132
            }
4526
133
            else
4527
134
            {
4528
135
                auto top_level_windows = count_if(begin(app_info.windows()), end(app_info.windows()), [this]
4529
136
                    (Window const& window){ return !tools.info_for(window).parent(); });
4530
137
4531
138
                parameters.top_left() = tile.top_left + top_level_windows*Displacement{15, 15};
4532
139
            }
4533
140
        }
4534
141
4535
142
        clip_to_tile(parameters, tile);
4536
143
    }
4537
144
4538
145
    return parameters;
4539
146
}
4540
147
4541
148
void TilingWindowManagerPolicy::advise_new_window(WindowInfo const& window_info)
4542
149
{
4543
150
    if (window_info.type() == mir_window_type_normal &&
4544
151
        !window_info.parent() &&
4545
152
        window_info.state() == mir_window_state_restored)
4546
153
    {
4547
154
        WindowSpecification specification;
4548
155
4549
156
        specification.state() = mir_window_state_maximized;
4550
157
4551
158
        tools.place_and_size_for_state(specification, window_info);
4552
159
        constrain_size_and_place(specification, window_info.window(), tile_for(window_info));
4553
160
        tools.modify_window(window_info.window(), specification);
4554
161
    }
4555
162
}
4556
163
4557
164
void TilingWindowManagerPolicy::handle_window_ready(WindowInfo& window_info)
4558
165
{
4559
166
    if (window_info.can_be_active())
4560
167
        tools.select_active_window(window_info.window());
4561
168
4562
169
    if (spinner.session() != window_info.window().application())
4563
170
    {
4564
171
        tiles.push(window_info.userdata());
4565
172
        dirty_tiles = true;
4566
173
    }
4567
174
}
4568
175
4569
176
namespace
4570
177
{
4571
178
template<typename ValueType>
4572
179
void reset(mir::optional_value<ValueType>& option)
4573
180
{
4574
181
    if (option.is_set()) option.consume();
4575
182
}
4576
183
}
4577
184
4578
185
void TilingWindowManagerPolicy::handle_modify_window(
4579
186
    miral::WindowInfo& window_info,
4580
187
    miral::WindowSpecification const& modifications)
4581
188
{
4582
189
    auto const window = window_info.window();
4583
190
    auto const tile = tile_for(window_info);
4584
191
    auto mods = modifications;
4585
192
4586
193
    constrain_size_and_place(mods, window, tile);
4587
194
4588
195
    reset(mods.output_id());
4589
196
4590
197
    tools.modify_window(window_info, mods);
4591
198
}
4592
199
4593
200
void TilingWindowManagerPolicy::constrain_size_and_place(
4594
201
    WindowSpecification& mods, Window const& window, Rectangle const& tile) const
4595
202
{
4596
203
    if (mods.size().is_set())
4597
204
    {
4598
205
        auto width = std::min(tile.size.width, mods.size().value().width);
4599
206
        auto height = std::min(tile.size.height, mods.size().value().height);
4600
207
4601
208
        mods.size() = Size{width, height};
4602
209
    }
4603
210
4604
211
    if (mods.top_left().is_set())
4605
212
    {
4606
213
        auto x = std::max(tile.top_left.x, mods.top_left().value().x);
4607
214
        auto y = std::max(tile.top_left.y, mods.top_left().value().y);
4608
215
4609
216
        mods.top_left() = Point{x, y};
4610
217
    }
4611
218
4612
219
    auto top_left = mods.top_left().is_set() ? mods.top_left().value() : window.top_left();
4613
220
    auto bottom_right = top_left + as_displacement(mods.size().is_set() ? mods.size().value() : window.size());
4614
221
    auto overhang = bottom_right - tile.bottom_right();
4615
222
4616
223
    if (overhang.dx > DeltaX{0}) top_left = top_left - overhang.dx;
4617
224
    if (overhang.dy > DeltaY{0}) top_left = top_left - overhang.dy;
4618
225
4619
226
    if (top_left != window.top_left())
4620
227
        mods.top_left() = top_left;
4621
228
    else
4622
229
        reset(mods.top_left());
4623
230
}
4624
231
4625
232
auto TilingWindowManagerPolicy::transform_set_state(MirWindowState value)
4626
233
-> MirWindowState
4627
234
{
4628
235
    switch (value)
4629
236
    {
4630
237
    default:
4631
238
        return mir_window_state_restored;
4632
239
4633
240
    case mir_window_state_hidden:
4634
241
    case mir_window_state_minimized:
4635
242
        return mir_window_state_hidden;
4636
243
    }
4637
244
}
4638
245
4639
246
void TilingWindowManagerPolicy::drag(Point cursor)
4640
247
{
4641
248
    if (auto const application = application_under(cursor))
4642
249
    {
4643
250
        if (application == application_under(old_cursor))
4644
251
        {
4645
252
            if (auto const window = tools.select_active_window(tools.window_at(old_cursor)))
4646
253
            {
4647
254
4648
255
                auto const tile = tile_for(tools.info_for(application));
4649
256
                WindowSpecification mods;
4650
257
                mods.top_left() = window.top_left() + (cursor-old_cursor);
4651
258
                constrain_size_and_place(mods, window, tile);
4652
259
                tools.modify_window(window, mods);
4653
260
            }
4654
261
        }
4655
262
    }
4656
263
}
4657
264
4658
265
void TilingWindowManagerPolicy::handle_raise_window(WindowInfo& window_info)
4659
266
{
4660
267
    tools.select_active_window(window_info.window());
4661
268
}
4662
269
4663
270
bool TilingWindowManagerPolicy::handle_keyboard_event(MirKeyboardEvent const* event)
4664
271
{
4665
272
    auto const action = mir_keyboard_event_action(event);
4666
273
    auto const scan_code = mir_keyboard_event_scan_code(event);
4667
274
    auto const modifiers = mir_keyboard_event_modifiers(event) & modifier_mask;
4668
275
4669
276
    if (action == mir_keyboard_action_down && scan_code == KEY_F12 &&
4670
277
        (modifiers & modifier_mask) == mir_input_event_modifier_alt)
4671
278
    {
4672
279
        launcher.launch("Spinner", spinner);
4673
280
        return true;
4674
281
    }
4675
282
4676
283
    if (action == mir_keyboard_action_down && scan_code == KEY_F11)
4677
284
    {
4678
285
        switch (modifiers & modifier_mask)
4679
286
        {
4680
287
        case mir_input_event_modifier_alt:
4681
288
            toggle(mir_window_state_maximized);
4682
289
            return true;
4683
290
4684
291
        case mir_input_event_modifier_shift:
4685
292
            toggle(mir_window_state_vertmaximized);
4686
293
            return true;
4687
294
4688
295
        case mir_input_event_modifier_ctrl:
4689
296
            toggle(mir_window_state_horizmaximized);
4690
297
            return true;
4691
298
4692
299
        default:
4693
300
            break;
4694
301
        }
4695
302
    }
4696
303
    else if (action == mir_keyboard_action_down && scan_code == KEY_F4)
4697
304
    {
4698
305
        switch (modifiers & modifier_mask)
4699
306
        {
4700
307
        case mir_input_event_modifier_alt|mir_input_event_modifier_shift:
4701
308
            if (auto const& window = tools.active_window())
4702
309
                kill(window.application(), SIGTERM);
4703
310
            return true;
4704
311
4705
312
        case mir_input_event_modifier_alt:
4706
313
            tools.ask_client_to_close(tools.active_window());;
4707
314
            return true;
4708
315
4709
316
        default:
4710
317
            break;
4711
318
        }
4712
319
    }
4713
320
    else if (action == mir_keyboard_action_down &&
4714
321
            modifiers == mir_input_event_modifier_alt &&
4715
322
            scan_code == KEY_TAB)
4716
323
    {
4717
324
        tools.focus_next_application();
4718
325
4719
326
        return true;
4720
327
    }
4721
328
    else if (action == mir_keyboard_action_down &&
4722
329
            modifiers == mir_input_event_modifier_alt &&
4723
330
            scan_code == KEY_GRAVE)
4724
331
    {
4725
332
        tools.focus_next_within_application();
4726
333
4727
334
        return true;
4728
335
    }
4729
336
    else if (action == mir_keyboard_action_down &&
4730
337
             modifiers == (mir_input_event_modifier_alt | mir_input_event_modifier_shift) &&
4731
338
             scan_code == KEY_GRAVE)
4732
339
    {
4733
340
        tools.focus_prev_within_application();
4734
341
4735
342
        return true;
4736
343
    }
4737
344
4738
345
    return false;
4739
346
}
4740
347
4741
348
bool TilingWindowManagerPolicy::handle_touch_event(MirTouchEvent const* event)
4742
349
{
4743
350
    auto const count = mir_touch_event_point_count(event);
4744
351
4745
352
    long total_x = 0;
4746
353
    long total_y = 0;
4747
354
4748
355
    for (auto i = 0U; i != count; ++i)
4749
356
    {
4750
357
        total_x += mir_touch_event_axis_value(event, i, mir_touch_axis_x);
4751
358
        total_y += mir_touch_event_axis_value(event, i, mir_touch_axis_y);
4752
359
    }
4753
360
4754
361
    Point const cursor{total_x/count, total_y/count};
4755
362
4756
363
    bool is_drag = true;
4757
364
    for (auto i = 0U; i != count; ++i)
4758
365
    {
4759
366
        switch (mir_touch_event_action(event, i))
4760
367
        {
4761
368
        case mir_touch_action_up:
4762
369
            return false;
4763
370
4764
371
        case mir_touch_action_down:
4765
372
            is_drag = false;
4766
373
            continue;
4767
374
4768
375
        default:
4769
376
            continue;
4770
377
        }
4771
378
    }
4772
379
4773
380
    bool consumes_event = false;
4774
381
    if (is_drag)
4775
382
    {
4776
383
        switch (count)
4777
384
        {
4778
385
        case 4:
4779
386
            resize(cursor);
4780
387
            consumes_event = true;
4781
388
            break;
4782
389
4783
390
        case 3:
4784
391
            drag(cursor);
4785
392
            consumes_event = true;
4786
393
            break;
4787
394
        }
4788
395
    }
4789
396
    else
4790
397
    {
4791
398
        if (auto const& window = tools.window_at(cursor))
4792
399
            tools.select_active_window(window);
4793
400
    }
4794
401
4795
402
    old_cursor = cursor;
4796
403
    return consumes_event;
4797
404
}
4798
405
4799
406
bool TilingWindowManagerPolicy::handle_pointer_event(MirPointerEvent const* event)
4800
407
{
4801
408
    auto const action = mir_pointer_event_action(event);
4802
409
    auto const modifiers = mir_pointer_event_modifiers(event) & modifier_mask;
4803
410
    Point const cursor{
4804
411
        mir_pointer_event_axis_value(event, mir_pointer_axis_x),
4805
412
        mir_pointer_event_axis_value(event, mir_pointer_axis_y)};
4806
413
4807
414
    bool consumes_event = false;
4808
415
4809
416
    if (action == mir_pointer_action_button_down)
4810
417
    {
4811
418
        click(cursor);
4812
419
    }
4813
420
    else if (action == mir_pointer_action_motion &&
4814
421
             modifiers == mir_input_event_modifier_alt)
4815
422
    {
4816
423
        if (mir_pointer_event_button_state(event, mir_pointer_button_primary))
4817
424
        {
4818
425
            drag(cursor);
4819
426
            consumes_event = true;
4820
427
        }
4821
428
        else if (mir_pointer_event_button_state(event, mir_pointer_button_tertiary))
4822
429
        {
4823
430
            resize(cursor);
4824
431
            consumes_event = true;
4825
432
        }
4826
433
    }
4827
434
4828
435
    old_cursor = cursor;
4829
436
    return consumes_event;
4830
437
}
4831
438
4832
439
void TilingWindowManagerPolicy::toggle(MirWindowState state)
4833
440
{
4834
441
    if (auto window = tools.active_window())
4835
442
    {
4836
443
        auto& window_info = tools.info_for(window);
4837
444
4838
445
        if (window_info.state() == state)
4839
446
            state = mir_window_state_restored;
4840
447
4841
448
        WindowSpecification mods;
4842
449
        mods.state() = transform_set_state(state);
4843
450
        tools.modify_window(window_info, mods);
4844
451
    }
4845
452
}
4846
453
4847
454
auto TilingWindowManagerPolicy::application_under(Point position)
4848
455
-> Application
4849
456
{
4850
457
    return tools.find_application([&, this](ApplicationInfo const& info)
4851
458
        { return spinner.session() != info.application() && tile_for(info).contains(position);});
4852
459
}
4853
460
4854
461
void TilingWindowManagerPolicy::update_tiles(Rectangles const& outputs)
4855
462
{
4856
463
    auto const tile_count = tiles.count();
4857
464
4858
465
    if (tile_count < 1 || outputs.size() < 1) return;
4859
466
4860
467
    auto const bounding_rect = outputs.bounding_rectangle();
4861
468
4862
469
    auto const total_width  = bounding_rect.size.width.as_int();
4863
470
    auto const total_height = bounding_rect.size.height.as_int();
4864
471
4865
472
    auto index = 0;
4866
473
4867
474
    if (tile_count < 3)
4868
475
    {
4869
476
        tiles.enumerate([&](std::shared_ptr<void> const& userdata)
4870
477
            {
4871
478
                auto const tile_data = std::static_pointer_cast<TilingWindowManagerPolicyData>(userdata);
4872
479
                tile_data->old_tile = tile_data->tile;
4873
480
4874
481
                auto const x = (total_width * index) / tile_count;
4875
482
                ++index;
4876
483
                auto const dx = (total_width * index) / tile_count - x;
4877
484
4878
485
                tile_data->tile = Rectangle{{x,  0}, {dx, total_height}};
4879
486
            });
4880
487
    }
4881
488
    else
4882
489
    {
4883
490
        tiles.enumerate([&](std::shared_ptr<void> const& userdata)
4884
491
            {
4885
492
                auto const tile_data = std::static_pointer_cast<TilingWindowManagerPolicyData>(userdata);
4886
493
                tile_data->old_tile = tile_data->tile;
4887
494
4888
495
                auto const dx = total_width/2;
4889
496
                if (!index)
4890
497
                {
4891
498
                    tile_data->tile = Rectangle{{0,  0}, {dx, total_height}};
4892
499
                }
4893
500
                else
4894
501
                {
4895
502
                    auto const x = dx;
4896
503
                    auto const y = total_height*(index-1) / (tile_count-1);
4897
504
                    auto const dy = total_height / (tile_count-1);
4898
505
                    tile_data->tile = Rectangle{{x,  y}, {dx, dy}};
4899
506
                }
4900
507
4901
508
                ++index;
4902
509
            });
4903
510
    }
4904
511
4905
512
    tools.for_each_application([&](ApplicationInfo& info)
4906
513
        {
4907
514
            if (spinner.session() == info.application())
4908
515
                return;
4909
516
4910
517
            auto const tile_data = std::static_pointer_cast<TilingWindowManagerPolicyData>(info.userdata());
4911
518
            update_surfaces(info, tile_data->old_tile, tile_data->tile);
4912
519
        });
4913
520
}
4914
521
4915
522
void TilingWindowManagerPolicy::update_surfaces(ApplicationInfo& info, Rectangle const& old_tile, Rectangle const& new_tile)
4916
523
{
4917
524
    for (auto const& window : info.windows())
4918
525
    {
4919
526
        if (window)
4920
527
        {
4921
528
            auto& window_info = tools.info_for(window);
4922
529
4923
530
            if (!window_info.parent())
4924
531
            {
4925
532
                auto const new_pos = window.top_left() + (new_tile.top_left - old_tile.top_left);
4926
533
                auto const offset = new_pos - new_tile.top_left;
4927
534
4928
535
                // For now just scale if was filling width/height of tile
4929
536
                auto const old_size = window.size();
4930
537
                auto const scaled_width  = old_size.width  == old_tile.size.width  ? new_tile.size.width  : old_size.width;
4931
538
                auto const scaled_height = old_size.height == old_tile.size.height ? new_tile.size.height : old_size.height;
4932
539
4933
540
                auto width  = std::min(new_tile.size.width.as_int()  - offset.dx.as_int(), scaled_width.as_int());
4934
541
                auto height = std::min(new_tile.size.height.as_int() - offset.dy.as_int(), scaled_height.as_int());
4935
542
4936
543
                WindowSpecification modifications;
4937
544
                modifications.top_left() = new_pos;
4938
545
                modifications.size() = {width, height};
4939
546
                tools.modify_window(window_info, modifications);
4940
547
            }
4941
548
        }
4942
549
    }
4943
550
}
4944
551
4945
552
void TilingWindowManagerPolicy::clip_to_tile(miral::WindowSpecification& parameters, Rectangle const& tile)
4946
553
{
4947
554
    auto const displacement = parameters.top_left().value() - tile.top_left;
4948
555
4949
556
    auto width = std::min(tile.size.width.as_int()-displacement.dx.as_int(), parameters.size().value().width.as_int());
4950
557
    auto height = std::min(tile.size.height.as_int()-displacement.dy.as_int(), parameters.size().value().height.as_int());
4951
558
4952
559
    parameters.size() = Size{width, height};
4953
560
}
4954
561
4955
562
void TilingWindowManagerPolicy::resize(Window window, Point cursor, Point old_cursor, Rectangle bounds)
4956
563
{
4957
564
    auto const top_left = window.top_left();
4958
565
4959
566
    auto const old_displacement = old_cursor - top_left;
4960
567
    auto const new_displacement = cursor - top_left;
4961
568
4962
569
    auto const scale_x = float(new_displacement.dx.as_int())/std::max(1.0f, float(old_displacement.dx.as_int()));
4963
570
    auto const scale_y = float(new_displacement.dy.as_int())/std::max(1.0f, float(old_displacement.dy.as_int()));
4964
571
4965
572
    if (scale_x <= 0.0f || scale_y <= 0.0f) return;
4966
573
4967
574
    auto const old_size = window.size();
4968
575
    Size new_size{scale_x*old_size.width, scale_y*old_size.height};
4969
576
4970
577
    auto const size_limits = as_size(bounds.bottom_right() - top_left);
4971
578
4972
579
    if (new_size.width > size_limits.width)
4973
580
        new_size.width = size_limits.width;
4974
581
4975
582
    if (new_size.height > size_limits.height)
4976
583
        new_size.height = size_limits.height;
4977
584
4978
585
    window.resize(new_size);
4979
586
}
4980
587
4981
588
void TilingWindowManagerPolicy::advise_focus_gained(WindowInfo const& info)
4982
589
{
4983
590
    tools.raise_tree(info.window());
4984
591
4985
592
    if (auto const spinner_session = spinner.session())
4986
593
    {
4987
594
        auto const& spinner_info = tools.info_for(spinner_session);
4988
595
4989
596
        if (spinner_info.windows().size() > 0)
4990
597
            tools.raise_tree(spinner_info.windows()[0]);
4991
598
    }
4992
599
    else
4993
600
    {
4994
601
        tiles.push(info.userdata());
4995
602
        dirty_tiles = true;
4996
603
    }
4997
604
}
4998
605
4999
606
void TilingWindowManagerPolicy::advise_new_app(miral::ApplicationInfo& application)
5000
607
{
Status:	Merged
Approved by:	Gerry Boland on 2017-08-30
Approved revision:	no longer in the source branch.
Merged at revision:	4235
Proposed branch:	lp:~alan-griffiths/mir/move-miral-to-mir
Merge into:	lp:mir
Diff against target:	18088 lines (+17392/-3) 127 files modified CMakeLists.txt (+0/-2) cmake/FindPIL.cmake (+8/-0) debian/changelog (+4/-1) debian/control (+51/-0) debian/libmiral-dev.install (+3/-0) debian/libmiral2.install (+1/-0) debian/libmiral2.symbols (+399/-0) debian/libmirclientcpp-dev.install (+2/-0) debian/miral-examples.install (+9/-0) examples/CMakeLists.txt (+3/-0) examples/miral-kiosk/CMakeLists.txt (+12/-0) examples/miral-kiosk/kiosk_main.cpp (+94/-0) examples/miral-kiosk/kiosk_window_manager.cpp (+148/-0) examples/miral-kiosk/kiosk_window_manager.h (+52/-0) examples/miral-kiosk/sw_splash.cpp (+173/-0) examples/miral-kiosk/sw_splash.h (+44/-0) examples/miral-shell/CMakeLists.txt (+65/-0) examples/miral-shell/decoration_provider.cpp (+666/-0) examples/miral-shell/decoration_provider.h (+119/-0) examples/miral-shell/desktop/CMakeLists.txt (+12/-0) examples/miral-shell/desktop/miral-shell.desktop.in (+18/-0) examples/miral-shell/desktop/ubuntu-logo.svg (+27/-0) examples/miral-shell/floating_window_manager.cpp (+801/-0) examples/miral-shell/floating_window_manager.h (+146/-0) examples/miral-shell/miral-app.sh (+51/-0) examples/miral-shell/miral-desktop.sh (+45/-0) examples/miral-shell/miral-run.sh (+17/-0) examples/miral-shell/miral-screencast.sh (+48/-0) examples/miral-shell/miral-xrun.sh (+45/-0) examples/miral-shell/shell_main.cpp (+98/-0) examples/miral-shell/spinner/CMakeLists.txt (+67/-0) examples/miral-shell/spinner/eglapp.cpp (+83/-0) examples/miral-shell/spinner/eglapp.h (+33/-0) examples/miral-shell/spinner/eglspinner.cpp (+372/-0) examples/miral-shell/spinner/miregl.cpp (+239/-0) examples/miral-shell/spinner/miregl.h (+67/-0) examples/miral-shell/spinner/png2header.py (+87/-0) examples/miral-shell/spinner/splash.h (+45/-0) examples/miral-shell/tiling_window_manager.cpp (+688/-0) examples/miral-shell/tiling_window_manager.h (+140/-0) examples/miral-shell/titlebar_config.cpp (+38/-0) examples/miral-shell/titlebar_config.h (+30/-0) include/miral/mir/client/blob.h (+50/-0) include/miral/mir/client/connection.h (+54/-0) include/miral/mir/client/cookie.h (+50/-0) include/miral/mir/client/display_config.h (+78/-0) include/miral/mir/client/surface.h (+50/-0) include/miral/mir/client/window.h (+53/-0) include/miral/mir/client/window_id.h (+48/-0) include/miral/mir/client/window_spec.h (+253/-0) include/miral/miral/active_outputs.h (+74/-0) include/miral/miral/add_init_callback.h (+47/-0) include/miral/miral/append_event_filter.h (+44/-0) include/miral/miral/application.h (+42/-0) include/miral/miral/application_authorizer.h (+103/-0) include/miral/miral/application_info.h (+55/-0) include/miral/miral/canonical_window_manager.h (+59/-0) include/miral/miral/command_line_option.h (+109/-0) include/miral/miral/cursor_theme.h (+44/-0) include/miral/miral/debug_extension.h (+47/-0) include/miral/miral/display_configuration_option.h (+30/-0) include/miral/miral/internal_client.h (+88/-0) include/miral/miral/keymap.h (+58/-0) include/miral/miral/output.h (+113/-0) include/miral/miral/runner.h (+74/-0) include/miral/miral/set_command_line_handler.h (+50/-0) include/miral/miral/set_terminator.h (+47/-0) include/miral/miral/set_window_management_policy.h (+55/-0) include/miral/miral/version.h (+67/-0) include/miral/miral/window.h (+82/-0) include/miral/miral/window_info.h (+130/-0) include/miral/miral/window_management_options.h (+65/-0) include/miral/miral/window_management_policy.h (+194/-0) include/miral/miral/window_management_policy_addendum2.h (+70/-0) include/miral/miral/window_management_policy_addendum3.h (+68/-0) include/miral/miral/window_manager_tools.h (+254/-0) include/miral/miral/window_specification.h (+134/-0) include/miral/miral/workspace_policy.h (+88/-0) src/CMakeLists.txt (+1/-0) src/miral/CMakeLists.txt (+140/-0) src/miral/active_outputs.cpp (+65/-0) src/miral/add_init_callback.cpp (+33/-0) src/miral/append_event_filter.cpp (+48/-0) src/miral/application.cpp (+51/-0) src/miral/application_authorizer.cpp (+129/-0) src/miral/application_info.cpp (+99/-0) src/miral/basic_window_manager.cpp (+2234/-0) src/miral/basic_window_manager.h (+272/-0) src/miral/both_versions.h (+33/-0) src/miral/canonical_window_manager.cpp (+77/-0) src/miral/command_line_option.cpp (+210/-0) src/miral/coordinate_translator.cpp (+51/-0) src/miral/coordinate_translator.h (+52/-0) src/miral/cursor_theme.cpp (+62/-0) src/miral/debug_extension.cpp (+51/-0) src/miral/display_configuration_listeners.cpp (+120/-0) src/miral/display_configuration_listeners.h (+67/-0) src/miral/display_configuration_option.cpp (+115/-0) src/miral/internal_client.cpp (+215/-0) src/miral/join_client_threads.h (+24/-0) src/miral/keymap.cpp (+173/-0) src/miral/miral.pc.in (+9/-0) src/miral/mirclientcpp.pc.in (+7/-0) src/miral/mru_window_list.cpp (+65/-0) src/miral/mru_window_list.h (+46/-0) src/miral/output.cpp (+117/-0) src/miral/runner.cpp (+278/-0) src/miral/set_command_line_handler.cpp (+33/-0) src/miral/set_terminator.cpp (+33/-0) src/miral/set_window_management_policy.cpp (+91/-0) src/miral/symbols.map (+438/-0) src/miral/version.h.in (+67/-0) src/miral/window.cpp (+127/-0) src/miral/window_info.cpp (+594/-0) src/miral/window_management_options.cpp (+99/-0) src/miral/window_management_policy.cpp (+37/-0) src/miral/window_management_trace.cpp (+798/-0) src/miral/window_management_trace.h (+146/-0) src/miral/window_manager_tools.cpp (+141/-0) src/miral/window_manager_tools_implementation.h (+108/-0) src/miral/window_specification.cpp (+587/-0) src/miral/workspace_policy.cpp (+29/-0) src/miral/xcursor.c (+899/-0) src/miral/xcursor.h (+62/-0) src/miral/xcursor_loader.cpp (+215/-0) src/miral/xcursor_loader.h (+66/-0) tools/update_package_abis.sh (+1/-0)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/move-miral-to-mir
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration	2017-08-23	Approve on 2017-08-30
Gerry Boland (community)			Approve on 2017-08-29
Brandon Schaefer (community)		2017-08-23	Approve on 2017-08-24
Review via email: mp+329455@code.launchpad.net