1
=== modified file 'src/platforms/mesa/server/kms/cursor.cpp'
2
--- src/platforms/mesa/server/kms/cursor.cpp	2017-06-09 10:22:15 +0000
3
+++ src/platforms/mesa/server/kms/cursor.cpp	2017-07-20 14:14:51 +0000
4
@@ -71,7 +71,7 @@
5
71
{
71
{
6
72
    // on some older hardware drm incorrectly reports the cursor size
72
    // on some older hardware drm incorrectly reports the cursor size
7
73
    bool const force_64x64_cursor = getenv(mir_drm_cursor_64x64);
73
    bool const force_64x64_cursor = getenv(mir_drm_cursor_64x64);
9
74
   
74
10
75
    uint64_t height = fallback_cursor_size;
75
    uint64_t height = fallback_cursor_size;
11
76
    if (!force_64x64_cursor)
76
    if (!force_64x64_cursor)
12
77
       drmGetCap(fd, DRM_CAP_CURSOR_HEIGHT, &height);
77
       drmGetCap(fd, DRM_CAP_CURSOR_HEIGHT, &height);
13
@@ -82,7 +82,7 @@
14
82
{
82
{
15
83
    // on some older hardware drm incorrectly reports the cursor size
83
    // on some older hardware drm incorrectly reports the cursor size
16
84
    bool const force_64x64_cursor = getenv(mir_drm_cursor_64x64);
84
    bool const force_64x64_cursor = getenv(mir_drm_cursor_64x64);
18
85
    
85
19
86
    uint64_t width = fallback_cursor_size;
86
    uint64_t width = fallback_cursor_size;
20
87
    if (!force_64x64_cursor)
87
    if (!force_64x64_cursor)
21
88
       drmGetCap(fd, DRM_CAP_CURSOR_WIDTH, &width);
88
       drmGetCap(fd, DRM_CAP_CURSOR_WIDTH, &width);
22
@@ -233,6 +233,7 @@
23
233
233
24
234
    auto const& size = cursor_image.size();
234
    auto const& size = cursor_image.size();
25
235
235
26
236
    hotspot = cursor_image.hotspot();
27
236
    {
237
    {
28
237
        auto locked_buffers = buffers.lock();
238
        auto locked_buffers = buffers.lock();
29
238
        for (auto& pair : *locked_buffers)
239
        for (auto& pair : *locked_buffers)
30
@@ -249,8 +250,7 @@
31
249
            }
250
            }
32
250
        }
251
        }
33
251
    }
252
    }
36
252
    hotspot = cursor_image.hotspot();
253
35
253
    
37
254
    // Writing the data could throw an exception so lets
254
    // Writing the data could throw an exception so lets
38
255
    // hold off on setting visible until after we have succeeded.
255
    // hold off on setting visible until after we have succeeded.
39
256
    visible = true;
256
    visible = true;
40
@@ -334,7 +334,7 @@
41
334
        if (output_rect.contains(position))
334
        if (output_rect.contains(position))
42
335
        {
335
        {
43
336
            auto dp = transform(output_rect, position - output_rect.top_left, orientation);
336
            auto dp = transform(output_rect, position - output_rect.top_left, orientation);
45
337
            
337
46
338
            // It's a little strange that we implement hotspot this way as there is
338
            // It's a little strange that we implement hotspot this way as there is
47
339
            // drmModeSetCursor2 with hotspot support. However it appears to not actually
339
            // drmModeSetCursor2 with hotspot support. However it appears to not actually
48
340
            // work on radeon and intel. There also seems to be precedent in weston for
340
            // work on radeon and intel. There also seems to be precedent in weston for
49
341
341
50
=== modified file 'src/platforms/mesa/server/kms/real_kms_output.cpp'
51
--- src/platforms/mesa/server/kms/real_kms_output.cpp	2017-05-08 03:04:26 +0000
52
+++ src/platforms/mesa/server/kms/real_kms_output.cpp	2017-07-20 14:14:51 +0000
53
@@ -272,8 +272,8 @@
54
272
    if (current_crtc)
272
    if (current_crtc)
55
273
    {
273
    {
56
274
        if (auto result = drmModeMoveCursor(drm_fd_, current_crtc->crtc_id,
274
        if (auto result = drmModeMoveCursor(drm_fd_, current_crtc->crtc_id,
59
275
                                            destination.x.as_uint32_t(),
275
                                            destination.x.as_int(),
60
276
                                            destination.y.as_uint32_t()))
276
                                            destination.y.as_int()))
61
277
        {
277
        {
62
278
            mir::log_warning("move_cursor: drmModeMoveCursor failed (%s)",
278
            mir::log_warning("move_cursor: drmModeMoveCursor failed (%s)",
63
279
                             strerror(-result));
279
                             strerror(-result));
Status:	Merged
Approved by:	Brandon Schaefer on 2017-07-20
Approved revision:	no longer in the source branch.
Merged at revision:	4210
Proposed branch:	lp:~alan-griffiths/mir/tidy-code
Merge into:	lp:mir
Diff against target:	63 lines (+7/-7) 2 files modified src/platforms/mesa/server/kms/cursor.cpp (+5/-5) src/platforms/mesa/server/kms/real_kms_output.cpp (+2/-2)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/tidy-code
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Brandon Schaefer (community)		2017-07-20	Approve on 2017-07-20
Mir CI Bot	continuous-integration		Approve on 2017-07-20
Review via email: mp+327795@code.launchpad.net
1	=== modified file 'src/platforms/mesa/server/kms/cursor.cpp'
2	--- src/platforms/mesa/server/kms/cursor.cpp 2017-06-09 10:22:15 +0000
3	+++ src/platforms/mesa/server/kms/cursor.cpp 2017-07-20 14:14:51 +0000
4	@@ -71,7 +71,7 @@
5	71	{	71	{
6	72	// on some older hardware drm incorrectly reports the cursor size	72	// on some older hardware drm incorrectly reports the cursor size
7	73	bool const force_64x64_cursor = getenv(mir_drm_cursor_64x64);	73	bool const force_64x64_cursor = getenv(mir_drm_cursor_64x64);
9	74		74
10	75	uint64_t height = fallback_cursor_size;	75	uint64_t height = fallback_cursor_size;
11	76	if (!force_64x64_cursor)	76	if (!force_64x64_cursor)
12	77	drmGetCap(fd, DRM_CAP_CURSOR_HEIGHT, &height);	77	drmGetCap(fd, DRM_CAP_CURSOR_HEIGHT, &height);
13	@@ -82,7 +82,7 @@
14	82	{	82	{
15	83	// on some older hardware drm incorrectly reports the cursor size	83	// on some older hardware drm incorrectly reports the cursor size
16	84	bool const force_64x64_cursor = getenv(mir_drm_cursor_64x64);	84	bool const force_64x64_cursor = getenv(mir_drm_cursor_64x64);
18	85		85
19	86	uint64_t width = fallback_cursor_size;	86	uint64_t width = fallback_cursor_size;
20	87	if (!force_64x64_cursor)	87	if (!force_64x64_cursor)
21	88	drmGetCap(fd, DRM_CAP_CURSOR_WIDTH, &width);	88	drmGetCap(fd, DRM_CAP_CURSOR_WIDTH, &width);
22	@@ -233,6 +233,7 @@
23	233		233
24	234	auto const& size = cursor_image.size();	234	auto const& size = cursor_image.size();
25	235		235
26			236	hotspot = cursor_image.hotspot();
27	236	{	237	{
28	237	auto locked_buffers = buffers.lock();	238	auto locked_buffers = buffers.lock();
29	238	for (auto& pair : *locked_buffers)	239	for (auto& pair : *locked_buffers)
30	@@ -249,8 +250,7 @@
31	249	}	250	}
32	250	}	251	}
33	251	}	252	}
36	252	hotspot = cursor_image.hotspot();	253
35	253
37	254	// Writing the data could throw an exception so lets	254	// Writing the data could throw an exception so lets
38	255	// hold off on setting visible until after we have succeeded.	255	// hold off on setting visible until after we have succeeded.
39	256	visible = true;	256	visible = true;
40	@@ -334,7 +334,7 @@
41	334	if (output_rect.contains(position))	334	if (output_rect.contains(position))
42	335	{	335	{
43	336	auto dp = transform(output_rect, position - output_rect.top_left, orientation);	336	auto dp = transform(output_rect, position - output_rect.top_left, orientation);
45	337		337
46	338	// It's a little strange that we implement hotspot this way as there is	338	// It's a little strange that we implement hotspot this way as there is
47	339	// drmModeSetCursor2 with hotspot support. However it appears to not actually	339	// drmModeSetCursor2 with hotspot support. However it appears to not actually
48	340	// work on radeon and intel. There also seems to be precedent in weston for	340	// work on radeon and intel. There also seems to be precedent in weston for
49	341		341
50	=== modified file 'src/platforms/mesa/server/kms/real_kms_output.cpp'
51	--- src/platforms/mesa/server/kms/real_kms_output.cpp 2017-05-08 03:04:26 +0000
52	+++ src/platforms/mesa/server/kms/real_kms_output.cpp 2017-07-20 14:14:51 +0000
53	@@ -272,8 +272,8 @@
54	272	if (current_crtc)	272	if (current_crtc)
55	273	{	273	{
56	274	if (auto result = drmModeMoveCursor(drm_fd_, current_crtc->crtc_id,	274	if (auto result = drmModeMoveCursor(drm_fd_, current_crtc->crtc_id,
59	275	destination.x.as_uint32_t(),	275	destination.x.as_int(),
60	276	destination.y.as_uint32_t()))	276	destination.y.as_int()))
61	277	{	277	{
62	278	mir::log_warning("move_cursor: drmModeMoveCursor failed (%s)",	278	mir::log_warning("move_cursor: drmModeMoveCursor failed (%s)",
63	279	strerror(-result));	279	strerror(-result));