Add flexible keybinding/command system to sk_app

tools/viewer/Viewer.cpp

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "Viewer.h"
 
 #include "GMSlide.h"
 #include "SKPSlide.h"
 
 #include "SkCanvas.h"
 #include "SkCommonFlags.h"
 #include "SkOSFile.h"
 #include "SkRandom.h"
 #include "SkStream.h"
 
 using namespace sk_app;
 
 Application* Application::Create(int argc, char** argv, void* platformData) {
     return new Viewer(argc, argv, platformData);
 }
 
-static bool on_key_handler(Window::Key key, Window::InputState state, uint32_t modifiers,
-                           void* userData) {
-    Viewer* vv = reinterpret_cast<Viewer*>(userData);
-
-    return vv->onKey(key, state, modifiers);
-}
-
-static bool on_char_handler(SkUnichar c, uint32_t modifiers, void* userData) {
-    Viewer* vv = reinterpret_cast<Viewer*>(userData);
-
-    return vv->onChar(c, modifiers);
-}
-
 static void on_paint_handler(SkCanvas* canvas, void* userData) {
     Viewer* vv = reinterpret_cast<Viewer*>(userData);
 
     return vv->onPaint(canvas);
 }
 
 DEFINE_bool2(fullscreen, f, true, "Run fullscreen.");
 DEFINE_string(key, "", "Space-separated key/value pairs to add to JSON identifying this builder.");
 DEFINE_string2(match, m, nullptr,
                "[~][^]substring[$] [...] of bench name to run.\n"
@@ skipping 21 matching lines @@
         SkDebugf("%s ", argv[i]);
     }
     SkDebugf("\n");
 
     SkCommandLineFlags::Parse(argc, argv);
 
     fWindow = Window::CreateNativeWindow(platformData);
     fWindow->attach(Window::kVulkan_BackendType, DisplayParams());
 
     // register callbacks
-    fWindow->registerKeyFunc(on_key_handler, this);
-    fWindow->registerCharFunc(on_char_handler, this);
+    fCommands.attach(fWindow);
     fWindow->registerPaintFunc(on_paint_handler, this);
 
+    // add key-bindings
+    fCommands.addCommand('s', "Overlays", "Toggle stats display", [this]() {
+        this->fDisplayStats = !this->fDisplayStats;
+        fWindow->inval();
+    });
+    fCommands.addCommand('c', "Modes", "Toggle sRGB color mode", [this]() {
+        DisplayParams params = fWindow->getDisplayParams();
+        params.fProfileType = (kLinear_SkColorProfileType == params.fProfileType)
+            ? kSRGB_SkColorProfileType : kLinear_SkColorProfileType;
+        fWindow->setDisplayParams(params);
+        this->updateTitle();
+        fWindow->inval();
+    });
+    fCommands.addCommand(Window::Key::kRight, "Right", "Navigation", "Next slide", [this]() {
+        int previousSlide = fCurrentSlide;
+        fCurrentSlide++;
+        if (fCurrentSlide >= fSlides.count()) {
+            fCurrentSlide = 0;
+        }
+        this->setupCurrentSlide(previousSlide);
+    });
+    fCommands.addCommand(Window::Key::kLeft, "Left", "Navigation", "Previous slide", [this]() {
+        int previousSlide = fCurrentSlide;
+        fCurrentSlide--;
+        if (fCurrentSlide < 0) {
+            fCurrentSlide = fSlides.count() - 1;
+        }
+        this->setupCurrentSlide(previousSlide);
+    });
+    fCommands.addCommand(Window::Key::kUp, "Up", "Transform", "Zoom in", [this]() {
+        this->changeZoomLevel(1.f / 32.f);
+        fWindow->inval();
+    });
+    fCommands.addCommand(Window::Key::kDown, "Down", "Transform", "Zoom out", [this]() {
+        this->changeZoomLevel(-1.f / 32.f);
+        fWindow->inval();
+    });
+
     // set up slides
     this->initSlides();
 
     fAnimTimer.run();
 
     // set up first frame
     fCurrentSlide = 0;
     setupCurrentSlide(-1);
     updateMatrix();
 
@@ skipping 108 matching lines @@
     }
 
     // TODO: add gesture support
     // Apply any gesture matrix
     //m.preConcat(fGesture.localM());
     //m.preConcat(fGesture.globalM());
 
     fLocalMatrix = m;
 }
 
-bool Viewer::onKey(Window::Key key, Window::InputState state, uint32_t modifiers) {
-    if (Window::kDown_InputState == state) {
-        switch (key) {
-            case Window::kRight_Key: {
-                int previousSlide = fCurrentSlide;
-                fCurrentSlide++;
-                if (fCurrentSlide >= fSlides.count()) {
-                    fCurrentSlide = 0;
-                }
-                setupCurrentSlide(previousSlide);
-                return true;
-            }
-
-            case Window::kLeft_Key: {
-                int previousSlide = fCurrentSlide;
-                fCurrentSlide--;
-                if (fCurrentSlide < 0) {
-                    fCurrentSlide = fSlides.count() - 1;
-                }
-                setupCurrentSlide(previousSlide);
-                return true;
-            }
-
-            case Window::kUp_Key: {
-                this->changeZoomLevel(1.f / 32.f);
-                fWindow->inval();
-                return true;
-            }
-
-            case Window::kDown_Key: {
-                this->changeZoomLevel(-1.f / 32.f);
-                fWindow->inval();
-                return true;
-            }
-
-            default:
-                break;
-        }
-    }
-
-    return false;
-}
-
-bool Viewer::onChar(SkUnichar c, uint32_t modifiers) {
-    switch (c) {
-        case 's':
-            fDisplayStats = !fDisplayStats;
-            return true;
-        case 'c':
-            DisplayParams params = fWindow->getDisplayParams();
-            params.fProfileType = (kLinear_SkColorProfileType == params.fProfileType)
-                ? kSRGB_SkColorProfileType : kLinear_SkColorProfileType;
-            fWindow->setDisplayParams(params);
-            this->updateTitle();
-            fWindow->inval();
-            return true;
-    }
-
-    return false;
-}
-
 void Viewer::onPaint(SkCanvas* canvas) {
 
     int count = canvas->save();
 
     if (fWindow->supportsContentRect()) {
         SkRect contentRect = fWindow->getContentRect();
         canvas->clipRect(contentRect);
         canvas->translate(contentRect.fLeft, contentRect.fTop);
     }
 
     canvas->clear(SK_ColorWHITE);
     if (fWindow->supportsContentRect() && fWindow->scaleContentToFit()) {
         const SkRect contentRect = fWindow->getContentRect();
         const SkISize slideSize = fSlides[fCurrentSlide]->getDimensions();
         const SkRect slideBounds = SkRect::MakeIWH(slideSize.width(), slideSize.height());
         SkMatrix matrix;
         matrix.setRectToRect(slideBounds, contentRect, SkMatrix::kCenter_ScaleToFit);
         canvas->concat(matrix);
     }
     canvas->concat(fLocalMatrix);
 
     fSlides[fCurrentSlide]->draw(canvas);
     canvas->restoreToCount(count);
 
     if (fDisplayStats) {
         drawStats(canvas);
     }
+    fCommands.drawHelp(canvas);
 }
 
 void Viewer::drawStats(SkCanvas* canvas) {
     static const float kPixelPerMS = 2.0f;
     static const int kDisplayWidth = 130;
     static const int kDisplayHeight = 100;
     static const int kDisplayPadding = 10;
     static const int kGraphPadding = 3;
     static const SkScalar kBaseMS = 1000.f / 60.f;  // ms/frame to hit 60 fps
 
@@ skipping 41 matching lines @@
     // Record measurements
     fMeasurements[fCurrentMeasurement++] = ms;
     fCurrentMeasurement &= (kMeasurementCount - 1);  // fast mod
     SkASSERT(fCurrentMeasurement < kMeasurementCount);
 
     fAnimTimer.updateTime();
     if (fSlides[fCurrentSlide]->animate(fAnimTimer) || fDisplayStats) {
         fWindow->inval();
     }
 }