Merge lp:~brandontschaefer/mir/add-support-crosshair-cursor into lp:mir

[Brandon Schaefer]

Adds support for the system cursor XC_crosshair.

Adds support for the system cursor XC_crosshair.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2786
http://jenkins.qa.ubuntu.com/job/mir-ci/4424/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3322
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/847
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/573
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/573/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3270
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3270/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6066
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22157

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4424/rebuild

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Daniel van Vugt (vanvugt)]

(1) src/client/symbols.map: New symbols need to go in the bottom (9.1) stanza.

Otherwise, good.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

In here, I mean:

MIR_CLIENT_9.1 { # New functions in Mir 0.15

[Brandon Schaefer (brandontschaefer)]

Opps didnt finish reading that file! Pushed

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'examples/cursors_demo_client.c'
--- examples/cursors_demo_client.c	2014-07-07 23:50:43 +0000
+++ examples/cursors_demo_client.c	2015-07-28 02:45:17 +0000
@@ -38,7 +38,8 @@
         mir_diagonal_resize_top_to_bottom_cursor_name,
         mir_omnidirectional_resize_cursor_name,
         mir_vsplit_resize_cursor_name,
-        mir_hsplit_resize_cursor_name
+        mir_hsplit_resize_cursor_name,
+        mir_crosshair_cursor_name
     };
 
     size_t num_cursors = sizeof(cursors)/sizeof(*cursors);
 
=== modified file 'include/client/mir_toolkit/cursors.h'
--- include/client/mir_toolkit/cursors.h	2015-04-28 07:54:10 +0000
+++ include/client/mir_toolkit/cursors.h	2015-07-28 02:45:17 +0000
@@ -113,6 +113,12 @@
  */
 extern char const* const mir_hsplit_resize_cursor_name;
 
+/**
+ *  The cursor used for crosshair, which may be used for picking colors or
+ *  finer precision.
+ */
+extern char const* const mir_crosshair_cursor_name;
+
 #ifdef __cplusplus
 }
 #endif
 
=== modified file 'src/client/mir_cursor_api.cpp'
--- src/client/mir_cursor_api.cpp	2015-06-17 05:20:42 +0000
+++ src/client/mir_cursor_api.cpp	2015-07-28 02:45:17 +0000
@@ -42,6 +42,7 @@
 extern "C" char const* const mir_omnidirectional_resize_cursor_name = "omnidirectional-resize";
 extern "C" char const* const mir_vsplit_resize_cursor_name = "vsplit-resize";
 extern "C" char const* const mir_hsplit_resize_cursor_name = "hsplit-resize";
+extern "C" char const* const mir_crosshair_cursor_name = "crosshair";
 
 MirCursorConfiguration::MirCursorConfiguration(char const* name) :
     name{name ? name : std::string()},
 
=== modified file 'src/client/symbols.map'
--- src/client/symbols.map	2015-07-25 08:10:48 +0000
+++ src/client/symbols.map	2015-07-28 02:45:17 +0000
@@ -164,6 +164,7 @@
   global:
     mir_connection_pong;
     mir_connection_set_ping_event_callback;
+    mir_crosshair_cursor_name;
     mir_keyboard_event_input_event;
     mir_persistent_id_as_string;
     mir_persistent_id_from_string;
 
=== modified file 'src/server/input/xcursor_loader.cpp'
--- src/server/input/xcursor_loader.cpp	2015-06-25 19:29:44 +0000
+++ src/server/input/xcursor_loader.cpp	2015-07-28 02:45:17 +0000
@@ -137,6 +137,10 @@
     {
         return "h_double_arrow";
     }
+    else if (mir_cursor_name == mir_crosshair_cursor_name)
+    {
+        return "crosshair";
+    }
     else
     {
         return mir_cursor_name;