← Back to branch summary

~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to tests/mir_test_doubles/mock_x11.cpp

  • Committer: Tarmac
  • Author(s): Andreas Pokorny
  • Date: 2016-06-28 21:26:12 UTC
  • mfrom: (3554.1.1 fix-1596051)
  • Revision ID: tarmac-20160628212612-ezjkdjm4zge7sh7z
fix: use Information inside default x11 screen of display to calculate size of window in mm

instead of using the resolution as screen size in mm. Fixes: https://bugs.launchpad.net/bugs/1596051.

Approved by Cemil Azizoglu, Alexandros Frantzis, mir-ci-bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mir_test_doubles/mock_x11.cpp
43
43
    std::memset(&enter_notify_event_return, 0, sizeof(XEvent));
44
44
    std::memset(&leave_notify_event_return, 0, sizeof(XEvent));
45
45
    std::memset(&visual_info, 0, sizeof(XVisualInfo));
 
46
    std::memset(&screen, 0, sizeof screen);
46
47
    visual_info.red_mask = 0xFF0000;
47
48
    keypress_event_return.type = KeyPress;
48
49
    button_release_event_return.type = ButtonRelease;
56
57
    motion_event_return.type = MotionNotify;
57
58
    enter_notify_event_return.type = EnterNotify;
58
59
    leave_notify_event_return.type = LeaveNotify;
 
60
    screen.width = 1024;
 
61
    screen.height = 768;
 
62
    screen.mwidth = 338;
 
63
    screen.mwidth = 270;
59
64
}
60
65
 
61
66
mtd::MockX11::MockX11()
68
73
    ON_CALL(*this, XOpenDisplay(_))
69
74
    .WillByDefault(Return(fake_x11.display));
70
75
 
 
76
    ON_CALL(*this, XDefaultScreenOfDisplay(fake_x11.display))
 
77
    .WillByDefault(Return(&fake_x11.screen));
 
78
 
71
79
    ON_CALL(*this, XGetVisualInfo(fake_x11.display,_,_,_))
72
80
    .WillByDefault(DoAll(SetArgPointee<3>(1),
73
81
                         Return(&fake_x11.visual_info)));
224
232
{
225
233
    return global_mock->XSetWMProtocols(display, w, protocols, count);
226
234
}
 
235
 
 
236
Screen* XDefaultScreenOfDisplay(Display* display)
 
237
{
 
238
    return global_mock->XDefaultScreenOfDisplay(display);
 
239
}