1
=== modified file 'examples/miral-shell/miral-app.sh'
2
--- examples/miral-shell/miral-app.sh	2017-09-06 16:44:12 +0000
3
+++ examples/miral-shell/miral-app.sh	2017-09-18 08:42:01 +0000
4
@@ -15,6 +15,7 @@
5
15
fi
15
fi
6
16
16
7
17
socket=${XDG_RUNTIME_DIR}/miral_socket
17
socket=${XDG_RUNTIME_DIR}/miral_socket
8
18
wayland_display=miral_wayland
9
18
19
10
19
while [ $# -gt 0 ]
20
while [ $# -gt 0 ]
11
20
do
21
do
12
@@ -23,14 +24,16 @@
13
23
    echo "$(basename $0) - Handy launch script for a hosted miral \"desktop session\""
24
    echo "$(basename $0) - Handy launch script for a hosted miral \"desktop session\""
14
24
    echo "Usage: $(basename $0) [options] [shell options]"
25
    echo "Usage: $(basename $0) [options] [shell options]"
15
25
    echo "Options are:"
26
    echo "Options are:"
20
26
    echo "    -kiosk               use miral-kiosk instead of ${miral_server}"
27
    echo "    -kiosk                        use miral-kiosk instead of ${miral_server}"
21
27
    echo "    -launcher <launcher> use <launcher> instead of '${launcher}'"
28
    echo "    -launcher <launcher>          use <launcher> instead of '${launcher}'"
22
28
    echo "    -socket   <socket>   set the mir socket [${socket}]"
29
    echo "    -socket <socket>              set the legacy mir socket [${socket}]"
23
29
    echo "    -bindir   <bindir>   path to the miral executable [${bindir}]"
30
    echo "    -wayland-socket-name <socket> set the wayland socket [${wayland_display}]"
24
31
    echo "    -bindir <bindir>              path to the miral executable [${bindir}]"
25
30
    exit 0
32
    exit 0
26
31
    elif [ "$1" == "-kiosk" ];              then miral_server=miral-kiosk
33
    elif [ "$1" == "-kiosk" ];              then miral_server=miral-kiosk
27
32
    elif [ "$1" == "-launcher" ];           then shift; launcher=$1
34
    elif [ "$1" == "-launcher" ];           then shift; launcher=$1
28
33
    elif [ "$1" == "-socket" ];             then shift; socket=$1
35
    elif [ "$1" == "-socket" ];             then shift; socket=$1
29
36
    elif [ "$1" == "-wayland-socket-name" ];then shift; wayland_display=$1
30
34
    elif [ "$1" == "-bindir" ];             then shift; bindir=$1
37
    elif [ "$1" == "-bindir" ];             then shift; bindir=$1
31
35
    elif [ "${1:0:2}" == "--" ];            then break
38
    elif [ "${1:0:2}" == "--" ];            then break
32
36
    fi
39
    fi
33
@@ -40,15 +43,16 @@
34
40
if [ "${bindir}" != "" ]; then bindir="${bindir}/"; fi
43
if [ "${bindir}" != "" ]; then bindir="${bindir}/"; fi
35
41
44
36
42
if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
45
if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
37
46
if [ -e "${wayland_display}" ]; then echo "Error: wayland endpoint '${wayland_display}' already exists"; exit 1 ;fi
38
43
47
39
44
qtubuntu_desktop_installed=$(apt list qtubuntu-desktop 2>/dev/null | grep installed | wc -l)
48
qtubuntu_desktop_installed=$(apt list qtubuntu-desktop 2>/dev/null | grep installed | wc -l)
40
45
if [ "${qtubuntu_desktop_installed}" == "0" ]; then echo "Need qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""; exit 1 ;fi
49
if [ "${qtubuntu_desktop_installed}" == "0" ]; then echo "Need qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""; exit 1 ;fi
41
46
50
43
47
sh -c "${bindir}${miral_server} $* ${hostsocket} --file ${socket} --desktop_file_hint=miral-shell.desktop"&
51
sh -c "${bindir}${miral_server} $* ${hostsocket} --file ${socket} --wayland-socket-name ${wayland_display} --desktop_file_hint=miral-shell.desktop"&
44
48
52
45
49
while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
53
while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
46
50
54
47
51
unset QT_QPA_PLATFORMTHEME
55
unset QT_QPA_PLATFORMTHEME
49
52
MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir dbus-run-session -- ${launcher}
56
MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir WAYLAND_DISPLAY=${wayland_display} dbus-run-session -- ${launcher}
50
53
killall ${bindir}${miral_server}
57
killall ${bindir}${miral_server}
51
54
58
52
55
59
53
=== modified file 'examples/miral-shell/miral-desktop.sh'
54
--- examples/miral-shell/miral-desktop.sh	2017-09-11 13:23:39 +0000
55
+++ examples/miral-shell/miral-desktop.sh	2017-09-18 08:42:01 +0000
56
@@ -1,6 +1,7 @@
57
1
#! /bin/bash
1
#! /bin/bash
58
2
2
59
3
socket=${XDG_RUNTIME_DIR}/miral_socket
3
socket=${XDG_RUNTIME_DIR}/miral_socket
60
4
wayland_display=miral_wayland
61
4
miral_server=miral-shell
5
miral_server=miral-shell
62
5
launcher=qterminal
6
launcher=qterminal
63
6
bindir=$(dirname $0)
7
bindir=$(dirname $0)
64
@@ -13,17 +14,19 @@
65
13
    echo "$(basename $0) - Handy launch script for a miral \"desktop session\""
14
    echo "$(basename $0) - Handy launch script for a miral \"desktop session\""
66
14
    echo "Usage: $(basename $0) [options] [shell options]"
15
    echo "Usage: $(basename $0) [options] [shell options]"
67
15
    echo "Options are:"
16
    echo "Options are:"
73
16
    echo "    -kiosk               use miral-kiosk instead of ${miral_server}"
17
    echo "    -kiosk                        use miral-kiosk instead of ${miral_server}"
74
17
    echo "    -launcher <launcher> use <launcher> instead of '${launcher}'"
18
    echo "    -launcher <launcher>          use <launcher> instead of '${launcher}'"
75
18
    echo "    -vt       <termid>   set the virtual terminal [${vt}]"
19
    echo "    -vt <termid>                  set the virtual terminal [${vt}]"
76
19
    echo "    -socket   <socket>   set the mir socket [${socket}]"
20
    echo "    -socket <socket>              set the legacy mir socket [${socket}]"
77
20
    echo "    -bindir   <bindir>   path to the miral executable [${bindir}]"
21
    echo "    -wayland-socket-name <socket> set the wayland socket [${wayland_display}]"
78
22
    echo "    -bindir <bindir>              path to the miral executable [${bindir}]"
79
21
    exit 0
23
    exit 0
80
22
    elif [ "$1" == "-kiosk" ];              then miral_server=miral-kiosk
24
    elif [ "$1" == "-kiosk" ];              then miral_server=miral-kiosk
81
23
    elif [ "$1" == "-launcher" ];           then shift; launcher=$1
25
    elif [ "$1" == "-launcher" ];           then shift; launcher=$1
82
24
    elif [ "$1" == "-vt" ];                 then shift; vt=$1
26
    elif [ "$1" == "-vt" ];                 then shift; vt=$1
83
25
    elif [ "$1" == "-socket" ];             then shift; socket=$1
27
    elif [ "$1" == "-socket" ];             then shift; socket=$1
85
26
    elif [ "$1" == "-bindir" ];             then shift; bindir=$1/
28
    elif [ "$1" == "-wayland-socket-name" ];then shift; wayland_display=$1
86
29
    elif [ "$1" == "-bindir" ];             then shift; bindir=$1
87
27
    elif [ "${1:0:2}" == "--" ];            then break
30
    elif [ "${1:0:2}" == "--" ];            then break
88
28
    fi
31
    fi
89
29
    shift
32
    shift
90
@@ -31,15 +34,19 @@
91
31
34
92
32
if [ "${bindir}" != "" ]; then bindir="${bindir}/"; fi
35
if [ "${bindir}" != "" ]; then bindir="${bindir}/"; fi
93
33
36
95
34
if [ -e "${socket}" ]; then echo "Error: '${socket}' already exists"; exit 1 ;fi
37
if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
96
38
if [ -e "${wayland_display}" ]; then echo "Error: wayland endpoint '${wayland_display}' already exists"; exit 1 ;fi
97
39
98
40
qtubuntu_desktop_installed=$(apt list qtubuntu-desktop 2>/dev/null | grep installed | wc -l)
99
41
if [ "${qtubuntu_desktop_installed}" == "0" ]; then echo "Need qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""; exit 1 ;fi
100
35
42
101
36
sudo ls >> /dev/null
43
sudo ls >> /dev/null
102
37
oldvt=$(sudo fgconsole)
44
oldvt=$(sudo fgconsole)
104
38
sudo sh -c "LD_LIBRARY_PATH=${LD_LIBRARY_PATH} XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR} ${bindir}${miral_server} --vt ${vt} --arw-file --file ${socket} $*; chvt ${oldvt}"&
45
sudo sh -c "LD_LIBRARY_PATH=${LD_LIBRARY_PATH} XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR} --wayland-socket-name ${wayland_display} ${bindir}${miral_server} --vt ${vt} --arw-file --file ${socket} $*; chvt ${oldvt}"&
105
39
46
106
40
while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
47
while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
107
41
48
108
42
unset QT_QPA_PLATFORMTHEME
49
unset QT_QPA_PLATFORMTHEME
110
43
MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir dbus-run-session -- ${launcher}
50
MIR_SOCKET=${socket} XDG_SESSION_TYPE=mir GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir WAYLAND_DISPLAY=${wayland_display} dbus-run-session -- ${launcher}
111
44
sudo killall ${bindir}${miral_server}
51
sudo killall ${bindir}${miral_server}
112
45
52
113
46
53
114
=== modified file 'src/include/platform/mir/options/configuration.h'
115
--- src/include/platform/mir/options/configuration.h	2017-07-28 17:00:43 +0000
116
+++ src/include/platform/mir/options/configuration.h	2017-09-18 08:42:01 +0000
117
@@ -27,6 +27,7 @@
118
27
{
27
{
119
28
namespace options
28
namespace options
120
29
{
29
{
121
30
extern char const* const wayland_socket_name_opt;
122
30
extern char const* const server_socket_opt;
31
extern char const* const server_socket_opt;
123
31
extern char const* const prompt_socket_opt;
32
extern char const* const prompt_socket_opt;
124
32
extern char const* const no_server_socket_opt;
33
extern char const* const no_server_socket_opt;
125
33
34
126
=== modified file 'src/platform/options/default_configuration.cpp'
127
--- src/platform/options/default_configuration.cpp	2017-07-28 17:00:43 +0000
128
+++ src/platform/options/default_configuration.cpp	2017-09-18 08:42:01 +0000
129
@@ -27,6 +27,7 @@
130
27
27
131
28
namespace mo = mir::options;
28
namespace mo = mir::options;
132
29
29
133
30
char const* const mo::wayland_socket_name_opt     = "wayland-socket-name";
134
30
char const* const mo::server_socket_opt           = "file,f";
31
char const* const mo::server_socket_opt           = "file,f";
135
31
char const* const mo::prompt_socket_opt           = "prompt-file,p";
32
char const* const mo::prompt_socket_opt           = "prompt-file,p";
136
32
char const* const mo::no_server_socket_opt        = "no-file";
33
char const* const mo::no_server_socket_opt        = "no-file";
137
@@ -139,6 +140,8 @@
138
139
    namespace po = boost::program_options;
140
    namespace po = boost::program_options;
139
140
141
140
141
    add_options()
142
    add_options()
141
143
        (wayland_socket_name_opt, po::value<std::string>(),
142
144
         "Overrides the default socket name used for communicating with clients")
143
142
        (host_socket_opt, po::value<std::string>(),
145
        (host_socket_opt, po::value<std::string>(),
144
143
            "Host socket filename")
146
            "Host socket filename")
145
144
        (server_socket_opt, po::value<std::string>()->default_value(::mir::default_server_socket),
147
        (server_socket_opt, po::value<std::string>()->default_value(::mir::default_server_socket),
146
145
148
147
=== modified file 'src/platform/symbols.map'
148
--- src/platform/symbols.map	2017-05-25 08:58:03 +0000
149
+++ src/platform/symbols.map	2017-09-18 08:42:01 +0000
150
@@ -153,3 +153,10 @@
151
153
  };
153
  };
152
154
 local: *;
154
 local: *;
153
155
};
155
};
154
156
155
157
MIRPLATFORM_1.0 {
156
158
 global:
157
159
  extern "C++" {
158
160
    mir::options::wayland_socket_name_opt*;
159
161
  };
160
162
} MIRPLATFORM_0.27;
161
156
163
162
=== modified file 'src/server/frontend/wayland/wayland_connector.cpp'
163
--- src/server/frontend/wayland/wayland_connector.cpp	2017-09-11 13:23:39 +0000
164
+++ src/server/frontend/wayland/wayland_connector.cpp	2017-09-18 08:42:01 +0000
165
@@ -1680,6 +1680,7 @@
166
1680
}
1680
}
167
1681
1681
168
1682
mf::WaylandConnector::WaylandConnector(
1682
mf::WaylandConnector::WaylandConnector(
169
1683
    optional_value<std::string> const& display_name,
170
1683
    std::shared_ptr<mf::Shell> const& shell,
1684
    std::shared_ptr<mf::Shell> const& shell,
171
1684
    DisplayChanger& display_config,
1685
    DisplayChanger& display_config,
172
1685
    std::shared_ptr<mg::GraphicBufferAllocator> const& allocator,
1686
    std::shared_ptr<mg::GraphicBufferAllocator> const& allocator,
173
@@ -1733,7 +1734,21 @@
174
1733
        mir::log_warning("No WaylandAllocator EGL support!");
1734
        mir::log_warning("No WaylandAllocator EGL support!");
175
1734
    }
1735
    }
176
1735
1736
178
1736
    if (auto const wayland_display = wl_display_add_socket_auto(display.get()))
1737
    char const* wayland_display = nullptr;
179
1738
180
1739
    if (!display_name.is_set())
181
1740
    {
182
1741
        wayland_display = wl_display_add_socket_auto(display.get());
183
1742
    }
184
1743
    else
185
1744
    {
186
1745
        if (!wl_display_add_socket(display.get(), display_name.value().c_str()))
187
1746
        {
188
1747
            wayland_display = display_name.value().c_str();
189
1748
        }
190
1749
    }
191
1750
192
1751
    if (wayland_display)
193
1737
    {
1752
    {
194
1738
        if (arw_socket)
1753
        if (arw_socket)
195
1739
        {
1754
        {
196
1740
1755
197
=== modified file 'src/server/frontend/wayland/wayland_connector.h'
198
--- src/server/frontend/wayland/wayland_connector.h	2017-09-14 11:08:07 +0000
199
+++ src/server/frontend/wayland/wayland_connector.h	2017-09-18 08:42:01 +0000
200
@@ -21,6 +21,7 @@
201
21
21
202
22
#include "mir/frontend/connector.h"
22
#include "mir/frontend/connector.h"
203
23
#include "mir/fd.h"
23
#include "mir/fd.h"
204
24
#include "mir/optional_value.h"
205
24
25
206
25
#include <wayland-server-core.h>
26
#include <wayland-server-core.h>
207
26
#include <thread>
27
#include <thread>
208
@@ -50,6 +51,7 @@
209
50
{
51
{
210
51
public:
52
public:
211
52
    WaylandConnector(
53
    WaylandConnector(
212
54
        optional_value<std::string> const& display_name,
213
53
        std::shared_ptr<Shell> const& shell,
55
        std::shared_ptr<Shell> const& shell,
214
54
        DisplayChanger& display_config,
56
        DisplayChanger& display_config,
215
55
        std::shared_ptr<graphics::GraphicBufferAllocator> const& allocator,
57
        std::shared_ptr<graphics::GraphicBufferAllocator> const& allocator,
216
56
58
217
=== modified file 'src/server/frontend/wayland/wayland_default_configuration.cpp'
218
--- src/server/frontend/wayland/wayland_default_configuration.cpp	2017-09-11 13:23:39 +0000
219
+++ src/server/frontend/wayland/wayland_default_configuration.cpp	2017-09-18 08:42:01 +0000
220
@@ -33,7 +33,13 @@
221
33
        {
33
        {
222
34
            bool const arw_socket = the_options()->is_set(options::arw_server_socket_opt);
34
            bool const arw_socket = the_options()->is_set(options::arw_server_socket_opt);
223
35
35
224
36
            optional_value<std::string> display_name;
225
37
226
38
            if (the_options()->is_set(options::wayland_socket_name_opt))
227
39
                display_name = the_options()->get<std::string>(options::wayland_socket_name_opt);
228
40
229
36
            return std::make_shared<mf::WaylandConnector>(
41
            return std::make_shared<mf::WaylandConnector>(
230
42
                display_name,
231
37
                the_frontend_shell(),
43
                the_frontend_shell(),
232
38
                *the_frontend_display_changer(),
44
                *the_frontend_display_changer(),
233
39
                the_buffer_allocator(),
45
                the_buffer_allocator(),
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-09-18
Chris Halse Rogers		2017-09-15	Approve on 2017-09-18
Review via email: mp+330843@code.launchpad.net