Merge lp:~vanvugt/mir/tidy-up-mirout-edid into lp:mir

[Daniel van Vugt]

mirout: Tidy up the EDID output and hide it by default behind
the -v (verbose) flag.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3863
https://mir-jenkins.ubuntu.com/job/mir-ci/2298/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2990
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3055
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3047
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3047
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3047
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3019
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3019/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3019
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3019/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3019
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3019/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3019
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3019/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3019
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3019/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3019
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3019/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2298/rebuild

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Ok

review: Approve

=== modified file 'src/utils/out.c'
--- src/utils/out.c	2016-12-01 08:08:56 +0000
+++ src/utils/out.c	2016-12-01 08:08:56 +0000
@@ -334,6 +334,7 @@
     char const* server = NULL;
     char** actionv = NULL;
     int actionc = 0;
+    bool verbose = false;
 
     for (int a = 1; a < argc; a++)
     {
@@ -345,11 +346,15 @@
 
             switch (arg[1])
             {
+                case 'v':
+                    verbose = true;
+                    break;
                 case 'h':
                 default:
                     printf("Usage: %s [OPTIONS] [/path/to/mir/socket] [[output OUTPUTID] ACTION ...]\n"
                            "Options:\n"
                            "    -h  Show this help information.\n"
+                           "    -v  Show verbose information.\n"
                            "    --  Ignore the rest of the command line.\n"
                            "Actions:\n"
                            "    off | suspend | standby | on\n"
@@ -456,16 +461,22 @@
             }
             printf("\n");
 
+            /*
+             * Note we're not checking if state == connected here but it's
+             * probably a good test to probe this stuff unconditionally and
+             * make sure it all returns nothing for disconnected outputs...
+             */
             uint8_t const* edid = mir_output_get_edid(out);
-            if (edid)
+            if (verbose && edid)
             {
-                printf("EDID:");
+                int indent = 0;
+                printf("    EDID: %n", &indent);
                 size_t const size = mir_output_get_edid_size(out);
-                for (size_t i = 0; i < size ; ++i)
+                for (size_t i = 0; i < size; ++i)
                 {
-                    if ((i % 16) == 0)
+                    if (i && (i % 32) == 0)
                     {
-                        printf("\n\t");
+                        printf("\n%*c", indent, ' ');
                     }
                     printf("%.2hhx", edid[i]);
                 }