1
=== modified file 'src/platforms/mesa/server/x11/graphics/display.cpp'
2
--- src/platforms/mesa/server/x11/graphics/display.cpp	2016-09-28 04:31:08 +0000
3
+++ src/platforms/mesa/server/x11/graphics/display.cpp	2016-09-28 04:31:09 +0000
4
@@ -39,6 +39,30 @@
5
39
39
6
40
namespace
40
namespace
7
41
{
41
{
8
42
geom::Size clip_to_display(Display *dpy, geom::Size requested_size)
9
43
{
10
44
    unsigned int screen_width, screen_height, uint_dummy;
11
45
    int int_dummy;
12
46
    Window window_dummy;
13
47
    int const border = 150;
14
48
15
49
    XGetGeometry(dpy, XDefaultRootWindow(dpy), &window_dummy, &int_dummy, &int_dummy,
16
50
        &screen_width, &screen_height, &uint_dummy, &uint_dummy);
17
51
18
52
    mir::log_info("Screen resolution = %dx%d", screen_width, screen_height);
19
53
20
54
    if ((screen_width < requested_size.width.as_uint32_t()+border) ||
21
55
        (screen_height < requested_size.height.as_uint32_t()+border))
22
56
    {
23
57
        mir::log_info(" ... is smaller than the requested size (%dx%d) plus border (%d). Clipping to (%dx%d).",
24
58
            requested_size.width.as_uint32_t(), requested_size.height.as_uint32_t(), border,
25
59
            screen_width-border, screen_height-border);
26
60
        return geom::Size{screen_width-border, screen_height-border};
27
61
    }
28
62
29
63
    return requested_size;
30
64
}
31
65
32
42
auto get_pixel_width(Display *dpy)
66
auto get_pixel_width(Display *dpy)
33
43
{
67
{
34
44
    auto screen = XDefaultScreenOfDisplay(dpy);
68
    auto screen = XDefaultScreenOfDisplay(dpy);
35
@@ -114,6 +138,7 @@
36
114
    r_mask = visInfo->red_mask;
138
    r_mask = visInfo->red_mask;
37
115
139
38
116
    XSetWindowAttributes attr;
140
    XSetWindowAttributes attr;
39
141
    std::memset(&attr, 0, sizeof(attr));
40
117
    attr.background_pixel = 0;
142
    attr.background_pixel = 0;
41
118
    attr.border_pixel = 0;
143
    attr.border_pixel = 0;
42
119
    attr.colormap = XCreateColormap(x_dpy, root, visInfo->visual, AllocNone);
144
    attr.colormap = XCreateColormap(x_dpy, root, visInfo->visual, AllocNone);
43
@@ -200,12 +225,12 @@
44
200
}
225
}
45
201
226
46
202
mgx::Display::Display(::Display* x_dpy,
227
mgx::Display::Display(::Display* x_dpy,
48
203
                      geom::Size const size,
228
                      geom::Size const requested_size,
49
204
                      std::shared_ptr<GLConfig> const& gl_config,
229
                      std::shared_ptr<GLConfig> const& gl_config,
50
205
                      std::shared_ptr<DisplayReport> const& report)
230
                      std::shared_ptr<DisplayReport> const& report)
51
206
    : shared_egl{*gl_config},
231
    : shared_egl{*gl_config},
52
207
      x_dpy{x_dpy},
232
      x_dpy{x_dpy},
54
208
      size{size},
233
      actual_size{clip_to_display(x_dpy, requested_size)},
55
209
      gl_config{gl_config},
234
      gl_config{gl_config},
56
210
      pixel_width{get_pixel_width(x_dpy)},
235
      pixel_width{get_pixel_width(x_dpy)},
57
211
      pixel_height{get_pixel_height(x_dpy)},
236
      pixel_height{get_pixel_height(x_dpy)},
58
@@ -216,7 +241,7 @@
59
216
241
60
217
    win = std::make_unique<X11Window>(x_dpy,
242
    win = std::make_unique<X11Window>(x_dpy,
61
218
                                      shared_egl.display(),
243
                                      shared_egl.display(),
63
219
                                      size,
244
                                      actual_size,
64
220
                                      shared_egl.config());
245
                                      shared_egl.config());
65
221
246
66
222
    auto red_mask = win->red_mask();
247
    auto red_mask = win->red_mask();
67
@@ -226,7 +251,7 @@
68
226
    display_buffer = std::make_unique<mgx::DisplayBuffer>(
251
    display_buffer = std::make_unique<mgx::DisplayBuffer>(
69
227
                         x_dpy,
252
                         x_dpy,
70
228
                         *win,
253
                         *win,
72
229
                         size,
254
                         actual_size,
73
230
                         shared_egl.context(),
255
                         shared_egl.context(),
74
231
                         report,
256
                         report,
75
232
                         orientation,
257
                         orientation,
76
@@ -249,7 +274,7 @@
77
249
std::unique_ptr<mg::DisplayConfiguration> mgx::Display::configuration() const
274
std::unique_ptr<mg::DisplayConfiguration> mgx::Display::configuration() const
78
250
{
275
{
79
251
    return std::make_unique<mgx::DisplayConfiguration>(
276
    return std::make_unique<mgx::DisplayConfiguration>(
81
252
        pf, size, geom::Size{size.width * pixel_width, size.height * pixel_height}, orientation);
277
        pf, actual_size, geom::Size{actual_size.width * pixel_width, actual_size.height * pixel_height}, orientation);
82
253
}
278
}
83
254
279
84
255
void mgx::Display::configure(mg::DisplayConfiguration const& new_configuration)
280
void mgx::Display::configure(mg::DisplayConfiguration const& new_configuration)
85
256
281
86
=== modified file 'src/platforms/mesa/server/x11/graphics/display.h'
87
--- src/platforms/mesa/server/x11/graphics/display.h	2016-09-28 04:31:08 +0000
88
+++ src/platforms/mesa/server/x11/graphics/display.h	2016-09-28 04:31:09 +0000
89
@@ -66,7 +66,7 @@
90
66
{
66
{
91
67
public:
67
public:
92
68
    explicit Display(::Display* x_dpy,
68
    explicit Display(::Display* x_dpy,
94
69
                     geometry::Size const size,
69
                     geometry::Size const requested_size,
95
70
                     std::shared_ptr<GLConfig> const& gl_config,
70
                     std::shared_ptr<GLConfig> const& gl_config,
96
71
                     std::shared_ptr<DisplayReport> const& report);
71
                     std::shared_ptr<DisplayReport> const& report);
97
72
    ~Display() noexcept;
72
    ~Display() noexcept;
98
@@ -101,7 +101,7 @@
99
101
private:
101
private:
100
102
    helpers::EGLHelper shared_egl;
102
    helpers::EGLHelper shared_egl;
101
103
    ::Display* const x_dpy;
103
    ::Display* const x_dpy;
103
104
    mir::geometry::Size const size;
104
    mir::geometry::Size const actual_size;
104
105
    std::shared_ptr<GLConfig> const gl_config;
105
    std::shared_ptr<GLConfig> const gl_config;
105
106
    float pixel_width;
106
    float pixel_width;
106
107
    float pixel_height;
107
    float pixel_height;
107
108
108
108
=== modified file 'tests/include/mir/test/doubles/mock_x11.h'
109
--- tests/include/mir/test/doubles/mock_x11.h	2016-06-28 08:24:02 +0000
110
+++ tests/include/mir/test/doubles/mock_x11.h	2016-09-28 04:31:09 +0000
111
@@ -88,7 +88,8 @@
112
88
    MOCK_METHOD9(XGrabPointer, int(Display*, Window, Bool, unsigned int, int, int, Window, Cursor, Time));
88
    MOCK_METHOD9(XGrabPointer, int(Display*, Window, Bool, unsigned int, int, int, Window, Cursor, Time));
113
89
    MOCK_METHOD2(XUngrabPointer, int(Display*, Time));
89
    MOCK_METHOD2(XUngrabPointer, int(Display*, Time));
114
90
    MOCK_METHOD3(XInternAtom, Atom(Display*, const char*, Bool));
90
    MOCK_METHOD3(XInternAtom, Atom(Display*, const char*, Bool));
116
91
    MOCK_METHOD4(XSetWMProtocols, Status(Display *, Window, Atom*, int));
91
    MOCK_METHOD4(XSetWMProtocols, Status(Display*, Window, Atom*, int));
117
92
    MOCK_METHOD9(XGetGeometry, Status(Display*, Drawable, Window*, int*, int*, unsigned int*, unsigned int*, unsigned int*, unsigned int*));
118
92
93
119
93
    FakeX11Resources fake_x11;
94
    FakeX11Resources fake_x11;
120
94
};
95
};
121
95
96
122
=== modified file 'tests/mir_test_doubles/mock_x11.cpp'
123
--- tests/mir_test_doubles/mock_x11.cpp	2016-06-28 08:24:02 +0000
124
+++ tests/mir_test_doubles/mock_x11.cpp	2016-09-28 04:31:09 +0000
125
@@ -57,8 +57,8 @@
126
57
    motion_event_return.type = MotionNotify;
57
    motion_event_return.type = MotionNotify;
127
58
    enter_notify_event_return.type = EnterNotify;
58
    enter_notify_event_return.type = EnterNotify;
128
59
    leave_notify_event_return.type = LeaveNotify;
59
    leave_notify_event_return.type = LeaveNotify;
131
60
    screen.width = 1024;
60
    screen.width = 2880;
132
61
    screen.height = 768;
61
    screen.height = 1800;
133
62
    screen.mwidth = 338;
62
    screen.mwidth = 338;
134
63
    screen.mwidth = 270;
63
    screen.mwidth = 270;
135
64
}
64
}
136
@@ -91,6 +91,11 @@
137
91
                                     {
91
                                     {
138
92
                                         return fake_x11.pending_events;
92
                                         return fake_x11.pending_events;
139
93
                                     }));
93
                                     }));
140
94
141
95
    ON_CALL(*this, XGetGeometry(fake_x11.display,_,_,_,_,_,_,_,_))
142
96
    .WillByDefault(DoAll(SetArgPointee<5>(fake_x11.screen.width),
143
97
                         SetArgPointee<6>(fake_x11.screen.height),
144
98
                         Return(1)));
145
94
}
99
}
146
95
100
147
96
mtd::MockX11::~MockX11()
101
mtd::MockX11::~MockX11()
148
@@ -237,3 +242,15 @@
149
237
{
242
{
150
238
    return global_mock->XDefaultScreenOfDisplay(display);
243
    return global_mock->XDefaultScreenOfDisplay(display);
151
239
}
244
}
152
245
153
246
Status XGetGeometry(Display* display, Drawable d,
154
247
                    Window* root_return,
155
248
                    int* x_return, int* y_return,
156
249
                    unsigned int* width_return, unsigned int* height_return,
157
250
                    unsigned int* border_width_return, unsigned int* depth_return)
158
251
{
159
252
    return global_mock->XGetGeometry(display, d, root_return,
160
253
                                     x_return, y_return,
161
254
                                     width_return, height_return,
162
255
                                     border_width_return, depth_return);
163
256
}
164
240
257
165
=== modified file 'tests/unit-tests/platforms/mesa/x11/test_display.cpp'
166
--- tests/unit-tests/platforms/mesa/x11/test_display.cpp	2016-09-28 04:31:08 +0000
167
+++ tests/unit-tests/platforms/mesa/x11/test_display.cpp	2016-09-28 04:31:09 +0000
168
@@ -93,6 +93,11 @@
169
93
        mock_x11.fake_x11.screen.mwidth = mm.width.as_int();
93
        mock_x11.fake_x11.screen.mwidth = mm.width.as_int();
170
94
        mock_x11.fake_x11.screen.mheight = mm.height.as_int();
94
        mock_x11.fake_x11.screen.mheight = mm.height.as_int();
171
95
        size = window;
95
        size = window;
172
96
173
97
        ON_CALL(mock_x11, XGetGeometry(mock_x11.fake_x11.display,_,_,_,_,_,_,_,_))
174
98
        .WillByDefault(DoAll(SetArgPointee<5>(mock_x11.fake_x11.screen.width),
175
99
                             SetArgPointee<6>(mock_x11.fake_x11.screen.height),
176
100
                             Return(1)));
177
96
    }
101
    }
178
97
    std::shared_ptr<mgx::Display> create_display()
102
    std::shared_ptr<mgx::Display> create_display()
179
98
    {
103
    {
180
@@ -151,7 +156,7 @@
181
151
156
182
152
TEST_F(X11DisplayTest, calculates_physical_size_of_display_based_on_default_screen)
157
TEST_F(X11DisplayTest, calculates_physical_size_of_display_based_on_default_screen)
183
153
{
158
{
185
154
    auto const pixel = geom::Size{2560, 1080};
159
    auto const pixel = geom::Size{2880, 1800};
186
155
    auto const mm = geom::Size{677, 290};
160
    auto const mm = geom::Size{677, 290};
187
156
    auto const window = geom::Size{1280, 1024};
161
    auto const window = geom::Size{1280, 1024};
188
157
    auto const pixel_width = float(mm.width.as_int()) / float(pixel.width.as_int());
162
    auto const pixel_width = float(mm.width.as_int()) / float(pixel.width.as_int());
189
@@ -175,7 +180,7 @@
190
175
180
191
176
TEST_F(X11DisplayTest, reports_a_resolution_that_matches_the_window_size)
181
TEST_F(X11DisplayTest, reports_a_resolution_that_matches_the_window_size)
192
177
{
182
{
194
178
    auto const pixel = geom::Size{2560, 1080};
183
    auto const pixel = geom::Size{2880, 1800};
195
179
    auto const mm = geom::Size{677, 290};
184
    auto const mm = geom::Size{677, 290};
196
180
    auto const window = geom::Size{1280, 1024};
185
    auto const window = geom::Size{1280, 1024};
197
181
186
198
@@ -193,3 +198,24 @@
199
193
198
200
194
    EXPECT_THAT(reported_resolution, Eq(window));
199
    EXPECT_THAT(reported_resolution, Eq(window));
201
195
}
200
}
202
201
203
202
TEST_F(X11DisplayTest, adjusts_resolution_with_respect_to_screen_size)
204
203
{
205
204
    auto const pixel = geom::Size{1000, 1000};
206
205
    auto const mm = geom::Size{677, 290};
207
206
    auto const window = geom::Size{1280, 1024};
208
207
    auto const border = 150; //must match the border value in clip_to_display()
209
208
210
209
    setup_x11_screen(pixel, mm, window);
211
210
212
211
    auto display = create_display();
213
212
    auto config = display->configuration();
214
213
    geom::Size reported_resolution;
215
214
    config->for_each_output(
216
215
        [&reported_resolution](mg::DisplayConfigurationOutput const& output)
217
216
        {
218
217
            reported_resolution = output.modes[0].size;
219
218
        });
220
219
221
220
    EXPECT_THAT(reported_resolution, Eq(geom::Size{pixel.width.as_uint32_t()-border, pixel.height.as_uint32_t()-border}));
222
221
}
Reviewer	Review Type	Date Requested	Status
Kevin DuBois (community)			Approve on 2016-09-30
Alan Griffiths			Approve on 2016-09-30
Alexandros Frantzis (community)		2016-09-27	Approve on 2016-09-29
Mir CI Bot	continuous-integration	2016-09-27	Approve on 2016-09-28
Review via email: mp+306961@code.launchpad.net